kelredd-resourceful 0.7.10 → 0.7.13

data/lib/resourceful/model/activerecord_associations.rb

@@ -15,19 +15,20 @@ module Resourceful
           config ||= {}
           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).to_s || 'find'
           force = config.delete(:force) || true
           define_method(name) 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)
-              raise NotImplementedError, "has_many_resourceful expects #{klass} to be findable (ie mixin the Findable helper)"
+            unless klass.respond_to?(find_method_name)
+              raise NotImplementedError, "has_many_resourceful expects #{klass} to implement a Findable method named '#{find_method_name}'"
             end
             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.find(:all, config, force)
+                klass.send(find_method_name, :all, config, force)
               )
           end
         end
@@ -38,6 +39,7 @@ module Resourceful
           raise ArgumentError, "belongs_to_resourceful requires a :class_name option to be specified" unless config[:class_name]
           class_name = config.delete(:class_name).to_s
           foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
+          find_method_name = config.delete(:method).to_s || 'find'
           force = config.delete(:force) || true
           define_method(name) do
             klass = class_name.resourceful_constantize
@@ -45,8 +47,8 @@ module Resourceful
             unless self.respond_to?(foreign_key)
               raise ArgumentError, "belongs_to_resourceful requires a '#{foreign_key}' method defined to return the foreign_key"
             end
-            unless klass.respond_to?(:find)
-              raise NotImplementedError, "belongs_to_resourceful expects #{klass} to be findable (ie mixin the Findable helper)"
+            unless klass.respond_to?(find_method_name)
+              raise NotImplementedError, "belongs_to_resourceful expects #{klass} to implement a Findable method named '#{find_method_name}'"
             end
             fk = self.send(foreign_key)
             if fk.nil? || (fk.respond_to?('empty?') && fk.empty?)
@@ -54,7 +56,7 @@ module Resourceful
             else
               instance_variable_get("@#{clean_name}") || \
                 instance_variable_set("@#{clean_name}", \
-                  klass.find(fk, config, force)
+                  klass.send(find_method_name, fk, config, force)
                 )
             end
           end

data/lib/resourceful/model/external_associations.rb

@@ -15,19 +15,20 @@ module Resourceful
           config ||= {}
           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).to_s || 'find'
           force = config.delete(:force) || true
           define_method(name) 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)
-              raise NotImplementedError, "has_many expects #{klass} to be findable (ie mixin the Findable helper)"
+            unless klass.respond_to?(find_method_name)
+              raise NotImplementedError, "has_many expects #{klass} to implement a Findable method named '#{find_method_name}'"
             end
             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.find(:all, config, force)
+                klass.send(find_method_name, :all, config, force)
               )
           end
         end
@@ -38,6 +39,7 @@ module Resourceful
           raise ArgumentError, "belongs_to requires a :class option to be specified" unless config[:class]
           class_name = config.delete(:class).to_s
           foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
+          find_method_name = config.delete(:method).to_s || 'find'
           force = config.delete(:force) || true
           define_method(name) do
             klass = self.class.get_namespaced_klass(class_name)
@@ -45,8 +47,8 @@ module Resourceful
             unless self.respond_to?(foreign_key)
               raise ArgumentError, "belongs_to requires a '#{foreign_key}' method defined to return the foreign_key"
             end
-            unless klass.respond_to?(:find)
-              raise NotImplementedError, "belongs_to expects #{klass} to be findable (ie mixin the Findable helper)"
+            unless klass.respond_to?(find_method_name)
+              raise NotImplementedError, "belongs_to expects #{klass} to implement a Findable method named '#{find_method_name}'"
             end
             fk = self.send(foreign_key)
             if fk.nil? || (fk.respond_to?('empty?') && fk.empty?)
@@ -54,7 +56,7 @@ module Resourceful
             else
               instance_variable_get("@#{clean_name}") || \
                 instance_variable_set("@#{clean_name}", \
-                  klass.find(fk, config, force)
+                  klass.send(find_method_name, fk, config, force)
                 )
             end
           end

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 7
-    TINY  = 10
+    TINY  = 13
     
     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.10
+  version: 0.7.13
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency