Adds http_basic to API

Author: Michael Bleigh

lib/grape/api.rb

@@ -48,6 +48,10 @@ def default_format(new_format = nil)
         new_format ? set(:default_format, new_format.to_sym) : settings[:default_format]
       end
 
+      def http_basic(&block)
+        block_given? ? set(:basic_auth, block) : settings[:basic_auth]
+      end
+      
       def route_set
         @route_set ||= Rack::Mount::RouteSet.new
       end
@@ -68,6 +72,7 @@ def route(method, path_info, &block)
       def build_endpoint(&block)
         b = Rack::Builder.new
         b.use Grape::Middleware::Error
+        b.use Grape::Middleware::Auth::Basic, &http_basic if http_basic
         b.use Grape::Middleware::Prefixer, :prefix => prefix if prefix        
         b.use Grape::Middleware::Versioner if version
         b.use Grape::Middleware::Formatter, :default_format => default_format || :json
@@ -82,9 +87,9 @@ def head(path_info, &block); route('HEAD', path_info, &block) end
       def delete(path_info, &block); route('DELETE', path_info, &block) end
 
       def namespace(space = nil, &block)
-        if space
+        if space || block_given?
           settings_stack << {}
-          set(:namespace, space.to_s)
+          set(:namespace, space.to_s) if space
           instance_eval &block
           settings_stack.pop
         else

spec/grape/api_spec.rb

@@ -78,6 +78,14 @@ def app; subject end
       subject.namespace.should == '/'
     end
 
+    it 'should be callable with nil just to push onto the stack' do
+      subject.namespace do
+        version 'v2'
+        compile_path('hello').should == '/v2/hello'
+      end
+      subject.compile_path('hello').should == '/hello'
+    end
+    
     %w(group resource resources).each do |als|
       it "`.#{als}` should be an alias" do
         subject.send(als, :awesome) do
@@ -86,4 +94,33 @@ def app; subject end
       end
     end
   end
+  
+  describe '.basic' do
+    it 'should protect any resources on the same scope' do
+      subject.http_basic do |u,p|
+        u == 'allow'
+      end
+      subject.get(:hello){ "Hello, world."}
+      get '/hello'
+      last_response.status.should == 401
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
+      last_response.status.should == 200
+    end
+    
+    it 'should be scopable' do
+      subject.get(:hello){ "Hello, world."}
+      subject.namespace :admin do
+        http_basic do |u,p|
+          u == 'allow'
+        end
+        
+        get(:hello){ "Hello, world." }
+      end
+      
+      get '/hello'
+      last_response.status.should == 200
+      get '/admin/hello'
+      last_response.status.should == 401
+    end
+  end
 end

spec/grape/middleware/auth/basic_spec.rb

@@ -13,23 +13,19 @@ def app
     end
   end
 
-  def encode(username, password)
-    "Basic " + Base64.encode64("#{username}:#{password}")
-  end
-  
   it 'should throw a 401 if no auth is given' do
     @proc = lambda{ false }
     get '/whatever'
     last_response.status.should == 401
   end
 
   it 'should authenticate if given valid creds' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode('admin','admin')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','admin')
     last_response.status.should == 200
   end
 
   it 'should throw a 401 is wrong auth is given' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode('admin','wrong')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','wrong')
     last_response.status.should == 401
   end
 end

spec/spec_helper.rb

@@ -10,6 +10,11 @@
 require 'rspec'
 require 'rack/test'
 
+require 'base64'
+def encode_basic(username, password)
+  "Basic " + Base64.encode64("#{username}:#{password}")
+end
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 end