Updating gemspec and such.

Author: Michael Bleigh

grape.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grape}
-  s.version = "0.0.0.alpha.2"
+  s.version = "0.0.0.beta.1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-11-11}
   s.description = %q{A Ruby framework for rapid API development with great conventions.}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = [
@@ -30,18 +30,25 @@ Gem::Specification.new do |s|
      "autotest/discover.rb",
      "grape.gemspec",
      "lib/grape.rb",
+     "lib/grape/api.rb",
+     "lib/grape/endpoint.rb",
+     "lib/grape/middleware/auth/basic.rb",
      "lib/grape/middleware/auth/oauth2.rb",
      "lib/grape/middleware/base.rb",
      "lib/grape/middleware/error.rb",
      "lib/grape/middleware/formatter.rb",
      "lib/grape/middleware/prefixer.rb",
      "lib/grape/middleware/versioner.rb",
+     "lib/grape/middleware_stack.rb",
+     "spec/grape/api_spec.rb",
+     "spec/grape/middleware/auth/basic_spec.rb",
      "spec/grape/middleware/auth/oauth2_spec.rb",
      "spec/grape/middleware/base_spec.rb",
      "spec/grape/middleware/error_spec.rb",
      "spec/grape/middleware/formatter_spec.rb",
      "spec/grape/middleware/prefixer_spec.rb",
      "spec/grape/middleware/versioner_spec.rb",
+     "spec/grape/middleware_stack_spec.rb",
      "spec/grape_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -51,12 +58,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby framework for rapid API development.}
   s.test_files = [
-    "spec/grape/middleware/auth/oauth2_spec.rb",
+    "spec/grape/api_spec.rb",
+     "spec/grape/middleware/auth/basic_spec.rb",
+     "spec/grape/middleware/auth/oauth2_spec.rb",
      "spec/grape/middleware/base_spec.rb",
      "spec/grape/middleware/error_spec.rb",
      "spec/grape/middleware/formatter_spec.rb",
      "spec/grape/middleware/prefixer_spec.rb",
      "spec/grape/middleware/versioner_spec.rb",
+     "spec/grape/middleware_stack_spec.rb",
      "spec/grape_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -69,22 +79,25 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
       s.add_runtime_dependency(%q<rack-jsonp>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+      s.add_runtime_dependency(%q<multi_xml>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-mount>, [">= 0"])
       s.add_dependency(%q<rack-jsonp>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<multi_xml>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-mount>, [">= 0"])
     s.add_dependency(%q<rack-jsonp>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<multi_xml>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

lib/grape/api.rb

@@ -48,8 +48,16 @@ def default_format(new_format = nil)
         new_format ? set(:default_format, new_format.to_sym) : settings[:default_format]
       end
 
+      def auth(type = nil, &block)
+        if type
+          set(:auth, {:type => type.to_sym, :proc => block})
+        else
+          settings[:auth]
+        end
+      end
+      
       def http_basic(&block)
-        block_given? ? set(:basic_auth, block) : settings[:basic_auth]
+        auth :http_basic, &block
       end
 
       def route_set
@@ -72,7 +80,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::Auth::Basic, &settings[:auth][:proc] if settings[:auth] && settings[:auth][:type] == :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

spec/grape/api_spec.rb

@@ -122,5 +122,17 @@ def app; subject end
       get '/admin/hello'
       last_response.status.should == 401
     end
+    
+    it 'should be callable via .auth as well' do
+      subject.auth :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
   end
 end