inherited_resources 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8ecdfec2db9c75ad03674c7a299777858f9d9e
-  data.tar.gz: e98f948659ee83a8f939d25f3f65545a6bfce8ad
+  metadata.gz: c29a882f1b539c21b739478231165d73d23e0342
+  data.tar.gz: 4f2ef22ade978647e66640a6955a118e82f89af5
 SHA512:
-  metadata.gz: c62f90fc082c373908ef03d428571f5ab773ae1c6d37d26c2dbde54a08c3799102adf3a4bca50c3b367e4f7cb5333182820bacff4b6592df5a0772d82aec302d
-  data.tar.gz: 0c5d1d18700eaeb3c97e2eb4d6f60c2e7d72d3306417e237ecc2c5b781d0c47d40120e58dbc6631532e6cde079f978e36039f2630a8e476df8b6db170c1a7d9b
+  metadata.gz: a92f1ed2578bf0dd95973e5bdb95d5397d5cc00edf3b566a86ae4718f22861898094311cce0eee77b21f4cb9166ca6c87e0cba74743f0f1af67838d74efa4334
+  data.tar.gz: 2741b0b1712fe05728038baf22239b096941c2423ca059e530f3e245354022073427228823899c58eb7cf45b570d909fbd4d83daf7436096eb7d131c55e61c95

data/README.md

@@ -1,14 +1,17 @@
-## Deprecation notice
+## Notice
  
-Since Rails 3 came out, I have no longer used Inherited Resources and it is no
-longer actively maintained. I have found that the responders abstraction
-offers the perfect balance between hiding and showing too much logic in controllers.
-That said, I suggest developers to make use of Rails' `respond_with` feature
-alongside the [responders gem](https://github.com/plataformatec/responders) as a
-replacement to Inherited Resources.
+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).
 
 ## 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)
+
 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.
@@ -22,8 +25,6 @@ two screencasts available besides this README:
 
 ## Installation
 
-### Rails 3
-
 You can let bundler install Inherited Resources by adding this line to your application's Gemfile:
 
 ```ruby
@@ -42,20 +43,6 @@ Or install it yourself with:
 $ gem install inherited_resources
 ```
 
-### Rails 2.3.x
-
-If you want to use the Rails 2.3.x version, you should install:
-
-```sh
-$ gem install inherited_resources --version=1.0.6
-```
-
-Or checkout from the v1.0 branch:
-
-```
-http://github.com/josevalim/inherited_resources/tree/v1.0
-```
-
 ## HasScope
 
 Since Inherited Resources 1.0, has_scope is not part of its core anymore but
@@ -428,7 +415,7 @@ end
 ```
 
 It also accepts `:route_name`, `:parent_class` and `:instance_name` as options.
-Check the [lib/inherited_resources/class_methods.rb](https://github.com/josevalim/inherited_resources/blob/master/lib/inherited_resources/class_methods.rb)
+Check the [lib/inherited_resources/class_methods.rb](https://github.com/activeadmin/inherited_resources/blob/master/lib/inherited_resources/class_methods.rb)
 for more.
 
 ## Nested belongs to
@@ -655,7 +642,7 @@ index actions accordingly). Also, it will produce `delete_resource_{path,url}` a
 Sometimes just DRYing up the controllers is not enough. If you need to DRY up your views,
 check this Wiki page:
 
-https://github.com/josevalim/inherited_resources/wiki/Views-Inheritance
+https://github.com/activeadmin/inherited_resources/wiki/Views-Inheritance
 
 
 Notice that Rails 3.1 ships with view inheritance built-in.

data/lib/inherited_resources/base_helpers.rb

@@ -2,7 +2,7 @@
 require 'inherited_resources/blank_slate'
 
 module InheritedResources
-  # Base helpers for InheritedResource work. Some methods here can be overwriten
+  # Base helpers for InheritedResource work. Some methods here can be overwritten
   # and you will need to do that to customize your controllers from time to time.
   #
   module BaseHelpers
@@ -75,7 +75,7 @@ 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 then the usual :update_attributes:
+      # way than the usual :update_attributes:
       #
       #   def update_resource(object, attributes)
       #     object.reset_password!(attributes)
@@ -86,7 +86,7 @@ module InheritedResources
       end
 
       # Handle the :destroy method for the resource. Overwrite it to call your
-      # own method for destroing the resource, as:
+      # own method for destroying the resource, as:
       #
       #   def destroy_resource(object)
       #     object.cancel
@@ -123,7 +123,7 @@ module InheritedResources
       end
 
       # Returns if the controller has a parent. When only base helpers are loaded,
-      # it's always false and should not be overwriten.
+      # it's always false and should not be overwritten.
       #
       def parent?
         false
@@ -184,7 +184,7 @@ module InheritedResources
             apply_scopes_if_available(chain.send(method_for_association_chain))
           else
             # This only happens when we specify begin_of_association_chain in
-            # a singletion controller without parents. In this case, the chain
+            # a singleton controller without parents. In this case, the chain
             # is exactly the begin_of_association_chain which is already an
             # instance and then not scopable.
             chain
@@ -200,7 +200,7 @@ module InheritedResources
         (begin_of_association_chain || parent?) ? method_for_association_build : :new
       end
 
-      # Returns the name of the method used for build the resource in cases
+      # Returns the name of the method used for building the resource in cases
       # where we have a parent. This is overwritten in singleton scenarios.
       #
       def method_for_association_build
@@ -208,7 +208,7 @@ module InheritedResources
       end
 
       # Returns the name of the method to be called, before returning the end
-      # of the association chain. This is overwriten by singleton cases
+      # of the association chain. This is overwritten by singleton cases
       # where no method for association chain is called.
       #
       def method_for_association_chain #:nodoc:
@@ -223,7 +223,8 @@ module InheritedResources
       # Get resource ivar based on the current resource controller.
       #
       def get_resource_ivar #:nodoc:
-        instance_variable_get("@#{resource_instance_name}")
+        instance_variable_defined?(:"@#{resource_instance_name}") &&
+          instance_variable_get("@#{resource_instance_name}")
       end
 
       # Set resource ivar based on the current resource controller.
@@ -235,7 +236,8 @@ module InheritedResources
       # Get collection ivar based on the current resource controller.
       #
       def get_collection_ivar #:nodoc:
-        instance_variable_get("@#{resource_collection_name}")
+        instance_variable_defined?(:"@#{resource_collection_name}") &&
+          instance_variable_get("@#{resource_collection_name}")
       end
 
       # Set collection ivar based on the current resource controller.
@@ -283,7 +285,7 @@ module InheritedResources
         respond_to?(:apply_scopes, true) ? apply_scopes(target_object) : target_object
       end
 
-      # Symbols chain in base helpers return nothing. This is later overwriten
+      # Symbols chain in base helpers return nothing. This is later overwritten
       # by belongs_to and can be complex in polymorphic cases.
       #
       def symbols_for_association_chain #:nodoc:

data/lib/inherited_resources/belongs_to_helpers.rb

@@ -71,9 +71,16 @@ module InheritedResources
       # association chain.
       #
       def evaluate_parent(parent_symbol, parent_config, chain = nil) #:nodoc:
-        instantiated_object = instance_variable_get("@#{parent_config[:instance_name]}")
-        return instantiated_object if instantiated_object
+        get_parent_ivar(parent_config[:instance_name]) ||
+          set_parent_instance(parent_config, chain)
+      end
+
+      def get_parent_ivar(instance_name)
+        instance_variable_defined?(:"@#{instance_name}") &&
+          instance_variable_get("@#{instance_name}")
+      end
 
+      def set_parent_instance(parent_config, chain)
         if parent_config[:singleton]
           parent = if chain
             chain.send(parent_config[:instance_name])

data/lib/inherited_resources/class_methods.rb

@@ -363,6 +363,16 @@ module InheritedResources
 
         # Deal with namespaced controllers
         namespaces = self.controller_path.split('/')[0..-2]
+
+        # Remove namespace if its a mountable engine
+        namespaces.delete_if do |namespace|
+          begin
+            "#{namespace}/engine".camelize.constantize.isolated?
+          rescue StandardError, LoadError
+            false
+          end
+        end
+
         config[:route_prefix] = namespaces.join('_') unless namespaces.empty?
 
         # Deal with default request parameters in namespaced controllers, e.g.

data/lib/inherited_resources/url_helpers.rb

@@ -218,11 +218,13 @@ module InheritedResources
 
       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})
           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})

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -34,7 +34,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,21 +64,21 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.rc
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.rc
+        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: 
@@ -105,7 +105,7 @@ files:
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
 - lib/inherited_resources/version.rb
-homepage: http://github.com/josevalim/inherited_resources
+homepage: http://github.com/activeadmin/inherited_resources
 licenses:
 - MIT
 metadata: {}
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inherited_resources
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit