trifle 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -9,7 +9,8 @@ GIT
 PATH
   remote: .
   specs:
-    trifle (0.0.5)
+    trifle (0.0.7)
+      redis
 
 GEM
   remote: http://rubygems.org/
@@ -27,7 +28,6 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    rujitsu (0.3.3)
 
 PLATFORMS
   ruby
@@ -36,5 +36,4 @@ DEPENDENCIES
   active_support
   fakeredis!
   rspec
-  rujitsu
   trifle!

data/README.md

@@ -65,6 +65,7 @@ trifle.find "192.168.1.1"
 
 ## Release notes
 
+* **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
 * **0.0.4** Changed binary syntax

data/lib/trifle/loader.rb

@@ -17,6 +17,16 @@ class Trifle
       end
     end
 
+    def tmp_key
+      "#{key}:tmp"
+    end
+
+    def clear
+      redis.del key
+    end
+
+    protected
+
     def load_files filenames
       raise ArgumentError.new("filenames must be an array of strings") unless filenames.is_a?(Array) && !filenames.map{|element| element.is_a?(String)}.include?(false)
 
@@ -33,11 +43,12 @@ class Trifle
       clear
       sort(data)
       data.each {|row| append(row) }
+      move
     end
 
     def append row
       entry = row.values_at(2,3,4,5).join(":")
-      redis.rpush key, entry
+      redis.rpush tmp_key, entry
     end
 
     def sort data
@@ -60,8 +71,8 @@ class Trifle
       field.is_a?(Numeric) || field =~ /^\d+$/
     end
 
-    def clear
-      redis.del key
+    def move
+      redis.rename tmp_key, key
     end
   end
 end

data/lib/trifle/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
 require "trifle"
-require "rujitsu"
 require "fakeredis/rspec"

data/spec/trifle/loader_spec.rb

@@ -63,21 +63,21 @@ describe Trifle::Loader do
       end
 
       it "should read the files" do
-        @loader.load_files @filenames
+        @loader.send(:load_files, @filenames)
         @loader.redis.llen(@loader.key).should be == 4
       end
     end
 
     context "when given anything but an array of strings" do
       it "should raise an error" do
-        -> { @loader.load_files "" }.should raise_error(ArgumentError)
-        -> { @loader.load_files [:foo] }.should raise_error(ArgumentError)
+        -> { @loader.send(:load_files, "") }.should raise_error(ArgumentError)
+        -> { @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.load_files ["foobar.csv"] }.should raise_error(/No such file or directory - foobar.csv/)
+        -> { @loader.send(:load_files,  ["foobar.csv"]) }.should raise_error(/No such file or directory - foobar.csv/)
       end
     end
   end
@@ -87,41 +87,48 @@ describe Trifle::Loader do
     context "when given valid data" do
       it "should clear out existing data" do
         @loader.should_receive(:clear)
-        @loader.load_data @valid_data
+        @loader.send(:load_data, @valid_data)
       end
 
       it "should validate the data" do
         @loader.should_receive(:valid?).and_return(true)
-        @loader.load_data @valid_data
+        @loader.send(:load_data, @valid_data)
       end
 
       it "should load it in redis" do
-        @loader.load_data @valid_data
+        @loader.send(:load_data, @valid_data)
         @loader.redis.llen(@loader.key).should be == 2
       end
+
+      it "should load via a tmp key to ensure no downtime" do
+        @loader.should_receive(:move)
+        @loader.send(:load_data, @valid_data)
+        @loader.redis.get(@loader.key).should be_nil
+        @loader.redis.llen(@loader.tmp_key).should be == 2
+      end
     end
 
     context "when given invalid data" do
       it "should raise an error" do
         @loader.should_receive(:valid?).and_return(false)
-        -> { @loader.load_data @valid_data }.should raise_error(ArgumentError)
+        -> { @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.load_data :rubbish }.should raise_error(ArgumentError)
+        -> { @loader.send(:load_data, :rubbish) }.should raise_error(ArgumentError)
       end
     end
   end
 
   describe "#parse" do
     it "should parse valid csv data" do
-      @loader.parse(@csv).should be == @valid_data
+      @loader.send(:parse, @csv).should be == @valid_data
     end
 
     it "should raise an error for invalid csv data" do
-      -> { @loader.parse('"foo",","#') }.should raise_error(CSV::MalformedCSVError)
+      -> { @loader.send(:parse, '"foo",","#') }.should raise_error(CSV::MalformedCSVError)
     end
 
     it "should handle ipv6 data" do
@@ -129,39 +136,39 @@ 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.parse(@ipv6csv) }.should_not raise_error
+      -> { @loader.send(:parse, @ipv6csv) }.should_not raise_error
     end
   end
 
   describe "#sort" do
     it "should sort the data" do
-      @loader.sort(@valid_data.reverse).should be == @valid_data
+      @loader.send(:sort, @valid_data.reverse).should be == @valid_data
     end
   end
 
 
   describe "#valid?" do
     it "should mark valid data as such" do
-      @loader.valid?(@valid_data).should be_true
+      @loader.send(:valid?, @valid_data).should be_true
     end
 
     it "should mark invalid data as such" do
       invalid_data =  []
-      @loader.valid?(invalid_data).should be_false
+      @loader.send(:valid?, invalid_data).should be_false
       invalid_data = [
         ["223.255.254.0","223.255.254.255","not_a_number","3758096127","SG","Singapore"]
       ]
-      @loader.valid?(invalid_data).should be_false
+      @loader.send(:valid?, invalid_data).should be_false
       invalid_data = [
         ["223.255.254.0","223.255.254.255","3758095872","not_a_number","SG","Singapore"]
       ]
-      @loader.valid?(invalid_data).should be_false
+      @loader.send(:valid?, invalid_data).should be_false
     end
   end
 
   describe "#clear" do
     it "should clear existing data" do
-      @loader.load_data @valid_data
+      @loader.send(:load_data, @valid_data)
       @loader.clear
       @loader.redis.llen(@loader.key).should be == 0
     end

data/trifle.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rujitsu'
   s.add_development_dependency 'active_support'
   s.add_development_dependency "fakeredis", "~> 0.3.0"
+
+  s.add_dependency 'redis'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348294670440 !ruby/object:Gem::Requirement
+  requirement: &70133403697660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348294670440
+  version_requirements: *70133403697660
 - !ruby/object:Gem::Dependency
-  name: rujitsu
-  requirement: &70348294688940 !ruby/object:Gem::Requirement
+  name: active_support
+  requirement: &70133403697060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348294688940
+  version_requirements: *70133403697060
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70348294688500 !ruby/object:Gem::Requirement
+  name: fakeredis
+  requirement: &70133403696340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70348294688500
+  version_requirements: *70133403696340
 - !ruby/object:Gem::Dependency
-  name: fakeredis
-  requirement: &70348294688000 !ruby/object:Gem::Requirement
+  name: redis
+  requirement: &70133403695580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70348294688000
+  version_requirements: *70133403695580
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email: