redis-objects 0.8.0 → 0.9.1

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,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nate Wiger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ATOMICITY.rdoc
 - CHANGELOG.rdoc
 - Gemfile
@@ -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
@@ -148,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Map Redis types directly to Ruby objects

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