moderation 0.0.1 → 0.0.2

data/lib/moderation/storage/redis.rb

@@ -13,16 +13,15 @@ class Moderation
       end
 
       def insert(item)
-        if redis.respond_to?(:multi)
-          redis.multi { insert_item_and_trim_collection(item) }
-        else
-          insert_item_and_trim_collection(item)
+        transaction do
+          redis.lpush(collection, item)
+          redis.ltrim(collection, 0, (limit - 1))
         end
       end
 
       def all(options = {})
         fetch_limit = options.fetch(:limit, limit).to_i - 1
-        redis.lrange(collection, 0, fetch_limit)
+        redis.lrange(collection, 0, fetch_limit) || []
       end
 
       private
@@ -51,9 +50,22 @@ class Moderation
         end
       end
 
-      def insert_item_and_trim_collection(item)
-        redis.lpush(collection, item)
-        redis.ltrim(collection, 0, (limit - 1))
+      def transaction(&block)
+        if transactions_supported?
+          redis.multi { yield }
+        else
+          yield
+        end
+      end
+
+      def transactions_supported?
+        @transactions_supported ||= begin
+          redis_version.split('.').first.to_i >= 2 && redis.respond_to?(:multi)
+        end
+      end
+
+      def redis_version
+        @redis_version ||= redis.info["redis_version"]
       end
     end
   end

data/lib/moderation/version.rb

@@ -1,3 +1,3 @@
 class Moderation
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/storage/redis_spec.rb

@@ -1,55 +1,89 @@
 require File.expand_path('../../../lib/moderation/storage/redis.rb', __FILE__)
 
 describe Moderation::Storage::Redis do
-  before(:each) do
-    redis = Redis.new
-    @redis = Redis::Namespace.new('moderation_test', redis)
-    @redis.del 'test_data'
+  let(:redis) do
+    client = Redis.new
+    client = Redis::Namespace.new('moderation_test', client)
+    client.del 'test_data'
+    client
   end
 
-  it 'initializes with a default limit of 25' do
-    storage = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis)
-    storage.limit.should eql(25)
-  end
+  describe '#limit' do
+    it 'initializes with a default limit of 25' do
+      storage = Moderation::Storage::Redis.new(:collection => 'test_data', :server => redis)
+      storage.limit.should eql(25)
+    end
 
-  it 'accepts a custom limit' do
-    storage = Moderation::Storage::Redis.new(:limit => 200, :collection => 'test_data', :server => @redis)
-    storage.limit.should eql(200)
-  end
+    it 'accepts a custom limit' do
+      storage = Moderation::Storage::Redis.new(:limit => 200, :collection => 'test_data', :server => redis)
+      storage.limit.should eql(200)
+    end
 
-  it 'accespts a new limit after initialization' do
-    storage = Moderation::Storage::Redis.new(:limit => 200, :collection => 'test_data', :server => @redis)
-    storage.limit = 135
-    storage.limit.should eql(135)
+    it 'accespts a new limit after initialization' do
+      storage = Moderation::Storage::Redis.new(:limit => 200, :collection => 'test_data', :server => redis)
+      storage.limit = 135
+      storage.limit.should eql(135)
+    end
   end
 
-  it 'inserts data' do
-    storage = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis)
-    storage.insert('a little bit of data')
-    storage.all.should eql(['a little bit of data'])
-  end
+  describe '#insert' do
+    let(:storage) { Moderation::Storage::Redis.new(
+      :collection => 'test_data',
+      :server => redis,
+      :limit => 5)
+    }
 
-  it 'returns all data' do
-    numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis)
-    Array(0..10).each { |n|  numbers.insert(n) }
-    numbers.all.should eql(["10", "9", "8", "7", "6", "5", "4", "3", "2", "1", "0"])
-  end
+    it 'stores data' do
+      storage.insert('a little bit of data')
+      storage.all.should eql(['a little bit of data'])
+    end
 
-  it 'returns a subset of data' do
-    numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis)
-    Array(0..10).each { |n|  numbers.insert(n) }
-    numbers.all(:limit => 5).should eql(["10", "9", "8", "7", "6"])
-  end
+    it 'removes data outside of limit' do
+      Array(0..10).each { |n| storage.insert(n) }
+      redis.lrange('test_data', 0, -1).count.should eql(5)
+    end
 
-  it 'returns an empty Array' do
-    numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis)
-    numbers.all.should eql([])
+    it 'uses a transaction with redis 2.x or greater' do
+      redis.stub(:info).and_return({"redis_version" => "2.6.4"})
+      redis.stub(:lpush)
+      redis.stub(:ltrim)
+      redis.should_receive(:multi).and_yield
+      storage.insert('more data')
+    end
+
+    it 'does not use a transaction with redis 1.x' do
+      redis.stub(:info).and_return({"redis_version" => "1.2.0"})
+      redis.stub(:lpush)
+      redis.stub(:ltrim)
+      redis.should_not_receive(:multi)
+      storage.insert('more data')
+    end
   end
 
-  it 'removes data outside of limit' do
-    numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => @redis, :limit => 5)
-    Array(0..10).each { |n|  numbers.insert(n) }
-    @redis.lrange('test_data', 0, -1).count.should eql(5)
+  describe '#all' do
+    it 'returns all data' do
+      numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => redis)
+      Array(0..10).each { |n|  numbers.insert(n) }
+      numbers.all.should eql(["10", "9", "8", "7", "6", "5", "4", "3", "2", "1", "0"])
+    end
+
+    it 'returns a subset of data' do
+      numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => redis)
+      Array(0..10).each { |n|  numbers.insert(n) }
+      numbers.all(:limit => 5).should eql(["10", "9", "8", "7", "6"])
+    end
+
+    it 'returns an empty Array with redis greater than 2.x' do
+      redis.should_receive(:lrange).with('test_data', 0, 24).and_return([])
+      numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => redis)
+      numbers.all.should eql([])
+    end
+
+    it 'returns an empty Array with redis 1.x' do
+      redis.should_receive(:lrange).with('test_data', 0, 24).and_return(nil)
+      numbers = Moderation::Storage::Redis.new(:collection => 'test_data', :server => redis)
+      numbers.all.should eql([])
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: moderation
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lee Jones
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-11 00:00:00 Z
+date: 2013-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json