deflectable 0.3.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fc88c369571805b7f60abcf04e748a3ae02d55
-  data.tar.gz: 460b80af74858b9b19d7c6e286231b7df1de9e85
+  metadata.gz: 360ccb8d8e116753a9a29d6b042137467d9e4fb8
+  data.tar.gz: 369179b44205e1cbdbfeb93d6f35eadaa856d423
 SHA512:
-  metadata.gz: 174d85bef6a21be23f48aab6361a01e39507ab913ccb2685ce6fadc99553e4712dc886e747569069fefb102170ed9e9eee58c4c46fc73deb435ab2a1aac163de
-  data.tar.gz: 44c2a299a3ad2613f05f3234b60e0b83c46fe515038e2313b62e4dd2d8e6cf77f8c4b51d239e539dda43cbe85da9f266f89515758ece99f34476558dd9407f1f
+  metadata.gz: 7c96c23991ae7875dd6c33bb556dfdfdff524db693f0ec0d5384be4045756c6c9a0170b562f55a46ef9e8f25a559951464d4b56257f15b801a8b784d94dce5d4
+  data.tar.gz: 074dea192fd5ef24eceb6d20017248c62534965be62b9616f8e3ecaa897e5e93ef8de7b7f38c0e760aef68bfab282eec3814a7a66d47f27114dc6b2e4f6a762d

data/README.md

@@ -24,9 +24,22 @@ Or install it yourself as:
 ```bash
 $ rails generate deflectable:install
 ```
+Generated files
 
-* generated 'config/deflectable.yml'
-* generated 'public/403.html'
+* config/deflectable.yml
+* public/403.html
+
+#### deflectable.yml
+
+```yaml
+# config/deflectable.yml
+
+:log: true         # default false
+:whitelist:        # or :blacklist
+  - 192.168.1.1
+  - 10.20.30.0/24  # ip range
+  - 3ffe:505:2::1  # IPv6 supported
+```
 
 ### Modified config.ru
 
@@ -35,12 +48,3 @@ $ rails generate deflectable:install
 
 use Deflectable::Watcher
 ```
-
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/lib/deflectable/blacklist.rb

@@ -0,0 +1,10 @@
+class Deflectable::Blacklist < Deflectable::Filtering
+
+  def initialize(options)
+    super(options[:blacklist])
+  end
+
+  def permit?(request_ip)
+    not include?(request_ip)
+  end
+end

data/lib/deflectable/filtering.rb

@@ -0,0 +1,19 @@
+require 'ipaddr'
+class Deflectable::Filtering
+
+  def initialize(filter_list)
+    @list = parse_ipaddress(filter_list)
+  end
+
+  def include?(request_ip)
+    @list.any?{|ip| ip.include?(request_ip)}
+  end
+
+  private
+
+  def parse_ipaddress(list)
+    list.map do |ip|
+      IPAddr.new(ip).to_range rescue nil
+    end.compact
+  end
+end

data/lib/deflectable/version.rb

@@ -1,6 +1,6 @@
 module Deflectable
   major  = 0
-  minore = 3
+  minore = 5
   patch  = 1
 
   VERSION = [major, minore, patch].join('.')

data/lib/deflectable/watcher.rb

@@ -18,7 +18,7 @@ module Deflectable
     end
 
     def call(env)
-      return reject!(env) if detect?(env)
+      return reject!(env) unless permit?(env)
       status, headers, body = @app.call(env)
       [status, headers, body]
     end
@@ -34,8 +34,8 @@ There was both a :blanklist and :whitelist.
 `Please select the :blacklist or :whitelist.'
         EOS
       end
-      @filtering = :whitelist unless options[:whitelist].empty?
-      @filtering = :blacklist unless options[:blacklist].empty?
+      @filtering = Whitelist.new(options) unless options[:whitelist].empty?
+      @filtering = Blacklist.new(options) unless options[:blacklist].empty?
       unless options[:logger]
         self.options[:logger] = Logger.new('deflecter.log')
       end
@@ -65,25 +65,9 @@ There was both a :blanklist and :whitelist.
       '<p>failed</p>'
     end
 
-    def detect?(env)
-      case @filtering
-      when :whitelist
-        allowed?(env) ? false : true
-      when :blacklist
-        denied?(env)
-      else
-        false
-      end
-    end
-
-    def allowed?(env)
-      return true if options[:whitelist].empty?
-      options[:whitelist].include?(env['REMOTE_ADDR']) ? true : false
-    end
-
-    def denied?(env)
-      return false if options[:blacklist].empty?
-      options[:blacklist].include?(env['REMOTE_ADDR']) ? true : false
+    def permit?(env)
+      return true unless @filtering
+      @filtering.permit?(env['REMOTE_ADDR'])
     end
 
     def log(message, level = :info)

data/lib/deflectable/whitelist.rb

@@ -0,0 +1,10 @@
+class Deflectable::Whitelist < Deflectable::Filtering
+
+  def initialize(options)
+    super(options[:whitelist])
+  end
+
+  def permit?(request_ip)
+    include?(request_ip)
+  end
+end

data/lib/deflectable.rb

@@ -1,4 +1,7 @@
 require 'deflectable/watcher'
+require 'deflectable/filtering'
+require 'deflectable/whitelist'
+require 'deflectable/blacklist'
 
 module Deflectable
 end

data/lib/generators/deflectable/templates/deflectable.yml

@@ -1,7 +1,5 @@
-# :log: true  # default: false
-# :whitelist:
-#   - '127.0.0.1'
-#   - '10.20.30.40'
-# :blacklist:
-#   - '12.12.12.12'
-#   - '90.80.70.60'
+# :log: true         # default: false
+# :whitelist:        # or :blacklist
+#   - 192.168.1.1
+#   - 10.20.30.0/24  # ip range
+#   - 3ffe:505:2::1  # IPv6 supported

data/test/dummy/log/development.log

@@ -1,314 +1,108 @@
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-25 18:30:06 +0900
-
-SQLite3::CantOpenException (unable to open database file):
-  activerecord (4.0.0) lib/active_record/connection_adapters/sqlite3_adapter.rb:24:in `initialize'
-  activerecord (4.0.0) lib/active_record/connection_adapters/sqlite3_adapter.rb:24:in `new'
-  activerecord (4.0.0) lib/active_record/connection_adapters/sqlite3_adapter.rb:24:in `sqlite3_connection'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:440:in `new_connection'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:450:in `checkout_new_connection'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:421:in `acquire_connection'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:356:in `block in checkout'
-  /Users/sakuma/.rvm/rubies/ruby-2.0.0-p247/lib/ruby/2.0.0/monitor.rb:211:in `mon_synchronize'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:355:in `checkout'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:265:in `block in connection'
-  /Users/sakuma/.rvm/rubies/ruby-2.0.0-p247/lib/ruby/2.0.0/monitor.rb:211:in `mon_synchronize'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:264:in `connection'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:546:in `retrieve_connection'
-  activerecord (4.0.0) lib/active_record/connection_handling.rb:79:in `retrieve_connection'
-  activerecord (4.0.0) lib/active_record/connection_handling.rb:53:in `connection'
-  activerecord (4.0.0) lib/active_record/query_cache.rb:51:in `restore_query_cache_settings'
-  activerecord (4.0.0) lib/active_record/query_cache.rb:43:in `rescue in call'
-  activerecord (4.0.0) lib/active_record/query_cache.rb:32:in `call'
-  activerecord (4.0.0) lib/active_record/connection_adapters/abstract/connection_pool.rb:626:in `call'
-  activerecord (4.0.0) lib/active_record/migration.rb:369:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
-  activesupport (4.0.0) lib/active_support/callbacks.rb:373:in `_run__1688254131637688522__call__callbacks'
-  activesupport (4.0.0) lib/active_support/callbacks.rb:80:in `run_callbacks'
-  actionpack (4.0.0) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/reloader.rb:64:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/remote_ip.rb:76:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
-  railties (4.0.0) lib/rails/rack/logger.rb:38:in `call_app'
-  railties (4.0.0) lib/rails/rack/logger.rb:21:in `block in call'
-  activesupport (4.0.0) lib/active_support/tagged_logging.rb:67:in `block in tagged'
-  activesupport (4.0.0) lib/active_support/tagged_logging.rb:25:in `tagged'
-  activesupport (4.0.0) lib/active_support/tagged_logging.rb:67:in `tagged'
-  railties (4.0.0) lib/rails/rack/logger.rb:21:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/request_id.rb:21:in `call'
-  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
-  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
-  activesupport (4.0.0) lib/active_support/cache/strategy/local_cache.rb:83:in `call'
-  rack (1.5.2) lib/rack/lock.rb:17:in `call'
-  actionpack (4.0.0) lib/action_dispatch/middleware/static.rb:64:in `call'
-  railties (4.0.0) lib/rails/engine.rb:511:in `call'
-  railties (4.0.0) lib/rails/application.rb:97:in `call'
-  /Users/sakuma/apps/libs/deflectable/lib/deflectable/watcher.rb:25:in `call'
-  rack (1.5.2) lib/rack/lock.rb:17:in `call'
-  rack (1.5.2) lib/rack/content_length.rb:14:in `call'
-  rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
-  /Users/sakuma/.rvm/rubies/ruby-2.0.0-p247/lib/ruby/2.0.0/webrick/httpserver.rb:138:in `service'
-  /Users/sakuma/.rvm/rubies/ruby-2.0.0-p247/lib/ruby/2.0.0/webrick/httpserver.rb:94:in `run'
-  /Users/sakuma/.rvm/rubies/ruby-2.0.0-p247/lib/ruby/2.0.0/webrick/server.rb:295:in `block in start_thread'
-
-
-  Rendered /Users/sakuma/.rvm/gems/ruby-2.0.0-p247@deflectable/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/_source.erb (0.4ms)
-  Rendered /Users/sakuma/.rvm/gems/ruby-2.0.0-p247@deflectable/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/_trace.erb (0.8ms)
-  Rendered /Users/sakuma/.rvm/gems/ruby-2.0.0-p247@deflectable/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (0.7ms)
-  Rendered /Users/sakuma/.rvm/gems/ruby-2.0.0-p247@deflectable/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (11.6ms)
-   (2.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:04 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-24 23:00:33 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 54ms (Views: 54.0ms | ActiveRecord: 0.0ms)
+Completed 200 OK in 27ms (Views: 26.3ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 22:57:05 +0900
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-24 23:00:34 +0900
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 22:57:05 +0900
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-24 23:00:34 +0900
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-24 23:51:20 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 3ms (Views: 3.0ms | ActiveRecord: 0.0ms)
+  Rendered welcome/index.html.erb within layouts/application (17.0ms)
+Completed 200 OK in 41ms (Views: 40.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-24 23:51:20 +0900
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-24 23:51:20 +0900
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:26:37 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 2ms (Views: 2.2ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 22:57:13 +0900
+  Rendered welcome/index.html.erb within layouts/application (1.1ms)
+Completed 200 OK in 45ms (Views: 44.5ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:30:07 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 2ms (Views: 2.2ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.1ms)
-Completed 200 OK in 3ms (Views: 2.7ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 2ms (Views: 1.9ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 22:57:14 +0900
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 24ms (Views: 23.4ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:35:51 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:32:49 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.6ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:35:51 +0900
+Completed 200 OK in 24ms (Views: 23.7ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:35:51 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:36:39 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:39:33 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.3ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:36:39 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:36:39 +0900
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 23ms (Views: 23.0ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:36:43 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:46:32 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 2ms (Views: 2.2ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:36:44 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:36:44 +0900
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 24ms (Views: 23.5ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:42:54 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:47:37 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.2ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:42:54 +0900
+Completed 200 OK in 24ms (Views: 23.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:42:54 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:45:45 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:48:19 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.7ms)
-Completed 200 OK in 25ms (Views: 24.3ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:45:45 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:45:45 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:47:41 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.9ms)
-Completed 200 OK in 29ms (Views: 28.9ms | ActiveRecord: 0.0ms)
+Completed 200 OK in 24ms (Views: 23.8ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:47:41 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:47:41 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:48:09 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:49:49 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 24ms (Views: 24.0ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:48:09 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:48:09 +0900
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 24ms (Views: 23.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:49:31 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 09:50:53 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.7ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:49:31 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:49:31 +0900
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 24ms (Views: 23.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:49:35 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 10:26:22 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.0ms)
-Completed 200 OK in 3ms (Views: 2.4ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:49:36 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:49:36 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:55:23 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (1.5ms)
-Completed 200 OK in 29ms (Views: 28.6ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:55:30 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:55:33 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:55:52 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.5ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:55:53 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:55:53 +0900
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 00:56:17 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.4ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 00:56:17 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 00:56:17 +0900
+Completed 200 OK in 2ms (Views: 2.2ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 01:03:40 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 10:32:29 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 24ms (Views: 24.0ms | ActiveRecord: 0.0ms)
+  Rendered welcome/index.html.erb within layouts/application (0.7ms)
+Completed 200 OK in 24ms (Views: 23.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 01:03:40 +0900
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 10:32:30 +0900
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 01:03:40 +0900
-Rejected(blacklist): 127.0.0.1
-Rejected(blacklist): 127.0.0.1
-Rejected(blacklist): 127.0.0.1
-Rejected(blacklist): 127.0.0.1
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 10:32:30 +0900
 
 
-Started GET "/" for 127.0.0.1 at 2013-09-26 01:17:52 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 10:33:11 +0900
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.8ms)
-Completed 200 OK in 25ms (Views: 24.5ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 01:17:52 +0900
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 01:17:52 +0900
-Rejected(whitelist): 127.0.0.1
-
-
-Started GET "/" for 127.0.0.1 at 2013-09-26 01:20:16 +0900
-Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (1.0ms)
-Completed 200 OK in 25ms (Views: 24.5ms | ActiveRecord: 0.0ms)
+Completed 200 OK in 24ms (Views: 23.6ms | ActiveRecord: 0.0ms)
 
 
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-26 01:20:17 +0900
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 10:33:11 +0900
 
 
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-26 01:20:17 +0900
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 10:33:11 +0900

data/test/dummy/log/test.log

@@ -1,16 +1,49 @@
-   (2.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.2ms)  begin transaction
-----------------------------------------------------------
-AcceptableTest: test_should_get_index_when_not_ip_controll
-----------------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-09-25 18:31:54 +0900
+-------------------------------------
+AcceptableTest: test_should_get_index
+-------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+DeflectableTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+--------------------------------------------
+WelcomeControllerTest: test_should_get_index
+--------------------------------------------
 Processing by WelcomeController#index as HTML
   Rendered welcome/index.html.erb within layouts/application (0.7ms)
-Completed 200 OK in 14ms (Views: 13.8ms | ActiveRecord: 0.0ms)
+Completed 200 OK in 12ms (Views: 12.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+-------------------------------------
+AcceptableTest: test_should_get_index
+-------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+DeflectableTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+-------------------------------------
+AcceptableTest: test_should_get_index
+-------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+DeflectableTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+-------------------------------------
+AcceptableTest: test_should_get_index
+-------------------------------------
+Started GET "/" for 127.0.0.1 at 2013-09-24 23:17:55 +0900
+Processing by WelcomeController#index as HTML
+  Rendered welcome/index.html.erb within layouts/application (0.9ms)
+Completed 200 OK in 26ms (Views: 25.5ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
 ---------------------------
@@ -21,10 +54,10 @@ DeflectableTest: test_truth
 ----------------------------------------------------------
 AcceptableTest: test_should_get_index_when_not_ip_controll
 ----------------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-09-25 19:13:16 +0900
+Started GET "/" for 127.0.0.1 at 2013-09-25 18:10:23 +0900
 Processing by WelcomeController#index as HTML
-  Rendered welcome/index.html.erb within layouts/application (0.7ms)
-Completed 200 OK in 12ms (Views: 12.0ms | ActiveRecord: 0.0ms)
+  Rendered welcome/index.html.erb within layouts/application (1.1ms)
+Completed 200 OK in 13ms (Views: 13.1ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
 ---------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deflectable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Naohiro Sakuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -87,8 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/deflectable/blacklist.rb
+- lib/deflectable/filtering.rb
 - lib/deflectable/version.rb
 - lib/deflectable/watcher.rb
+- lib/deflectable/whitelist.rb
 - lib/deflectable.rb
 - lib/generators/deflectable/install_generator.rb
 - lib/generators/deflectable/templates/403.html
@@ -113,7 +116,6 @@ files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/deflect.yml
-- test/dummy/config/deflectable.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
@@ -193,7 +195,6 @@ test_files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/deflect.yml
-- test/dummy/config/deflectable.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb

data/test/dummy/config/deflectable.yml

@@ -1,7 +0,0 @@
-# :log: true  # default: false
-# :whitelist:
-#   - '127.0.0.1'
-#   - '10.20.30.40'
-# :blacklist:
-#   - '12.12.12.12'
-#   - '90.80.70.60'