redis-objects 0.8.0 → 0.9.0

data/spec/redis_objects_instance_spec.rb

@@ -46,6 +46,24 @@ describe Redis::Value do
     @value.options[:marshal] = false
   end
 
+  it "should not erroneously unmarshall a string" do
+    json_string = {json: 'value'}
+    @value = Redis::Value.new('spec/value', :marshal => true)
+    @value.value = json_string
+    @value.value.should == json_string
+    @value.clear
+
+    default_json_string = {json: 'default'}
+    @value = Redis::Value.new('spec/default', :default => default_json_string, :marshal => true)
+    @value.value.should == default_json_string
+    @value.clear
+
+    marshalled_string = Marshal.dump({json: 'marshal'})
+    @value = Redis::Value.new('spec/marshal', :default => marshalled_string, :marshal => true)
+    @value.value.should == marshalled_string
+    @value.clear
+  end
+
   it "should support renaming values" do
     @value.value = 'Peter Pan'
     @value.key.should == 'spec/value'
@@ -86,6 +104,19 @@ describe Redis::Value do
     @value.nil?.should == true
   end
 
+  it 'should set time to live in seconds when expiration option assigned' do
+    @value = Redis::Value.new('spec/value', :expiration => 10)
+    @value.value = 'monkey'
+    @value.ttl.should > 0
+    @value.ttl.should <= 10
+  end
+
+  it 'should set expiration when expireat option assigned' do
+    @value = Redis::Value.new('spec/value', :expireat => Time.now + 10.seconds)
+    @value.value = 'monkey'
+    @value.ttl.should > 0
+  end
+
   after do
     @value.delete
   end
@@ -298,6 +329,20 @@ describe Redis::List do
       @list.redis.del('spec/list2')
     end
 
+    it 'should set time to live in seconds when expiration option assigned' do
+      @list = Redis::List.new('spec/list', :expiration => 10)
+      @list << 'val'
+      @list.ttl.should > 0
+      @list.ttl.should <= 10
+    end
+
+    it 'should set expiration when expireat option assigned' do
+      @list = Redis::List.new('spec/list', :expireat => Time.now + 10.seconds)
+      @list << 'val'
+      @list.ttl.should > 0
+      @list.ttl.should <= 10
+    end
+
     after do
       @list.clear
     end
@@ -341,6 +386,33 @@ describe Redis::Counter do
     @counter.should == 111
   end
 
+  it "should support increment/decrement by float" do
+    @counter = Redis::Counter.new('spec/floater')
+    @counter.set 10.5
+    @counter.incrbyfloat 1
+    @counter.incrbyfloat 0.01
+    @counter.to_f.should == 11.51
+    @counter.set '5.0e3'
+    @counter.decrbyfloat -14.31
+    @counter.incrbyfloat 2.0e2
+    @counter.to_f.should == 5214.31
+    @counter.clear
+  end
+
+  it 'should set time to live in seconds when expiration option assigned' do
+    @counter = Redis::Counter.new('spec/counter', :expiration => 10)
+    @counter.increment
+    @counter.ttl.should > 0
+    @counter.ttl.should <= 10
+  end
+
+  it 'should set expiration when expireat option assigned' do
+    @counter = Redis::Counter.new('spec/counter', :expireat => Time.now + 10.seconds)
+    @counter.increment
+    @counter.ttl.should > 0
+    @counter.ttl.should <= 10
+  end
+
   after do
     @counter.delete
   end
@@ -473,8 +545,8 @@ describe Redis::HashKey do
   it "should handle complex marshaled values" do
     @hash.options[:marshal] = true
     @hash['abc'].should == nil
-    @hash['abc'] = {:json => 'data'}
-    @hash['abc'].should == {:json => 'data'}
+    @hash['abc'] = {:json => 'hash marshal'}
+    @hash['abc'].should == {:json => 'hash marshal'}
 
     # no marshaling
     @hash.options[:marshal] = false
@@ -544,6 +616,29 @@ describe Redis::HashKey do
     end
   end
 
+  it "should handle increment/decrement" do
+    @hash['integer'] = 1
+    @hash.incrby('integer')
+    @hash.incrby('integer', 2)
+    @hash.get('integer').to_i.should == 4
+
+    @hash['integer'] = 9
+    @hash.decrby('integer')
+    @hash.decrby('integer', 6)
+    @hash.get('integer').to_i.should == 2
+
+    @hash['float'] = 12.34
+    @hash.decrbyfloat('float')
+    @hash.decrbyfloat('float', 6.3)
+    @hash.get('float').to_f.should == 5.04
+
+    @hash['float'] = '5.0e3'
+    @hash.incrbyfloat('float')
+    @hash.incrbyfloat('float', '1.23e3')
+    @hash.incrbyfloat('float', 45.3)
+    @hash.get('float').to_f.should == 6276.3
+  end
+
   it "should respond to each_value" do
     @hash['foo'] = 'bar'
     @hash.each_value do |val|
@@ -603,6 +698,31 @@ describe Redis::HashKey do
     end
   end
 
+  it "should fetch default values" do
+    @hash['abc'] = "123"
+
+    value = @hash.fetch('missing_key','default_value')
+    block = @hash.fetch("missing_key") {|key| "oops: #{key}" }
+    no_error = @hash.fetch("abc") rescue "error"
+
+    no_error.should == "123"
+    value.should == "default_value"
+    block.should == "oops: missing_key"
+  end
+
+  it 'should set time to live in seconds when expiration option assigned' do
+    @hash = Redis::HashKey.new('spec/hash_key', :expiration => 10)
+    @hash['foo'] = 'bar'
+    @hash.ttl.should > 0
+    @hash.ttl.should <= 10
+  end
+
+  it 'should set expiration when expireat option assigned' do
+    @hash = Redis::HashKey.new('spec/hash_key', :expireat => Time.now + 10.seconds)
+    @hash['foo'] = 'bar'
+    @hash.ttl.should > 0
+  end
+
   after do
     @hash.clear
   end
@@ -665,6 +785,17 @@ describe Redis::Set do
     @set.sort.should == ['a','b','c']
     @set.delete_if{|m| m == 'c'}
     @set.sort.should == ['a','b']
+
+    @set << nil
+    @set.include?("").should.be.true
+  end
+
+  it "should handle empty array adds" do
+    should.not.raise(Redis::CommandError) { @set.add([]) }
+    @set.should.be.empty
+
+    should.not.raise(Redis::CommandError) { @set << [] }
+    @set.should.be.empty
   end
 
   it "should handle set intersections, unions, and diffs" do
@@ -764,7 +895,20 @@ describe Redis::Set do
     @set_1.redis.del val1.key
     @set_1.redis.del val2.key
     @set_1.redis.del SORT_STORE[:store]
+  end
+
+  it 'should set time to live in seconds when expiration option assigned' do
+    @set = Redis::Set.new('spec/set', :expiration => 10)
+    @set << 'val'
+    @set.ttl.should > 0
+    @set.ttl.should <= 10
+  end
 
+  it 'should set expiration when expireat option assigned' do
+    @set = Redis::Set.new('spec/set', :expireat => Time.now + 10.seconds)
+    @set << 'val'
+    @set.ttl.should > 0
+    @set.ttl.should <= 10
   end
 
   after do
@@ -882,6 +1026,17 @@ describe Redis::SortedSet do
     @set.size.should == 3
   end
 
+  it "should handle inserting multiple values at once" do
+    @set.merge({ 'a' => 1, 'b' => 2 })
+    @set.merge([['a', 4], ['c', 5]])
+    @set.merge({d: 0, e: 9 })
+
+    @set.members.should == ["d", "b", "a", "c", "e"]
+
+    @set[:f] = 3
+    @set.members.should == ["d", "b", "f", "a", "c", "e"]
+  end
+
   it "should support marshaling key names" do
     @set_4[Object] = 1.20
     @set_4[Module] = 2.30
@@ -909,6 +1064,20 @@ describe Redis::SortedSet do
     @set.redis.del('spec/zset2')
   end
 
+  it 'should set time to live in seconds when expiration option assigned' do
+    @set = Redis::SortedSet.new('spec/zset', :expiration => 10)
+    @set['val'] = 1
+    @set.ttl.should > 0
+    @set.ttl.should <= 10
+  end
+
+  it 'should set expiration when expireat option assigned' do
+    @set = Redis::SortedSet.new('spec/zset', :expireat => Time.now + 10.seconds)
+    @set['val'] = 1
+    @set.ttl.should > 0
+    @set.ttl.should <= 10
+  end
+
   after do
     @set.clear
     @set_1.clear

data/spec/redis_objects_model_spec.rb

@@ -33,6 +33,20 @@ class Roster
   #callable as key
   counter :daily, :global => true, :key => Proc.new { |roster| "#{roster.name}:#{Time.now.strftime('%Y-%m-%dT%H')}:daily" }
 
+  # set default expiration
+  value :value_with_expiration, :expiration => 10
+  value :value_with_expireat, :expireat => Time.now + 10.seconds
+  set :set_with_expiration, :expiration => 10
+  set :set_with_expireat, :expireat => Time.now + 10.seconds
+  list :list_with_expiration, :expiration => 10
+  list :list_with_expireat, :expireat => Time.now + 10.seconds
+  hash_key :hash_with_expiration, :expiration => 10
+  hash_key :hash_with_expireat, :expireat => Time.now + 10.seconds
+  counter :counter_with_expiration, :expiration => 10
+  counter :counter_with_expireat, :expireat => Time.now + 10.seconds
+  sorted_set :sorted_set_with_expiration,:expiration => 10
+  sorted_set :sorted_set_with_expireat, :expireat => Time.now + 10.seconds
+
   def initialize(id=1) @id = id end
   def id; @id; end
   def username; "user#{id}"; end
@@ -594,19 +608,23 @@ describe Redis::Objects do
     @roster_1.outfielders.intersection(@roster_2.outfielders, @roster_3.outfielders).sort.should == ['d']
     @roster_1.outfielders.intersect(@roster_2.outfielders).sort.should == ['c','d','e']
     @roster_1.outfielders.inter(@roster_2.outfielders, @roster_3.outfielders).sort.should == ['d']
+
     @roster_1.outfielders.interstore(INTERSTORE_KEY, @roster_2.outfielders).should == 3
-    @roster_1.redis.smembers(INTERSTORE_KEY).sort.should == ['c','d','e']
+    @roster_1.redis.smembers(INTERSTORE_KEY).sort.map{|v| Marshal.restore(v)}.should == ['c','d','e']
+
     @roster_1.outfielders.interstore(INTERSTORE_KEY, @roster_2.outfielders, @roster_3.outfielders).should == 1
-    @roster_1.redis.smembers(INTERSTORE_KEY).sort.should == ['d']
+    @roster_1.redis.smembers(INTERSTORE_KEY).sort.map{|v| Marshal.restore(v)}.should == ['d']
 
     (@roster_1.outfielders | @roster_2.outfielders).sort.should == ['a','b','c','d','e','f','g']
     (@roster_1.outfielders + @roster_2.outfielders).sort.should == ['a','b','c','d','e','f','g']
     @roster_1.outfielders.union(@roster_2.outfielders).sort.should == ['a','b','c','d','e','f','g']
     @roster_1.outfielders.union(@roster_2.outfielders, @roster_3.outfielders).sort.should == ['a','b','c','d','e','f','g','l','m']
+
     @roster_1.outfielders.unionstore(UNIONSTORE_KEY, @roster_2.outfielders).should == 7
-    @roster_1.redis.smembers(UNIONSTORE_KEY).sort.should == ['a','b','c','d','e','f','g']
+    @roster_1.redis.smembers(UNIONSTORE_KEY).map{|v| Marshal.restore(v)}.sort.should == ['a','b','c','d','e','f','g']
+
     @roster_1.outfielders.unionstore(UNIONSTORE_KEY, @roster_2.outfielders, @roster_3.outfielders).should == 9
-    @roster_1.redis.smembers(UNIONSTORE_KEY).sort.should == ['a','b','c','d','e','f','g','l','m']
+    @roster_1.redis.smembers(UNIONSTORE_KEY).map{|v| Marshal.restore(v)}.sort.should == ['a','b','c','d','e','f','g','l','m']
   end
 
   it "should handle class-level global lists of simple values" do
@@ -920,4 +938,52 @@ describe Redis::Objects do
     extended_roster.extended_sorted_set.should.be.kind_of(Redis::SortedSet)
     @roster.respond_to?(:extended_sorted_set).should == false
   end
+
+  it "should set time to live in seconds when expiration option assigned" do
+    @roster.value_with_expiration.value = 'val'
+    @roster.value_with_expiration.ttl.should > 0
+    @roster.value_with_expiration.ttl.should <= 10
+
+    @roster.set_with_expiration << 'val'
+    @roster.set_with_expiration.ttl.should > 0
+    @roster.set_with_expiration.ttl.should <= 10
+
+    @roster.list_with_expiration << 'val'
+    @roster.list_with_expiration.ttl.should > 0
+    @roster.list_with_expiration.ttl.should <= 10
+
+    @roster.hash_with_expiration[:foo] = :bar
+    @roster.hash_with_expiration.ttl.should > 0
+    @roster.hash_with_expiration.ttl.should <= 10
+
+    @roster.counter_with_expiration.increment
+    @roster.counter_with_expiration.ttl.should > 0
+    @roster.counter_with_expiration.ttl.should <= 10
+
+    @roster.sorted_set_with_expiration[:foo] = 1
+    @roster.sorted_set_with_expiration.ttl.should > 0
+    @roster.sorted_set_with_expiration.ttl.should <= 10
+  end
+
+  it "should set expiration when expireat option assigned" do
+    @roster.value_with_expireat.value = 'val'
+    @roster.value_with_expireat.ttl.should > 0
+    @roster.value_with_expireat.ttl.should <= 10
+
+    @roster.set_with_expireat << 'val'
+    @roster.set_with_expireat.ttl.should > 0
+    @roster.set_with_expireat.ttl.should <= 10
+
+    @roster.list_with_expireat << 'val'
+    @roster.list_with_expireat.ttl.should > 0
+    @roster.list_with_expireat.ttl.should <= 10
+
+    @roster.hash_with_expireat[:foo] = :bar
+    @roster.hash_with_expireat.ttl.should > 0
+    @roster.hash_with_expireat.ttl.should <= 10
+
+    @roster.sorted_set_with_expireat[:foo] = 1
+    @roster.sorted_set_with_expireat.ttl.should > 0
+    @roster.sorted_set_with_expireat.ttl.should <= 10
+  end
 end

data/spec/spec_helper.rb

@@ -19,26 +19,31 @@ DIFFSTORE_KEY  = 'test:diffstore'
 REDIS_BIN  = 'redis-server'
 REDIS_PORT = ENV['REDIS_PORT'] || 9212
 REDIS_HOST = ENV['REDIS_HOST'] || 'localhost'
-REDIS_PID  = File.expand_path 'redis.pid', File.dirname(__FILE__)
-REDIS_DUMP = File.expand_path 'redis.rdb', File.dirname(__FILE__)
+REDIS_PID  = 'redis.pid'  # can't be absolute
+REDIS_DUMP = 'redis.rdb'  # can't be absolute
+REDIS_RUNDIR = File.dirname(__FILE__)
 
-describe 'redis-server' do
-  it "starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}" do
-    fork_pid = fork do
-      system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+if !(defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby")
+  describe 'redis-server' do
+    it "starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}" do
+      fork_pid = fork do
+        system "cd #{REDIS_RUNDIR} && (echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}; echo databases 32) | #{REDIS_BIN} -"
+      end
+      fork_pid.should > 0
+      sleep 2
     end
-    fork_pid.should > 0
-    sleep 2 
   end
-end
 
-at_exit do
-  pid = File.read(REDIS_PID).to_i
-  puts "=> Killing #{REDIS_BIN} with pid #{pid}"
-  Process.kill "TERM", pid
-  Process.kill "KILL", pid
-  File.unlink REDIS_PID
-  File.unlink REDIS_DUMP if File.exists? REDIS_DUMP
+  at_exit do
+    pidfile = File.expand_path REDIS_PID,  REDIS_RUNDIR
+    rdbfile = File.expand_path REDIS_DUMP, REDIS_RUNDIR
+    pid = File.read(pidfile).to_i
+    puts "=> Killing #{REDIS_BIN} with pid #{pid}"
+    Process.kill "TERM", pid
+    Process.kill "KILL", pid
+    File.unlink pidfile
+    File.unlink rdbfile if File.exists? rdbfile
+  end
 end
 
 def raises_exception(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Nate Wiger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -115,7 +115,6 @@ files:
 - lib/redis/counter.rb
 - lib/redis/hash_key.rb
 - lib/redis/helpers/core_commands.rb
-- lib/redis/helpers/serialize.rb
 - lib/redis/list.rb
 - lib/redis/lock.rb
 - lib/redis/objects.rb

data/lib/redis/helpers/serialize.rb

@@ -1,41 +0,0 @@
-class Redis
-  module Helpers
-    module Serialize
-      include Marshal
-
-      def to_redis(value, marshal=false)
-        return value unless options[:marshal] || marshal
-        case value
-        when String, Fixnum, Bignum, Float
-          value
-        else
-          dump(value)
-        end
-      end
- 
-      def from_redis(value, marshal=false)
-        # This was removed because we can't reliably determine
-        # if a person said @value = "123.4" maybe for space/etc.
-        #begin
-        #  case value
-        #  when /^\d+$/
-        #    return Integer(value)
-        #  when /^(?:\d+\d.\d*|\d*\.\d+)$/
-        #    return Float(value)
-        #  end
-        #rescue
-        #  # continue below
-        #end
-        return value unless options[:marshal] || marshal
-        case value
-        when Array
-          value.collect{|v| from_redis(v)}
-        when Hash
-          value.inject({}) { |h, (k, v)| h[k] = from_redis(v); h }
-        else
-          restore(value) rescue value
-        end
-      end
-    end
-  end
-end