inherited_resources 1.7.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c29a882f1b539c21b739478231165d73d23e0342
-  data.tar.gz: 4f2ef22ade978647e66640a6955a118e82f89af5
+SHA256:
+  metadata.gz: aaebb8b497c48f9057e36c1dcf828487b28fec89e6b71c586b358e402fd34984
+  data.tar.gz: 5e52d03746f0c38b5dc1babb70e52e8f0c563613e67fa6ce1169e0ec130472e7
 SHA512:
-  metadata.gz: a92f1ed2578bf0dd95973e5bdb95d5397d5cc00edf3b566a86ae4718f22861898094311cce0eee77b21f4cb9166ca6c87e0cba74743f0f1af67838d74efa4334
-  data.tar.gz: 2741b0b1712fe05728038baf22239b096941c2423ca059e530f3e245354022073427228823899c58eb7cf45b570d909fbd4d83daf7436096eb7d131c55e61c95
+  metadata.gz: fcdda43c097f8a9e75d5711ca5268b6b4b01c0462bd46084b30e48d880fdd2334399885f54dc966f6ecbac38390c25805c5f31333e467c892be2ae3a10afc9a0
+  data.tar.gz: ec4aede5a01a46cc309e2254d2817d4d9e5a134f15dec60590c1473ce723c5a170152188e89048ace1aae0c2d2cf54b81cdb25628b1b6ac1dcbf47dccef49276

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 José Valim
+Copyright (c) 2009-2017 José Valim
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,16 +1,17 @@
 ## Notice
- 
+
 Inherited Resources is no longer actively maintained by the original author and
 has been transferred to the ActiveAdmin organization for maintenance.  New feature
 requests are not encouraged.
 
-If you are not already using Inherited Resources we suggest instead using Rails' 
-`respond_with` feature alongside the [responders gem](https://github.com/plataformatec/responders).
+If you are not already using Inherited Resources we suggest instead using Rails'
+`respond_with` feature alongside the [responders gem](https://github.com/heartcombo/responders).
 
 ## 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]
+[![Github Actions  ][actions_badge]][actions]
+[![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
@@ -21,7 +22,7 @@ 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
+* https://www.akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with-inherited-resources
 
 ## Installation
 
@@ -48,7 +49,7 @@ $ gem install inherited_resources
 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>
+- <https://github.com/heartcombo/has_scope>
 
 And it can be installed as:
 
@@ -63,7 +64,7 @@ but is set as Inherited Resources dependency and it's used by default by
 InheritedResources controllers. Be sure to check the documentation to see
 how it will change your application:
 
-- <http://github.com/plataformatec/responders>
+- <https://github.com/heartcombo/responders>
 
 And it can be installed with:
 
@@ -167,6 +168,13 @@ class AccountsController < ApplicationController
 end
 ```
 
+By default, `InheritedResources::Base` will inherit from `::ApplicationController`. You can change this in a rails initializer:
+
+```ruby
+# config/initializers/inherited_resources.rb
+InheritedResources.parent_controller = 'MyController'
+```
+
 ## Overwriting defaults
 
 Whenever you inherit from InheritedResources, several defaults are assumed.
@@ -188,7 +196,7 @@ different route prefix you can do the following:
 
 ```ruby
 class Administrators::PeopleController < InheritedResources::Base
-  defaults :route_prefix => 'admin'
+  defaults :route_prefix => :admin
 end
 ```
 
@@ -634,7 +642,7 @@ end
 ```
 
 This code creates delete and search actions in controller (they behaves like show and
-index actions accordingly). Also, it will produce `delete_resource_{path,url}` and 
+index actions accordingly). Also, it will produce `delete_resource_{path,url}` and
 `search_resources_{path,url}` url helpers.
 
 ## What about views?
@@ -715,6 +723,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
 
@@ -722,4 +737,18 @@ 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-2012 José Valim.
+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]: https://img.shields.io/gem/v/inherited_resources.svg
+[rubygems]: https://rubygems.org/gems/inherited_resources
+[actions_badge]: https://github.com/activeadmin/inherited_resources/workflows/ci/badge.svg
+[actions]: https://github.com/activeadmin/inherited_resources/actions
+[tidelift_badge]: https://tidelift.com/badges/package/rubygems/inherited_resources?style=flat
+[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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module InheritedResources
   # = Base
   #
@@ -8,7 +9,7 @@ module InheritedResources
   # call <tt>default</tt> class method, call <<tt>actions</tt> class method
   # or overwrite some helpers in the base_helpers.rb file.
   #
-  class Base < ::ApplicationController
+  class Base < InheritedResources.parent_controller.constantize
     # Overwrite inherit_resources to add specific InheritedResources behavior.
     def self.inherit_resources(base)
       base.class_eval do
@@ -30,8 +31,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 +41,4 @@ module InheritedResources
 
     inherit_resources(self)
   end
-end
+end

data/lib/generators/rails/inherited_resources_controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
@@ -8,4 +10,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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module InheritedResources
-  # Holds all default actions for InheritedResouces.
+  # Holds all default actions for InheritedResources.
   module Actions
 
     # GET /resources
@@ -64,4 +66,3 @@ module InheritedResources
     protected :index!, :show!, :new!, :create!, :edit!, :update!, :destroy!
   end
 end
-

data/lib/inherited_resources/base_helpers.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Whenever base is required load the dumb responder since it's used inside actions.
-require 'inherited_resources/blank_slate'
+require_relative 'blank_slate'
 
 module InheritedResources
   # Base helpers for InheritedResource work. Some methods here can be overwritten
@@ -22,14 +24,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
 
@@ -61,7 +56,7 @@ module InheritedResources
 
       # Responsible for saving the resource on :create method. Overwriting this
       # allow you to control the way resource is saved. Let's say you have a
-      # PassworsController who is responsible for finding an user by email and
+      # PasswordsController who is responsible for finding an user by email and
       # sent password instructions for him. Instead of overwriting the entire
       # :create method, you could do something:
       #
@@ -75,14 +70,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
@@ -133,25 +128,23 @@ module InheritedResources
       # current resource).
       #
       def association_chain
-        @association_chain ||= begin
-          symbol_chain = if resources_configuration[:self][:singleton]
-            symbols_for_association_chain.reverse
-          else
-            symbols_for_association_chain
-          end
-
-          symbol_chain.inject([begin_of_association_chain]) do |chain, symbol|
+        @association_chain ||=
+          symbols_for_association_chain.inject([begin_of_association_chain]) do |chain, symbol|
             chain << evaluate_parent(symbol, resources_configuration[symbol], chain.last)
           end.compact.freeze
-        end
       end
 
+      # rubocop:disable Layout/CommentIndentation
+      # See https://github.com/rubocop/rubocop/issues/6450
+      #
       # Overwrite this method to provide other interpolation options when
       # the flash message is going to be set.
       #
-      # def interpolation_options
+      # def flash_interpolation_options
       #    { }
       # end
+      #
+      # rubocop:enable Layout/CommentIndentation
 
     private
 
@@ -223,27 +216,33 @@ module InheritedResources
       # Get resource ivar based on the current resource controller.
       #
       def get_resource_ivar #:nodoc:
-        instance_variable_defined?(:"@#{resource_instance_name}") &&
-          instance_variable_get("@#{resource_instance_name}")
+        if instance_variable_defined?(:"@#{resource_instance_name}")
+          instance_variable_get(:"@#{resource_instance_name}")
+        else
+          nil
+        end
       end
 
       # Set resource ivar based on the current resource controller.
       #
       def set_resource_ivar(resource) #:nodoc:
-        instance_variable_set("@#{resource_instance_name}", resource)
+        instance_variable_set(:"@#{resource_instance_name}", resource)
       end
 
       # Get collection ivar based on the current resource controller.
       #
       def get_collection_ivar #:nodoc:
-        instance_variable_defined?(:"@#{resource_collection_name}") &&
-          instance_variable_get("@#{resource_collection_name}")
+        if instance_variable_defined?(:"@#{resource_collection_name}")
+          instance_variable_get(:"@#{resource_collection_name}")
+        else
+          nil
+        end
       end
 
       # Set collection ivar based on the current resource controller.
       #
       def set_collection_ivar(collection) #:nodoc:
-        instance_variable_set("@#{resource_collection_name}", collection)
+        instance_variable_set(:"@#{resource_collection_name}", collection)
       end
 
       # Used to allow to specify success and failure within just one block:
@@ -371,9 +370,9 @@ module InheritedResources
         self.resources_configuration[:self][:role].present?
       end
 
-      # getting role for mass-asignment
+      # getting role for mass-assignment
       def as_role
-        { :as => self.resources_configuration[:self][:role] }
+        { as: self.resources_configuration[:self][:role] }
       end
 
       def without_protection_given?
@@ -381,8 +380,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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module InheritedResources
 
   # = belongs_to
   #
   # Let's suppose that we have some tasks that belongs to projects. To specify
-  # this assoication in your controllers, just do:
+  # this association in your controllers, just do:
   #
   #    class TasksController < InheritedResources::Base
   #      belongs_to :project
@@ -56,11 +58,11 @@ module InheritedResources
       def parent?
         true
       end
-      
+
       def parent
         @parent ||= association_chain[-1]
       end
-      
+
       def parent_type
         parent.class.name.underscore.to_sym
       end
@@ -75,12 +77,12 @@ module InheritedResources
           set_parent_instance(parent_config, chain)
       end
 
-      def get_parent_ivar(instance_name)
+      def get_parent_ivar(instance_name) #:nodoc:
         instance_variable_defined?(:"@#{instance_name}") &&
-          instance_variable_get("@#{instance_name}")
+          instance_variable_get(:"@#{instance_name}")
       end
 
-      def set_parent_instance(parent_config, chain)
+      def set_parent_instance(parent_config, chain) #:nodoc:
         if parent_config[:singleton]
           parent = if chain
             chain.send(parent_config[:instance_name])
@@ -97,7 +99,7 @@ module InheritedResources
           parent = parent.send(parent_config[:finder], params[parent_config[:param]])
         end
 
-        instance_variable_set("@#{parent_config[:instance_name]}", parent)
+        instance_variable_set(:"@#{parent_config[:instance_name]}", parent)
       end
 
       # Maps parents_symbols to build association chain. In this case, it

data/lib/inherited_resources/blank_slate.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module InheritedResources
   # An object from BlankSlate simply discards all messages sent to it.
   class BlankSlate
     instance_methods.each do |m|
-      undef_method m unless m =~ /^(__|object_id)/
+      undef_method m unless /^(__|object_id)/.match?(m)
     end
 
     def method_missing(*args)

data/lib/inherited_resources/class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
   module ClassMethods
 
@@ -25,7 +27,7 @@ module InheritedResources
       #
       # * <tt>:route_instance_name</tt> - The name of the singular route. Defaults to :instance_name.
       #
-      # * <tt>:route_prefix</tt> - The route prefix which is automically set in namespaced
+      # * <tt>:route_prefix</tt> - The route prefix which is automatically set in namespaced
       #                            controllers. Default to :admin on Admin::ProjectsController.
       #
       # * <tt>:singleton</tt> - Tells if this controller is singleton or not.
@@ -48,21 +50,24 @@ module InheritedResources
         acts_as_singleton! if options.delete(:singleton)
 
         config = self.resources_configuration[:self]
-        config[:route_prefix] = options.delete(:route_prefix) if options.key?(:route_prefix)
 
         if options.key?(:resource_class) or options.key?(:class_name)
-          config[:request_name] = self.resource_class.to_s.underscore.gsub('/', '_')
+          config[:request_name] = begin
+            request_name = self.resource_class
+            request_name = request_name.model_name.param_key if request_name.respond_to?(:model_name)
+            request_name.to_s.underscore.tr('/', '_')
+          end
           options.delete(:resource_class) and options.delete(:class_name)
         end
 
         options.each do |key, value|
-          config[key] = value.to_sym
+          config[key] = value&.to_sym
         end
 
         create_resources_url_helpers!
       end
 
-      # Defines wich actions will be inherited from the inherited controller.
+      # Defines which actions will be inherited from the inherited controller.
       # Syntax is borrowed from resource_controller.
       #
       #   actions :index, :show, :edit
@@ -148,7 +153,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
@@ -175,7 +183,7 @@ module InheritedResources
           config[:parent_class] = options.delete(:parent_class) ||
             begin
               class_name = if options[:class_name]
-                options.delete(:class_name).to_s.pluralize.classify
+                options.delete(:class_name)
               else
                 namespace = self.name.deconstantize
                 model_name = symbol.to_s.pluralize.classify
@@ -209,12 +217,11 @@ module InheritedResources
           config[:finder]          = finder || :find
         end
 
-        if block_given?
+        if block
           class_eval(&block)
         else
           create_resources_url_helpers!
         end
-        helper_method :parent, :parent?
       end
       alias :nested_belongs_to :belongs_to
 
@@ -222,7 +229,7 @@ module InheritedResources
       #
       def polymorphic_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:polymorphic => true)
+        options[:polymorphic] = true
         belongs_to(*symbols, options, &block)
       end
 
@@ -230,7 +237,7 @@ module InheritedResources
       #
       def singleton_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:singleton => true)
+        options[:singleton] = true
         belongs_to(*symbols, options, &block)
       end
 
@@ -238,7 +245,7 @@ module InheritedResources
       #
       def optional_belongs_to(*symbols, &block)
         options = symbols.extract_options!
-        options.merge!(:optional => true)
+        options[:optional] = true
         belongs_to(*symbols, options, &block)
       end
 
@@ -292,7 +299,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
 
@@ -373,16 +380,16 @@ module InheritedResources
           end
         end
 
-        config[:route_prefix] = namespaces.join('_') unless namespaces.empty?
+        config[:route_prefix] = namespaces.join('_').to_sym unless namespaces.empty?
 
         # Deal with default request parameters in namespaced controllers, e.g.
         # Forum::Thread#create will properly pick up the request parameter
         # which will be forum_thread, and not thread
         # Additionally make this work orthogonally with instance_name
-        config[:request_name] = self.resource_class.to_s.underscore.gsub('/', '_')
+        config[:request_name] = self.resource_class.to_s.underscore.tr('/', '_')
 
         # 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/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
   # Allows controllers to write actions using a class method DSL.
   #

data/lib/inherited_resources/engine.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module InheritedResources
+  class Railtie < ::Rails::Engine
+    config.inherited_resources = InheritedResources
+
+    if config.respond_to?(:app_generators)
+      config.app_generators.scaffold_controller = :inherited_resources_controller
+    else
+      config.generators.scaffold_controller = :inherited_resources_controller
+    end
+  end
+end

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
 
   # = polymorphic associations
@@ -102,11 +104,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,8 +122,8 @@ module InheritedResources
       #
       def parent
         if parent_type
-          p = instance_variable_get("@#{parent_type}")
-          p || instance_variable_set("@#{parent_type}", association_chain[-1])
+          p = instance_variable_defined?(:"@#{parent_type}") && instance_variable_get(:"@#{parent_type}")
+          p || instance_variable_set(:"@#{parent_type}", association_chain[-1])
         end
       end
 
@@ -149,9 +153,9 @@ module InheritedResources
           if symbol == :polymorphic
             params_keys = params.keys
 
-            keys = polymorphic_config[:symbols].map do |poly|
-              params_keys.include?(resources_configuration[poly][:param].to_s) ? poly : nil
-            end.compact
+            keys = polymorphic_config[:symbols].select do |poly|
+              params_keys.include?(resources_configuration[poly][:param].to_s)
+            end
 
             if keys.empty?
               raise ScriptError, "Could not find param for polymorphic association. The request " <<
@@ -161,7 +165,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 +175,3 @@ module InheritedResources
 
   end
 end
-

data/lib/inherited_resources/responder.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module InheritedResources
   class Responder < ActionController::Responder
     include Responders::FlashResponder
-    include Responders::HttpCacheResponder
+
+    self.error_status = :unprocessable_entity
+    self.redirect_status = :see_other
   end
-end
+end

data/lib/inherited_resources/shallow_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
   # Shallow provides a functionality that goes on pair with Rails' shallow.
   # It is very similar to "optional" but it actually finds all the parents
@@ -33,7 +35,7 @@ module InheritedResources
       end
 
       def load_parents(instance, parent_symbols)
-        parent_symbols.reverse.each do |parent|
+        parent_symbols.reverse_each do |parent|
           instance = instance.send(parent)
           config   = resources_configuration[parent]
           params[config[:param]] = instance.to_param

data/lib/inherited_resources/singleton_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
 
   # = singleton

data/lib/inherited_resources/url_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
   # = URLHelpers
   #
@@ -34,203 +36,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]
           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
 
+        # 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
 
-      # 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
-
-      # 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
+
+        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!
+
+          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
 
-      class_eval <<-URL_HELPERS, __FILE__, __LINE__
-        protected
-          undef :#{prefix}#{name}_path if method_defined? :#{prefix}#{name}_path
-          def #{prefix}#{name}_path(*given_args)
-            given_options = given_args.extract_options!
-            #{prefix}#{segments}_path(#{ivars})
+          if !(singleton && name != :parent) && args.present? && name != :collection && prefix != :new
+            resource = args.pop
+            args.push(given_args.first || resource)
           end
 
-          undef :#{prefix}#{name}_url if method_defined? :#{prefix}#{name}_url
-          def #{prefix}#{name}_url(*given_args)
-            given_options = given_args.extract_options!
-            #{prefix}#{segments}_url(#{ivars})
+          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
-      URL_HELPERS
-    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,4 @@
+# frozen_string_literal: true
 module InheritedResources
-  VERSION = '1.7.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/inherited_resources.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
+# This is here because responders don't require it.
 require 'rails/engine'
 require 'responders'
-require 'inherited_resources/blank_slate'
-require 'inherited_resources/responder'
+
+require_relative 'inherited_resources/engine'
+require_relative 'inherited_resources/blank_slate'
+require_relative 'inherited_resources/responder'
 
 module InheritedResources
   ACTIONS = [ :index, :show, :new, :edit, :create, :update, :destroy ] unless self.const_defined?(:ACTIONS)
@@ -22,20 +27,15 @@ module InheritedResources
     Responders::FlashResponder.flash_keys = array
   end
 
-  class Railtie < ::Rails::Engine
-    config.inherited_resources = InheritedResources
-    if config.respond_to?(:app_generators)
-      config.app_generators.scaffold_controller = :inherited_resources_controller
-    else
-      config.generators.scaffold_controller = :inherited_resources_controller
-    end
-  end
+  # Inherit from a different controller. This only has an effect if changed
+  # before InheritedResources::Base is loaded, e.g. in a rails initializer.
+  mattr_accessor(:parent_controller) { '::ApplicationController' }
 end
 
-class ActionController::Base
+ActiveSupport.on_load(:action_controller_base) do
   # If you cannot inherit from InheritedResources::Base you can call
   # inherit_resources in your controller to have all the required modules and
-  # funcionality included.
+  # functionality included.
   def self.inherit_resources
     InheritedResources::Base.inherit_resources(self)
     initialize_resources_class_accessors!

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.1.0
 platform: ruby
 authors:
 - José Valim
 - Rafael Mendonça França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -17,71 +17,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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.
-email: 
+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: []
 extra_rdoc_files: []
@@ -91,7 +80,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
@@ -99,17 +88,19 @@ files:
 - lib/inherited_resources/blank_slate.rb
 - lib/inherited_resources/class_methods.rb
 - lib/inherited_resources/dsl.rb
+- lib/inherited_resources/engine.rb
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/responder.rb
 - lib/inherited_resources/shallow_helpers.rb
 - 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: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,16 +108,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: inherited_resources
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit
   all restful actions so you just have to focus on what is important.