dzl 1.0.0 → 1.0.1

data/lib/dzl/dsl_proxies/protection.rb

@@ -4,7 +4,8 @@ class Dzl::DSLProxies::Protection < Dzl::DSLProxy
     @subject.opts[:http_basic] = opts
   end
   def api_key(opts)
-    raise ArgumentError unless [:header, :valid_keys].all? {|k| opts[k].present?}
+    raise ArgumentError unless opts[:header].present?
+    raise ArgumentError unless [:validate_with, :valid_keys].one? {|k| opts[k].present?}
     @subject.opts[:api_key] = opts
   end
 end

data/lib/dzl/dsl_subjects/protection.rb

@@ -29,13 +29,18 @@ class Dzl::DSLSubjects::Protection < Dzl::DSLSubject
 
     if @opts[:api_key].present?
       api_key_header = @opts[:api_key][:header]
-      allowed_keys = @opts[:api_key][:valid_keys]
       request_key = request.headers[api_key_header]
 
       if request_key
         # Invalid API key provided
-        unless allowed_keys.include? request_key
-          return Dzl::ValueOrError.new(e: :invalid_api_key)
+        if (valid_keys = @opts[:api_key][:valid_keys]).present?
+          unless valid_keys.include? request_key
+            return Dzl::ValueOrError.new(e: :invalid_api_key)
+          end
+        elsif (key_proc = @opts[:api_key][:validate_with]).present?
+          unless key_proc.call(request_key)
+            return Dzl::ValueOrError.new(e: :invalid_api_key)
+          end
         end
       # No API key provided
       else

data/lib/dzl/examples/fun_with_params.rb

@@ -54,6 +54,12 @@ class Dzl::Examples::FunWithParams < Dzl::Examples::Base
     end
   end
 
+  endpoint '/api_proc' do
+    protect do
+      api_key header: 'x_api_key', validate_with: lambda {|key| key.match(/valid/)}
+    end
+  end
+
   endpoint '/arithmetic' do
     optional :int do
       type Fixnum

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/fun_with_params_spec.rb

@@ -189,6 +189,23 @@ describe Dzl::Examples::FunWithParams do
     end
   end
 
+  describe '/api_proc' do
+    it 'should 401 if no api key provided' do
+      get '/api_proc'
+      last_response.status.should == 401
+    end
+
+    it 'should 401 if invalid api key provided' do
+      get '/api_proc', {}, {"HTTP_X_API_KEY" => 'bad-key'}
+      last_response.status.should == 401
+    end
+
+    it 'should accept valid api key' do
+      get '/api_proc', {}, {"HTTP_X_API_KEY" => 'valid-key'}
+      last_response.status.should == 200
+    end
+  end
+
   describe '/arithmetic' do
     it 'should not allow :int < 5' do
       get('/arithmetic', {int: 4}) do |response|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70266315864100 !ruby/object:Gem::Requirement
+  requirement: &70301799221440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70266315864100
+  version_requirements: *70301799221440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70266315862300 !ruby/object:Gem::Requirement
+  requirement: &70301799219580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70266315862300
+  version_requirements: *70301799219580
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: