inherited_resources 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a60a19db3de46551218e41c5a21d1abba726dc
-  data.tar.gz: f2a20b840de6f573d9cd11a90acfc1fb1279e697
+  metadata.gz: a3deb097f7881768ed33aa684188d8b19eaaad1a
+  data.tar.gz: dfac24780729a88a781c708c183fda899e4c8b24
 SHA512:
-  metadata.gz: 0ad4233f81504e49ab360e97d529e7a9ec73c23c7b2b1281ddcfd9745ae4aa26037862001d126f68877451efa63440648a10f63a2ec53ff116779e2f2407de40
-  data.tar.gz: cd04f24cf22cfa31c54f6c90929052ad8ad0fc7524d9c59220462b83746049e279bf6765ad4d71626be7379404f084a200d067f08e7c40cace0aa6b256e44942
+  metadata.gz: 6d0ccce04af931a80d457f25434fe6a7aa035915096ecedb4b2a1c040a2bf84473bbad26e69316820263a4220f846bc6f9e217ca9ca825c06ae74e40af5bb30f
+  data.tar.gz: c2d60488ae290f43bebe6f2f06178259007619ecf75cdbd52bbb64d55e3136e2470a81e993855f02cc3198cf11d172e2c52e3872de915c00850903373906edca

data/lib/inherited_resources/base_helpers.rb

@@ -133,17 +133,10 @@ 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
 
       # Overwrite this method to provide other interpolation options when

data/lib/inherited_resources/class_methods.rb

@@ -51,7 +51,11 @@ module InheritedResources
         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.gsub('/', '_')
+          end
           options.delete(:resource_class) and options.delete(:class_name)
         end
 
@@ -175,7 +179,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

data/lib/inherited_resources/responder.rb

@@ -1,6 +1,5 @@
 module InheritedResources
   class Responder < ActionController::Responder
     include Responders::FlashResponder
-    include Responders::HttpCacheResponder
   end
-end
+end

data/lib/inherited_resources/url_helpers.rb

@@ -216,16 +216,20 @@ module InheritedResources
       prefix = prefix ? "#{prefix}_" : ''
       ivars << (ivars.empty? ? 'given_options' : ', given_options')
 
+      given_args_transform = 'given_args = given_args.collect { |arg| arg.respond_to?(:permitted?) ? arg.to_h : arg }'
+
       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})
           end
 
           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})
           end

data/lib/inherited_resources/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -31,40 +31,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.x
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.x
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.x
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.x
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inherited_resources
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit