inherited_resources 1.8.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3deb097f7881768ed33aa684188d8b19eaaad1a
-  data.tar.gz: dfac24780729a88a781c708c183fda899e4c8b24
+SHA256:
+  metadata.gz: f4cb8a8e3e1fc321346443a8264926120e60b5a4e316987143a58a6278114c4c
+  data.tar.gz: 942712a75ce52463be67c273ebefa83dced93511bde604efec8cf2223cbdc6c4
 SHA512:
-  metadata.gz: 6d0ccce04af931a80d457f25434fe6a7aa035915096ecedb4b2a1c040a2bf84473bbad26e69316820263a4220f846bc6f9e217ca9ca825c06ae74e40af5bb30f
-  data.tar.gz: c2d60488ae290f43bebe6f2f06178259007619ecf75cdbd52bbb64d55e3136e2470a81e993855f02cc3198cf11d172e2c52e3872de915c00850903373906edca
+  metadata.gz: fcd578a613128060649285c664854bc289e00d6ae0feed1420aa9f0c5dfa550660de341fe5791372580515dae1d5a5567c5aa068139182db5712b56aae6325d0
+  data.tar.gz: 2d365cf4b2c82c5ed363825136d6efa926c164bb2a3ca9861242258338c8c0de89e69355bde57b5ec8a08ed4e321b2a20407c67f438fce02d391bb33c84ced16

data/README.md

@@ -9,8 +9,9 @@ If you are not already using Inherited Resources we suggest instead using Rails'
 
 ## Inherited Resources
 
