rack-block 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c2f1a087957bf72667d02d6fcf99f1364d1c1cb
+  data.tar.gz: ffa62d33a25ab0c38bec661c0233bffbb5dc8289
+SHA512:
+  metadata.gz: bb66d510b1e728481724e710ad5f56d491219650041d81217a0ac5622d3524cf0222b3674db7e904f1013259579c653ffccf69287e2c9b2c288bd5b7b5f5817f
+  data.tar.gz: 07e27e0b4de75b704b34c0a4ed69cade6e2825deb190a8bb5ecc1efa39b4ff32f720abf972158ea5b2a18d072096d5c677e428c33853e3f7bfdd3357d83b3f7e

data/.gitignore

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

data/.rspec

@@ -1 +1 @@
--fs --color
+-f documentation --color

data/.travis.yml

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

data/README.md

@@ -96,6 +96,7 @@ Or please look into `spec/*`
 * (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" />
+* (gemnagium)[https://gemnasium.com/udzura/rack-block] / <img src="https://gemnasium.com/udzura/rack-block.png" alt="dep status" />
 * (author's blog)[http://blog.udzura.jp] (Japanese)
 
 ## Todo

data/Rakefile

@@ -5,12 +5,12 @@ begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
-    spec.rspec_opts = "-fs --color"
+    spec.rspec_opts = "-f documentation --color"
   end
 
   RSpec::Core::RakeTask.new(:"spec:integrations") do |spec|
     spec.pattern = FileList['spec/integrations/**/*_spec.rb']
-    spec.rspec_opts = "-fs --color"
+    spec.rspec_opts = "-f documentation --color"
   end
   task :default => :spec
 rescue LoadError

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

@@ -1,4 +1,5 @@
 require 'rack/block/dsl/builtin_bot_pattern'
+require 'rack/block/ipaddr/monkeypatch'
 module Rack::Block::DSL
   module Matchers
     def bot_access(&block)
@@ -42,6 +43,8 @@ module Rack::Block::DSL
       when /^(\d+)(\.\d+){0,2}\.?$/
         ip_pattern = ip_pattern.sub(/\.$/, '')
         Regexp.compile("^" + ip_pattern.gsub('.', '\\.') + '(\\.\\d+)+' + "$")
+      when /^\d+\.\d+\.\d+\.\d+\/\d+$/
+        IPAddr.new(ip_pattern)
       else
         raise ArgumentError, 'passed invalid IP string'
       end

data/lib/rack/block/ipaddr/monkeypatch.rb

@@ -0,0 +1,7 @@
+require 'ipaddr'
+
+class IPAddr
+  def =~(target)
+    include?(target)
+  end
+end

data/lib/rack/block/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Block
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/rack-block.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rack", '>= 1.3'
 
-  s.add_development_dependency "bundler", '~> 1.1.rc'
+  #s.add_development_dependency "bundler", '~> 1.1.rc'
   s.add_development_dependency "pry"
   s.add_development_dependency "rake", '> 0'
   s.add_development_dependency "rspec", '>= 2'
+  s.add_development_dependency "mocha", '>= 0'
   s.add_development_dependency "rack-test", '> 0'
   s.add_development_dependency "sinatra", '> 1.0'
   s.add_development_dependency "guard-rspec"

data/spec/integrations/ip_blocking_spec.rb

@@ -2,6 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
 
 describe "Blocking by IP" do
+  before do
+    Rack::Request.any_instance.stubs(:ip).returns('10.20.30.40')
+  end
+
   it 'blocks accesses from a specific IP' do
     mock_app {
       use Rack::Block do
@@ -11,58 +15,67 @@ describe "Blocking by IP" do
       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
+  describe 'blocks accesses from a specific IP pattern' do
+    before do
+      mock_app {
+        use Rack::Block do
+          ip_pattern '10.20.30.' do
+            halt 404
+          end
         end
+        run DEFAULT_APP
+      }
+    end
+    
+    it 'blocks 10.20.30.40 when supplied with 10.20.30.' do
+      ['/', '/any', '/path/blocked'].each do |path|
+        get path
+        last_response.should be_not_found
       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
+    it 'blocks 10.20.30.50 when supplied with 10.20.30.' do
+      Rack::Request.any_instance.stubs(:ip).returns('10.20.30.50')
+      ['/', '/any', '/path/blocked'].each do |path|
+        get path
+        last_response.should be_not_found
+      end
     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
+  describe 'blocks accesses from a specific IP pattern(with a netmask)' do
+    before do
+      mock_app {
+        use Rack::Block do
+          ip_pattern '10.20.30.0/24' do
+            halt 404
+          end
         end
+        run DEFAULT_APP
+      }
+    end
+
+    it 'blocks 10.20.30.40 when supplied with 10.20.30.0/24' do
+      Rack::Request.any_instance.stubs(:ip).returns('10.20.30.40')
+      ['/', '/any', '/path/blocked'].each do |path|
+        get path
+        last_response.should be_not_found
       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
+    it 'does not block 10.20.31.0 when supplied with 10.20.30.0/24' do
+      Rack::Request.any_instance.stubs(:ip).returns('10.20.31.0')
+      ['/', '/any', '/path/blocked'].each do |path|
+        get path
+        last_response.should be_ok
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,12 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rack/test'
 require 'rack-block'
+require 'mocha'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.mock_framework = :mocha
   #...
 end
 

metadata

@@ -1,104 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: rack-block
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &72148790 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *72148790
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &72148500 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.rc
-  type: :development
-  prerelease: false
-  version_requirements: *72148500
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &72148210 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72148210
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &72147600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72147600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72147090 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *72147090
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &72141630 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72141630
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &72141270 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *72141270
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &72140870 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72140870
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rack middleware for controlling accesses by search bot or not, remote
   ip address, etc.
 email:
@@ -107,11 +130,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -124,6 +146,7 @@ files:
 - lib/rack/block/dsl/builtin_bot_pattern.rb
 - lib/rack/block/dsl/matchers.rb
 - lib/rack/block/dsl/responses.rb
+- lib/rack/block/ipaddr/monkeypatch.rb
 - lib/rack/block/version.rb
 - rack-block.gemspec
 - spec/integrations/bot_pattern_spec.rb
@@ -137,27 +160,35 @@ files:
 - spec/spec_helper.rb
 homepage: http://udzura.jp/rack-block
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rack-block
-rubygems_version: 1.8.10
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A rack middleware for controlling accesses by search bot or not, remote ip
   address, etc.
-test_files: []
+test_files:
+- 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/normally_passes_access.rb
+- spec/integrations/path_matching_spec.rb
+- spec/integrations/response_verbs_spec.rb
+- spec/integrations/ua_blocking_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-block (0.1.1)
-      rack (>= 1.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    coderay (0.9.8)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    guard (0.9.4)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.5.10)
-      guard (>= 0.8.4)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
-    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)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.9)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (2.1.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.1.rc)
-  guard-rspec
-  pry
-  rack-block!
-  rack-test (> 0)
-  rake (> 0)
-  rspec (>= 2)
-  sinatra (> 1.0)