trifle 0.0.8 → 0.0.9

data/Gemfile

@@ -3,8 +3,4 @@ source :rubygems
 # Specify your gem's dependencies in messages.gemspec
 gemspec
 
-gem "fakeredis", github: "caius/fakeredis", branch: "redis-rb-3"
-
-group :test do
-  gem "rake"
-end
+gem "fakeredis", github: "guilleiguaran/fakeredis", require: "fakeredis/rspec"

data/Gemfile.lock

@@ -1,16 +1,15 @@
 GIT
-  remote: git://github.com/caius/fakeredis.git
-  revision: ab336ff1edf50c259b557559f42316fe15a4feb7
-  branch: redis-rb-3
+  remote: git://github.com/guilleiguaran/fakeredis.git
+  revision: 534517a139b129e29366302e8c75232e6b9d2754
   specs:
-    fakeredis (0.3.1)
-      redis (>= 3.0.0)
+    fakeredis (0.4.1)
+      redis (~> 3.0.0)
 
 PATH
   remote: .
   specs:
-    trifle (0.0.8)
-      redis
+    trifle (0.0.9)
+      redis (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # Trifle
 
-![Build status](https://secure.travis-ci.org/EmberAds/trifle.png?branch=master)
+[![Build status](https://secure.travis-ci.org/EmberAds/trifle.png?branch=master)](https://travis-ci.org/#!/EmberAds/trifle)
 
 Stores the GeoIP databases in Redis and gives it a simple way to lookup IPs and map them to countries/country codes.
 
@@ -16,9 +16,7 @@ Loading the GeoIP databases from disk is slow, and doing that for every request
 
 Install the gem
 
-```
-gem install trifle
-```
+    gem install trifle
 
 or add it to your Gemfile and bundle
 
@@ -49,9 +47,7 @@ trifle = Trifle.new(Redis.new, key: "foobar")
 
 You can also load the Trifle from the command line:
 
-```
-trifle redis://127.0.0.1:6379/0 file1.csv file2.csv
-```
+    trifle redis://127.0.0.1:6379/0 file1.csv file2.csv
 
 ### Lookup
 

data/lib/trifle.rb

@@ -24,4 +24,4 @@ class Trifle
   def finder
     @finder = Finder.new(redis, key: key)
   end
-end
+end

data/lib/trifle/finder.rb

@@ -6,7 +6,7 @@ class Trifle
     include InitializeWithRedis
 
     def handle ip
-      ip_i = IPAddr.new(ip).to_i
+      ip_i = IPAddr.new(ip).native.to_i
       find(ip_i, 0, max)
     rescue ArgumentError => ex
       nil
@@ -44,4 +44,4 @@ class Trifle
       range[0] <= ip_i && ip_i <= range[1]
     end
   end
-end
+end

data/lib/trifle/version.rb

@@ -1,3 +1,3 @@
 class Trifle
-  VERSION = "0.0.8" unless defined? Trifle::VERSION
-end
+  VERSION = "0.0.9" unless defined? Trifle::VERSION
+end

data/spec/trifle/finder_spec.rb

@@ -52,6 +52,11 @@ describe Trifle::Finder do
     it "should handle nil ips" do
       @finder.handle(nil).should be_nil
     end
-  end
 
-end
+    it "should handle ipv6 compatible ipv4 addresses" do
+      @finder.handle("::ffff:223.255.128.0").should be == ["HK", "Hong Kong"]
+      @finder.handle("::ffff:223.255.244.10").should be == ["IN", "India"]
+      @finder.handle("::ffff:223.255.255.255").should be == ["AU","Australia"]
+    end
+  end
+end

data/trifle.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'active_support'
-  s.add_development_dependency "fakeredis", "~> 0.3.0"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "active_support"
+  s.add_development_dependency "fakeredis", ">= 0.4.0"
 
-  s.add_dependency 'redis'
+  s.add_dependency "redis", ">= 3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
+- !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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -48,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email:
@@ -118,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2107613967180143252
+      hash: 3796573718370968341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2107613967180143252
+      hash: 3796573718370968341
 requirements: []
 rubyforge_project: trifle
 rubygems_version: 1.8.24