rack-private 0.1.8 → 0.2.0

data/README.markdown

@@ -6,42 +6,61 @@ Rack::Private
 Installation
 ------------
 
-    gem install rack-private
+``` bash
+$ gem install rack-private
+```
 
 Usage
 -----
 
 ``` ruby
 require 'rack-private'
-use Rack::Private :code => 'secret'
+use Rack::Private, :code => 'secret'
 ```
 
 You can also define multiple codes.
 
 ``` ruby
-use Rack::Private :codes => ['secret', 'super-secret']
+use Rack::Private, :codes => ['secret', 'super-secret']
 ```
 
 And provide your own template.
 
 ``` ruby
-use Rack::Private :code => 'secret', :template_path => Rails.root.join("app/templates/private.html")
+use Rack::Private, :code => 'secret', :template_path => Rails.root.join("app/templates/private.html")
 ```
 
 You can specify exceptions, using strings or regular expressions
 
 ``` ruby
-use Rack::Private :code => 'secret', :except => ["public"]
+use Rack::Private, :code => 'secret', :except => ["public"]
 ```
 
 This will allow access to *any* URL containing 'public'. If you want more control, use a regular expression:
 
 ``` ruby
-use Rack::Private :code => 'secret', :except => [/public$/]
+use Rack::Private, :code => 'secret', :except => [/public$/]
 ```
 
 This will only allow access to URLs that *end* in 'public'. You can use any expressions you want.
 
+If you have a lot of exceptions, you can specify a block
+
+``` ruby
+use Rack::Private, :code => 'secret' do
+  except /foo$/
+  except 'public'
+end
+```
+
+You can also specify a HTTP method in the block form
+
+``` ruby
+use Rack::Private, :code => 'secret' do
+  except /foo$/, :method => 'post'
+  except 'public', :method => :get
+end
+```
 
 Note on Patches/Pull Requests
 -----------------------------
@@ -55,4 +74,4 @@ Note on Patches/Pull Requests
 Author
 ------
 
-* [Thibaud Guillaume-Gentil](http://github.com/thibaudgg)
+[Thibaud Guillaume-Gentil](http://github.com/thibaudgg)

data/lib/rack/private.rb

@@ -1,9 +1,16 @@
 module Rack
   class Private
     
-    def initialize(app, options = {})
+    def initialize(app, options = {}, &block)
       @app = app
       @options = options
+      @exceptions = []
+
+      unless options[:except].nil?
+        options[:except].each {|exception| except(exception) }
+      end
+
+      instance_eval(&block) if block_given?
     end
     
     def call(env)
@@ -45,9 +52,26 @@ module Rack
     
     # Checks if the url matches one of our exception strings or regexs
     def public_page?(request)
-      @options[:except] && @options[:except].find {|x| request.url.match(x)}
+      @exceptions.find {|exception| exception?(request, exception)}
+    end
+
+    def exception?(request, exception)
+      path, method = *exception
+      matches_path?(request, path) && matches_method?(request, method)
+    end
+
+    def matches_path?(request, path)
+      request.url.match(path)
+    end
+
+    def matches_method?(request, method)
+      return true if method.nil?
+      request.request_method.downcase == method.values.first.downcase.to_s
+    end
+
+    def except(match, method = nil)
+      @exceptions << [match, method]
     end
-    
   end
 end
 

data/lib/rack/private/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Private
-    VERSION = "0.1.8"
+    VERSION = "0.2.0"
   end
-end
+end

metadata

@@ -1,71 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-private
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.11.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Private Rack middleware purpose is to protect your Rack application from anonymous via a secret code form.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Private Rack middleware purpose is to protect your Rack application from
+  anonymous via a secret code form.
+email:
 - thibaud@thibaud.me
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rack/private/index.html
 - lib/rack/private/version.rb
 - lib/rack/private.rb
@@ -74,30 +91,29 @@ files:
 - README.markdown
 homepage: http://github.com/thibaudgg/rack-private
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -4059976681787191131
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: rack-private
-rubygems_version: 1.8.1
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Protect your Rack application from anonymous.
 test_files: []
-