inherited_resources 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cb8a8e3e1fc321346443a8264926120e60b5a4e316987143a58a6278114c4c
-  data.tar.gz: 942712a75ce52463be67c273ebefa83dced93511bde604efec8cf2223cbdc6c4
+  metadata.gz: 2b677266578b38d74ba037804681b9797ba4a9e5297df6378ffd69b97f42ce2f
+  data.tar.gz: 889a492764877b22bdc10496668f4776068cacee1c702232f7f7a289de8ceeb0
 SHA512:
-  metadata.gz: fcd578a613128060649285c664854bc289e00d6ae0feed1420aa9f0c5dfa550660de341fe5791372580515dae1d5a5567c5aa068139182db5712b56aae6325d0
-  data.tar.gz: 2d365cf4b2c82c5ed363825136d6efa926c164bb2a3ca9861242258338c8c0de89e69355bde57b5ec8a08ed4e321b2a20407c67f438fce02d391bb33c84ced16
+  metadata.gz: 6a239ef30d340455e51f738e103ec5b90315f1b318ce1f069b51a62d2e69df2a41cda41ed8f0e5399cb0ccc02f81fe8eef2606e180fbcd03fda5bd3e85a58d18
+  data.tar.gz: a2c79cacf2dbef2f7eca1a97b3bd2f12260cf7da5dfbca330eb03de25c1341eda93d6215ae25a9aae9bb11ff2334bb3edc78f883b2311e282f1e9374cfae38a2

data/README.md

@@ -10,7 +10,7 @@ If you are not already using Inherited Resources we suggest instead using Rails'
 ## Inherited Resources
 
 [![Version         ][rubygems_badge]][rubygems]
-[![CircleCI        ][circleci_badge]][circleci]
+[![Github Actions  ][actions_badge]][actions]
 [![Tidelift        ][tidelift_badge]][tidelift]
 
 Inherited Resources speeds up development by making your controllers inherit
@@ -189,7 +189,7 @@ different route prefix you can do the following:
 
 ```ruby
 class Administrators::PeopleController < InheritedResources::Base
-  defaults :route_prefix => 'admin'
+  defaults :route_prefix => :admin
 end
 ```
 
@@ -739,8 +739,8 @@ 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
+[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]: https://tidelift.com/subscription/pkg/rubygems-inherited-resources?utm_source=rubygems-inherited-resources&utm_medium=referral&utm_campaign=readme
 

data/lib/inherited_resources/class_methods.rb

@@ -48,7 +48,6 @@ 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] = begin
@@ -60,7 +59,7 @@ module InheritedResources
         end
 
         options.each do |key, value|
-          config[key] = value.to_sym
+          config[key] = value&.to_sym
         end
 
         create_resources_url_helpers!
@@ -379,7 +378,7 @@ 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

data/lib/inherited_resources/url_helpers.rb

@@ -54,7 +54,7 @@ module InheritedResources
         # Add route_prefix if any.
         unless resource_config[:route_prefix].blank?
           if polymorphic
-            resource_ivars << resource_config[:route_prefix].to_s
+            resource_ivars << resource_config[:route_prefix]
           else
             resource_segments << resource_config[:route_prefix]
           end

data/lib/inherited_resources/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -125,14 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit