effective_resources 1.2.16 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c23ef5a90f34cc5bdbc8387f8cf71639ecb2dac
-  data.tar.gz: 15defee279ffbd2c5782e00ee00d9f4fa91bfec9
+SHA256:
+  metadata.gz: 62a13e49dcaa1728b9d2e692effb9317025f50ee43c94c4bdfba755a41b6f934
+  data.tar.gz: 12ae76b6b3036eeb8b4d96eb537db5de68549ca79d45430a98cde565454d58ae
 SHA512:
-  metadata.gz: 82adc2be2d04687cd7e284847850a236af9f39ec1c1be3ff338d0125703087de09f81c5b63df7d5252c4ba7d0bae3a4171aaf1fe9f9465c556b95cd30414e63c
-  data.tar.gz: f86b0d54cbe8abbf54efd27a7cae1d39b6caa29d87613e19bc4877b8ab6b419d724dee1373a3b2af607f985b0515f0544ff46f048e6a821e77ae55e5b331ca6d
+  metadata.gz: e34e82481d6186e20c200a24eb76db93b5c08e5f9bd2bc9a2c5910b22f30f543bdc1a742c009767e2adbe894dd5cc73b037500faa57408be0bf898e6890dd348
+  data.tar.gz: ee8fc48132ea61fa5d0b4a5851c35e35578dd1b35bdb739ed48d8c1a3a191737a116ec1a49157d3c5e59e34f80553ea59eaf16be7a8105f15a00cd7bf72c51dc

data/app/models/effective/resources/actions.rb

@@ -9,7 +9,7 @@ module Effective
           matches = [[namespace, plural_name].compact.join('/'.freeze), [namespace, name].compact.join('/'.freeze)]
 
           routes_engine.routes.routes.select do |route|
-            matches.any? { |match| match == route.defaults[:controller] }
+            matches.any? { |match| match == route.defaults[:controller] } && !route.name.to_s.end_with?('root')
           end.inject({}) do |h, route|
             h[route.defaults[:action].to_sym] = route; h
           end

data/lib/effective_resources/engine.rb

@@ -9,19 +9,6 @@ module EffectiveResources
       eval File.read("#{config.root}/config/effective_resources.rb")
     end
 
-    # Register the acts_as_archived routes concern
-    # resources :things, concerns: :acts_as_archived
-    initializer 'effective_resources.routes_concern' do |app|
-      ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-    end
-
-    # Register the flash_messages concern so that it can be called in ActionController
-    initializer 'effective_resources.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        include(Effective::FlashMessages)
-      end
-    end
-
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_resources.active_record' do |app|
       ActiveSupport.on_load :active_record do
@@ -34,17 +21,36 @@ module EffectiveResources
     end
 
     initializer 'effective_resources.cancancan' do |app|
-      if defined?(CanCan::Ability)
-        CanCan::Ability.module_eval do
-          CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
+      ActiveSupport.on_load :active_record do
+        if defined?(CanCan::Ability)
+          CanCan::Ability.module_eval do
+            CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
 
-          def crud
-            CRUD_ACTIONS
+            def crud
+              CRUD_ACTIONS
+            end
           end
+
+          CanCan::Ability.include(ActsAsArchived::CanCan)
+          CanCan::Ability.include(ActsAsStatused::CanCan)
         end
+      end
+    end
 
-        CanCan::Ability.include(ActsAsArchived::CanCan)
-        CanCan::Ability.include(ActsAsStatused::CanCan)
+    # Register the acts_as_archived routes concern
+    # 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
+    initializer 'effective_resources.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        include(Effective::FlashMessages)
       end
     end
 

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make any controller an effective resource controller.