redis-store 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc1ba61b75205e6f17d1bb790c3324d98335abb
-  data.tar.gz: 95cf5013e84b74ef20e9041c971cce5773411ec3
+  metadata.gz: f43972892970b9f94f1e04ac38fc754a503b1896
+  data.tar.gz: fda18462ae2aabe2bf7a3df1b0c2fb3f83aef61d
 SHA512:
-  metadata.gz: 42f21ac1f963af2a5e96a145672ec97d670dc7bfe94dba63eeda69a1bd37567effb5f2d60a09d4f0871f9ded839318de092b88221189e955dd91191adb20c260
-  data.tar.gz: 488d11620f6f0c2a8ea615825056c199e0267386d374d9d91891c648fe1420739858c7f75cb3c1afafebabe22fa2ffdb99c7c77b33bd46def781a68709c6f15b
+  metadata.gz: 74d6284f5ca7dbcb5f47cc7b851b7421b7faa08ee8fa7a437f78ad2d6f7325ef54f7022db9c405d9e95708af4444ef53ad67ae21eba4c3a157762431e972cc9b
+  data.tar.gz: 221b8a496bf165cab7ab25cfd3cb426e222cc11e10faa6f6250dfc9d64ec3c381892498d64def2d2de9ee22ed33deb9d433918b10bb64d185195edb40bb58771

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 before_install: gem install bundler
 script: 'bundle exec rake'
 rvm:

data/README.md

@@ -1,5 +1,7 @@
 # Redis stores for Ruby frameworks
 
+[![Build Status](https://travis-ci.org/redis-store/redis-store.svg?branch=master)](https://travis-ci.org/redis-store/redis-store)
+
 __Redis Store__ provides a full set of stores (*Cache*, *I18n*, *Session*, *HTTP Cache*) for modern Ruby frameworks like: __Ruby on Rails__, __Sinatra__, __Rack__, __Rack::Cache__ and __I18n__. It supports object marshalling, timeouts, single or multiple nodes, and namespaces.
 
 Please check the *README* file of each gem for usage and installation guidelines.
@@ -35,7 +37,9 @@ If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" rub
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/redis-store.png)](http://badge.fury.io/rb/redis-store) [![Build Status](https://secure.travis-ci.org/redis-store/redis-store.png?branch=master)](http://travis-ci.org/jodosha/redis-store?branch=master) [![Code Climate](https://codeclimate.com/github/jodosha/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
+[![Gem Version](https://badge.fury.io/rb/redis-store.png)](http://badge.fury.io/rb/redis-store)
+[![Build Status](https://secure.travis-ci.org/redis-store/redis-store.png?branch=master)](http://travis-ci.org/redis-store/redis-store?branch=master)
+[![Code Climate](https://codeclimate.com/github/redis-store/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
 
 ## Copyright
 

data/lib/redis/store/factory.rb

@@ -50,6 +50,7 @@ class Redis
         if options.key?(:key_prefix) && !options.key?(:namespace)
           options[:namespace] = options.delete(:key_prefix) # RailsSessionStore
         end
+        options[:raw] = !options[:marshalling]
         options
       end
 

data/lib/redis/store/marshalling.rb

@@ -24,6 +24,16 @@ class Redis
         end
       end
 
+      def mset(*args)
+        options = args.pop if args.length.odd?
+        updates = []
+        args.each_slice(2) do |(key, value)|
+          updates << encode(key)
+          _marshal(value, options) { |v| updates << encode(v) }
+        end
+        super(*updates)
+      end
+
       private
         def _marshal(val, options)
           yield marshal?(options) ? Marshal.dump(val) : val

data/lib/redis/store/namespace.rb

@@ -44,7 +44,7 @@ class Redis
       end
 
       def mget(*keys)
-        options = keys.pop if keys.last.is_a? Hash
+        options = (keys.pop if keys.last.is_a? Hash) || {}
         if keys.any?
           # Marshalling gets extended before Namespace does, so we need to pass options further
           if singleton_class.ancestors.include? Marshalling

data/lib/redis/store/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Store < self
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/test/redis/store/factory_test.rb

@@ -44,6 +44,7 @@ describe "Redis::Store::Factory" do
       it "allows/disable marshalling" do
         store = Redis::Store::Factory.create :marshalling => false
         store.instance_variable_get(:@marshalling).must_equal(false)
+        store.instance_variable_get(:@options)[:raw].must_equal(true)
       end
 
       it "should instantiate a Redis::DistributedStore store" do

data/test/redis/store/marshalling_test.rb

@@ -23,6 +23,12 @@ describe "Redis::Marshalling" do
     @store.get("rabbit").must_equal(@white_rabbit)
   end
 
+  it "marshals on multi set" do
+    @store.mset("rabbit", @white_rabbit, "rabbit2", @rabbit)
+    @store.get("rabbit").must_equal(@white_rabbit)
+    @store.get("rabbit2").must_equal(@rabbit)
+  end
+
   if RUBY_VERSION.match /1\.9/
     it "doesn't unmarshal on get if raw option is true" do
       @store.get("rabbit", :raw => true).must_equal("\x04\bU:\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\x06EF")
@@ -38,6 +44,12 @@ describe "Redis::Marshalling" do
     @store.get("rabbit", :raw => true).must_equal(%(#<OpenStruct color="white">))
   end
 
+  it "doesn't marshal multi set if raw option is true" do
+    @store.mset("rabbit", @white_rabbit, "rabbit2", @rabbit, :raw => true)
+    @store.get("rabbit", :raw => true).must_equal(%(#<OpenStruct color="white">))
+    @store.get("rabbit2", :raw => true).must_equal(%(#<OpenStruct name="bunny">))
+  end
+
   it "doesn't unmarshal if get returns an empty string" do
     @store.set "empty_string", ""
     @store.get("empty_string").must_equal("")
@@ -87,7 +99,9 @@ describe "Redis::Marshalling" do
 
   it "doesn't unmarshal on multi get" do
     @store.set "rabbit2", @white_rabbit
-    rabbit, rabbit2 = @store.mget "rabbit", "rabbit2"
+    rabbits = @store.mget "rabbit", "rabbit2"
+    rabbit, rabbit2 = rabbits
+    rabbits.length.must_equal(2)
     rabbit.must_equal(@rabbit)
     rabbit2.must_equal(@white_rabbit)
   end

data/test/redis/store/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Redis::Store::VERSION do
   it 'returns current version' do
-    Redis::Store::VERSION.must_equal '1.1.7'
+    Redis::Store::VERSION.wont_equal nil
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
 - !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: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: redis-store-testing
   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'
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for
@@ -116,8 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -154,17 +154,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: redis-store
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Redis stores for Ruby frameworks