effective_resources 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a13e49dcaa1728b9d2e692effb9317025f50ee43c94c4bdfba755a41b6f934
-  data.tar.gz: 12ae76b6b3036eeb8b4d96eb537db5de68549ca79d45430a98cde565454d58ae
+  metadata.gz: b6df84b754524ec505a90063610dcff9af6e4e24e0cb2e0ada087d5420dbe4fe
+  data.tar.gz: fc0be89c03c109066c49f87778eb85ba2ac0a38309f72bb2f668e8e4bcc1201a
 SHA512:
-  metadata.gz: e34e82481d6186e20c200a24eb76db93b5c08e5f9bd2bc9a2c5910b22f30f543bdc1a742c009767e2adbe894dd5cc73b037500faa57408be0bf898e6890dd348
-  data.tar.gz: ee8fc48132ea61fa5d0b4a5851c35e35578dd1b35bdb739ed48d8c1a3a191737a116ec1a49157d3c5e59e34f80553ea59eaf16be7a8105f15a00cd7bf72c51dc
+  metadata.gz: 339825fdc0ed4abb28094c5fe83e4f2dd2fa426447f8f1ee3933e909f58b4600958e647dae712dbd47fb7aed155af7eae027f0dfb61ace74418535691de463f0
+  data.tar.gz: 7b4b5ad7565dd0ea09728af5d2769fa6ce51a0ed7c4e6c7c68d594a66861e975cb23af87b3334d5481cd984c0e62c8bd10ef47b6b49f4c56de1fd4bdc758f0fe

data/app/helpers/effective_resources_helper.rb

@@ -68,7 +68,7 @@ module EffectiveResourcesHelper
     partial = atts[:partial]
     spacer_template = locals[:spacer_template]
 
-    effective_resource = (atts[:effective_resource] || find_effective_resource)
+    effective_resource = (atts[:effective_resource] || find_effective_resource(resource))
     namespace = atts[:namespace] || (effective_resource.namespace.to_sym if effective_resource.namespace)
 
     # Assign actions

data/app/helpers/effective_resources_private_helper.rb

@@ -55,8 +55,19 @@ module EffectiveResourcesPrivateHelper
     end
   end
 
-  def find_effective_resource
+  def find_effective_resource(resource = nil)
     @_effective_resource ||= (controller.respond_to?(:effective_resource) ? controller.effective_resource : Effective::Resource.new(controller_path))
+
+    # We might be calling this on a sub resource of the same page.
+    if resource.present? && @_effective_resource.present?
+      resource = Array(resource).first
+
+      if resource.kind_of?(ActiveRecord::Base) && resource.class != @_effective_resource.klass
+        return Effective::Resource.new(resource, namespace: @_effective_resource.namespace)
+      end
+    end
+
+    @_effective_resource
   end
 
 end

data/app/models/concerns/acts_as_archived.rb

@@ -65,7 +65,7 @@ module ActsAsArchived
     scope :unarchived, -> { where(archived: [false, nil]) }
 
     effective_resource do
-      archived :boolean,  permitted: false
+      archived :boolean, permitted: false
     end
 
     acts_as_archived_options = @acts_as_archived_options

data/lib/effective_resources/engine.rb

@@ -41,10 +41,6 @@ module EffectiveResources
     # resources :things, concerns: :acts_as_archived
     initializer 'effective_resources.routes_concern' do |app|
       ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-      
-      # ActiveSupport.on_load :active_record do
-      #   ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-      # end
     end
 
     # Register the flash_messages concern so that it can be called in ActionController

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails