trifle 0.1.0 → 0.1.1

data/.travis.yml

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

data/Gemfile

@@ -3,4 +3,4 @@ source :rubygems
 # Specify your gem's dependencies in messages.gemspec
 gemspec
 
-gem "fakeredis", github: "guilleiguaran/fakeredis", require: "fakeredis/rspec"
+gem "fakeredis", :github => "guilleiguaran/fakeredis", :require => "fakeredis/rspec"

data/README.md

@@ -66,6 +66,7 @@ trifle.find "192.168.1.1"
 
 ## Release notes
 
+* **0.1.1** Made 1.8.7 compatible
 * **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

data/bin/trifle

@@ -8,7 +8,7 @@ if ARGV.count < 2
   exit(1)
 end
 
-redis = Redis.new(url: ARGV[0])
+redis = Redis.new(:url => ARGV[0])
 ARGV.shift
 
 filenames = []
@@ -27,5 +27,5 @@ ARGV.each do |arg|
 end
 
 puts "Loading #{filenames.join(", ")}"
-Trifle.new(redis, options).load(filenames: filenames)
+Trifle.new(redis, options).load(:filenames => filenames)
 puts "Trifle loaded"

data/lib/trifle.rb

@@ -18,10 +18,10 @@ class Trifle
   protected
 
   def loader
-    @loader = Loader.new(redis, key: key)
+    @loader = Loader.new(redis, :key => key)
   end
 
   def finder
-    @finder = Finder.new(redis, key: key)
+    @finder = Finder.new(redis, :key => key)
   end
 end

data/lib/trifle/finder.rb

@@ -1,4 +1,4 @@
-require_relative "initialize_with_redis"
+require "trifle/initialize_with_redis"
 require 'ipaddr'
 
 class Trifle

data/lib/trifle/loader.rb

@@ -1,4 +1,5 @@
-require_relative "initialize_with_redis"
+require "trifle/initialize_with_redis"
+require "fastercsv"
 require "csv"
 
 class Trifle
@@ -57,7 +58,8 @@ class Trifle
 
     def parse contents
       contents.gsub!('", "', '","')
-      CSV.parse(contents)
+      csv = RUBY_VERSION =~ /^1\.8/ ? FasterCSV : CSV
+      csv.parse(contents)
     end
 
     def valid? data

data/lib/trifle/version.rb

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

data/spec/trifle/finder_spec.rb

@@ -28,7 +28,7 @@ describe Trifle::Finder do
     @redis = Redis.new
     @trifle = Trifle.new(@redis)
     @finder = Trifle::Finder.new(@redis)
-    @trifle.load(data: @valid_data)
+    @trifle.load(:data => @valid_data)
   end
 
   describe "#handle" do
@@ -45,7 +45,7 @@ describe Trifle::Finder do
     end
 
     it "should not fail if there's only 1 record" do
-      @trifle.load(data: [["82.132.242.55","82.132.242.55","1384444471","1384444471","GB","United Kingdrom"]])
+      @trifle.load(:data => [["82.132.242.55","82.132.242.55","1384444471","1384444471","GB","United Kingdrom"]])
       @finder.handle("127.0.0.1").should be_nil
     end
 

data/spec/trifle/initialize_with_redis_spec.rb

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

data/spec/trifle/loader_spec.rb

@@ -25,7 +25,7 @@ describe Trifle::Loader do
       it "should pass it on to load_files" do
         filename = 'data.csv'
         @loader.should_receive(:load_files).with([filename])
-        @loader.handle(filename: filename)
+        @loader.handle(:filename => filename)
       end
     end
 
@@ -33,7 +33,7 @@ describe Trifle::Loader do
       it "should pass it on to load_files" do
         filenames = ['data1.csv', 'data2.csv']
         @loader.should_receive(:load_files).with(filenames)
-        @loader.handle(filenames: filenames)
+        @loader.handle(:filenames => filenames)
       end
     end
 
@@ -41,14 +41,14 @@ describe Trifle::Loader do
       it "should pass it on to load_data" do
         data = [:foo, :bar]
         @loader.should_receive(:load_data).with(data)
-        @loader.handle(data: data)
+        @loader.handle(:data => data)
       end
     end
 
     context "when given anything else" do
       it "should raise an error" do
-        -> { @loader.handle(foo: :bar) }.should raise_error(ArgumentError)
-        -> { @loader.handle }.should raise_error(ArgumentError)
+        lambda { @loader.handle(:foo => :bar) }.should raise_error(ArgumentError)
+        lambda { @loader.handle }.should raise_error(ArgumentError)
       end
     end
   end
@@ -70,14 +70,14 @@ describe Trifle::Loader do
 
     context "when given anything but an array of strings" do
       it "should raise an error" do
-        -> { @loader.send(:load_files, "") }.should raise_error(ArgumentError)
-        -> { @loader.send(:load_files, [:foo]) }.should raise_error(ArgumentError)
+        lambda { @loader.send(:load_files, "") }.should raise_error(ArgumentError)
+        lambda { @loader.send(:load_files, [:foo]) }.should raise_error(ArgumentError)
       end
     end
 
     context "when given a filename for a file that's missing" do
       it "should raise an error" do
-        -> { @loader.send(:load_files,  ["foobar.csv"]) }.should raise_error(/No such file or directory - foobar.csv/)
+        lambda { @loader.send(:load_files,  ["foobar.csv"]) }.should raise_error(/No such file or directory - foobar.csv/)
       end
     end
   end
@@ -111,13 +111,13 @@ describe Trifle::Loader do
     context "when given invalid data" do
       it "should raise an error" do
         @loader.should_receive(:valid?).and_return(false)
-        -> { @loader.send(:load_data, @valid_data) }.should raise_error(ArgumentError)
+        lambda { @loader.send(:load_data, @valid_data) }.should raise_error(ArgumentError)
       end
     end
 
     context "when given anything but an array" do
       it "should raise an error" do
-        -> { @loader.send(:load_data, :rubbish) }.should raise_error(ArgumentError)
+        lambda { @loader.send(:load_data, :rubbish) }.should raise_error(ArgumentError)
       end
     end
   end
@@ -128,7 +128,8 @@ describe Trifle::Loader do
     end
 
     it "should raise an error for invalid csv data" do
-      -> { @loader.send(:parse, '"foo",","#') }.should raise_error(CSV::MalformedCSVError)
+      csv = RUBY_VERSION =~ /^1\.8/ ? FasterCSV : CSV
+      lambda { @loader.send(:parse, '"foo",","#') }.should raise_error(csv::MalformedCSVError)
     end
 
     it "should handle ipv6 data" do
@@ -136,7 +137,7 @@ describe Trifle::Loader do
         "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.send(:parse, @ipv6csv) }.should_not raise_error
+      lambda { @loader.send(:parse, @ipv6csv) }.should_not raise_error
     end
   end
 

data/spec/trifle_spec.rb

@@ -10,12 +10,12 @@ describe Trifle do
     before do
       @redis = Redis.new
       @trifle = Trifle.new(@redis)
-      @options = { filenames: "foobar.csv" }
+      @options = { :filenames => "foobar.csv" }
     end
 
     it "should pass this to the loader" do
       loader = mock Trifle::Loader
-      Trifle::Loader.should_receive(:new).with(@redis, key: @trifle.key).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
@@ -30,7 +30,7 @@ describe Trifle do
 
     it "should pass this to the finder" do
       finder = mock Trifle::Finder
-      Trifle::Finder.should_receive(:new).with(@redis, key: @trifle.key).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

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fakeredis", ">= 0.4.0"
 
   s.add_dependency "redis", ">= 3.0.0"
+  s.add_dependency "fastercsv", ">= 1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email:
@@ -133,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3747848338070537568
+      hash: -1333851127389149991
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3747848338070537568
+      hash: -1333851127389149991
 requirements: []
 rubyforge_project: trifle
 rubygems_version: 1.8.24