redis-objects 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3ed8e9d16f4beddbb3e7192845ba17a8367bdb
-  data.tar.gz: 834245d36db41b311e29d9c2cdce0a7ab02a14e1
+  metadata.gz: db06e487bea5d7ea6fe9524c0309fe4bac4c959a
+  data.tar.gz: 332266c573fa0b396ecd35b1f95c0923e9e2a8a7
 SHA512:
-  metadata.gz: 446c36a59eed213a54d2c73479096b1ffb1cb778cef1f40a1a42ce9bc7e773abe13251a78976b75b15387247f1f28cf8cb8708131608340b27e71e239aa4b191
-  data.tar.gz: 47626977f71544038bb1a9d3ef0261e126ca804a21c798c6efcca297d8d4b7d012f3ff9701f479d2339f2ceb4b4e5499553814b1d8bba4da0ce72aec030f6190
+  metadata.gz: e9440f03a1c478a8f0fd4fdb15a22ddab2656ae315210b235cc31d0bed929aff90ec06afb8b93f9bd68253bdabbf115dd14bee8e14504e648682d7e870940d68
+  data.tar.gz: 0fa8ff012020af2740020fcc58d86473ffe8deed5fe487cd546d4007c86666b0642720fe0d703fc343905a3853fc5a9256ecaca29ba0302de5dfd105b377df6b

data/README.md

@@ -289,7 +289,7 @@ You can bound the size of the list to only hold N elements like so:
 @list = Redis::List.new('list_name', :maxlength => 10)
 ~~~
 
-Complex data types are now handled with :marshal => true:
+Complex data types are serialized with :marshal => true:
 
 ~~~ruby
 @list = Redis::List.new('list_name', :marshal => true)
@@ -300,6 +300,8 @@ Complex data types are now handled with :marshal => true:
 end
 ~~~
 
+Note: If you run into issues, with Marshal errors, refer to the fix in [Issue #176](https://github.com/nateware/redis-objects/issues/176).
+
 Hashes
 ------
 Hashes work like a Ruby [Hash](http://ruby-doc.org/core/classes/Hash.html), with

data/Rakefile

@@ -5,6 +5,7 @@ task :test do
   sh "bacon spec/*_spec.rb"
 end
 task :default => :test
+task :spec => :test
 
 desc "show changelog"
 task :changelog do

data/lib/redis/base_object.rb

@@ -23,7 +23,9 @@ class Redis
     end
 
     def allow_expiration(&block)
-      block.call.tap { set_expiration }
+      result = block.call
+      set_expiration
+      result
     end
   end
 end

data/lib/redis/hash_key.rb

@@ -118,7 +118,7 @@ class Redis
 
     # Set keys in bulk if they do not exist. Takes a hash of field/values {'field1' => 'val1'}. Redis: HSETNX
     def fill(pairs={})
-      raise ArgumentError, "Arugment to fill must be a hash of key/value pairs" unless pairs.is_a?(::Hash)
+      raise ArgumentError, "Argument to fill must be a hash of key/value pairs" unless pairs.is_a?(::Hash)
       allow_expiration do
         pairs.each do |field, value|
           redis.hsetnx(key, field, marshal(value, options[:marshal_keys][field]))

data/lib/redis/objects.rb

@@ -28,7 +28,7 @@ class Redis
   #     set :player_ids
   #   end
   #
-  # The, you can use these counters both for bookeeping and as atomic actions:
+  # The, you can use these counters both for bookkeeping and as atomic actions:
   #
   #   @game = Game.find(id)
   #   @game_user = @game.joined_players.increment do |val|

data/lib/redis/objects/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Objects
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/redis/set.rb

@@ -39,7 +39,9 @@ class Redis
     # Adds the specified values to the set. Only works on redis > 2.4
     # Redis: SADD
     def merge(*values)
-      redis.sadd(key, values.flatten.map{|v| marshal(v)})
+      allow_expiration do
+        redis.sadd(key, values.flatten.map{|v| marshal(v)})
+      end
     end
 
     # Return all members in the set.  Redis: SMEMBERS

data/spec/redis_objects_conn_spec.rb

@@ -240,4 +240,15 @@ describe 'Connection tests' do
     # Fix for future tests
     Redis.current = @redis_handle
   end
+
+  it "should support pipelined changes" do
+    list = Redis::List.new('pipelined/list')
+    key = Redis::HashKey.new('pipelined/hash')
+    Redis::Objects.redis.pipelined do
+      key['foo'] = 'bar'
+      list.push 1, 2
+    end
+    key.all.should == { 'foo' => 'bar' }
+    list.values.should == %w[1 2]
+  end
 end

data/spec/redis_objects_instance_spec.rb

@@ -1035,7 +1035,7 @@ describe Redis::Set do
   end
 
   describe "with expiration" do
-    [:<<, :add].each do |meth|
+    [:<<, :add, :merge].each do |meth|
       it "should set time to live in seconds when expiration option assigned" do
         @set = Redis::Set.new('spec/set', :expiration => 10)
         @set.send(meth, 'val')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Nate Wiger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
 email:
 - nwiger@gmail.com
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Map Redis types directly to Ruby objects