prosto_cache 0.2.3 → 0.2.4

data/lib/prosto_cache/prosto_model_cache.rb

@@ -137,11 +137,10 @@ module ProstoCache
 
       cache_values = model_class.all
       self.cache = build_cache(cache_values, accessor_keys)
-      self.validated_at = time
-      self.signature = current_cache_signature
-
       cache.values(sorted_cache_values(cache_values))
       cache.keys(sorted_keys(cache.values))
+      self.validated_at = time
+      self.signature = current_cache_signature
     end
 
 
@@ -170,9 +169,8 @@ module ProstoCache
 
     def sorted_cache_values(cache_values)
       cache_values.sort_by { |o|
-        sort_keys.each_with_object('') { |k, memo|
-          sort_key = o.public_send(k)
-          memo << sort_key if sort_key
+        sort_keys.inject('') { |memo, k|
+          memo << o.public_send(k)
         }
       }
     end
@@ -180,9 +178,7 @@ module ProstoCache
     def sorted_keys(cache_values)
       cache_values.map { |o|
         accessor_keys.inject([]) { |memo, k|
-          sort_key = o.public_send(k)
-          raise BadCacheValuesError, "Null key '#{k}' found in value #{o.inspect}" unless sort_key
-          memo << sort_key.to_sym
+          memo << o.public_send(k).to_sym
         }
       }.tap { |rtn|
         rtn.flatten! if accessor_keys.length == 1
@@ -198,10 +194,10 @@ module ProstoCache
         [].tap { |rows| raw_result.each_hash { |h| rows << h } }
       when 'Mysql2::Result'
         [].tap { |rows| raw_result.each(:as => :hash) { |h| rows << h } }
-      when 'PGresult'
+      when 'PGresult', 'PG::Result'
         raw_result.map(&:to_hash)
       else
-        fail "Result class #{raw_result.class.name} in unsupported"
+        fail "Result class #{raw_result.class.name} is unsupported"
       end
       array_result.map(&:symbolize_keys).first
     end

data/spec/prosto_cache_spec.rb

@@ -45,14 +45,6 @@ describe ProstoCache::ProstoModelCache do
       it "should return all keys from the cache" do
         model_class.cache.keys.should == [:bar, :foo]
       end
-
-      context 'when key for one of the rows is nil' do
-        it "should raise meaningful error" do
-          model_class.should_receive(:all).once.and_return(['foo', nil].map { |n| model_class.new(n) })
-
-          expect { model_class.cache.keys }.to raise_error ProstoCache::BadCacheValuesError
-        end
-      end
     end
 
     describe "#values" do
@@ -69,14 +61,6 @@ describe ProstoCache::ProstoModelCache do
         values.map(&:name).should == %w(bar foo)
       end
 
-      context 'when key for one of the rows is nil' do
-        it "should raise meaningful error" do
-          model_class.should_receive(:all).once.and_return(['foo', nil].map { |n| model_class.new(n) })
-
-          expect { model_class.cache.values }.to raise_error ProstoCache::BadCacheValuesError
-        end
-      end
-
       context 'when sort_keys are provided' do
         let(:model_class) {
           Class.new {
@@ -114,14 +98,6 @@ describe ProstoCache::ProstoModelCache do
         model_class.cache[:foo]
       end
 
-      context 'when key for one of the rows is nil' do
-        it "should raise meaningful error when other key is accessed" do
-          model_class.should_receive(:all).once.and_return(['foo', nil].map { |n| model_class.new(n) })
-
-          expect { model_class.cache[:foo] }.to raise_error ProstoCache::BadCacheValuesError
-        end
-      end
-
       context 'when key is symbol' do
         it "should raise an error for key that was not found" do
           expect { model_class.cache[:nondef] }.to raise_error ProstoCache::BadCacheKeyError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prosto_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Very simple caching for your ActiveRecord models.