kelredd-resourceful 0.8.1 → 0.8.2

data/lib/resourceful/extensions.rb

@@ -18,7 +18,7 @@ module Resourceful::Extensions::String
 
           constant = ::Object
           names.each do |name|
-            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+            constant = constant.const_defined?(name) ? constant.const_get(name) : raise(NameError.new("uninitialized constant #{self}"))
           end
           constant
         end
@@ -29,7 +29,7 @@ module Resourceful::Extensions::String
 
           constant = ::Object
           names.each do |name|
-            constant = constant.const_get(name, false) || constant.const_missing(name)
+            constant = constant.const_get(name, false) || raise(NameError.new("uninitialized constant #{self}"))
           end
           constant
         end

data/lib/resourceful/model/activerecord_associations.rb

@@ -26,7 +26,7 @@ module Resourceful::Model::ActiverecordAssociations
       define_method(name) do |*args|
         reload = args.first || false
         if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
-          klass = class_name.resourceful_constantize
+          klass = class_name.kind_of(::String) ? class_name.resourceful_constantize : class_name
           raise ArgumentError, "has_many_resourceful :class_name '#{class_name}' is not defined" if klass.nil?
           unless klass.respond_to?(find_method_name)
             raise NotImplementedError, "has_many_resourceful expects #{klass} to implement a Findable method named '#{find_method_name}'"
@@ -63,11 +63,15 @@ module Resourceful::Model::ActiverecordAssociations
       define_method(name) do |*args|
         reload = args.first || false
         if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
-          klass = if polymorphic
-            self.send("#{clean_name}_type")
+          klass = if class_name.kind_of(::String)
+            if polymorphic
+              self.send("#{clean_name}_type")
+            else
+              class_name
+            end.resourceful_constantize
           else
             class_name
-          end.resourceful_constantize
+          end
           raise ArgumentError, "belongs_to_resourceful :class_name '#{class_name}' is not defined" if klass.nil?
           unless self.respond_to?(foreign_key_method)
             raise ArgumentError, "belongs_to_resourceful requires a '#{foreign_key_method}' method defined to return the foreign_key"

data/lib/resourceful/model/base.rb

@@ -21,12 +21,16 @@ module Resourceful::Model
     end
     def self.get_namespaced_klass(class_name)
       klass = nil
-      @@namespaces.each do |ns|
-        begin
-          klass = "#{ns}::#{class_name}".resourceful_constantize
-          break;
-        rescue Exception => err
+      if class_name.kind_of?(::String)
+        @@namespaces.each do |ns|
+          begin
+            klass = "#{ns}::#{class_name}".resourceful_constantize
+            break;
+          rescue Exception => err
+          end
         end
+      else
+        klass = class_name
       end
       klass
     end

data/lib/resourceful/model/eager_load.rb

@@ -14,7 +14,15 @@ module Resourceful
       associations.each do |association_name|
         clean_association_name = Resourceful::Model::Base.cleanup_name(association_name.to_s)
         assoc_data = get_association_data(klass, clean_association_name)
-        assoc_klass = klass.ancestors.include?(Resourceful::Model::Base) ? klass.get_namespaced_klass(assoc_data[:class_name]) : assoc_data[:class_name].resourceful_constantize
+        assoc_klass = if klass.ancestors.include?(Resourceful::Model::Base)
+          klass.get_namespaced_klass(assoc_data[:class_name])
+        else
+          if assoc_data[:class_name].kind_of?(::String)
+            assoc_data[:class_name].resourceful_constantize
+          else
+            assoc_data[:class_name]
+          end
+        end
         fk_values = collection.inject([]) {|vals, item| vals << item.send(assoc_data[:foreign_key_method])}
         fk_results = assoc_klass.send(assoc_data[:find_method_name], :all, {assoc_data[:foreign_key_name] => fk_values}, true)
         collection.each do |item|

data/lib/resourceful/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Kelly Redding