trifle 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -9,11 +9,14 @@ GIT
 PATH
   remote: .
   specs:
-    trifle (0.0.1)
+    trifle (0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    active_support (3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
     diff-lcs (1.1.3)
     redis (3.0.1)
     rspec (2.10.0)
@@ -30,6 +33,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_support
   fakeredis!
   rspec
   rujitsu

data/README.md

@@ -51,4 +51,10 @@ trifle.find "192.168.1.1"
 ```
 
 
+## Release notes
+
+* **0.0.2** Added support for custom Redis key
+* **0.0.1** First draft
+
+
 

data/lib/trifle/finder.rb

@@ -29,18 +29,18 @@ class Trifle
     end
 
     def max
-      redis.llen Trifle::KEY
+      redis.llen(key)
     end
 
     def entry_for index
-      entry = redis.lindex(Trifle::KEY, index).split(":")
+      entry = redis.lindex(key, index).split(":")
       entry[0] = entry[0].to_i
       entry[1] = entry[1].to_i
       entry
     end
 
     def in_range range, ip_i
-      ip_i >= range[0] && ip_i <= range[1]
+      range[0] <= ip_i && ip_i <= range[1]
     end
   end
 end

data/lib/trifle/initialize_with_redis.rb

@@ -1,10 +1,12 @@
 class Trifle
   module InitializeWithRedis
     attr_accessor :redis
+    attr_accessor :key
 
-    def initialize redis
-      raise ArgumentError.new("Redis object expected") unless redis.is_a?(Redis)
+    def initialize redis, options = {}
+      raise ArgumentError.new("Redis-like object expected") unless redis
       self.redis = redis
+      self.key = options[:key] || "trifle"
     end
   end
 end

data/lib/trifle/loader.rb

@@ -37,7 +37,7 @@ class Trifle
 
     def append row
       entry = row.values_at(2,3,4,5).join(":")
-      redis.rpush Trifle::KEY, entry
+      redis.rpush key, entry
     end
 
     def sort data
@@ -51,9 +51,7 @@ class Trifle
 
     def valid? data
       if data.is_a?(Array) && data.count > 0
-        return data.map do |row|
-          is_number(row[2]) && is_number(row[3])
-        end.select{|valid| !valid}.count == 0
+        return data.detect {|row| !is_number(row[2]) || !is_number(row[3])}.nil?
       end
       false
     end
@@ -63,7 +61,7 @@ class Trifle
     end
 
     def clear
-      redis.del(Trifle::KEY)
+      redis.del key
     end
   end
 end

data/lib/trifle/version.rb

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

data/lib/trifle.rb

@@ -7,8 +7,6 @@ require "trifle/initialize_with_redis"
 class Trifle
   include InitializeWithRedis
 
-  KEY = "trifle".freeze
-
   def load options = {}
     loader.handle options
   end
@@ -20,10 +18,10 @@ class Trifle
   protected
 
   def loader
-    @loader = Loader.new(redis)
+    @loader = Loader.new(redis, key: key)
   end
 
   def finder
-    @finder = Finder.new(redis)
+    @finder = Finder.new(redis, key: key)
   end
 end

data/spec/trifle/initialize_with_redis_spec.rb

@@ -15,7 +15,11 @@ describe Trifle::InitializeWithRedis do
 
     it "should fail without a redis instance" do
       -> { @klass.new(nil) }.should raise_error(ArgumentError)
-      -> { @klass.new("http://127.0.0.1:3000/") }.should raise_error(ArgumentError)
+    end
+
+    it "should accept an optional redis key" do
+      instance = @klass.new(Redis.new, key: "foo")
+      instance.key.should be == "foo"
     end
   end
 

data/spec/trifle/loader_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'active_support/core_ext/string/strip'
 
 describe Trifle::Loader do
 
@@ -8,10 +9,10 @@ describe Trifle::Loader do
       ["223.255.254.0","223.255.254.255","3758095872","3758096127","SG","Singapore"],
       ["223.255.255.0","223.255.255.255","3758096128","3758096383","AU","Australia"]
     ]
-    @csv = <<-EOD
-"223.255.254.0","223.255.254.255","3758095872","3758096127","SG","Singapore"
-"223.255.255.0","223.255.255.255","3758096128","3758096383","AU","Australia"
-    EOD
+    @csv = <<-CSV.strip_heredoc
+      "223.255.254.0","223.255.254.255","3758095872","3758096127","SG","Singapore"
+      "223.255.255.0","223.255.255.255","3758096128","3758096383","AU","Australia"
+    CSV
   end
 
   it "should extend InitializeWithRedis" do
@@ -63,7 +64,7 @@ describe Trifle::Loader do
 
       it "should read the files" do
         @loader.load_files @filenames
-        @loader.redis.llen(Trifle::KEY).should be == 4
+        @loader.redis.llen(@loader.key).should be == 4
       end
     end
 
@@ -96,7 +97,7 @@ describe Trifle::Loader do
 
       it "should load it in redis" do
         @loader.load_data @valid_data
-        @loader.redis.llen(Trifle::KEY).should be == 2
+        @loader.redis.llen(@loader.key).should be == 2
       end
     end
 
@@ -124,9 +125,9 @@ describe Trifle::Loader do
     end
 
     it "should handle ipv6 data" do
-      @ipv6csv = <<-CSV
-"2c0f:ffe8::", "2c0f:ffe8:ffff:ffff:ffff:ffff:ffff:ffff", "58569106662796955307479896348547874816", "58569106742025117821744233942091825151", "NG", "Nigeria"
-"2c0f:fff0::", "2c0f:fff0:ffff:ffff:ffff:ffff:ffff:ffff", "58569107296622255421594597096899477504", "58569107375850417935858934690443427839", "NG", "Nigeria"
+      @ipv6csv = <<-CSV.strip_heredoc
+        "2c0f:ffe8::", "2c0f:ffe8:ffff:ffff:ffff:ffff:ffff:ffff", "58569106662796955307479896348547874816", "58569106742025117821744233942091825151", "NG", "Nigeria"
+        "2c0f:fff0::", "2c0f:fff0:ffff:ffff:ffff:ffff:ffff:ffff", "58569107296622255421594597096899477504", "58569107375850417935858934690443427839", "NG", "Nigeria"
       CSV
       -> { @loader.parse(@ipv6csv) }.should_not raise_error
     end
@@ -162,7 +163,7 @@ describe Trifle::Loader do
     it "should clear existing data" do
       @loader.load_data @valid_data
       @loader.clear
-      @loader.redis.llen(Trifle::KEY).should be == 0
+      @loader.redis.llen(@loader.key).should be == 0
     end
   end
 

data/spec/trifle_spec.rb

@@ -8,13 +8,14 @@ describe Trifle do
 
   describe "#load" do
     before do
-      @trifle = Trifle.new(Redis.new)
+      @redis = Redis.new
+      @trifle = Trifle.new(@redis)
       @options = { filenames: "foobar.csv" }
     end
 
     it "should pass this to the loader" do
       loader = mock Trifle::Loader
-      Trifle::Loader.should_receive(:new).and_return(loader)
+      Trifle::Loader.should_receive(:new).with(@redis, key: @trifle.key).and_return(loader)
       loader.should_receive(:handle).with(@options)
       @trifle.load @options
     end
@@ -22,13 +23,14 @@ describe Trifle do
 
   describe "#find" do
     before do
-      @trifle = Trifle.new(Redis.new)
+      @redis = Redis.new
+      @trifle = Trifle.new(@redis)
       @ip = "127.0.0.1"
     end
 
     it "should pass this to the finder" do
       finder = mock Trifle::Finder
-      Trifle::Finder.should_receive(:new).and_return(finder)
+      Trifle::Finder.should_receive(:new).with(@redis, key: @trifle.key).and_return(finder)
       finder.should_receive(:handle).with(@ip)
       @trifle.find @ip
     end

data/trifle.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rujitsu'
+  s.add_development_dependency 'active_support'
   s.add_development_dependency "fakeredis", "~> 0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353203055680 !ruby/object:Gem::Requirement
+  requirement: &70340253404740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353203055680
+  version_requirements: *70340253404740
 - !ruby/object:Gem::Dependency
   name: rujitsu
-  requirement: &70353203079000 !ruby/object:Gem::Requirement
+  requirement: &70340253404100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353203079000
+  version_requirements: *70340253404100
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &70340253403320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70340253403320
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &70353203078460 !ruby/object:Gem::Requirement
+  requirement: &70340253402820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70353203078460
+  version_requirements: *70340253402820
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email: