inherited_resources 1.13.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e985edc0b00007f056c8bab4bf65f18cb9ac7b087478390e12362b7a45868130
-  data.tar.gz: 28d9210771402b65da33424ad31aec491b97db10764a58400e8b2c77206f2d61
+  metadata.gz: aaebb8b497c48f9057e36c1dcf828487b28fec89e6b71c586b358e402fd34984
+  data.tar.gz: 5e52d03746f0c38b5dc1babb70e52e8f0c563613e67fa6ce1169e0ec130472e7
 SHA512:
-  metadata.gz: 46791f6fbb49ffe7c997a794c58f46ede3473b26e6d1d9631e3cc541091fbfa070eef3610e32790e7e1dbff4b38148b243bf477514dfbfa88eaa407765cafd34
-  data.tar.gz: 6ca9898f4c265ed6115116e2a6aa94358e497fea6320da6018c7dec01cb9731e29969ad27fcf58c981ad7ec95f6abf22a9e04ec5071d16001aba7e3f0b38ecd6
+  metadata.gz: fcdda43c097f8a9e75d5711ca5268b6b4b01c0462bd46084b30e48d880fdd2334399885f54dc966f6ecbac38390c25805c5f31333e467c892be2ae3a10afc9a0
+  data.tar.gz: ec4aede5a01a46cc309e2254d2817d4d9e5a134f15dec60590c1473ce723c5a170152188e89048ace1aae0c2d2cf54b81cdb25628b1b6ac1dcbf47dccef49276

data/README.md

@@ -5,7 +5,7 @@ has been transferred to the ActiveAdmin organization for maintenance.  New featu
 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).
+`respond_with` feature alongside the [responders gem](https://github.com/heartcombo/responders).
 
 ## Inherited Resources
 
@@ -22,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
 
@@ -49,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:
 
@@ -64,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:
 
@@ -168,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.
@@ -737,11 +744,11 @@ MIT License. Copyright (c) 2009-2017 José Valim.
 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_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/github/activeadmin/inherited_resources
+[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

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

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

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
@@ -54,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:
       #
@@ -133,7 +135,7 @@ module InheritedResources
       end
 
       # rubocop:disable Layout/CommentIndentation
-      # See https://github.com/rubocop-hq/rubocop/issues/6450
+      # 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.
@@ -215,7 +217,7 @@ module InheritedResources
       #
       def get_resource_ivar #:nodoc:
         if instance_variable_defined?(:"@#{resource_instance_name}")
-          instance_variable_get("@#{resource_instance_name}")
+          instance_variable_get(:"@#{resource_instance_name}")
         else
           nil
         end
@@ -224,14 +226,14 @@ module InheritedResources
       # 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:
         if instance_variable_defined?(:"@#{resource_collection_name}")
-          instance_variable_get("@#{resource_collection_name}")
+          instance_variable_get(:"@#{resource_collection_name}")
         else
           nil
         end
@@ -240,7 +242,7 @@ module InheritedResources
       # 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:
@@ -368,7 +370,7 @@ 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] }
       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
@@ -77,7 +79,7 @@ module InheritedResources
 
       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) #:nodoc:
@@ -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.
@@ -53,7 +55,7 @@ module InheritedResources
           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.gsub('/', '_')
+            request_name.to_s.underscore.tr('/', '_')
           end
           options.delete(:resource_class) and options.delete(:class_name)
         end
@@ -65,7 +67,7 @@ module InheritedResources
         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
@@ -215,7 +217,7 @@ module InheritedResources
           config[:finder]          = finder || :find
         end
 
-        if block_given?
+        if block
           class_eval(&block)
         else
           create_resources_url_helpers!
@@ -227,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
 
@@ -235,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
 
@@ -243,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
 
@@ -384,7 +386,7 @@ module InheritedResources
         # 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 }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
   class Railtie < ::Rails::Engine
     config.inherited_resources = InheritedResources

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InheritedResources
 
   # = polymorphic associations
@@ -120,8 +122,8 @@ module InheritedResources
       #
       def parent
         if parent_type
-          p = instance_variable_defined?("@#{parent_type}") && 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
 
@@ -151,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 " <<

data/lib/inherited_resources/responder.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+
 module InheritedResources
   class Responder < ActionController::Responder
     include Responders::FlashResponder
+
+    self.error_status = :unprocessable_entity
+    self.redirect_status = :see_other
   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
   #

data/lib/inherited_resources/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module InheritedResources
-  VERSION = '1.13.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/inherited_resources.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 # This is here because responders don't require it.
 require 'rails/engine'
 require 'responders'
-require 'inherited_resources/engine'
-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)
@@ -23,18 +26,19 @@ module InheritedResources
   def self.flash_keys=(array)
     Responders::FlashResponder.flash_keys = array
   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
 
-ActiveSupport.on_load(:action_controller) do
-  # We can remove this check and change to `on_load(:action_controller_base)` in Rails 5.2.
-  if self == ActionController::Base
-    # If you cannot inherit from InheritedResources::Base you can call
-    # inherit_resources in your controller to have all the required modules and
-    # funcionality included.
-    def self.inherit_resources
-      InheritedResources::Base.inherit_resources(self)
-      initialize_resources_class_accessors!
-      create_resources_url_helpers!
-    end
+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
+  # functionality included.
+  def self.inherit_resources
+    InheritedResources::Base.inherit_resources(self)
+    initialize_resources_class_accessors!
+    create_resources_url_helpers!
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 2.1.0
 platform: ruby
 authors:
 - José Valim
 - Rafael Mendonça França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,67 +25,52 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.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.
   It makes your controllers more powerful and cleaner at the same time.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,8 +98,9 @@ files:
 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
@@ -125,15 +108,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-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.