lib/resourcelogic/parent.rb in resourcelogic-0.12.2 vs lib/resourcelogic/parent.rb in resourcelogic-0.12.3

@@ -1,54 +1,54 @@
 module Resourcelogic
   module Parent
+    class RequiredParentError < StandardError; end
+    
     def self.included(klass)
       klass.class_eval do
         extend Config
         add_acts_as_resource_module(Urls)
         add_acts_as_resource_module(Reflection)
       end
     end
-    
+
     module Config
-      def belongs_to(name = nil, options = {})
+      def belongs_to(*args)
+        options = args.extract_options!
         @belongs_to ||= {}
-        if name.nil?
-          @belongs_to
-        else
-          @belongs_to[name.to_sym] = options
-        end
+        args.each { |name| @belongs_to[name.to_sym] = options }
+        @belongs_to
       end
-      
+
       def require_parent(value = nil)
         rw_config(:require_parent, value, false)
       end
     end
-    
+
     module Urls
       private
         def parent_url_parts(action = nil, url_params = {})
           [action] + contexts_url_parts + [url_params]
         end
-        
+
         def parent_collection_url_parts(*args)
           parent_url_parts(*args)
         end
     end
-    
+
     module Reflection
       def self.included(klass)
         klass.class_eval do
-          helper_method :parent?, :parent_model_name, :parent_object
+          helper_method :parent?, :parent_model_name, :parent
           before_filter :require_parent
         end
       end
-      
+
       private
         def belongs_to
           self.class.belongs_to
         end
-        
+
         def parent_path_name
           return @parent_path_name if defined?(@parent_path_name)
           path_parts = request.path.split("/")
           path_parts.reverse.each do |path_part|
             next if path_part.blank?
@@ -56,11 +56,11 @@
               return @parent_path_name = path_part.to_sym
             end
           end
           @parent_path_name = nil
         end
-        
+
         def parent_route_name
           return @parent_route_name if defined?(@parent_route_name)
           path_parts = request.path.split("/")
           path_parts.reverse.each do |path_part|
             next if path_part.blank?
@@ -68,23 +68,23 @@
               return @parent_route_name = route_name_from_path_part(path_part)
             end
           end
           @parent_route_name = parent_model_name
         end
-        
+
         # Returns the type of the current parent
         #
         def parent_model_name
           return @parent_model_name if defined?(@parent_model_name)
-          parent_from_path?
+          parent_from_path? || parent_from_params?
           @parent_model_name
         end
-        
+
         def parent_model
           @parent_model ||= parent_model_name.to_s.camelize.constantize
         end
-        
+
         # Returns the type of the current parent extracted form a request path
         #
         def parent_from_path?
           return @parent_from_path if defined?(@parent_from_path)
           belongs_to.each do |model_name, options|
@@ -97,46 +97,60 @@
               end
             end
           end
           @parent_from_path = false
         end
-        
+
+        # Returns the type of the current parent extracted form the request parameters
+        #
+        def parent_from_params?
+          return @parent_from_params if defined?(@parent_from_params)
+          belongs_to.each do |model_name, options|
+            if params["#{model_name}_id".to_sym]
+              @parent_model_name = model_name
+              return @parent_from_params = true
+            end
+          end
+          @parent_from_params = false
+        end
+
         # Returns true/false based on whether or not a parent is present.
         #
         def parent?
           !parent_model_name.nil?
         end
-        
+
         # Returns true/false based on whether or not a parent is a singleton.
         #
         def parent_singleton?
           parent? && parent_id.nil?
         end
-        
+
         # Returns the current parent param, if there is a parent. (i.e. params[:post_id])
         def parent_id
           params["#{parent_route_name}_id".to_sym]
         end
-        
+
         # Returns the current parent object if a parent object is present.
         #
-        def parent_object(reload = false)
-          return @parent_object if !reload && defined?(@parent_object)
+        def parent(reload = false)
+          return @parent if !reload && defined?(@parent)
           if parent?
             if parent_singleton? && respond_to?("current_#{parent_model_name}", true)
-              @parent_object = send("current_#{parent_model_name}")
+              @parent = send("current_#{parent_model_name}")
             elsif parent_singleton? && parent_scope.respond_to?(parent_model_name)
-              @parent_object = parent_scope.send(parent_model_name, reload)
+              @parent = parent_scope.send(parent_model_name, reload)
             else
-              @parent_object = parent_scope.find(parent_id)
+              @parent = parent_scope.find(parent_id)
             end
           else
-            @parent_object = nil
+            @parent = nil
           end
         end
-        
+
         def require_parent
-          raise StandardError.new("A parent is required to access this resource and no parent was found") if !parent? && self.class.require_parent == true
+          raise RequiredParentError.new("A parent is required to access this resource and no parent was found") if !parent? && self.class.require_parent == true
         end
     end
   end
-end
\ No newline at end of file
+end
+