rackif 0.0.1 → 0.0.2

data/README

@@ -1,12 +1,20 @@
 Use or don't use rack apps based on a variety of environment variables.
 
+gem install rackif --source http://gemcutter.org
+
 Example:
-use Rack::If, :path => '/protected', :method => /get/i do
+
+require 'rackif'
+use Rack::If, {:path => /\A\/protected.*/, :method => 'POST'}, :any do
   use Rack::Auth::Basic, "Rack::If Example" do |username, password|
     'secret' == password
   end
 end
 
+The third argument (:all or :any) is optional, defaults to :all.
+
+With :all, all options must match for the block to get run. In the above example, the path would need to start with /protected AND the method would need to be POST. With :any, if ANY of the criteria match (either POST or the path), the block is run.
+
 Options available are: path, method, user_agent, host, port, query_string, http_accept, and http_accept_encoding.
 
 Values given can be strings or regex (=== used for comparison).

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rackif', '0.0.1') do |p|
+Echoe.new('rackif', '0.0.2') do |p|
   p.summary        = "Conditional use of rack apps"
   p.description    = "Use or don't use Rack apps based on a variety of environment factors."
   # p.url            = "http://samsm.com/"

data/config.ru

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rack'
 require 'lib/rackif'
 
-use Rack::If, :path => '/protected', :method => 'GET' do
+use Rack::If, {:path => '/protected', :method => 'POST'}, :any do
   use Rack::Auth::Basic, "Rack::If Example" do |username, password|
     'secret' == password
   end

data/lib/if.rb

@@ -2,15 +2,34 @@ class Rack::If
  
   attr_reader :app
  
-  def initialize(app, options={}, &block)
-    @options = options
-    @app     = app
+  def initialize(app, options={}, all_or_any = :all, &block)
+    @methodology = all_or_any
+    @options     = options
+    @app         = app
     
     @middleware = []
     instance_eval(&block)
   end
   
   def match?(env)
+    case @methodology.to_s
+    when 'all'
+      match_all?(env)
+    when 'any'
+      match_any?(env)
+    end
+  end
+  
+  def match_any?(env)
+    @options.inject(false) do |memo,pair|
+      if_key = pair[0]
+      rack_key = comparison_table[if_key]
+      if_value = pair[1]
+      memo || if_value === env[rack_key]
+    end
+  end
+  
+  def match_all?(env)
     @options.inject(true) do |memo, pair|
       if_key = pair[0]
       rack_key = comparison_table[if_key]

data/rackif.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackif}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-18}
   s.description = %q{Use or don't use Rack apps based on a variety of environment factors.}
   s.email = %q{}
   s.extra_rdoc_files = ["README", "lib/if.rb", "lib/rackif.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackif
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - ""
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency