rack-block 0.0.1.pre1 → 0.1.0

data/.gitignore

@@ -3,3 +3,4 @@
 pkg/*
 *~
 .rvmrc
+*\#*

data/.travis.yml

@@ -0,0 +1,8 @@
+# http://about.travis-ci.org/docs/user/build-configuration/
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3-p0
+notifications:
+  email:
+    - udzura@udzura.jp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-block (0.0.1)
+    rack-block (0.0.1.pre1)
       rack (>= 1.3)
 
 GEM
@@ -13,8 +13,11 @@ GEM
     guard-rspec (0.5.9)
       guard (>= 0.8.4)
     rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
+    rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -23,7 +26,12 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     thor (0.14.6)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
@@ -32,4 +40,6 @@ DEPENDENCIES
   guard-rspec
   rack-block!
   rack-test (> 0)
+  rake (> 0)
   rspec (>= 2)
+  sinatra (> 1.0)

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2011 Uchio Kondo <udzura@udzura.jp>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+http://mit-license.org/

data/README.md

@@ -0,0 +1,121 @@
+# rack-block
+
+A rack middleware for controlling accesses by search bot or not, remote ip address, etc.
+
+## Install
+
+```bash
+    $ gem install rack-block
+```
+
+No doubt it depends on `rack` (>= 1.3).
+
+## Usage
+
+### block all bot accesses:
+
+```ruby
+    use Rack::Block do
+      bot_access do
+        halt 404
+      end
+    end
+    run App.new
+```
+
+### block all bot accesses on a specific path:
+
+```ruby
+    use Rack::Block do
+      bot_access do
+        path '/secret/*' do
+          halt 404
+        end
+      end
+    end
+    run App.new
+```
+
+### block some patterns of accesses:
+
+```ruby
+    use Rack::Block do
+      ua_pattern /googlebot/i do
+        halt 404
+      end
+    end
+    run App.new
+```
+
+### block accesses from specific IP(s):
+
+```ruby
+    use Rack::Block do
+      ip_pattern '192.0.0.0' do
+      # expressions like '192.0.0.' also available
+        halt 404
+      end
+    end
+    run App.new
+```
+
+### redirect accesses:
+
+```ruby
+    use Rack::Block do
+      bot_access do
+        path '/secret/*' do
+          redirect '/'
+        end
+      end
+    end
+    run App.new
+```
+
+### redirect accesses to a double app:
+
+```ruby
+    use Rack::Block do
+      bot_access do
+        path '/secret/*' do
+          double { Dummy.new # is a Rack-compatible app }
+        end
+      end
+    end
+    run App.new
+```
+
+More usage on RDoc: [http://rubydoc.info/github/udzura/rack-block/master/frames]
+
+Or please look into `spec/*`
+
+## Related Sites
+
+* (official)[http://udzura.jp/rack-block]
+* (rubygems.org)[https://rubygems.org/gems/rack-block]
+* (github)[https://github.com/udzura/rack-block]
+* (travis-ci)[http://travis-ci.org/udzura/rack-block] / <img src="https://secure.travis-ci.org/udzura/rack-block.png" alt="build status" />
+* (author's blog)[http://blog.udzura.jp] (Japanese)
+
+## Todo
+
+* Make it more DRY
+* More test cases
+* Refactoring internal classes
+* Proxying accesses to another server
+* Passing IP patterns like `'192.0.0.0/24'`...
+
+## Contributing to rack-block
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2011 Uchio Kondo <udzura@udzura.jp>. See LICENSE for
+further details.

data/index.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset='utf-8'>
+
+  <title>udzura/rack-block @ GitHub</title>
+
+  <style type="text/css">
+    body {
+      margin-top: 1.0em;
+      background-color: #d25b93;
+      font-family: Helvetica, Arial, FreeSans, san-serif;
+      color: #000000;
+    }
+    #container {
+      margin: 0 auto;
+      width: 700px;
+    }
+    h1 { font-size: 3.8em; color: #2da46c; margin-bottom: 3px; }
+    h1 .small { font-size: 0.4em; }
+    h1 a { text-decoration: none }
+    h2 { font-size: 1.5em; color: #2da46c; }
+    h3 { text-align: center; color: #2da46c; }
+    a { color: #2da46c; }
+    .description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
+    .download { float: right; }
+    pre { background: #000; color: #fff; padding: 15px;}
+    hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
+    .footer { text-align:center; padding-top:30px; font-style: italic; }
+  </style>
+</head>
+
+<body>
+  <a href="https://github.com/udzura/rack-block"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+
+  <div id="container">
+
+    <div class="download">
+      <a href="https://github.com/udzura/rack-block/zipball/master">
+        <img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
+      <a href="https://github.com/udzura/rack-block/tarball/master">
+        <img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
+    </div>
+
+    <h1><a href="https://github.com/udzura/rack-block">rack-block</a>
+      <span class="small">by <a href="https://github.com/udzura">udzura</a></span></h1>
+
+    <div class="description">
+      A rack middleware for handling search bot access, ip block, etc.
+    </div>
+
+    
+
+    
+      <h2>Dependencies</h2>
+      <p>rack (>= 1.3)</p>
+    
+
+    
+      <h2>Install</h2>
+      <p>    gem install rack-block
+
+then edit `config.ru`:
+    use Rack::Block do
+      bot_access do
+        path '/foo' do
+          halt 404
+        end
+      end
+    end
+    run YourApp.new
+</p>
+    
+
+    
+      <h2>License</h2>
+      <p>MIT License.</p>
+    
+
+    
+      <h2>Authors</h2>
+      <p>Uchio Kondo (udzura@udzura.jp)
+    
+
+    
+      <h2>Contact</h2>
+      <p>Uchio Kondo (udzura@udzura.jp)
+    
+
+    <h2>Download</h2>
+    <p>
+      You can download this project in either
+      <a href="https://github.com/udzura/rack-block/zipball/master">zip</a> or
+      <a href="https://github.com/udzura/rack-block/tarball/master">tar formats.
+    </p>
+    <p>You can also clone the project with <a href="http://git-scm.com">Git</a>
+      by running:
+      <pre>$ git clone git://github.com/udzura/rack-block</pre>
+    </p>
+
+    <div class="footer">
+      get the source code on GitHub : <a href="https://github.com/udzura/rack-block">udzura/rack-block</a>
+    </div>
+
+  </div>
+
+</body>
+</html>

data/lib/rack/block.rb

@@ -1,7 +1,7 @@
 require 'rack'
 module Rack
   class Block
-    autoload :DSL, 'rack/block/dsl'
+    require 'rack/block/dsl'
 
     include DSL::Matchers
     include DSL::Responses
@@ -26,11 +26,23 @@ module Rack
           path_matchers.each_pair do |path, action_with_args|
             if path =~ req.path_info
               action, *args = action_with_args
-              return send action, *args
+              return send action, req, *args
             end
           end
         end
       end
+
+      self.ip_matchers.each_pair do |pattern, path_matchers|
+        if pattern =~ req.ip
+          path_matchers.each_pair do |path, action_with_args|
+            if path =~ req.path_info
+              action, *args = action_with_args
+              return send action, req, *args
+            end
+          end
+        end
+      end
+
       app.call(env)
     end
     # Your code goes here...

data/lib/rack/block/dsl.rb

@@ -1,9 +1,8 @@
 module Rack
   class Block
     module DSL
-      autoload :Matchers, 'rack/block/dsl/matchers'
-      autoload :Responses, 'rack/block/dsl/responses'
     end
   end
 end
-
+require 'rack/block/dsl/matchers'
+require 'rack/block/dsl/responses'

data/lib/rack/block/dsl/builtin_bot_pattern.rb

@@ -0,0 +1,21 @@
+# patterns barrowed from CodeIgniter's helper
+# thanks:
+# https://github.com/EllisLab/CodeIgniter/blob/develop/application/config/user_agents.php#L200
+# http://www.useragentstring.com/pages/useragentstring.php
+# TODO more more bot sample
+module Rack::Block::DSL
+  module Matchers
+    BUILTIN_BOT_PATTERN = /#{
+      ["Googlebot",
+       "MSNBot",
+       "Bing",
+       "Inktomi Slurp",
+       "Yahoo",
+       "AskJeeves",
+       "FastCrawler",
+       "InfoSeek Robot 1.0",
+       "Baiduspider",
+       "Lycos"].join("|")
+    }/i
+  end
+end

data/lib/rack/block/dsl/matchers.rb

@@ -1,11 +1,11 @@
+require 'rack/block/dsl/builtin_bot_pattern'
 module Rack::Block::DSL
   module Matchers
-    BUILTIN_BOT_PATTERN = /googlebot/i
-
     def bot_access(&block)
       ua_pattern BUILTIN_BOT_PATTERN, &block      
     end
 
+    # TODO it's NO DRY
     def ua_pattern(pattern, &block)
       @_current_matching_type, orig = :by_UA, @_current_matching_type
       @_current_matching_ua_pattern, orig_ptn = pattern, @_current_matching_ua_pattern
@@ -15,11 +15,44 @@ module Rack::Block::DSL
       @_current_matching_type = orig
     end
 
+    def ip_pattern(pattern, &block)
+      @_current_matching_type, orig = :by_IP, @_current_matching_type
+      @_current_matching_ip_pattern, orig_ptn = ip_to_pattern(pattern), @_current_matching_ip_pattern
+      yield
+    ensure
+      @_current_matching_ip_pattern = orig_ptn
+      @_current_matching_type = orig
+    end
+
+    alias block_ua ua_pattern
+    alias block_ip ip_pattern
+
     def path(pattern, &block)
       @_current_matching_path, orig = pattern, @_current_matching_path
       yield
     ensure
       @_current_matching_path = orig
     end
+
+    private
+    def ip_to_pattern(ip_pattern)
+      case ip_pattern
+      when /^(\d+)(\.\d+){3}$/
+        Regexp.compile("^" + ip_pattern.gsub('.', '\\.') + "$")
+      when /^(\d+)(\.\d+){0,2}\.?$/
+        ip_pattern = ip_pattern.sub(/\.$/, '')
+        Regexp.compile("^" + ip_pattern.gsub('.', '\\.') + '(\\.\\d+)+' + "$")
+      else
+        raise ArgumentError, 'passed invalid IP string'
+      end
+    end
+
+    def in_ua_block?
+      @_current_matching_type == :by_UA
+    end
+
+    def in_ip_block?
+      @_current_matching_type == :by_IP
+    end
   end
 end

data/lib/rack/block/dsl/responses.rb

@@ -1,9 +1,18 @@
 module Rack::Block::DSL
   module Responses
+    def detect_matching_pattern
+      if in_ua_block?
+        ua_matchers[@_current_matching_ua_pattern] ||= {}
+      elsif in_ip_block?
+        ip_matchers[@_current_matching_ip_pattern] ||= {}
+      end
+    end
+
+    # TODO non DRY on handling `@_current_matching_path' !!!! it is terrible!!
     def halt(code, opts={})
       if @_current_matching_path
-        path = Regexp.compile("^" + @_current_matching_path.sub(/\*/, '.*'))
-        current_matchers = (self.ua_matchers[@_current_matching_ua_pattern] ||= {})
+        path = Regexp.compile("^" + @_current_matching_path.gsub(/\./, '\\.').gsub(/\*/, '.*'))
+        current_matchers = detect_matching_pattern
         current_matchers[path] = [:do_halt, code, opts]
       else
         path '*' do
@@ -12,10 +21,59 @@ module Rack::Block::DSL
       end
     end
 
-    def do_halt(code, opts={})
+    def redirect(dest_path, opts={})
+      if @_current_matching_path
+        path = Regexp.compile("^" + @_current_matching_path.gsub(/\./, '\\.').gsub(/\*/, '.*'))
+        current_matchers = detect_matching_pattern
+        current_matchers[path] = [:do_redirect, dest_path, opts]
+      else
+        path '*' do
+          redirect dest_path, opts
+        end
+      end
+    end
+
+    def dummy_app(opts={}, &app_proc)
+      if @_current_matching_path
+        path = Regexp.compile("^" + @_current_matching_path.gsub(/\./, '\\.').gsub(/\*/, '.*'))
+        current_matchers = detect_matching_pattern
+        current_matchers[path] = [:do_dummy_app, app_proc, opts]
+      else
+        path '*' do
+          dummy_app opts, &app_proc
+        end
+      end
+    end
+
+    alias_method :double, :dummy_app
+
+    private
+    def do_halt(req, code, opts={})
       headers = {"Content-Type" => "text/plain"}.merge(opts[:headers] || {})
       body = opts[:body] || "Halt!"
       return [code, headers, [body]]
     end
+
+    def do_redirect(req, dest_path, opts={})
+      dest_full_path = case dest_path
+                       when /^https?:\/\//
+                         dest_path
+                       else
+                         uri = URI.parse req.url
+                         uri.path = dest_path
+                         uri.to_s
+                       end
+      code = opts[:status_code] || 301
+      return [code, {"Location" => dest_full_path}, []]
+    end
+
+    def do_dummy_app(req, app_proc, opts={})
+      case app_proc.arity
+      when 0
+        return app_proc.call.call(req.env)
+      else
+        return app_proc.call(req.env)
+      end
+    end
   end
 end

data/lib/rack/block/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Block
-    VERSION = "0.0.1.pre1"
+    VERSION = "0.1.0"
   end
 end

data/rack-block.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = Rack::Block::VERSION
   s.authors     = ["Uchio Kondo"]
   s.email       = ["udzura@udzura.jp"]
-  s.homepage    = ""
-  s.summary     = %q{A rack middleware for handling search bot access, ip block, etc.}
-  s.description = %q{A rack middleware for handling search bot access, ip block, etc.}
+  s.homepage    = "http://udzura.jp/rack-block"
+  s.summary     = %q{A rack middleware for controlling accesses by search bot or not, remote ip address, etc.}
+  s.description = %q{A rack middleware for controlling accesses by search bot or not, remote ip address, etc.}
 
   s.rubyforge_project = "rack-block"
 
@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rack", '>= 1.3'
 
+  s.add_development_dependency "rake", '> 0'
   s.add_development_dependency "rspec", '>= 2'
   s.add_development_dependency "rack-test", '> 0'
+  s.add_development_dependency "sinatra", '> 1.0'
   s.add_development_dependency "guard-rspec"
 end

data/spec/integrations/bot_pattern_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
+
+describe "Blocking search bots" do
+  def access_root_as(ua)
+    header "User-Agent", ua
+    get '/'
+  end
+
+  before do
+    mock_app do
+      use Rack::Block do
+        bot_access { halt 404 }
+      end
+      run DEFAULT_APP
+    end
+  end
+
+  it 'blocks google bot' do
+    access_root_as 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+    last_response.should be_not_found
+  end
+
+  it 'blocks msn bot' do
+    access_root_as 'msnbot/1.1 (+http://search.msn.com/msnbot.htm)'
+    last_response.should be_not_found
+  end
+
+  it 'blocks bing bot' do
+    access_root_as 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'
+    last_response.should be_not_found
+  end
+
+  it 'blocks yahoo! slurp' do
+    access_root_as 'Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)'
+    last_response.should be_not_found
+  end
+
+  it 'blocks baiduspider' do
+    access_root_as 'Baiduspider+(+http://www.baidu.com/search/spider_jp.html)'
+    last_response.should be_not_found
+  end
+end

data/spec/integrations/ip_blocking_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
+
+describe "Blocking by IP" do
+  it 'blocks accesses from a specific IP' do
+    mock_app {
+      use Rack::Block do
+        ip_pattern '10.20.30.40' do
+          halt 404
+        end
+      end
+      run DEFAULT_APP
+    }
+      
+    header "X-Forwarded-For", "10.20.30.40"
+    ['/', '/any', '/path/blocked'].each do |path|
+      get path
+      last_response.should be_not_found
+    end
+  end
+
+  it 'blocks accesses from a specific IP pattern' do
+    mock_app {
+      use Rack::Block do
+        ip_pattern '10.20.30.' do
+          halt 404
+        end
+      end
+      run DEFAULT_APP
+    }
+      
+    header "X-Forwarded-For", "10.20.30.40"
+    ['/', '/any', '/path/blocked'].each do |path|
+      get path
+      last_response.should be_not_found
+    end
+
+    header "X-Forwarded-For", "10.20.30.50"
+    ['/', '/any', '/path/blocked'].each do |path|
+      get path
+      last_response.should be_not_found
+    end
+  end
+
+  it 'blocks accesses from a specific IP pattern(with a netmask)' do
+    pending "Not yet implemented, netmask expressions to Regexp or some other matching methods..."
+    mock_app {
+      use Rack::Block do
+        ip_pattern '10.20.30.0/24' do
+          halt 404
+        end
+      end
+      run DEFAULT_APP
+    }
+      
+    header "X-Forwarded-For", "10.20.30.40"
+    ['/', '/any', '/path/blocked'].each do |path|
+      get path
+      last_response.should be_not_found
+    end
+
+    header "X-Forwarded-For", "10.20.30.50"
+    ['/', '/any', '/path/blocked'].each do |path|
+      get path
+      last_response.should be_not_found
+    end
+  end
+end

data/spec/integrations/path_matching_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
+
+describe "Path matching patterns" do
+  it 'matching path should specified with `/\' starting' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('/foo'){ halt 404 } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/foo'
+    last_response.should be_not_found
+
+    get '/bar/foo'
+    last_response.should be_ok
+  end
+
+  it 'matching glob `*\' should be a wildcard' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('/foo/*/bar'){ halt 500 } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/foo/123/bar'
+    last_response.should be_server_error
+
+    get '/foo/hogehoge/bar/4'
+    last_response.should be_server_error
+  end
+
+  it 'path including `.\' should be sane' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('/favicon.ico'){ halt 404 } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/favicon.ico'
+    last_response.should be_not_found
+
+    header "User-Agent", "Googlebot"
+    get '/favicon_ico'
+    last_response.should be_ok
+  end
+end

data/spec/integrations/response_verbs_spec.rb

@@ -0,0 +1,133 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
+
+describe "Response value verbs" do
+  before do
+  end
+
+  it 'can halt with status code 404' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('*'){ halt 404 } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/'
+    last_response.should be_not_found
+  end
+
+  it 'can halt with status code 500' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('*'){ halt 500 } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/'
+    last_response.status.should eq(500)
+  end
+
+  it 'can redirect' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('*'){ redirect 'http://www.google.com/' } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/'
+    last_response.should be_redirect
+  end
+
+  it 'can redirect internal' do
+    mock_app {
+      use Rack::Block do
+        bot_access { path('/foo/*'){ redirect '/' } }
+      end
+      run DEFAULT_APP
+    }
+
+    header "User-Agent", "Googlebot"
+    get '/foo/bar'
+    last_response.should be_redirect
+
+    follow_redirect!
+    last_response.body.should match /It is summer/
+  end
+
+  context 'doubling application' do
+    require 'sinatra/base'
+    let :dummy do
+      Class.new(Sinatra::Base) do
+        get '/' do
+          "This is a dummy access to: #{request.path_info}"
+        end
+      end
+    end
+
+    it 'can point access to a dummy application' do
+      dummy = dummy()
+      mock_app {
+        use Rack::Block do
+          bot_access do
+            path('*') do
+              dummy_app { dummy.new }
+            end
+          end
+        end
+        run DEFAULT_APP
+      }
+
+      header "User-Agent", "Googlebot"
+      get '/'
+      last_response.body.should match /This is a dummy access to: \//
+
+      get '/not-found'
+      last_response.should be_not_found
+    end
+
+    it 'should be called with env' do
+      dummy = dummy()
+      mock_app {
+        use Rack::Block do
+          bot_access do
+            path('*') do
+              double do |env|
+                # Sinatra::Base and its subclasses have a #call method in his class methods
+                dummy.call(env)
+              end
+            end
+          end
+        end
+        run DEFAULT_APP
+      }
+
+      header "User-Agent", "Googlebot"
+      get '/'
+      last_response.body.should match /This is a dummy access to: \//
+    end
+
+    it 'should be aliased by #double' do
+      dummy = dummy()
+      mock_app {
+        use Rack::Block do
+          bot_access do
+            path('*') do
+              double { dummy.new }
+            end
+          end
+        end
+        run DEFAULT_APP
+      }
+
+      header "User-Agent", "Googlebot"
+      get '/'
+      last_response.body.should match /This is a dummy access to: \//
+    end
+  end
+end

data/spec/integrations/ua_blocking_spec.rb

@@ -2,23 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
 
 describe "Blocking by UA" do
-  before do
-    mock_app {
-      use Rack::Block do
-        bot_access do
-          path '/foo' do
-            halt 404
-          end
-
-          path '/bar' do
-            redirect '/'
-          end
-        end
-      end
-      run DEFAULT_APP
-    }
-  end
-
   describe "Blocking built-in bot UA pattern" do
 
     it "blocks all bot access if no nesting block" do
@@ -50,14 +33,55 @@ describe "Blocking by UA" do
         run DEFAULT_APP
       }
       
+      header "User-Agent", "Googlebot"
+      get '/foo'
+      last_response.should be_not_found
+    end
+
+    it "does not block excepting specified paths" do
+      mock_app {
+        use Rack::Block do
+          bot_access do
+            path '/foo' do
+              halt 404
+            end
+          end
+        end
+        run DEFAULT_APP
+      }
+      
       header "User-Agent", "Googlebot"
       get '/'
       last_response.should be_ok
+    end
+  end
 
-      get '/foo'
-      last_response.should be_not_found
+  describe "Blocking customized UA pattern" do
+    before do
+      mock_app {
+        use Rack::Block do
+          ua_pattern /MSIE [678]\.[05].*Windows/ do
+            halt 404
+          end
+        end
+        run DEFAULT_APP
+      }
     end
 
-    it "does not block excepting specified paths"
+    it "blocks customized UA" do
+      header "User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"
+      ['/', '/any', '/path/blocked'].each do |path|
+        get path
+        last_response.should be_not_found
+      end
+    end
+
+    it "doesn't block non-matching UA" do
+      header "User-Agent", "Mozilla/5.0 (Ubuntu; X11; Linux i686; rv:8.0) Gecko/20100101 Firefox/8.0"
+      ['/', '/any', '/path/not-blocked'].each do |path|
+        get path
+        last_response.should be_ok
+      end
+    end
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rack-block
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000Z
+date: 2011-12-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &76848810 !ruby/object:Gem::Requirement
+  requirement: &85009500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *76848810
+  version_requirements: *85009500
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &85009210 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85009210
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76848430 !ruby/object:Gem::Requirement
+  requirement: &85008940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *76848430
+  version_requirements: *85008940
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &76847930 !ruby/object:Gem::Requirement
+  requirement: &85008680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76847930
+  version_requirements: *85008680
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &85008300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *85008300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &76847490 !ruby/object:Gem::Requirement
+  requirement: &85008070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +76,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76847490
-description: A rack middleware for handling search bot access, ip block, etc.
+  version_requirements: *85008070
+description: A rack middleware for controlling accesses by search bot or not, remote
+  ip address, etc.
 email:
 - udzura@udzura.jp
 executables: []
@@ -64,22 +87,32 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE
+- README.md
 - Rakefile
+- index.html
 - lib/rack-block.rb
 - lib/rack/block.rb
 - lib/rack/block/dsl.rb
+- lib/rack/block/dsl/bot_ua_pattern.rb
+- lib/rack/block/dsl/builtin_bot_pattern.rb
 - lib/rack/block/dsl/matchers.rb
 - lib/rack/block/dsl/responses.rb
 - lib/rack/block/version.rb
 - rack-block.gemspec
+- spec/integrations/bot_pattern_spec.rb
+- spec/integrations/ip_blocking_spec.rb
 - spec/integrations/mock_app_helper.rb
 - spec/integrations/mock_app_works_spec.rb
+- spec/integrations/path_matching_spec.rb
+- spec/integrations/response_verbs_spec.rb
 - spec/integrations/ua_blocking_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://udzura.jp/rack-block
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -94,13 +127,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rack-block
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A rack middleware for handling search bot access, ip block, etc.
+summary: A rack middleware for controlling accesses by search bot or not, remote ip
+  address, etc.
 test_files: []