cached_values 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.1 / 2008-03-12
+
+* The find_target method is now public
+
 === 1.0.0 / 2008-03-06
 
 * Converted from a Rails plugin

data/lib/cached_values.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/cached_values/cached_value")
 require File.expand_path(File.dirname(__FILE__) + "/cached_values/caches_value")
 
 module CachedValues # :nodoc:
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 
 ActiveRecord::Base.send :include, CachesValues

data/lib/cached_values/cached_value.rb

@@ -10,18 +10,17 @@ module ActiveRecord
     
     def reset
       @target = nil
-      @loaded = false
     end
 
     def load
       reset
-      load_target
+      @target = find_target(true)
+      update_cache(@target)
     end
 
     def reload
       @owner.instance_variable_set("@#{@reflection.name}", nil)
-      reset
-      @target = find_target(true)
+      load
       @owner.send @reflection.name
     end
     
@@ -32,35 +31,19 @@ module ActiveRecord
       @owner.instance_variable_set("@#{@reflection.name}", nil)
     end
 
-    def loaded?
-      @loaded
-    end
-    
-    def loaded
-      @loaded = true
-    end
-    
     def target
       @target
     end
 
-    protected
-      
-      def load_target
-        return nil unless defined?(@loaded)
-        @target = find_target unless loaded?
-        @loaded = true
-        @target
-      end
-
-      def find_target(skip_cache = false)
-        target = find_target_from_cache unless skip_cache
-        unless target
-          target ||= @reflection.options[:sql] ? find_target_by_sql : find_target_by_eval
-          update_cache(target)
-        end
-        target
+    def find_target(skip_cache = false)
+      target = find_target_from_cache unless skip_cache
+      unless target
+        target ||= @reflection.options[:sql] ? find_target_by_sql : find_target_by_eval
       end
+      target
+    end
+    
+    protected
       
       def find_target_from_cache
         @owner.send(:read_attribute, cache_column) if has_cache?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cached_values
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-07 00:00:00 -08:00
+date: 2008-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency