rack-screen-door 0.0.3 → 0.0.4

data/README.md

@@ -30,6 +30,7 @@ Additional options can be supplied:
       :template_path => 'path/to/my_screen_door.html.erb',
       :cookie_key => 'my_cookie_name',
       :cookie_hash => { :domain => '.example.org', :secure => true },
-      :expires => 1.year
+      :expires => 1.year,
+      :bypass_if => lambda { |request| request.path == '/safe_area' }
 
 See [default_template.html.erb](https://github.com/patdeegan/rack-screen-door/blob/master/default_template.html.erb) as an example template file.

data/lib/rack/screen_door.rb

@@ -15,7 +15,7 @@ module Rack
     DEFAULT_SALT          = 'SaltySalt'
     
     attr_reader :app, :cookie_key, :cookie_hash, :expires
-    attr_reader :template_path, :salt, :answer
+    attr_reader :template_path, :salt, :answer, :bypass_if
     attr_reader :redirect_url, :error
     
     # Creates the middleware.
@@ -24,10 +24,14 @@ module Rack
     # @param [String] answer secret answer
     # @param [Hash] options options
     # @option options [String] :salt (DEFAULT_SALT) a server-side secret
-    # @option options [String] :template_path (DEFAULT_TEMPLATE_PATH) the path to an HTML or ERB file to render
+    # @option options [String] :template_path (DEFAULT_TEMPLATE_PATH) the path to
+    #                 an HTML or ERB file to render
     # @option options [String] :cookie_key (DEFAULT_COOKIE_KEY) the cookie key (name)
-    # @option options [Hash] :cookie_hash (DEFAULT_COOKIE_HASH) cookie options that will be passed to Rack::Response#set_cookie
+    # @option options [Hash] :cookie_hash (DEFAULT_COOKIE_HASH) cookie
+    #                 options that will be passed to Rack::Response#set_cookie
     # @option options [Integer] :expires (DEFAULT_EXPIRES) how long a cookie will persist
+    # @option options [Proc] :bypass_if a block that gets passed `request`;
+    #                 truthy return values will be allowed even without a cookie.
     def initialize(app, answer, options = {})
       @app           = app
       @answer        = answer
@@ -36,6 +40,7 @@ module Rack
       @cookie_key    = options[:cookie_key]    || DEFAULT_COOKIE_KEY
       @cookie_hash   = DEFAULT_COOKIE_HASH.merge(options[:cookie_hash] || {})
       @expires       = options[:expires]       || DEFAULT_EXPIRES
+      @bypass_if     = options[:bypass_if]
     end
     
     # Rack middleware chain.
@@ -49,7 +54,8 @@ module Rack
     
     def _call(env)
       request = Rack::Request.new(env)
-      return app.call(env) if verified_cookie?(request)
+      return app.call(env) if verified_cookie?(request) ||
+                             (bypass_if && bypass_if.call(request))
       response = Rack::Response.new
       if request.post?
         @redirect_url = request.params['redirect'] || '/'

data/lib/rack/screen_door/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ScreenDoor
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/screen_door_spec.rb

@@ -29,6 +29,7 @@ describe Rack::ScreenDoor do
     its(:expires)       { should == 60 * 60 * 24 * 30 }
     its(:answer)        { should == penguin_answer }
     its(:hashed_answer) { should == penguin_hash }
+    its(:bypass_if)     { should be_nil }
 
   end
   
@@ -38,14 +39,6 @@ describe Rack::ScreenDoor do
     
     before { clear_cookies }
 
-    def cookie_value
-      rack_mock_session.cookie_jar[default_cookie_key]
-    end
-    
-    def headers
-      last_response.headers
-    end
-
     context 'GET /blah' do
 
       before { get '/blah' }
@@ -121,6 +114,42 @@ describe Rack::ScreenDoor do
 
     end
   
-  end
+    context 'bypass_if is set' do
+    
+      let(:app) do
+        Rack::ScreenDoor.new(default_app, penguin_answer,
+          :bypass_if => lambda { |request| request.path == '/safe_area' }
+        )
+      end
+    
+      context 'GET /blah' do
+
+        before { get '/blah' }
+        it { should be_ok }
+        its(:body) { should include(default_question) }
+        specify { cookie_value.should be_nil }
+    
+      end
+    
+      context 'GET /safe_area' do
+      
+        before { get '/safe_area' }
+        it { should be_ok }
+        its(:body) { should == default_app_body }
+        specify { cookie_value.should be_nil }
+    
+      end
   
+    end
+
+    def cookie_value
+      rack_mock_session.cookie_jar[default_cookie_key]
+    end
+  
+    def headers
+      last_response.headers
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-screen-door
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - John Nishinaga
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
   name: rack
-  type: :runtime
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -41,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   name: rake
-  type: :development
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,12 +56,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   name: rack-test
-  type: :development
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,12 +70,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
   name: rspec
-  type: :development
+  version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   name: yard
-  type: :development
+  version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,10 +98,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  prerelease: false
   name: redcarpet
-  type: :development
+  version_requirements: *id006
+  prerelease: false
 description: Rack middleware for simple question and answer authorization.
 email: 
 - jingoro@casa-z.org