alpaca 1.0.2 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5b83cdbfb00c2aaab10f5b06cd8b096019e7d500
+  data.tar.gz: 46728adbd38c82af38342fad4bae359eb4668c5e
+SHA512:
+  metadata.gz: e959f340854e63384d3e87c6bb2d819333698206627b32838c8af88b3e2bbc83a0508db965be49e1a60f65b20d09e72488daf3806caa20c32ae7f924be45f72b
+  data.tar.gz: b57f8032424964f876925ae488d7da00166b20e5433621d7b5a0983515d06f27feaf4e47f18bee653685ff9849dcc07becffd077707196cbd177ac81ced8cbc3

data/lib/rack/alpaca.rb

@@ -1,15 +1,17 @@
 module Rack
   module Alpaca
     class << self
+
       attr_reader :whitelist, :blacklist
       attr_accessor :default
 
       def new (app)
+        @@config ||= YAML.load_file('config/alpaca.yml')
+
         @app = app
-        config = YAML.load_file('config/alpaca.yml')
-        @whitelist ||= config['whitelist'].map { |ip| IPAddr.new(ip) }.freeze
-        @blacklist ||= config['blacklist'].map { |ip| IPAddr.new(ip) }.freeze
-        @default = config['default']
+        @whitelist ||= Hash[@@config['whitelist'].map { |ip| [IPAddr.new(ip), true] }].freeze
+        @blacklist ||= Hash[@@config['blacklist'].map { |ip| [IPAddr.new(ip), true] }].freeze
+        @default = @@config['default']
 
         self
       end
@@ -39,9 +41,12 @@ module Rack
       end
 
       def check (type, req)
-        instance_variable_get("@#{type}").any? do |ip|
-          ip.include?(req.ip)
-        end
+        req_ip = IPAddr.new(req.ip)
+        !instance_variable_get("@#{type}").select { |k, v| k.include? req_ip }.empty?
+        #instance_variable_get("@#{type}")[req_ip]
+        #instance_variable_get("@#{type}").any? do |ip|
+        #  ip.include?(req.ip)
+        #end
       end
 
       alias_method :whitelisted?, :check

data/lib/rack/alpaca/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Alpaca
-    VERSION = '1.0.2'
+    VERSION = '1.1.2'
   end
 end

data/lib/rails/generators/alpaca/install/install_generator.rb

@@ -1,7 +1,7 @@
 module Alpaca
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../../../config', __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       desc 'Copies an Alpaca configuration file to your application.'
 

data/lib/rails/generators/alpaca/install/templates/alpaca.yml

@@ -0,0 +1,12 @@
+# The defaults below are reserved IPv4 and IPv6 addresses used for testing.
+# Replace the IP addresses in this configuration file with your own.
+
+whitelist:
+  - 0.0.0.1
+  - 198.18.0.0/15
+  - "::/128"
+blacklist:
+  - 0.0.0.1
+  - 0.0.0.2
+  - "2001:db8::/32"
+default: allow

data/spec/rack_alpaca_spec.rb

@@ -13,13 +13,13 @@ describe 'Rack::Alpaca' do
     end
 
     it 'should have a whitelist' do
-      Rack::Alpaca.whitelist.class.must_equal Array
-      Rack::Alpaca.whitelist.each { |ip| ip.class.must_equal IPAddr }
-      Rack::Alpaca.whitelist.must_equal @ips
+      Rack::Alpaca.whitelist.class.must_equal Hash
+      Rack::Alpaca.whitelist.each { |ip, v| ip.class.must_equal IPAddr }
+      Rack::Alpaca.whitelist.keys.must_equal @ips
     end
 
     it 'should permit IP addresses on the whitelist' do
-      Rack::Alpaca.whitelist.each do |ip|
+      Rack::Alpaca.whitelist.each do |ip, v|
         get '/', {}, 'REMOTE_ADDR' => ip.to_s
         last_response.status.must_equal 200
         last_response.body.must_equal 'foo'
@@ -41,15 +41,15 @@ describe 'Rack::Alpaca' do
     end
 
     it 'should have a blacklist' do
-      Rack::Alpaca.blacklist.class.must_equal Array
-      Rack::Alpaca.whitelist.each { |ip| ip.class.must_equal IPAddr }
-      Rack::Alpaca.blacklist.must_equal @ips
+      Rack::Alpaca.blacklist.class.must_equal Hash
+      Rack::Alpaca.whitelist.each { |ip, v| ip.class.must_equal IPAddr }
+      Rack::Alpaca.blacklist.keys.must_equal @ips
     end
 
     it 'should reject IP addresses on the blacklist' do
-      Rack::Alpaca.blacklist.each do |ip|
+      Rack::Alpaca.blacklist.each do |ip, v|
         get '/', {}, 'REMOTE_ADDR' => ip.to_s
-        unless Rack::Alpaca.whitelist.include? ip
+        unless Rack::Alpaca.whitelist.keys.include? ip
           last_response.status.must_equal 503
           last_response.body.must_equal "Request blocked\n"
         end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: alpaca
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeff Chao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A rack middleware for whitelisting and blacklisting IPs
@@ -118,6 +105,7 @@ files:
 - lib/rack/alpaca/version.rb
 - lib/rack/alpaca.rb
 - lib/rails/generators/alpaca/install/install_generator.rb
+- lib/rails/generators/alpaca/install/templates/alpaca.yml
 - Rakefile
 - README.md
 - spec/alpaca_controller_additions_spec.rb
@@ -131,28 +119,27 @@ files:
 homepage: http://github.com/jeffchao/alpaca
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Whitelist and blacklist IPs
 test_files:
 - spec/alpaca_controller_additions_spec.rb
@@ -163,4 +150,3 @@ test_files:
 - spec/support/baz_controller.rb
 - spec/support/filters.rb
 - spec/support/foo_controller.rb
-has_rdoc: