inherited_resources 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29a882f1b539c21b739478231165d73d23e0342
-  data.tar.gz: 4f2ef22ade978647e66640a6955a118e82f89af5
+  metadata.gz: 4c848b17107647c1d8ad488bb45dc1f25fa77c90
+  data.tar.gz: 881023687b11c42c47217decfc409c4b5bbf251c
 SHA512:
-  metadata.gz: a92f1ed2578bf0dd95973e5bdb95d5397d5cc00edf3b566a86ae4718f22861898094311cce0eee77b21f4cb9166ca6c87e0cba74743f0f1af67838d74efa4334
-  data.tar.gz: 2741b0b1712fe05728038baf22239b096941c2423ca059e530f3e245354022073427228823899c58eb7cf45b570d909fbd4d83daf7436096eb7d131c55e61c95
+  metadata.gz: 03ad83ca5106a764815cd74552101c4b78bf4d719b6788a8c1e90d24d226892510630ce50c00ce7c48a2b09dce316d01ce629f5d2500282b2d9b02d2356993ba
+  data.tar.gz: 36f3d2b845f40be1f036c7e4cea54276e7885a430a3360be8631a38f7af79f8037c2e30994ed773b113bbf38880b0ee0121fcf265221951b2986d59d43e7df54

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,16 @@
 ## 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' 
+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)
+[![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
@@ -634,7 +634,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?
@@ -722,4 +722,4 @@ 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.

data/lib/inherited_resources.rb

@@ -1,5 +1,7 @@
+# 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'
 
@@ -21,24 +23,18 @@ module InheritedResources
   def self.flash_keys=(array)
     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
 end
 
-class 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!
+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
   end
 end

data/lib/inherited_resources/base_helpers.rb

@@ -149,7 +149,7 @@ module InheritedResources
       # 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
 
@@ -223,8 +223,11 @@ module InheritedResources
       # Get resource ivar based on the current resource controller.
       #
       def get_resource_ivar #:nodoc:
-        instance_variable_defined?(:"@#{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.
@@ -236,8 +239,11 @@ module InheritedResources
       # Get collection ivar based on the current resource controller.
       #
       def get_collection_ivar #:nodoc:
-        instance_variable_defined?(:"@#{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.

data/lib/inherited_resources/belongs_to_helpers.rb

@@ -75,12 +75,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}")
       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])

data/lib/inherited_resources/engine.rb

@@ -0,0 +1,11 @@
+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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -99,6 +99,7 @@ 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