domain_neutral 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2868d506ab5999b3bdfb949b1486c1a8cef507a9
-  data.tar.gz: 9c48bcc5503051b3ace5e5e169ec26dd6fb19edc
+  metadata.gz: 0f5efbdab266c46f4389694389accd31b416a33b
+  data.tar.gz: 4a96857832d7baf3fbf7cf38559430f69d2c4ad7
 SHA512:
-  metadata.gz: 28e382c272fc6fbc15b513d5eac723683d97a447405d5d0f64fa58f232b3cdcc92c01572c79b5533951525d737c37ca2e51433fb0ae58f321b7702e0b4722aa4
-  data.tar.gz: 244d3890989160739db9f88a809a5cb6076448d732d97d4fcc452196c318476e307fd759aeca8a810b67cc4ef2aa7b02df320d9be3fd62f4ec09a4b104a0d066
+  metadata.gz: 68c7f2f9b5515b1faee5d87cff549f30daf1c43d3f111bc97e987b8b31c07164f9be063ef4ed095f583673dda8c69695b6a75d0c7aa2b8f9827e710243d2e511
+  data.tar.gz: 573e9a8514a100bae77e7281af051fbc2a922b8733cfdbb9c139100bdd9dfbdeee11903036ba6699207f754a7fd137f6caa758ba6f941d3bc2466f66b92a4e6b

data/lib/domain_neutral/symbolized_class.rb

@@ -57,9 +57,7 @@ module DomainNeutral
       # Overrides find by using cache.
       # The key in cache is [class_name, id] or ':class_name/:id', e.g. 'Role/1'
       def find(id)
-        if caching_enabled
-          Rails.cache.fetch([name, id]) { super }
-        else
+        fetch([name, id]) do
           super
         end
       end
@@ -70,11 +68,7 @@ module DomainNeutral
       #   Descriptor[:symbol]
       #   Descriptor.symbol
       def find_by_symbol(symbol)
-        if caching_enabled
-          Rails.cache.fetch([name, symbol.to_s]) do
-            where(symbol: symbol).first
-          end
-        else
+        fetch([name, symbol.to_s]) do
           where(symbol: symbol).first
         end
       end
@@ -107,6 +101,20 @@ module DomainNeutral
       def enable_caching(*args)
         self.caching_enabled = args.size > 0 ? args.first : true
       end
+      
+    private
+      # Ensures cache is cleared if nil result
+      def fetch(key, options = nil) 
+        if caching_enabled
+          result = Rails.cache.fetch(key, options) do
+            yield
+          end
+          Rails.cache.delete(key) unless result
+        else
+          result = yield
+        end
+        result
+      end
     end
 
     # Store symbol

data/lib/domain_neutral/version.rb

@@ -1,3 +1,3 @@
 module DomainNeutral
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/domain_neutral/symbolized_class_test.rb

@@ -95,16 +95,24 @@ module DomainNeutral
             @tc.enable_caching # true
           end
           should 'delegate find to super' do
-            expect_cached [@tc.name, 44]  do
+            expect_cached [@tc.name, 44], nil  do
               assert_equal 44, @tc.find(44)
             end
           end
           should 'lookup object by symbol' do
-            expect_cached [@tc.name, 'expert'] do
+            expect_cached [@tc.name, 'expert'], nil do
               @tc.expects(:where).with(symbol: :expert).returns([:ok])
               assert_equal :ok, @tc.find_by_symbol( :expert)
             end
           end
+          should 'delete cached entry if not found' do
+            expect_cached [@tc.name, 'expert'], nil do |cache|
+              @tc.expects(:where).with(symbol: :expert).returns([nil])
+              assert_equal nil, @tc.find_by_symbol( :expert)
+              assert_equal [@tc.name, 'expert'], cache.called?( :delete)
+            end
+          end
+          
         end
       end