kelredd-resourceful 0.7.14 → 0.7.16

data/Rakefile

@@ -7,7 +7,7 @@ require 'lib/resourceful/version'
 task :default => :test
 
 spec = Gem::Specification.new do |s|
-  s.name             = 'resourceful'
+  s.name             = 'kelredd-resourceful'
   s.version          = Resourceful::Version.to_s
   s.has_rdoc         = true
   s.extra_rdoc_files = %w(README.rdoc)

data/lib/resourceful/model/activerecord_associations.rb

@@ -16,8 +16,8 @@ module Resourceful
           raise ArgumentError, "has_many_resourceful requires a :class_name option to be specified" unless config[:class_name]
           class_name = config.delete(:class_name).to_s
           find_method_name = (config.delete(:method) || 'find').to_s
-          force = config.delete(:force) || true
-          define_method(name) do
+          force = config.delete(:force) || false
+          define_method(name, reload=false) do
             klass = class_name.resourceful_constantize
             raise ArgumentError, "has_many_resourceful :class_name '#{class_name}' is not defined" if klass.nil?
             unless klass.respond_to?(find_method_name)
@@ -26,10 +26,11 @@ module Resourceful
             fk = config.delete(:foreign_key) || "#{self.class.name.demodulize.underscore}_id"
             fk_method = config.delete(:foreign_key_method) || 'id'
             config[fk] = self.send(fk_method)
-            instance_variable_get("@#{clean_name}") || \
-              instance_variable_set("@#{clean_name}", \
-                klass.send(find_method_name, :all, config, force)
-              )
+            if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
+              instance_variable_set("@#{clean_name}", klass.send(find_method_name, :all, config, force))
+            else
+              assoc_val
+            end
           end
         end
 
@@ -40,8 +41,8 @@ module Resourceful
           class_name = config.delete(:class_name).to_s
           foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
           find_method_name = (config.delete(:method) || 'find').to_s
-          force = config.delete(:force) || true
-          define_method(name) do
+          force = config.delete(:force) || false
+          define_method(name, reload=false) do
             klass = class_name.resourceful_constantize
             raise ArgumentError, "belongs_to_resourceful :class_name '#{class_name}' is not defined" if klass.nil?
             unless self.respond_to?(foreign_key)
@@ -54,10 +55,11 @@ module Resourceful
             if fk.nil? || (fk.respond_to?('empty?') && fk.empty?)
               nil
             else
-              instance_variable_get("@#{clean_name}") || \
-                instance_variable_set("@#{clean_name}", \
-                  klass.send(find_method_name, fk, config, force)
-                )
+              if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
+                instance_variable_set("@#{clean_name}", klass.send(find_method_name, fk, config, force))
+              else
+                assoc_val
+              end
             end
           end
         end

data/lib/resourceful/model/external_associations.rb

@@ -16,8 +16,8 @@ module Resourceful
           raise ArgumentError, "has_many requires a :class option to be specified" unless config[:class]
           class_name = config.delete(:class).to_s
           find_method_name = (config.delete(:method) || 'find').to_s
-          force = config.delete(:force) || true
-          define_method(name) do
+          force = config.delete(:force) || false
+          define_method(name, reload=false) do
             klass = self.class.get_namespaced_klass(class_name)
             raise ArgumentError, "has_many :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
             unless klass.respond_to?(find_method_name)
@@ -26,10 +26,11 @@ module Resourceful
             fk = config.delete(:foreign_key) || "#{self.class.name.demodulize.underscore}_id"
             fk_method = config.delete(:foreign_key_method) || 'id'
             config[fk] = self.send(fk_method)
-            instance_variable_get("@#{clean_name}") || \
-              instance_variable_set("@#{clean_name}", \
-                klass.send(find_method_name, :all, config, force)
-              )
+            if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
+              instance_variable_set("@#{clean_name}", klass.send(find_method_name, :all, config, force))
+            else
+              assoc_val
+            end
           end
         end
 
@@ -40,8 +41,8 @@ module Resourceful
           class_name = config.delete(:class).to_s
           foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
           find_method_name = (config.delete(:method) || 'find').to_s
-          force = config.delete(:force) || true
-          define_method(name) do
+          force = config.delete(:force) || false
+          define_method(name, reload=false) do
             klass = self.class.get_namespaced_klass(class_name)
             raise ArgumentError, "belongs_to :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
             unless self.respond_to?(foreign_key)
@@ -54,10 +55,11 @@ module Resourceful
             if fk.nil? || (fk.respond_to?('empty?') && fk.empty?)
               nil
             else
-              instance_variable_get("@#{clean_name}") || \
-                instance_variable_set("@#{clean_name}", \
-                  klass.send(find_method_name, fk, config, force)
-                )
+              if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
+                instance_variable_set("@#{clean_name}", klass.send(find_method_name, fk, config, force))
+              else
+                assoc_val
+              end
             end
           end
         end

data/lib/resourceful/model/findable.rb

@@ -4,7 +4,7 @@ module Resourceful
       
       module ClassMethods
 
-        def find(id, opts={}, force=true)
+        def find(id, opts={}, force=false)
           opts ||= {}
           opts = findable_default_opts.merge(opts) if respond_to?(:findable_default_opts)
           case id

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 7
-    TINY  = 14
+    TINY  = 16
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.7.14
+  version: 0.7.16
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 -07:00
+date: 2009-10-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,15 +83,12 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - Rakefile
-- lib/resourceful
-- lib/resourceful/agent
 - lib/resourceful/agent/base.rb
 - lib/resourceful/agent/mechanize.rb
 - lib/resourceful/agent/rest_client.rb
 - lib/resourceful/agent.rb
 - lib/resourceful/exceptions.rb
 - lib/resourceful/extensions.rb
-- lib/resourceful/model
 - lib/resourceful/model/activerecord_associations.rb
 - lib/resourceful/model/attribute_types.rb
 - lib/resourceful/model/base.rb
@@ -101,18 +98,17 @@ files:
 - lib/resourceful/model/json.rb
 - lib/resourceful/model/xml.rb
 - lib/resourceful/model.rb
-- lib/resourceful/resource
 - lib/resourceful/resource/cache.rb
 - lib/resourceful/resource/format.rb
 - lib/resourceful/resource.rb
-- lib/resourceful/shoulda
 - lib/resourceful/shoulda/test_unit.rb
 - lib/resourceful/shoulda.rb
 - lib/resourceful/version.rb
 - lib/resourceful.rb
-has_rdoc: false
+has_rdoc: true
 homepage: ""
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main