rack-ketai 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rack/ketai/carrier/abstract.rb

@@ -141,7 +141,7 @@ module Rack::Ketai::Carrier
 
     # キャリアのIPアドレス帯を利用しているか
     def valid_addr?
-      self.class.valid_ip? @env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_ADDR']
+      self.class.valid_ip? @env['HTTP_X_FORWARDED_FOR'] ? @env['HTTP_X_FORWARDED_FOR'].sub(/,.+$/, '') : @env['REMOTE_ADDR']
     end
     alias :valid_ip? :valid_addr?
 

data/rack-ketai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-ketai}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuichi Takeuchi"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-11-22}
   s.email = %q{info@takeyu-web.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "spec/unit/docomo_spec.rb",
      "spec/unit/emoticon_filter_spec.rb",
      "spec/unit/filter_spec.rb",
+     "spec/unit/general_spec.rb",
      "spec/unit/gps_spec.rb",
      "spec/unit/iphone_spec.rb",
      "spec/unit/middleware_spec.rb",

data/spec/unit/valid_addr_spec.rb

@@ -2,6 +2,15 @@
 require 'rack/ketai/carrier/docomo'
 describe "Rack::Ketai::Carrier::*.valid_addr? を使うとき" do
 
+  def proxy_from(proxy_addr, carrier, addr)
+    env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                    'HTTP_USER_AGENT' => 'DoCoMo/1.0/N505i/c20/TB/W24H12',
+                                    'HTTP_X_DCMGUID' => '0123abC',
+                                    'REMOTE_ADDR' => proxy_addr,
+                                    'HTTP_X_FORWARDED_FOR' => [addr, proxy_addr].join(', '))
+    carrier.new(env)
+  end
+
   def from(carrier, addr)
     env = Rack::MockRequest.env_for('http://hoge.com/dummy',
                                     'HTTP_USER_AGENT' => 'DoCoMo/1.0/N505i/c20/TB/W24H12',
@@ -64,6 +73,7 @@ describe "Rack::Ketai::Carrier::*.valid_addr? を使うとき" do
         from(klass, addrs.first.to_s).should be_valid_addr
         from(klass, addrs[(addrs.size - 1)/2].to_s).should be_valid_addr
         from(klass, addrs.last.to_s).should be_valid_addr
+        proxy_from('192.168.1.1', klass, addrs.first.to_s).should be_valid_addr # プロキシ越し
       end
     end
   end
@@ -78,6 +88,7 @@ describe "Rack::Ketai::Carrier::*.valid_addr? を使うとき" do
           from(klass, addrs.first.to_s).should_not be_valid_addr
           from(klass, addrs[(addrs.size - 1)/2].to_s).should_not be_valid_addr
           from(klass, addrs.last.to_s).should_not be_valid_addr
+          proxy_from('192.168.1.1', klass, addrs.first.to_s).should_not be_valid_addr # プロキシ越し
         end
       end
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-ketai
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Yuichi Takeuchi
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +09:00
+date: 2010-11-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -86,6 +84,7 @@ files:
 - spec/unit/docomo_spec.rb
 - spec/unit/emoticon_filter_spec.rb
 - spec/unit/filter_spec.rb
+- spec/unit/general_spec.rb
 - spec/unit/gps_spec.rb
 - spec/unit/iphone_spec.rb
 - spec/unit/middleware_spec.rb
@@ -98,7 +97,6 @@ files:
 - tools/update_speclist.rb
 - vendor/datum_conv/MIT-LICENSE
 - vendor/datum_conv/lib/datum_conv.rb
-- spec/unit/general_spec.rb
 has_rdoc: true
 homepage: http://github.com/take-yu/rack-ketai
 licenses: []
@@ -113,7 +111,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -122,7 +119,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"