deflectable 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360ccb8d8e116753a9a29d6b042137467d9e4fb8
-  data.tar.gz: 369179b44205e1cbdbfeb93d6f35eadaa856d423
+  metadata.gz: 1e4716f5e2c86e3ce09ff3ad7900cb1e3b5aeb03
+  data.tar.gz: ed906c20acca45219ac490310119df32480061d7
 SHA512:
-  metadata.gz: 7c96c23991ae7875dd6c33bb556dfdfdff524db693f0ec0d5384be4045756c6c9a0170b562f55a46ef9e8f25a559951464d4b56257f15b801a8b784d94dce5d4
-  data.tar.gz: 074dea192fd5ef24eceb6d20017248c62534965be62b9616f8e3ecaa897e5e93ef8de7b7f38c0e760aef68bfab282eec3814a7a66d47f27114dc6b2e4f6a762d
+  metadata.gz: 0bd0aaf78c815ba922b3ce011853d9534511afe7cd4670da554fe8912e2b534caa8239e8a6ee30030734dd65da3fe5dc3daf825e429cc0031f4406fc4ccd9818
+  data.tar.gz: e586a7411d053dc91bbbcdd07e493cd18587b642181c870556116c4fbd59e8d5c0befaedf0393ed3df762998cb100b81d53e6de7aec306561f1f53eec32947aa

data/README.md

@@ -2,6 +2,9 @@
 
 RailsアプリにIP制限 (ブラックリスト、ホワイトリスト)を適用
 
+It is possible to add the ip limiting the rack app.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,11 +19,13 @@ Or install it yourself as:
 
     $ gem install deflectable
 
-## Usage
 
+## Usage
 
 ### Configure
 
+#### Generator
+
 ```bash
 $ rails generate deflectable:install
 ```
@@ -29,22 +34,49 @@ Generated files
 * config/deflectable.yml
 * public/403.html
 
+
 #### deflectable.yml
 
 ```yaml
-# config/deflectable.yml
+### config/deflectable.yml
+
+# default false
+:log: true
 
-:log: true         # default false
-:whitelist:        # or :blacklist
+# :whitelist or :blacklist
+:whitelist:
   - 192.168.1.1
   - 10.20.30.0/24  # ip range
   - 3ffe:505:2::1  # IPv6 supported
+
+# default: config/deflectable.yml (Rails.root)
+:config_path: Rails.root.join('vendor/app/config/setting.yml')
 ```
 
+
 ### Modified config.ru
 
+#### config.ru & deflectable.yml
+
 ```ruby
 # config.ru
 
 use Deflectable::Watcher
+
+```
+
+#### Define the settings in the block (only config.ru)
+
+deflectable.ymlを設置せずに、ブロックで定義することもできる。
+
+Possible to omit the 'deflectable.yml'.
+
+```ruby
+# config.ru
+
+use Deflectable::Watcher do
+  { :log => true,
+    :whitelist => %w(192.168.1.1 10.20.30.0/24 3ffe:505:2::1)
+  }
+end
 ```

data/lib/deflectable/version.rb

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

data/lib/deflectable/watcher.rb

@@ -3,7 +3,7 @@ module Deflectable
   class Watcher
     attr_accessor :options
 
-    def initialize(app, build_options = {})
+    def initialize(app, build_options={}, &block)
       @app = app
       @filtering = nil
       @options = {
@@ -13,7 +13,9 @@ module Deflectable
         :log_date_format => '%m/%d/%Y',
         :whitelist => [],
         :blacklist => [],
+        :config_path => nil,
       }.merge(build_options)
+      @options = @options.merge(block.call) if block_given?
       configure_check!
     end
 
@@ -27,7 +29,7 @@ module Deflectable
     private
 
     def configure_check!
-      set_rails_configure!
+      load_config_file!
       if (not options[:whitelist].empty?) and (not options[:blacklist].empty?)
         raise <<-EOS
 There was both a :blanklist and :whitelist.
@@ -41,10 +43,15 @@ There was both a :blanklist and :whitelist.
       end
     end
 
-    def set_rails_configure!
-      return unless defined?(Rails)
-      conf = YAML.load_file(Rails.root.join('config/deflectable.yml'))
-      self.options = options.merge(conf).merge(:logger => Rails.logger)
+    def load_config_file!
+      if defined?(Rails)
+        file = options[:config_path] || Rails.root.join('config/deflectable.yml')
+        loaded_config = YAML.load_file(file) rescue {}
+        loaded_config = loaded_config.merge(:logger => Rails.logger)
+      else
+        loaded_config = YAML.load_file(options[:config_path]) rescue {}
+      end
+      self.options = options.merge(loaded_config)
     rescue => e
       log e.message
     end

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

@@ -3,3 +3,4 @@
 #   - 192.168.1.1
 #   - 10.20.30.0/24  # ip range
 #   - 3ffe:505:2::1  # IPv6 supported
+# :config_path: Rails.root.join('vendor/app/config/setting.yml') # default: config/deflectable.yml (Rails.root)

data/test/dummy/deflecter.log

@@ -0,0 +1 @@
+# Logfile created on 2013-09-28 16:30:31 +0900 by logger.rb/36483

data/test/dummy/log/development.log

@@ -106,3 +106,15 @@ Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-25 10:33:1
 
 
 Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-25 10:33:11 +0900
+
+
+Started GET "/" for 127.0.0.1 at 2013-09-28 18:33:00 +0900
+Processing by WelcomeController#index as HTML
+  Rendered welcome/index.html.erb within layouts/application (1.1ms)
+Completed 200 OK in 52ms (Views: 51.3ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-28 18:33:00 +0900
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-28 18:33:00 +0900

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deflectable
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Naohiro Sakuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -133,6 +133,7 @@ files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/deflecter.log
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/403.html
@@ -212,6 +213,7 @@ test_files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/deflecter.log
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/403.html