-[![Version](http://img.shields.io/gem/v/inherited_resources.svg)](https://rubygems.org/gems/inherited_resources)
-[![Travis CI](http://img.shields.io/travis/activeadmin/inherited_resources/master.svg)](https://travis-ci.org/activeadmin/inherited_resources)
+[![Version         ][rubygems_badge]][rubygems]
+[![CircleCI        ][circleci_badge]][circleci]
+[![Tidelift        ][tidelift_badge]][tidelift]
 
 Inherited Resources speeds up development by making your controllers inherit
 all restful actions so you just have to focus on what is important. It makes
@@ -715,6 +716,13 @@ end
 
 In such case you should remove #permitted_params method because it has greater priority.
 
+## Funding
+
+If you want to support us financially, you can [help fund the project
+through a Tidelift subscription][tidelift]. By buying a Tidelift subscription
+you make sure your whole dependency stack is properly maintained, while also
+getting a comprehensive view of outdated dependencies, new releases, security
+alerts, and licensing compatibility issues.
 
 ## Bugs and Feedback
 
@@ -723,3 +731,17 @@ If you discover any bugs, please describe it in the issues tracker, including Ra
 Questions are better handled on StackOverflow.
 
 MIT License. Copyright (c) 2009-2017 José Valim.
+
+## Security contact information
+
+Please use the Tidelift security contact to [report a security vulnerability][Tidelift security contact].
+Tidelift will coordinate the fix and disclosure.
+
+[rubygems_badge]: http://img.shields.io/gem/v/inherited_resources.svg
+[rubygems]: https://rubygems.org/gems/inherited_resources
+[circleci_badge]: https://circleci.com/gh/activeadmin/inherited_resources.svg?style=svg
+[circleci]: https://circleci.com/gh/activeadmin/inherited_resources
+[tidelift_badge]: https://tidelift.com/badges/github/activeadmin/inherited_resources
+[tidelift]: https://tidelift.com/subscription/pkg/rubygems-inherited-resources?utm_source=rubygems-inherited-resources&utm_medium=referral&utm_campaign=readme
+
+[Tidelift security contact]: https://tidelift.com/security

data/app/controllers/inherited_resources/base.rb

@@ -30,8 +30,8 @@ module InheritedResources
                       :parent_url, :parent_path,
                       :smart_resource_url, :smart_collection_url
 
-        self.class_attribute :resource_class, :instance_writer => false unless self.respond_to? :resource_class
-        self.class_attribute :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?
@@ -40,4 +40,4 @@ module InheritedResources
 
     inherit_resources(self)
   end
-end
+end

data/lib/generators/rails/inherited_resources_controller_generator.rb

@@ -8,4 +8,4 @@ module Rails
       end
     end
   end
-end
+end

data/lib/generators/rails/templates/{controller.rb → controller.rb.tt}

@@ -2,13 +2,11 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
 <% if options[:singleton] -%>
   defaults :singleton => true
 <% end -%>
-<% if Rails::VERSION::MAJOR >= 4 || defined?(ActiveModel::ForbiddenAttributesProtection) -%>
 
   private
 
     def <%= singular_name %>_params
       params.require(:<%= singular_name %>).permit(<%= attributes_names.map{ |a_name| ":#{a_name}" }.join(", ") %>)
     end
-<% end -%>
-end
 
+end

data/lib/inherited_resources/actions.rb

@@ -64,4 +64,3 @@ module InheritedResources
     protected :index!, :show!, :new!, :create!, :edit!, :update!, :destroy!
   end
 end
-

data/lib/inherited_resources/base_helpers.rb

@@ -22,14 +22,7 @@ module InheritedResources
       def collection
         get_collection_ivar || begin
           c = end_of_association_chain
-          if defined?(ActiveRecord::DeprecatedFinders)
-            # ActiveRecord::Base#scoped and ActiveRecord::Relation#all
-            # are deprecated in Rails 4.  If it's a relation just use
-            # it, otherwise use .all to get a relation.
-            set_collection_ivar(c.is_a?(ActiveRecord::Relation) ? c : c.all)
-          else
-            set_collection_ivar(c.respond_to?(:scoped) ? c.scoped : c.all)
-          end
+          set_collection_ivar(c.respond_to?(:scoped) ? c.scoped : c.all)
         end
       end
 
@@ -75,14 +68,14 @@ module InheritedResources
 
       # Responsible for updating the resource in :update method. This allow you
       # to handle how the resource is going to be updated, let's say in a different
-      # way than the usual :update_attributes:
+      # way than the usual :update:
       #
       #   def update_resource(object, attributes)
       #     object.reset_password!(attributes)
       #   end
       #
       def update_resource(object, attributes)
-        object.update_attributes(*attributes)
+        object.update(*attributes)
       end
 
       # Handle the :destroy method for the resource. Overwrite it to call your
@@ -139,12 +132,17 @@ module InheritedResources
           end.compact.freeze
       end
 
+      # rubocop:disable Layout/CommentIndentation
+      # See https://github.com/rubocop-hq/rubocop/issues/6450
+      #
       # Overwrite this method to provide other interpolation options when
       # the flash message is going to be set.
       #
       # def flash_interpolation_options
       #    { }
       # end
+      #
+      # rubocop:enable Layout/CommentIndentation
 
     private
 
@@ -372,7 +370,7 @@ module InheritedResources
 
       # getting role for mass-asignment
       def as_role
-        { :as => self.resources_configuration[:self][:role] }
+        { as: self.resources_configuration[:self][:role] }
       end
 
       def without_protection_given?
@@ -380,8 +378,7 @@ module InheritedResources
       end
 
       def without_protection
-        { :without_protection => self.resources_configuration[:self][:without_protection] }
+        { without_protection: self.resources_configuration[:self][:without_protection] }
       end
   end
 end
-

data/lib/inherited_resources/belongs_to_helpers.rb

@@ -56,11 +56,11 @@ module InheritedResources
       def parent?
         true
       end
-      
+
       def parent
         @parent ||= association_chain[-1]
       end
-      
+
       def parent_type
         parent.class.name.underscore.to_sym
       end

data/lib/inherited_resources/class_methods.rb

@@ -152,7 +152,10 @@ module InheritedResources
         polymorphic = options.delete(:polymorphic)
         finder      = options.delete(:finder)
 
-        include BelongsToHelpers if self.parents_symbols.empty?
+        if self.parents_symbols.empty?
+          include BelongsToHelpers
+          helper_method :parent, :parent?
+        end
 
         acts_as_polymorphic! if polymorphic || optional
         acts_as_shallow!     if shallow
@@ -218,7 +221,6 @@ module InheritedResources
         else
           create_resources_url_helpers!
         end
-        helper_method :parent, :parent?
       end
       alias :nested_belongs_to :belongs_to
 
@@ -226,7 +228,7 @@ module InheritedResources
       #
       def polymorphic_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:polymorphic => true)
+        options.merge!(polymorphic: true)
         belongs_to(*symbols, options, &block)
       end
 
@@ -234,7 +236,7 @@ module InheritedResources
       #
       def singleton_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:singleton => true)
+        options.merge!(singleton: true)
         belongs_to(*symbols, options, &block)
       end
 
@@ -242,7 +244,7 @@ module InheritedResources
       #
       def optional_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:optional => true)
+        options.merge!(optional: true)
         belongs_to(*symbols, options, &block)
       end
 
@@ -296,7 +298,7 @@ module InheritedResources
         unless self.resources_configuration[:self][:singleton]
           self.resources_configuration[:self][:singleton] = true
           include SingletonHelpers
-          actions :all, :except => :index
+          actions :all, except: :index
         end
       end
 
@@ -386,7 +388,7 @@ module InheritedResources
         config[:request_name] = self.resource_class.to_s.underscore.gsub('/', '_')
 
         # Initialize polymorphic, singleton, scopes and belongs_to parameters
-        polymorphic = self.resources_configuration[:polymorphic] || { :symbols => [], :optional => false }
+        polymorphic = self.resources_configuration[:polymorphic] || { symbols: [], optional: false }
         polymorphic[:symbols] = polymorphic[:symbols].dup
         self.resources_configuration[:polymorphic] = polymorphic
       end

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -102,11 +102,13 @@ module InheritedResources
       # as parent types.
       #
       def parent_type
-        unless @parent_type
+        unless instance_variable_defined?(:@parent_type)
           symbols_for_association_chain
         end
 
-        @parent_type
+        if instance_variable_defined?(:@parent_type)
+          @parent_type
+        end
       end
 
       def parent_class
@@ -118,7 +120,7 @@ module InheritedResources
       #
       def parent
         if parent_type
-          p = instance_variable_get("@#{parent_type}")
+          p = instance_variable_defined?("@#{parent_type}") && instance_variable_get("@#{parent_type}")
           p || instance_variable_set("@#{parent_type}", association_chain[-1])
         end
       end
@@ -161,7 +163,7 @@ module InheritedResources
               nil
             else
               @parent_type = keys[-1].to_sym
-							@parent_types = keys.map(&:to_sym)
+              @parent_types = keys.map(&:to_sym)
             end
           else
             symbol
@@ -171,4 +173,3 @@ module InheritedResources
 
   end
 end
-

data/lib/inherited_resources/url_helpers.rb

@@ -34,207 +34,210 @@ module InheritedResources
   module UrlHelpers
     protected
 
-    # This method hard code url helpers in the class.
-    #
-    # We are doing this because is cheaper than guessing them when our action
-    # is being processed (and even more cheaper when we are using nested
-    # resources).
-    #
-    # When we are using polymorphic associations, those helpers rely on
-    # polymorphic_url Rails helper.
-    #
-    def create_resources_url_helpers!
-      resource_segments, resource_ivars = [], []
-      resource_config = self.resources_configuration[:self]
-
-      singleton   = resource_config[:singleton]
-      uncountable = !singleton && resource_config[:route_collection_name] == resource_config[:route_instance_name]
-      polymorphic = self.parents_symbols.include?(:polymorphic)
-
-      # Add route_prefix if any.
-      unless resource_config[:route_prefix].blank?
-        if polymorphic
-          resource_ivars << resource_config[:route_prefix].to_s.inspect
-        else
-          resource_segments << resource_config[:route_prefix]
-        end
-      end
-
-      # Deal with belongs_to associations and polymorphic associations.
-      # Remember that we don't have to build the segments in polymorphic cases,
-      # because the url will be polymorphic_url.
+      # This method hard code url helpers in the class.
       #
-      self.parents_symbols.each do |symbol|
-        if symbol == :polymorphic
-          resource_ivars << :parent
-        else
-          config = self.resources_configuration[symbol]
-          if config[:singleton] && polymorphic
-            resource_ivars << config[:instance_name].inspect
+      # We are doing this because is cheaper than guessing them when our action
+      # is being processed (and even more cheaper when we are using nested
+      # resources).
+      #
+      # When we are using polymorphic associations, those helpers rely on
+      # polymorphic_url Rails helper.
+      #
+      def create_resources_url_helpers!
+        resource_segments, resource_ivars = [], []
+        resource_config = self.resources_configuration[:self]
+
+        singleton   = resource_config[:singleton]
+        uncountable = !singleton && resource_config[:route_collection_name] == resource_config[:route_instance_name]
+        polymorphic = self.parents_symbols.include?(:polymorphic)
+
+        # Add route_prefix if any.
+        unless resource_config[:route_prefix].blank?
+          if polymorphic
+            resource_ivars << resource_config[:route_prefix].to_s
           else
-            resource_segments << config[:route_name]
-          end
-          if !config[:singleton]
-            resource_ivars    << :"@#{config[:instance_name]}"
+            resource_segments << resource_config[:route_prefix]
           end
         end
-      end
-
-      collection_ivars    = resource_ivars.dup
-      collection_segments = resource_segments.dup
-
 
-      # Generate parent url before we add resource instances.
-      unless parents_symbols.empty?
-        generate_url_and_path_helpers nil,   :parent, resource_segments, resource_ivars
-        generate_url_and_path_helpers :edit, :parent, resource_segments, resource_ivars
-      end
+        # Deal with belongs_to associations and polymorphic associations.
+        # Remember that we don't have to build the segments in polymorphic cases,
+        # because the url will be polymorphic_url.
+        #
+        self.parents_symbols.each do |symbol|
+          if symbol == :polymorphic
+            resource_ivars << :parent
+          else
+            config = self.resources_configuration[symbol]
+            if config[:singleton] && polymorphic
+              resource_ivars << config[:instance_name]
+            else
+              resource_segments << config[:route_name]
+            end
+            if !config[:singleton]
+              resource_ivars    << :"@#{config[:instance_name]}"
+            end
+          end
+        end
 
-      # This is the default route configuration, later we have to deal with
-      # exception from polymorphic and singleton cases.
-      #
-      collection_segments << resource_config[:route_collection_name]
-      resource_segments   << resource_config[:route_instance_name]
-      resource_ivars      << :"@#{resource_config[:instance_name]}"
+        collection_ivars    = resource_ivars.dup
+        collection_segments = resource_segments.dup
 
-      # In singleton cases, we do not send the current element instance variable
-      # because the id is not in the URL. For example, we should call:
-      #
-      #   project_manager_url(@project)
-      #
-      # Instead of:
-      #
-      #   project_manager_url(@project, @manager)
-      #
-      # Another exception in singleton cases is that collection url does not
-      # exist. In such cases, we create the parent collection url. So in the
-      # manager case above, the collection url will be:
-      #
-      #    project_url(@project)
-      #
-      # If the singleton does not have a parent, it will default to root_url.
-      #
-      # Finally, polymorphic cases we have to give hints to the polymorphic url
-      # builder. This works by attaching new ivars as symbols or records.
-      #
-      if singleton
-        collection_segments.pop
-        resource_ivars.pop
+        # Generate parent url before we add resource instances.
+        unless parents_symbols.empty?
+          generate_url_and_path_helpers nil,   :parent, resource_segments, resource_ivars
+          generate_url_and_path_helpers :edit, :parent, resource_segments, resource_ivars
+        end
 
-        if polymorphic
-          resource_ivars << resource_config[:instance_name].inspect
+        # In singleton cases, we do not send the current element instance variable
+        # because the id is not in the URL. For example, we should call:
+        #
+        #   project_manager_url(@project)
+        #
+        # Instead of:
+        #
+        #   project_manager_url(@project, @manager)
+        #
+        # Another exception in singleton cases is that collection url does not
+        # exist. In such cases, we create the parent collection url. So in the
+        # manager case above, the collection url will be:
+        #
+        #    project_url(@project)
+        #
+        # If the singleton does not have a parent, it will default to root_url.
+        #
+        collection_segments << resource_config[:route_collection_name] unless singleton
+        resource_segments   << resource_config[:route_instance_name]
+        resource_ivars      << :"@#{resource_config[:instance_name]}" unless singleton
+
+        # Finally, polymorphic cases we have to give hints to the polymorphic url
+        # builder. This works by attaching new ivars as symbols or records.
+        #
+        if polymorphic && singleton
+          resource_ivars << resource_config[:instance_name]
           new_ivars       = resource_ivars
         end
-      elsif polymorphic
-        collection_ivars << '(@_resource_class_new ||= resource_class.new)'
-      end
 
-      # If route is uncountable then add "_index" suffix to collection index route name
-      if uncountable
-        collection_segments << :"#{collection_segments.pop}_index"
-      end
+        # If route is uncountable then add "_index" suffix to collection index route name
+        if uncountable
+          collection_segments << :"#{collection_segments.pop}_index"
+        end
 
-      generate_url_and_path_helpers nil,   :collection, collection_segments, collection_ivars
-      generate_url_and_path_helpers :new,  :resource,   resource_segments,   new_ivars || collection_ivars
-      generate_url_and_path_helpers nil,   :resource,   resource_segments,   resource_ivars
-      generate_url_and_path_helpers :edit, :resource,   resource_segments,   resource_ivars
+        generate_url_and_path_helpers nil,   :collection, collection_segments, collection_ivars
+        generate_url_and_path_helpers :new,  :resource,   resource_segments,   new_ivars || collection_ivars
+        generate_url_and_path_helpers nil,   :resource,   resource_segments,   resource_ivars
+        generate_url_and_path_helpers :edit, :resource,   resource_segments,   resource_ivars
 
-      if resource_config[:custom_actions]
-        [*resource_config[:custom_actions][:resource]].each do | method |
-          generate_url_and_path_helpers method, :resource, resource_segments, resource_ivars
-        end
-        [*resource_config[:custom_actions][:collection]].each do | method |
-          generate_url_and_path_helpers method, :resources, collection_segments, collection_ivars
+        if resource_config[:custom_actions]
+          [*resource_config[:custom_actions][:resource]].each do | method |
+            generate_url_and_path_helpers method, :resource, resource_segments, resource_ivars
+          end
+          [*resource_config[:custom_actions][:collection]].each do | method |
+            generate_url_and_path_helpers method, :resources, collection_segments, collection_ivars
+          end
         end
       end
-    end
-
-    def handle_shallow_resource(prefix, name, segments, ivars) #:nodoc:
-      return segments, ivars unless self.resources_configuration[:self][:shallow]
-      case name
-      when :collection, :resources
-        segments = segments[-2..-1]
-        ivars = [ivars.last]
-      when :resource
-        if prefix == :new
+
+      def handle_shallow_resource(prefix, name, segments, ivars) #:nodoc:
+        return segments, ivars unless self.resources_configuration[:self][:shallow]
+        case name
+        when :collection, :resources
           segments = segments[-2..-1]
           ivars = [ivars.last]
-        else
+        when :resource
+          if prefix == :new
+            segments = segments[-2..-1]
+            ivars = [ivars.last]
+          else
+            segments = [segments.last]
+            ivars = [ivars.last]
+          end
+        when :parent
           segments = [segments.last]
           ivars = [ivars.last]
         end
-      when :parent
-        segments = [segments.last]
-        ivars = [ivars.last]
-      end
 
-      segments ||= []
+        segments ||= []
+
+        unless self.resources_configuration[:self][:route_prefix].blank?
+          segments.unshift self.resources_configuration[:self][:route_prefix]
+        end
 
-      unless self.resources_configuration[:self][:route_prefix].blank?
-        segments.unshift self.resources_configuration[:self][:route_prefix]
+        return segments, ivars
       end
 
-      return segments, ivars
-    end
+      def generate_url_and_path_helpers(prefix, name, resource_segments, resource_ivars) #:nodoc:
+        resource_segments, resource_ivars = handle_shallow_resource(prefix, name, resource_segments, resource_ivars)
 
-    def generate_url_and_path_helpers(prefix, name, resource_segments, resource_ivars) #:nodoc:
-      resource_segments, resource_ivars = handle_shallow_resource(prefix, name, resource_segments, resource_ivars)
+        ivars       = resource_ivars.dup
+        singleton   = self.resources_configuration[:self][:singleton]
+        polymorphic = self.parents_symbols.include?(:polymorphic)
 
-      ivars       = resource_ivars.dup
-      singleton   = self.resources_configuration[:self][:singleton]
-      polymorphic = self.parents_symbols.include?(:polymorphic)
+        # In collection in polymorphic cases, allow an argument to be given as a
+        # replacemente for the parent.
+        #
+        parent_index = ivars.index(:parent) if polymorphic
 
-      # If it's not a singleton, ivars are not empty, not a collection or
-      # not a "new" named route, we can pass a resource as argument.
-      #
-      unless (singleton && name != :parent) || ivars.empty? || name == :collection || prefix == :new
-        ivars.push "(given_args.first || #{ivars.pop})"
-      end
+        segments = if polymorphic
+          :polymorphic
+        elsif resource_segments.empty?
+          'root'
+        else
+          resource_segments.join('_')
+        end
 
-      # In collection in polymorphic cases, allow an argument to be given as a
-      # replacemente for the parent.
-      #
-      if name == :collection && polymorphic
-        index = ivars.index(:parent)
-        ivars.insert index, "(given_args.first || parent)"
-        ivars.delete(:parent)
+        define_params_helper(prefix, name, singleton, polymorphic, parent_index, ivars)
+        define_helper_method(prefix, name, :path, segments)
+        define_helper_method(prefix, name, :url, segments)
       end
 
-      # When polymorphic is true, the segments must be replace by :polymorphic
-      # and ivars should be gathered into an array, which is compacted when
-      # optional.
-      #
-      if polymorphic
-        segments = :polymorphic
-        ivars    = "[#{ivars.join(', ')}]"
-        ivars   << '.compact' if self.resources_configuration[:polymorphic][:optional]
-      else
-        segments = resource_segments.empty? ? 'root' : resource_segments.join('_')
-        ivars    = ivars.join(', ')
-      end
+      def define_params_helper(prefix, name, singleton, polymorphic, parent_index, ivars)
+        params_method_name = ['', prefix, name, :params].compact.join('_')
 
-      prefix = prefix ? "#{prefix}_" : ''
-      ivars << (ivars.empty? ? 'given_options' : ', given_options')
+        undef_method params_method_name if method_defined? params_method_name
 
-      given_args_transform = 'given_args = given_args.collect { |arg| arg.respond_to?(:permitted?) ? arg.to_h : arg }'
+        define_method params_method_name do |*given_args|
+          given_args = given_args.collect { |arg| arg.respond_to?(:permitted?) ? arg.to_h : arg }
+          given_options = given_args.extract_options!
 
-      class_eval <<-URL_HELPERS, __FILE__, __LINE__
-        protected
-          undef :#{prefix}#{name}_path if method_defined? :#{prefix}#{name}_path
-          def #{prefix}#{name}_path(*given_args)
-            #{given_args_transform}
-            given_options = given_args.extract_options!
-            #{prefix}#{segments}_path(#{ivars})
+          args = ivars.map do |ivar|
+            ivar.is_a?(Symbol) && ivar.to_s.start_with?('@') ? instance_variable_get(ivar) : ivar
           end
+          args[parent_index] = parent if parent_index
 
-          undef :#{prefix}#{name}_url if method_defined? :#{prefix}#{name}_url
-          def #{prefix}#{name}_url(*given_args)
-            #{given_args_transform}
-            given_options = given_args.extract_options!
-            #{prefix}#{segments}_url(#{ivars})
+          if !(singleton && name != :parent) && args.present? && name != :collection && prefix != :new
+            resource = args.pop
+            args.push(given_args.first || resource)
           end
-      URL_HELPERS
-    end
+
+          if polymorphic
+            if name == :collection
+              args[parent_index] = given_args.present? ? given_args.first : parent
+            end
+            if (name == :collection || name == :resource && prefix == :new) && !singleton
+              args << (@_resource_class_new ||= resource_class.new)
+            end
+            args.compact! if self.resources_configuration[:polymorphic][:optional]
+            args = [args]
+          end
+          args << given_options
+        end
+        protected params_method_name
+      end
+
+      def define_helper_method(prefix, name, suffix, segments)
+        method_name = [prefix, name, suffix].compact.join('_')
+        params_method_name = ['', prefix, name, :params].compact.join('_')
+        segments_method = [prefix, segments, suffix].compact.join('_')
+
+        undef_method method_name if method_defined? method_name
+
+        define_method method_name do |*given_args|
+          given_args = send params_method_name, *given_args
+          send segments_method, *given_args
+        end
+        protected method_name
+      end
 
   end
 end

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.12.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.12.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -17,54 +17,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -79,8 +85,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description: Inherited Resources speeds up development by making your controllers
-  inherit all restful actions so you just have to focus on what is important.
+description: |
+  Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
+  It makes your controllers more powerful and cleaner at the same time.
 email: 
 executables: []
 extensions: []
@@ -91,7 +98,7 @@ files:
 - app/controllers/inherited_resources/base.rb
 - lib/generators/rails/USAGE
 - lib/generators/rails/inherited_resources_controller_generator.rb
-- lib/generators/rails/templates/controller.rb
+- lib/generators/rails/templates/controller.rb.tt
 - lib/inherited_resources.rb
 - lib/inherited_resources/actions.rb
 - lib/inherited_resources/base_helpers.rb
@@ -106,7 +113,7 @@ files:
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
 - lib/inherited_resources/version.rb
-homepage: http://github.com/activeadmin/inherited_resources
+homepage: https://github.com/activeadmin/inherited_resources
 licenses:
 - MIT
 metadata: {}
@@ -118,15 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: inherited_resources
-rubygems_version: 2.5.1
+rubygems_version: 3.2.0
 signing_key: 
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit