trifle 0.0.7 → 0.0.8

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+
+branches:
+  only:
+    - master
+
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+notifications:
+  email:
+    - cristiano@emberads.com
+

data/Gemfile

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

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    trifle (0.0.7)
+    trifle (0.0.8)
       redis
 
 GEM
@@ -19,6 +19,7 @@ GEM
       activesupport (= 3.0.0)
     activesupport (3.0.0)
     diff-lcs (1.1.3)
+    rake (0.9.2.2)
     redis (3.0.1)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
@@ -35,5 +36,6 @@ PLATFORMS
 DEPENDENCIES
   active_support
   fakeredis!
+  rake
   rspec
   trifle!

data/README.md

@@ -1,11 +1,17 @@
 # Trifle
 
+![Build status](https://secure.travis-ci.org/EmberAds/trifle.png?branch=master)
+
 Stores the GeoIP databases in Redis and gives it a simple way to lookup IPs and map them to countries/country codes.
 
 Get your GeoIP country CSVs from http://www.maxmind.com/app/geolite.
 
 Trifle supports both the IPV4 and IPV6 databases.
 
+## Why?
+
+Loading the GeoIP databases from disk is slow, and doing that for every request is a pain. Trifle keeps your GeoIP database in memory and makes it easy to query.
+
 ## Installation
 
 Install the gem
@@ -62,9 +68,9 @@ trifle.find "192.168.1.1"
 # => nil
 ```
 
-
 ## Release notes
 
+* **0.0.8** Fixed a search bug that created conflicts between IPv4 and IPv6 data
 * **0.0.7** Loading now happens into separate key, making loading possible without downtime
 * **0.0.6** Added a fix for invalid IPs
 * **0.0.5** Fixed bug when finding IPs at the edge of the data set
@@ -73,6 +79,11 @@ trifle.find "192.168.1.1"
 * **0.0.2** Added support for custom Redis key
 * **0.0.1** First draft
 
+## Future releases
+
+* Allow for loading of more data than just country data
+* Split country data into separate Redis records
+
 ## License
 
 See LICENSE

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+
+desc "Set up and run tests"
+task :default => [:test]
+
+desc "Run tests"
+task :test do
+  sh "bundle exec rspec spec"
+end

data/lib/trifle/finder.rb

@@ -15,14 +15,13 @@ class Trifle
     protected
 
     def find ip_i, lower, upper
-      return nil if lower >= upper
-
       index = (lower+upper)/2
-
       current = entry_for(index)
 
       if in_range(current, ip_i)
         current.last(2)
+      elsif lower >= upper
+        nil
       elsif ip_i < current[0]
         find ip_i, lower, index-1
       else
@@ -31,7 +30,7 @@ class Trifle
     end
 
     def max
-      redis.llen(key)
+      redis.llen(key)-1
     end
 
     def entry_for index

data/lib/trifle/version.rb

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

data/spec/trifle/finder_spec.rb

@@ -14,7 +14,16 @@ describe Trifle::Finder do
       ["223.255.248.0","223.255.251.255","3758094336","3758095359","AU","Australia"],
       ["223.255.252.0","223.255.253.255","3758095360","3758095871","CN","China"],
       ["223.255.254.0","223.255.254.255","3758095872","3758096127","SG","Singapore"],
-      ["223.255.255.0","223.255.255.255","3758096128","3758096383","AU","Australia"]
+      ["223.255.255.0","223.255.255.255","3758096128","3758096383","AU","Australia"],
+      ["2407:7800::", "2407:7800:ffff:ffff:ffff:ffff:ffff:ffff", "47890987815419153418387641314551267328", "47890987894647315932651978908095217663", "AU", "Australia"],
+      ["2407:8400::", "2407:8400:ffff:ffff:ffff:ffff:ffff:ffff", "47891231204334397238432728681566699520", "47891231283562559752697066275110649855", "AU", "Australia"],
+      ["2407:8600::", "2407:8600:ffff:ffff:ffff:ffff:ffff:ffff", "47891271769153604541773576576069271552", "47891271848381767056037914169613221887", "AU", "Australia"],
+      ["2407:8800::", "2407:8800:ffff:ffff:ffff:ffff:ffff:ffff", "47891312333972811845114424470571843584", "47891312413200974359378762064115793919", "IN", "India"],
+      ["2407:8e00::", "2407:8e00:ffff:ffff:ffff:ffff:ffff:ffff", "47891434028430433755136968154079559680", "47891434107658596269401305747623510015", "AU", "Australia"],
+      ["2407:9000::", "2407:9000:ffff:ffff:ffff:ffff:ffff:ffff", "47891474593249641058477816048582131712", "47891474672477803572742153642126082047", "AU", "Australia"],
+      ["2407:a200::", "2407:a200:ffff:ffff:ffff:ffff:ffff:ffff", "47891839676622506788545447099105280000", "47891839755850669302809784692649230335", "AU", "Australia"],
+      ["2407:aa00::", "2407:aa00:ffff:ffff:ffff:ffff:ffff:ffff", "47892001935899336001908838677115568128", "47892002015127498516173176270659518463", "AU", "Australia"],
+      ["2407:ae00::", "2407:ae00:ffff:ffff:ffff:ffff:ffff:ffff", "47892083065537750608590534466120712192", "47892083144765913122854872059664662527", "AU", "Australia"],
     ]
     @redis = Redis.new
     @trifle = Trifle.new(@redis)
@@ -27,6 +36,8 @@ describe Trifle::Finder do
       @finder.handle("223.255.128.0").should be == ["HK", "Hong Kong"]
       @finder.handle("223.255.244.10").should be == ["IN", "India"]
       @finder.handle("223.255.255.255").should be == ["AU","Australia"]
+      @finder.handle("2407:8800:ffff:ffff:ffff:ffff:ffff:ffff").should be == ["IN","India"]
+      @finder.handle("2407:ae00:ffff:ffff:ffff:ffff:ffff:ffff").should be == ["AU","Australia"]
     end
 
     it "should return nil if the entry wasn't found" do

data/trifle.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Trifle::VERSION
   s.authors     = ["Cristiano Betta"]
   s.email       = ["cristiano@emberads.com"]
-  s.homepage    = "http://emberads.com"
+  s.homepage    = "http://github.com/EmberAds/trifle"
   s.summary     = "A GeoIP lookup in Redis"
   s.description = "Stores the GeoIP databases in Redis and gives it a simple way to lookup IPs and map them to countries"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133403697660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133403697660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70133403697060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133403697060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &70133403696340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70133403696340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70133403695580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133403695580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email:
@@ -66,6 +86,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -83,7 +104,7 @@ files:
 - spec/trifle/loader_spec.rb
 - spec/trifle_spec.rb
 - trifle.gemspec
-homepage: http://emberads.com
+homepage: http://github.com/EmberAds/trifle
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -95,15 +116,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2107613967180143252
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2107613967180143252
 requirements: []
 rubyforge_project: trifle
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A GeoIP lookup in Redis