inherited_resources 1.2.2 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+# Version 1.3.0
+
+* Added support for multiple polymorphic optional nesting
+* Fix nested namespace in mountable apps
+* Added support for rails 3.1 new mass assignment conventions
+* Turn InheritedResources::Base into a reloadable constant to fix reloading issues
+
 # Version 1.2.2
 
 * Fix a bug in params parsing

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.3"
+gem "rails", "3.1.0.rc4"
 gem "responders", "~> 0.6.0"
 gem "has_scope", "~> 0.5.0"
 gem "mocha"

data/Gemfile.lock

@@ -1,79 +1,97 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    builder (2.1.2)
-    columnize (0.3.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    actionmailer (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.0)
+      rack-cache (~> 1.0.1)
+      rack-mount (~> 0.8.1)
+      rack-test (~> 0.6.0)
+      sprockets (~> 2.0.0.beta.10)
+      tzinfo (~> 0.3.27)
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      arel (~> 2.1.1)
+      tzinfo (~> 0.3.27)
+    activeresource (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+    activesupport (3.1.0.rc4)
+      multi_json (~> 1.0)
+    arel (2.1.1)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    columnize (0.3.4)
+    erubis (2.7.0)
     has_scope (0.5.0)
-    i18n (0.5.0)
-    linecache (0.43)
-    mail (2.2.14)
-      activesupport (>= 2.3.6)
+    hike (1.1.0)
+    i18n (0.6.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.8)
       rake
+    multi_json (1.0.3)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.3.0)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.1)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.1.0.rc4)
+      actionmailer (= 3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activerecord (= 3.1.0.rc4)
+      activeresource (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.1.0.rc4)
+    railties (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.8.7)
-    responders (0.6.2)
-    ruby-debug (0.10.3)
+    rbx-require-relative (0.0.5)
+    rdoc (3.6.1)
+    responders (0.6.4)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    sprockets (2.0.0.beta.10)
+      hike (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
+    tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.28)
 
 PLATFORMS
   ruby
@@ -81,6 +99,6 @@ PLATFORMS
 DEPENDENCIES
   has_scope (~> 0.5.0)
   mocha
-  rails (= 3.0.3)
+  rails (= 3.1.0.rc4)
   responders (~> 0.6.0)
   ruby-debug

data/README.rdoc

@@ -8,8 +8,8 @@ Plus, making your controllers follow a pattern, it helps you to write better
 code by following fat models and skinny controllers convention. There are
 two screencasts available besides this README:
 
-http://railscasts.com/episodes/230-inherited-resources
-http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with-inherited-resources
+* http://railscasts.com/episodes/230-inherited-resources
+* http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with-inherited-resources
 
 == Installation
 
@@ -39,15 +39,12 @@ Or checkout from the v1.0 branch:
 
 == HasScope
 
-Since Inherited Resources 1.0, has_scope is not part of its core anymore.
-However, if you are using has_scope in your application, Inherited Resources
-will handle all the required hooks automatically.
-
-has_scope gem is available at:
+Since Inherited Resources 1.0, has_scope is not part of its core anymore but
+a gem dependency. Be sure to check the documentation to see how you can use it:
 
   http://github.com/plataformatec/has_scope
 
-And can be installed as:
+And it can be installed as:
 
   gem install has_scope
 
@@ -514,6 +511,8 @@ check this Wiki page:
 
 https://github.com/josevalim/inherited_resources/wiki/Views-Inheritance
 
+Notice that Rails 3.1 ships with view inheritance built-in.
+
 == Some DSL
 
 For those DSL lovers, InheritedResources won't leave you alone. You can overwrite
@@ -534,9 +533,9 @@ And then you can rewrite the last example as:
 
 == Bugs and Feedback
 
-If you discover any bugs or want to drop a line, join us in the mailing list:
+If you discover any bugs, please describe it in the issues tracker, including Rails and Inherited Resources versions.
 
-http://groups.google.com/group/inherited_resources
+Questions are better handled on StackOverflow.
 
-Copyright (c) 2009 José Valim http://blog.plataformatec.com.br
+Copyright (c) 2011 José Valim http://blog.plataformatec.com.br
 See the attached MIT License.

data/{lib → app/controllers}/inherited_resources/base.rb

@@ -1,6 +1,3 @@
-require 'inherited_resources/blank_slate'
-require 'inherited_resources/responder'
-
 module InheritedResources
   # = Base
   #
@@ -21,7 +18,7 @@ module InheritedResources
         extend  InheritedResources::UrlHelpers
 
         # Add at least :html mime type
-        respond_to :html
+        respond_to :html if self.mimes_for_respond_to.empty?
         self.responder = InheritedResources::Responder
 
         helper_method :resource, :collection, :resource_class, :association_chain,
@@ -33,7 +30,8 @@ module InheritedResources
                       :parent_url, :parent_path,
                       :smart_resource_url, :smart_collection_url
 
-        self.class_attribute :resource_class,  :parents_symbols,  :resources_configuration, :instance_writer => false
+        self.class_attribute :resource_class, :instance_writer => false unless self.respond_to? :resource_class
+        self.class_attribute :parents_symbols,  :resources_configuration, :instance_writer => false
 
         protected :resource_class, :parents_symbols, :resources_configuration,
           :resource_class?, :parents_symbols?, :resources_configuration?
@@ -42,4 +40,4 @@ module InheritedResources
 
     inherit_resources(self)
   end
-end
+end

data/lib/inherited_resources.rb

@@ -1,10 +1,12 @@
+require 'rails/engine'
 require 'responders'
+require 'inherited_resources/blank_slate'
+require 'inherited_resources/responder'
 
 module InheritedResources
   ACTIONS = [ :index, :show, :new, :edit, :create, :update, :destroy ] unless self.const_defined?(:ACTIONS)
 
   autoload :Actions,            'inherited_resources/actions'
-  autoload :Base,               'inherited_resources/base'
   autoload :BaseHelpers,        'inherited_resources/base_helpers'
   autoload :ShallowHelpers,     'inherited_resources/shallow_helpers'
   autoload :BelongsToHelpers,   'inherited_resources/belongs_to_helpers'
@@ -20,7 +22,7 @@ module InheritedResources
     Responders::FlashResponder.flash_keys = array
   end
 
-  class Railtie < ::Rails::Railtie
+  class Railtie < ::Rails::Engine
     config.inherited_resources = InheritedResources
     if config.respond_to?(:app_generators)
       config.app_generators.scaffold_controller = :inherited_resources_controller

data/lib/inherited_resources/base_helpers.rb

@@ -49,7 +49,7 @@ module InheritedResources
       # instance variable.
       #
       def build_resource
-        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, resource_params))
+        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, *resource_params))
       end
 
       # Responsible for saving the resource on :create method. Overwriting this
@@ -75,7 +75,7 @@ module InheritedResources
       #   end
       #
       def update_resource(object, attributes)
-        object.update_attributes(attributes)
+        object.update_attributes(*attributes)
       end
 
       # Handle the :destroy method for the resource. Overwrite it to call your
@@ -300,7 +300,19 @@ module InheritedResources
 
       # extract attributes from params
       def resource_params
-        params[resource_request_name] || params[resource_instance_name] || {}
+        rparams = [params[resource_request_name] || params[resource_instance_name] || {}]
+        rparams << as_role if role_given?
+        rparams
+      end
+      
+      # checking if role given
+      def role_given?
+        self.resources_configuration[:self][:role].present?
+      end
+      
+      # getting role for mass-asignment
+      def as_role
+         { :as => self.resources_configuration[:self][:role] }
       end
   end
 end

data/lib/inherited_resources/class_methods.rb

@@ -255,6 +255,12 @@ module InheritedResources
         end
       end
 
+      # Defines the role to use when creating or updating resource.
+      # Makes sense when using rails 3.1 mass assignment conventions
+      def with_role(role)
+        self.resources_configuration[:self][:role] = role.try(:to_sym)
+      end 
+
     private
 
       def acts_as_singleton! #:nodoc:
@@ -273,21 +279,31 @@ module InheritedResources
       end
 
       def acts_as_shallow! #:nodoc:
+        include BelongsToHelpers
         include ShallowHelpers
       end
 
       # Initialize resources class accessors and set their default values.
       #
       def initialize_resources_class_accessors! #:nodoc:
-        # First priority is the namespaced modek, e.g. User::Group
-        self.resource_class = begin
+        # First priority is the namespaced model, e.g. User::Group
+        self.resource_class ||= begin
           namespaced_class = self.name.sub(/Controller/, '').singularize
           namespaced_class.constantize
         rescue NameError
           nil
         end
 
-        # Second priority the camelcased c, i.e. UserGroup
+        # Second priority is the top namespace model, e.g. EngineName::Article for EngineName::Admin::ArticlesController
+        self.resource_class ||= begin
+          namespaced_classes = self.name.sub(/Controller/, '').split('::')
+          namespaced_class = [namespaced_classes.first, namespaced_classes.last].join('::').singularize
+          namespaced_class.constantize
+        rescue NameError
+          nil
+        end
+
+        # Third priority the camelcased c, i.e. UserGroup
         self.resource_class ||= begin
           camelcased_class = self.name.sub(/Controller/, '').gsub('::', '').singularize
           camelcased_class.constantize

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -126,28 +126,28 @@ module InheritedResources
       #
       def symbols_for_association_chain #:nodoc:
         polymorphic_config = resources_configuration[:polymorphic]
-
         parents_symbols.map do |symbol|
           if symbol == :polymorphic
             params_keys = params.keys
 
-            key = polymorphic_config[:symbols].find do |poly|
-              params_keys.include? resources_configuration[poly][:param].to_s
-            end
+            keys = polymorphic_config[:symbols].map do |poly|
+              params_keys.include?(resources_configuration[poly][:param].to_s) ? poly : nil
+            end.compact
 
-            if key.nil?
+            if keys.empty?
               raise ScriptError, "Could not find param for polymorphic association. The request" <<
                                  "parameters are #{params.keys.inspect} and the polymorphic " <<
                                  "associations are #{polymorphic_config[:symbols].inspect}." unless polymorphic_config[:optional]
 
               nil
             else
-              @parent_type = key.to_sym
+              @parent_type = keys[-1].to_sym
+							@parent_types = keys.map(&:to_sym)
             end
           else
             symbol
           end
-        end.compact
+        end.flatten.compact
       end
 
   end

data/lib/inherited_resources/shallow_helpers.rb

@@ -1,87 +1,43 @@
 module InheritedResources
-  # = belongs_to
+  # Shallow provides a functionality that goes on pair with Rails' shallow.
+  # It is very similar to "optional" but it actually finds all the parents
+  # resources instead of leaving them blank. Consider the following example:
   #
-  # Let's suppose that we have some tasks that belongs to projects. To specify
-  # this assoication in your controllers, just do:
+  #   belongs_to :post, :shallow => true do
+  #     belongs_to :comment
+  #   end
   #
-  #    class TasksController < InheritedResources::Base
-  #      belongs_to :project
-  #    end
-  #
-  # belongs_to accepts several options to be able to configure the association.
-  # For example, if you want urls like /projects/:project_title/tasks, you
-  # can customize how InheritedResources find your projects:
-  #
-  #    class TasksController < InheritedResources::Base
-  #      belongs_to :project, :finder => :find_by_title!, :param => :project_title
-  #    end
-  #
-  # It also accepts :route_name, :parent_class and :instance_name as options.
-  # Check the lib/inherited_resources/class_methods.rb for more.
-  #
-  # = nested_belongs_to
-  #
-  # Now, our Tasks get some Comments and you need to nest even deeper. Good
-  # practices says that you should never nest more than two resources, but sometimes
-  # you have to for security reasons. So this is an example of how you can do it:
-  #
-  #    class CommentsController < InheritedResources::Base
-  #      nested_belongs_to :project, :task
-  #    end
-  #
-  # If you need to configure any of these belongs to, you can nested them using blocks:
-  #
-  #    class CommentsController < InheritedResources::Base
-  #      belongs_to :project, :finder => :find_by_title!, :param => :project_title do
-  #        belongs_to :task
-  #      end
-  #    end
-  #
-  # Warning: calling several belongs_to is the same as nesting them:
-  #
-  #    class CommentsController < InheritedResources::Base
-  #      belongs_to :project
-  #      belongs_to :task
-  #    end
-  #
-  # In other words, the code above is the same as calling nested_belongs_to.
+  # When accessed as /comments/1, Inherited Resources will automatically get
+  # the post resource so both objects are actually accessible through the views.
   #
+  # However, when using optional, Inherited Resources wouldn't actually bother
+  # with finding the parent object.
   module ShallowHelpers
-    include BelongsToHelpers
-
     private
 
-      # Evaluate the parent given. This is used to nest parents in the
-      # association chain.
-      #
-
-      # Maps parents_symbols to build association chain. In this case, it
-      # simply return the parent_symbols, however on polymorphic belongs to,
-      # it has some customization.
-      #
       def symbols_for_association_chain #:nodoc:
         parent_symbols = parents_symbols.dup
-        if parents_symbols.size > 1 && !params[:id]
-          inst_class_name = parent_symbols.pop
-          finder_method = resources_configuration[inst_class_name][:finder] || :find
-          instance = resources_configuration[inst_class_name][:parent_class].send(finder_method, params[resources_configuration[inst_class_name][:param]])
-          load_parents(instance, parent_symbols)
-        end
-        if params[:id]
+        instance = nil
+
+        if id = params[:id]
           finder_method = resources_configuration[:self][:finder] || :find
-          instance = self.resource_class.send(finder_method, params[:id])
-          load_parents(instance, parent_symbols)
+          instance      = self.resource_class.send(finder_method, id)
+        elsif parents_symbols.size > 1
+          config         = resources_configuration[parent_symbols.pop]
+          finder_method  = config[:finder] || :find
+          instance       = config[:parent_class].send(finder_method, params[config[:param]])
         end
+
+        load_parents(instance, parent_symbols) if instance
         parents_symbols
       end
 
       def load_parents(instance, parent_symbols)
-
         parent_symbols.reverse.each do |parent|
           instance = instance.send(parent)
-          params[resources_configuration[parent][:param]] = instance.to_param
+          config   = resources_configuration[parent]
+          params[config[:param]] = instance.to_param
         end
       end
   end
-
 end