perforated 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e25f900f7679d5f4f579b0241ae489e282067f
-  data.tar.gz: 89faaf88ca21ab566ae430bcf191340e979657fd
+  metadata.gz: 2188079862ccf0f34ad99dc8ef2575101f54f6a4
+  data.tar.gz: 1083c36661390745858282f788f483ac434fb7c2
 SHA512:
-  metadata.gz: 71f125afe780caffb948823f4df8650e03f9909ae20e4fa9bc4d00aae486f9fa2826389150ec75c086091da6adfc084f50f974d9c455f95b333f2c82610424b0
-  data.tar.gz: dcaad74a443699fbaf91c35cee0df77c96b75ffa98c63600f0db07313072e3b181165311d78745a5db681469def7f24a18cbd22fe40b27b1a178f6d3a0971857
+  metadata.gz: 850b58a8bea4aed87934f41e03f47fb3a459eeaa1dd513dad53eaf5e41efc7e268cfbf5ee7688e01eaf6573ca0c98477ea1683c11aa4e956eaabdcbec160f4b6
+  data.tar.gz: 55afde3e6a522aac92ce38cf4891b774065c7d69c59da9a3ff59f7fa5eb8d7cdc5854aa32c0b5e65b91abb4d2a3508db8ab2191250e644a1156d9d8e4db628a8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 0.7.0
+
+* Alter the implementation of `fetch_multi` to return a hash rather than an
+  array. This is consistent with the new Dalli implementation, and what should
+  be new the Rails implementation.
+
 ## Version 0.6.0
 
 * Prevent frozen string errors by duplicating hash keys before fetching.

data/lib/perforated/cache.rb

@@ -11,20 +11,15 @@ module Perforated
       keyed = keyed_enumerable('as-json')
       keys  = keyed.keys.map(&:dup)
 
-      Perforated::Compatibility.fetch_multi(*keys) do |key|
-        keyed[key].as_json
-      end
+      fetch_multi(keys) { |key| keyed[key].as_json }.values
     end
 
     def to_json(*)
-      keyed = keyed_enumerable('to-json')
-      keys  = keyed.keys.map(&:dup)
-
-      json_objects = Perforated::Compatibility.fetch_multi(*keys) do |key|
-        keyed[key].to_json
-      end
+      keyed   = keyed_enumerable('to-json')
+      keys    = keyed.keys.map(&:dup)
+      objects = fetch_multi(keys) { |key| keyed[key].to_json }
 
-      "[#{json_objects.join(',')}]"
+      "[#{objects.values.join(',')}]"
     end
 
     private
@@ -35,5 +30,9 @@ module Perforated
         memo
       end
     end
+
+    def fetch_multi(keys, &block)
+      Perforated::Compatibility.fetch_multi *keys, &block
+    end
   end
 end

data/lib/perforated/compatibility/fetch_multi.rb

@@ -13,12 +13,14 @@ module Perforated
       options = {}
       results = Perforated.cache.read_multi(*names, options)
 
-      names.map do |name|
-        results.fetch(name) do
+      names.inject({}) do |memo, (name, _)|
+        memo[name] = results.fetch(name) do
           value = yield name
           Perforated.cache.write(name, value, options)
           value
         end
+
+        memo
       end
     end
   end

data/lib/perforated/version.rb

@@ -1,3 +1,3 @@
 module Perforated
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/perforated/cache_spec.rb

@@ -24,10 +24,10 @@ describe Perforated::Cache do
       array  = [ruby, elixir]
       cache  = Perforated::Cache.new(array)
 
-      cache.as_json.should == [{ name: 'Ruby' }, { name: 'Elixir' }]
+      expect(cache.as_json).to eq([{ name: 'Ruby' }, { name: 'Elixir' }])
 
-      Perforated.cache.read('Language/Ruby/as-json').should   == ruby.as_json
-      Perforated.cache.read('Language/Elixir/as-json').should == elixir.as_json
+      expect(Perforated.cache.read('Language/Ruby/as-json')).to eq(ruby.as_json)
+      expect(Perforated.cache.read('Language/Elixir/as-json')).to eq(elixir.as_json)
     end
 
     it 'does not overwrite existing key values' do
@@ -36,7 +36,7 @@ describe Perforated::Cache do
 
       Perforated::Cache.new([erlang]).as_json
 
-      Perforated.cache.read('Language/Erlang/as-json').should == { name: 'Elixir' }
+      expect(Perforated.cache.read('Language/Erlang/as-json')).to eq(name: 'Elixir')
     end
   end
 
@@ -44,10 +44,9 @@ describe Perforated::Cache do
     it 'constructs a stringified json array of underlying values' do
       cache = Perforated::Cache.new([Language.new('Ruby'), Language.new('Elixir')])
 
-      cache.to_json.should == %([{"name":"Ruby"},{"name":"Elixir"}])
-
-      Perforated.cache.exist?('Language/Ruby/to-json').should   be_true
-      Perforated.cache.exist?('Language/Elixir/to-json').should be_true
+      expect(cache.to_json).to eq(%([{"name":"Ruby"},{"name":"Elixir"}]))
+      expect(Perforated.cache.exist?('Language/Ruby/to-json')).to   be_true
+      expect(Perforated.cache.exist?('Language/Elixir/to-json')).to be_true
     end
   end
 end

data/spec/perforated/compatibility/fetch_multi_spec.rb

@@ -13,11 +13,9 @@ describe Perforated::Compatibility do
     end
 
     it 'falls back to the custom backfill if the cache does not support it' do
-      cache = Perforated.cache
+      results = Perforated::Compatibility.fetch_multi(:one, :two) { |key| key.to_s }
 
-      Perforated::Compatibility.fetch_multi(:one, :two) do |key|
-        key
-      end
+      expect(results).to eq(one: 'one', two: 'two')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perforated
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport