redis-activesupport 4.1.5 → 4.1.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08111437f7c13d726c3d0a9596c32e953fff51c6
-  data.tar.gz: 1872180c2cd4e0e7399dc1cb91d3d32b3893d2fc
+  metadata.gz: 6919fcaa1c61e64d94d7cbcd20e320956c385247
+  data.tar.gz: 2528731435eb7102d7dd9ca9ec62253cad7ec2c3
 SHA512:
-  metadata.gz: 40ed94c1e18f499a7f057f726a017699c3869976423a544ad1d08076d46f120bccc806c107be809c4d41039bb2acd5eceae330f1c36b0d331c486bba1f0c05d7
-  data.tar.gz: 5c4870cb7b4523c8acf728fac8890dc7ec11a1e890abafe74c2a3dee000a1bd6bbe02a16b82d8c73686241207c844d6d9e08fc3b6fe4788fb70a599020b1b181
+  metadata.gz: c6684dfa22128db951fe854d82634b1c512c03605fc2f5b70f943293bb2228d8c051d33430c1e3a0d27670643a00847a4bdf0138f9525fb93393e90a70d48be7
+  data.tar.gz: 73d58c822be26ffb4cbe56137c26be9f3d28e4d1d7d859611e8c1664cb53abb5830361e8f60bb87c5e6b4faaeee147a2927fec530d51aad73e6dc723c16d78f8

data/.travis.yml

@@ -16,5 +16,6 @@ services:
   - redis-server
 matrix:
   allow_failures:
+    - rvm: rbx-19mode
     - rvm: jruby-head
     - rvm: ruby-head

data/README.md

@@ -17,6 +17,40 @@ If you are using redis-store with Rails, consider using the [redis-rails gem](ht
 ActiveSupport::Cache.lookup_store :redis_store # { ... optional configuration ... }
 ```
 
+### Usage with Redis Sentinel
+
+```ruby
+sentinel_config = {
+  url: "redis://mymaster/0",
+  role: "master",
+  sentinels: [{
+    host: "127.0.0.1",
+    port: 26379
+  },{
+    host: "127.0.0.1",
+    port: 26380
+  },{
+    host: "127.0.0.1",
+    port: 26381
+  }]
+}
+
+# configure cache, merging opts with sentinel conf
+config.cache_store = :redis_store, sentinel_config.merge(
+  :namespace => "cache",
+  :expires_in => 1.days
+)
+
+# configure sessions, setting the sentinel config as the
+# servers value, merging opts with the sentinel conf.
+config.session_store :redis_store, {
+  :servers => sentinel_config.merge(
+    :namespace => "sessions"
+  ),
+  :expires_in => 2.days
+}
+```
+
 ## Running tests
 
 ```shell

data/lib/active_support/cache/redis_store.rb

@@ -92,35 +92,43 @@ module ActiveSupport
       #   cache.read_multi "rabbit", "white-rabbit"
       #   cache.read_multi "rabbit", "white-rabbit", :raw => true
       def read_multi(*names)
+        # Remove the options hash before mapping keys to values
         options = names.extract_options!
+        return {} if names == []
+
         keys = names.map{|name| namespaced_key(name, options)}
         values = with { |c| c.mget(*keys) }
         values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
-        # Remove the options hash before mapping keys to values
-        names.extract_options!
-
         result = Hash[keys.zip(values)]
         result.reject!{ |k,v| v.nil? }
         result
       end
 
       def fetch_multi(*names)
-        results = read_multi(*names)
         options = names.extract_options!
+        return {} if names == []
+
+        results = read_multi(*names, options)
         fetched = {}
 
+        need_writes = {}
+
+        fetched = names.inject({}) do |memo, name|
+          key = namespaced_key(name, options)
+          memo[key] = results.fetch(key) do
+            value = yield name
+            need_writes[name] = value
+            value
+          end
+
+          memo
+        end
+
         with do |c|
           c.multi do
-            fetched = names.inject({}) do |memo, (name, _)|
-              key = namespaced_key(name, options)
-              memo[key] = results.fetch(key) do
-                value = yield name
-                write(name, value, options)
-                value
-              end
-
-              memo
+            need_writes.each do |name, value|
+              write(name, value, options)
             end
           end
         end

data/redis-activesupport.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'redis-activesupport'
-  s.version     = '4.1.5'
+  s.version     = '4.1.6.pre'
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'

data/test/active_support/cache/redis_store_test.rb

@@ -313,6 +313,16 @@ describe ActiveSupport::Cache::RedisStore do
     result['namespaced:irish whisky'].must_equal("Jameson")
   end
 
+  it "read_multi return an empty {} when given an empty array" do
+    result = @store.read_multi(*[])
+    result.must_equal({})
+  end
+
+  it "read_multi return an empty {} when given an empty array with option" do
+    result = @store.read_multi(*[], option: true)
+    result.must_equal({})
+  end
+
   describe "fetch_multi" do
     it "reads existing keys and fills in anything missing" do
       @store.write "bourbon", "makers"
@@ -324,19 +334,75 @@ describe ActiveSupport::Cache::RedisStore do
       result.must_equal({ "bourbon" => "makers", "rye" => "rye-was-missing" })
       @store.read("rye").must_equal("rye-was-missing")
     end
+
+    it "fetch command within fetch_multi block" do
+      @store.delete 'rye'
+      @store.write "bourbon", "makers"
+
+      result = @store.fetch_multi("bourbon", "rye") do |key|
+        @store.fetch "inner-#{key}" do
+          "#{key}-was-missing"
+        end
+      end
+
+      result.must_equal({ "bourbon" => "makers", "rye" => "rye-was-missing" })
+      @store.read("rye").must_equal("rye-was-missing")
+      @store.read("inner-rye").must_equal("rye-was-missing")
+    end
+
+    it "return an empty {} when given an empty array" do
+      result = @store.fetch_multi(*[]) { 1 }
+      result.must_equal({})
+    end
+
+    it "return an empty {} when given an empty array with option" do
+      result = @store.fetch_multi(*[], option: true)
+      result.must_equal({})
+    end
   end
 
   describe "fetch_multi namespaced keys" do
     it "reads existing keys and fills in anything missing" do
-      @store.write "bourbon", "makers", namespace:'namespaced'
+      @store.write "bourbon", "makers", namespace: 'namespaced'
 
-      result = @store.fetch_multi("bourbon", "rye", namespace:'namespaced') do |key|
+      result = @store.fetch_multi("bourbon", "rye", namespace: 'namespaced') do |key|
         "#{key}-was-missing"
       end
 
       result.must_equal({ "namespaced:bourbon" => "makers", "namespaced:rye" => "rye-was-missing" })
       @store.read("namespaced:rye").must_equal("rye-was-missing")
     end
+
+    it "fetch command within fetch_multi block" do
+      @store.delete 'namespaced:rye'
+      @store.write "bourbon", "makers", namespace: 'namespaced'
+
+      result = @store.fetch_multi("bourbon", "rye", namespace: 'namespaced') do |key|
+        @store.fetch "namespaced:inner-#{key}" do
+          "#{key}-was-missing"
+        end
+      end
+
+      result.must_equal({ "namespaced:bourbon" => "makers", "namespaced:rye" => "rye-was-missing" })
+      @store.read("namespaced:rye").must_equal("rye-was-missing")
+      @store.read("namespaced:inner-rye").must_equal("rye-was-missing")
+    end
+  end
+
+  describe "fetch_multi nested keys" do
+    it "reads existing keys and fills in anything missing" do
+      @store.write ["bourbon", "bourbon-extended"], "makers"
+
+      bourbon_key = ["bourbon", "bourbon-extended"]
+      rye_key = ["rye", "rye-extended"]
+
+      result = @store.fetch_multi(bourbon_key, rye_key) do |key|
+        "#{key}-was-missing"
+      end
+
+      result.must_equal({ "bourbon/bourbon-extended" => "makers", "rye/rye-extended" => "#{rye_key}-was-missing" })
+      @store.read(rye_key).must_equal("#{rye_key}-was-missing")
+    end
   end
 
   describe "notifications" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6.pre
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,124 +9,124 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5'
 - !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: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !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: Redis store for ActiveSupport
@@ -137,8 +137,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -160,17 +160,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: redis-activesupport
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Redis store for ActiveSupport