simple_cacheable 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84641f34cae9d9da455523484d0a802851c938ed
-  data.tar.gz: 951f43891133aa8e58d6235d686cc2427b407dcb
+  metadata.gz: 82a842613fa2c2177a47105e827c286a0c959e4e
+  data.tar.gz: 21bcf0508eb353b7f4899392f47951138a4a3f3d
 SHA512:
-  metadata.gz: 99d9989b5970e995a3212583ae721802d04e1acb6e5ca4384213083926e03235f97f663027c599cdc4bbaba28ba6d0fc832813e18df2e7439e6994ead01f2985
-  data.tar.gz: 8dd71f349161ed02e8f63482e9a0e9dd88f98c12cdbbd7e2555fe3a217a7099c29ff5ec414dd79f98e2835a88878503a75f5cc32640129d25d691a79e5d708c8
+  metadata.gz: 8aef917182c022c49718748fef29f2b1b9152526d2de85021ccff9082386d3620ef867fe677a5c087c99ccbdb63cf3b4067a032db497ab6db728d3a5fc357edd
+  data.tar.gz: 046e1c0509df6ee8ad09a35865515ada8927018881b333fe2698146aa561c0f5ff2e237a750eee1a0a08ef5550adb298907a64f34e44239d4750dafe178eab0b

data/ChangeLog

@@ -1,3 +1,6 @@
+1.4.1
+* Fixed all silent failures for assocations that didn't exist
+
 1.4.0
 * Fixed after_commit silent failure for assocations that didn't exist
 * Fixed association for has_many through when there are several belongs_to relationships

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_cacheable (1.3.3)
+    simple_cacheable (1.4.0)
       rails (>= 3.0.0)
 
 GEM
@@ -25,9 +25,9 @@ GEM
       activesupport (= 4.0.0)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activerecord-jdbc-adapter (1.2.2.1)
-    activerecord-jdbcsqlite3-adapter (1.2.2.1)
-      activerecord-jdbc-adapter (~> 1.2.2.1)
+    activerecord-jdbc-adapter (1.2.9.1)
+    activerecord-jdbcsqlite3-adapter (1.2.9)
+      activerecord-jdbc-adapter (~> 1.2.9)
       jdbc-sqlite3 (~> 3.7.2)
     activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
@@ -43,12 +43,12 @@ GEM
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.4)
-    jdbc-sqlite3 (3.7.2)
-    jruby-memcached (0.5.1)
+    jdbc-sqlite3 (3.7.2.1)
+    jruby-memcached (0.5.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.6)
+    memcached (1.6.1)
     metaclass (0.0.1)
     mime-types (1.23)
     minitest (4.7.5)
@@ -92,7 +92,9 @@ GEM
       sprockets (~> 2.8)
     sqlite3 (1.3.7)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.2)
+      atomic
+    thread_safe (0.1.2-java)
       atomic
     tilt (1.4.1)
     treetop (1.4.14)
@@ -109,7 +111,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   jruby-memcached
   memcached
-  mocha
-  rspec
+  mocha (= 0.10.5)
+  rspec (= 2.8)
   simple_cacheable!
   sqlite3

data/cacheable.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.description = %q{a simple cache implementation based on activerecord}
 
   s.add_dependency("rails", ">= 3.0.0")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("mocha")
+  s.add_development_dependency("rspec", "2.8")
+  s.add_development_dependency("mocha", "0.10.5")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/cacheable/types/association_cache.rb

@@ -34,10 +34,13 @@ module Cacheable
                 after_commit "expire_#{association_name}_cache".to_sym
 
                 define_method("expire_#{association_name}_cache") do
+
                   if respond_to? "expire_#{reverse_association.name}_cache".to_sym
-                    send("cached_#{reverse_association.name}").expire_association_cache(association_name)
-                  else
-                    if send(reverse_association.name) && send(reverse_association.name).respond_to?(reverse_through_association.name)
+                    unless send("cached_#{reverse_association.name}").nil?
+                      send("cached_#{reverse_association.name}").expire_association_cache(association_name)
+                    end
+                  elsif !send(reverse_association.name).nil?
+                    if send(reverse_association.name).respond_to?(reverse_through_association.name) && !send(reverse_association.name).send(reverse_through_association.name).nil?
                       send(reverse_association.name).send(reverse_through_association.name).expire_association_cache(association_name)
                     end
                   end
@@ -55,10 +58,13 @@ module Cacheable
 
                 define_method "expire_#{association_name}_cache" do
                   if respond_to? "cached_#{reverse_association.name}".to_sym
-                    # cached_viewable.expire_association_cache
-                    send("cached_#{reverse_association.name}").expire_association_cache(association_name)
-                  else
+                    unless send("cached_#{reverse_association.name}").nil?
+                      # cached_viewable.expire_association_cache
+                      send("cached_#{reverse_association.name}").expire_association_cache(association_name)
+                    end
+                  elsif !send("#{reverse_association.name}").nil?
                     send("#{reverse_association.name}").each do |assoc|
+                      next if assoc.nil?
                       assoc.expire_association_cache(association_name)
                     end
                   end
@@ -74,8 +80,10 @@ module Cacheable
 
               define_method "expire_#{association_name}_cache" do
                 if respond_to? "cached_#{reverse_association.name}".to_sym
-                  send("cached_#{reverse_association.name}").expire_association_cache(association_name)
-                else
+                  unless send("cached_#{reverse_association.name}").nil?
+                    send("cached_#{reverse_association.name}").expire_association_cache(association_name)
+                  end
+                elsif !send("#{reverse_association.name}").nil?
                   send("#{reverse_association.name}").expire_association_cache(association_name)
                 end
               end

data/lib/cacheable/version.rb

@@ -1,3 +1,3 @@
 module Cacheable
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/lib/cacheable.rb

@@ -25,4 +25,4 @@ module Cacheable
     end
   end
 
-end
+end

data/spec/cacheable/types/association_cache_spec.rb

@@ -190,6 +190,28 @@ describe Cacheable do
       user.save
     end
 
+    context "with a user" do
+      it "should not hit expire_association_cache on save" do
+        account = Account.create
+        user = User.new
+        user.expects(:expire_association_cache)
+        account.stubs(:user).returns user
+        account.save
+      end
+    end
+
+    context "without a user" do
+      it "should not hit expire_association_cache on save" do
+        account = Account.create
+        obj = mock "object"
+        obj.stubs(:nil?).returns true
+        account.stubs(:user).returns obj
+        obj.expects(:expire_association_cache).never
+        account.expire_account_cache
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,30 +29,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 description: a simple cache implementation based on activerecord
 email:
 - flyerhzm@gmail.com