rackif 0.0.3 → 0.1.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Rack::If
 
-Use or don't use rack apps based on a variety of environment variables.
+Use or don't use rack apps based on a variety of environment variables. That was the original purpose of this gem, however Rack::If basically allows you make adjustment to the Rack stack based on environment variables.
 
 == Use
 
@@ -9,9 +9,11 @@ gem install rackif
 Example (in your config.ru):
 
   require 'rackif'
-  use Rack::If, {:path => /\A\/protected.*/, :method => 'POST'}, :any do
-    use Rack::Auth::Basic, "Rack::If Example" do |username, password|
-      'secret' == password
+  use Rack::If do
+    if path == '/protected' && method != 'GET'
+      use Rack::Auth::Basic, "Rack::If Example" do |username, password|
+        'secret' == password
+      end
     end
   end
   
@@ -19,27 +21,18 @@ Example (in your config.ru):
 
 == Configuration
 
-Rack::If, options, all_or_any
+Rack::If block
+Shortcut methods for path, method, user_agent, host, port, query_string, http_accept, and http_accept_encoding are available, anything else is available at env.
 
-The third argument (:all or :any) is optional, defaults to :all.
+Example:
 
-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).
+  use Rack::If do
+    unless env['rack.session']['verified_identity']
+      use EasyRackOpenID
+    end
+  end
 
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
 
 == Copyright
 
-Copyright (c) 2009 Sam Schenkman-Moore. See LICENSE for details.
+Copyright (c) 2009 Sam Schenkman-Moore, David Dollar. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/config.ru

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

data/lib/if.rb

@@ -1,6 +1,6 @@
 class Rack::If
  
-  attr_reader :app
+  attr_reader :app, :env
  
   def initialize(app, options={}, all_or_any = :all, &block)
     @methodology = all_or_any
@@ -8,63 +8,35 @@ class Rack::If
     @app         = app
     
     @middleware = []
-    instance_eval(&block)
+    @block = 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]
-      if_value = pair[1]
-      memo && if_value === env[rack_key]
-    end
-  end
-  
-  def comparison_table
-    {
-      :path                 => "PATH_INFO",
-      :method               => "REQUEST_METHOD",
-      :user_agent           => "HTTP_USER_AGENT",
-      :host                 => "HTTP_HOST",
-      :port                 => "SERVER_PORT",
-      :query_string         => "QUERY_STRING",
-      :http_accept          => "HTTP_ACCEPT",
-      :http_accept_encoding => "HTTP_ACCEPT_ENCODING"
-    }
-  end
+  # shortcuts
+  def path                 ; env["PATH_INFO"]            ; end
+  def method               ; env["REQUEST_METHOD"]       ; end
+  def user_agent           ; env["HTTP_USER_AGENT"]      ; end
+  def host                 ; env["HTTP_HOST"]            ; end
+  def port                 ; env["SERVER_PORT"]          ; end
+  def query_string         ; env["QUERY_STRING"]         ; end
+  def http_accept          ; env["HTTP_ACCEPT"]          ; end
+  def http_accept_encoding ; env["HTTP_ACCEPT_ENCODING"] ; end
   
-  def call(env)
-    if match?(env)
+  def call(rack_environment)
+    @env = rack_environment
+    instance_eval(&@block)
+    if @middleware.any?
       stack.call(env)
     else
       app.call(env)
     end
   end
- 
+  
   def stack
     @middleware.reverse.inject(app) { |app, mid| mid.call(app) }
   end
- 
+  
   def use(middleware, *args, &block)
     @middleware << lambda { |app| middleware.new(app, *args, &block) }
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackif
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency