matid-resource_controller 0.6.7 → 0.7.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 6
-:patch: 7
+:minor: 7
+:patch: 0
 :build: 

data/lib/resource_controller/helpers/current_objects.rb

@@ -2,23 +2,23 @@ module ResourceController
   module Helpers
     module CurrentObjects
       protected
-        # Used internally to return the model for your resource.  
+        # Used internally to return the model for your resource.
         #
         def model
           model_name.to_s.camelize.constantize
         end
 
-  
+
         # Used to fetch the collection for the index method
         #
         # In order to customize the way the collection is fetched, to add something like pagination, for example, override this method.
         #
         def collection
-          end_of_association_chain.find(:all)
+          end_of_association_chain.all
         end
-    
+
         # Returns the current param.
-        # 
+        #
         # Defaults to params[:id].
         #
         # Override this method if you'd like to use an alternate param name.
@@ -26,7 +26,17 @@ module ResourceController
         def param
           params[:id]
         end
-  
+
+        # Returns the model finder method.
+        #
+        # Defaults to :find_by_permalink if defined, otherwise :find
+        #
+        # Override this method if you'd like to use an alternate finder.
+        #
+        def finder
+          model.respond_to?(:find_by_permalink) ? :find_by_permalink : :permalink
+        end
+
         # Used to fetch the current member object in all of the singular methods that operate on an existing member.
         #
         # Override this method if you'd like to fetch your objects in some alternate way, like using a permalink.
@@ -39,30 +49,30 @@ module ResourceController
         #   end
         #
         def object
-          @object ||= end_of_association_chain.find(param) unless param.nil?
+          @object ||= end_of_association_chain.send(finder, param) unless param.nil?
           @object
         end
-    
+
         # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)
         #
         def load_object
           instance_variable_set "@#{parent_type}", parent_object if parent?
           instance_variable_set "@#{object_name}", object
         end
-    
+
         # Used internally to load the collection in to an instance variable @#{model_name.pluralize} (i.e. @posts)
         #
         def load_collection
           instance_variable_set "@#{parent_type}", parent_object if parent?
           instance_variable_set "@#{object_name.to_s.pluralize}", collection
         end
-  
+
         # Returns the form params.  Defaults to params[model_name] (i.e. params["post"])
         #
         def object_params
           params["#{object_name}"]
         end
-    
+
         # Builds the object, but doesn't save it, during the new, and create action.
         #
         def build_object

data/lib/resource_controller/helpers/nested.rb

@@ -3,60 +3,65 @@
 module ResourceController
   module Helpers
     module Nested
-      protected    
+      protected
         # Returns the relevant association proxy of the parent. (i.e. /posts/1/comments # => @post.comments)
         #
         def parent_association
           @parent_association ||= parent_object.send(model_name.to_s.pluralize.to_sym)
         end
-    
+
         # Returns the type of the current parent
         #
         def parent_type
           @parent_type ||= parent_type_from_params || parent_type_from_request
         end
-    
+
         # Returns the type of the current parent extracted from params
-        #    
+        #
         def parent_type_from_params
           [*belongs_to].find { |parent| !params["#{parent}_id".to_sym].nil? }
         end
-    
+
         # Returns the type of the current parent extracted form a request path
-        #    
+        #
         def parent_type_from_request
           [*belongs_to].find { |parent| request.path.split('/').include? parent.to_s }
         end
-    
+
         # Returns true/false based on whether or not a parent is present.
         #
         def parent?
           !parent_type.nil?
         end
-    
+
         # Returns true/false based on whether or not a parent is a singleton.
-        #    
+        #
         def parent_singleton?
           !parent_type_from_request.nil? && parent_type_from_params.nil?
         end
-    
+
         # Returns the current parent param, if there is a parent. (i.e. params[:post_id])
         def parent_param
           params["#{parent_type}_id".to_sym]
         end
-    
+
         # Like the model method, but for a parent relationship.
-        # 
+        #
         def parent_model
           parent_type.to_s.camelize.constantize
         end
-    
+
+        # Like the finder method, but for a parent relationship
+        def parent_finder
+          parent_model.respond_to?(:find_by_permalink) ? :find_by_permalink : :permalink
+        end
+
         # Returns the current parent object if a parent object is present.
         #
         def parent_object
-          parent? && !parent_singleton? ? parent_model.find(parent_param) : nil
+          parent? && !parent_singleton? ? parent_model.send(parent_finder, parent_param) : nil
         end
-    
+
         # If there is a parent, returns the relevant association proxy.  Otherwise returns model.
         #
         def end_of_association_chain

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
   - 7
-  version: 0.6.7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +00:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: []