effective_resources 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3054f246623c2920a43e74b98bdb52aa03501ca936da01036523ac76e6f35049
-  data.tar.gz: 2121fdfa7914e4b0c4c516a26d030f6ff3c1bda0d60ff54a5f683fe0c4280c51
+  metadata.gz: 79cab109b01cb0133d18f3530e8ed872c183c8e637c8279da87bbd068ddbee21
+  data.tar.gz: 20e8cb596ab2181fde595dc430c2e57fa1396b7d91490827d496e20438f59575
 SHA512:
-  metadata.gz: c714c8640357cbb5c52aeca16a5cef0a6e0caf9eafe1a54cccf8c9aee79f27afb65ae022a8512c4297c379b96b9dc9c98275345709a24591aa8b1544051d64fc
-  data.tar.gz: be065c497d1b2b664b9d82dedf8fa2e3fd77bc25f89b06d51a1841ce9069fdd41e933d681cf11a66a2f76d2846c09b9f1c2353e75d88c69d48d8df0cbdacde27
+  metadata.gz: b4ed96cdaf9a6fb68f51b3328fde6b38151f595f09e94fbc8943f034d0de2a9ae48a959f07c050fc77a8bfcaa8d1b6be0f671e7d23e762de51771cc58a6c8779
+  data.tar.gz: feaa6d1027ba1b6315a922b400feab502bc1f96e545092e4d9f9284f9cd935e80e918dd2b2e93fb5b0f2391b59978aaa908c1663ec112d10c9bd3cde819c830b

data/app/controllers/concerns/effective/crud_controller.rb

@@ -11,7 +11,6 @@ module Effective
     include Effective::CrudController::Submits
 
     included do
-      define_actions_from_routes
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
       layout -> { resource_layout }
     end
@@ -19,22 +18,11 @@ module Effective
     module ClassMethods
       include Effective::CrudController::Dsl
 
-      # This is used to define_actions_from_routes and for the buttons/submits/ons
+      # This is used for the buttons/submits/ons
       # It doesn't really work with the resource_scope correctly but the routes are important here
       def effective_resource
         @_effective_resource ||= Effective::Resource.new(controller_path)
       end
-
-      # Automatically respond to any action defined via the routes file
-      def define_actions_from_routes
-        (effective_resource.member_actions - effective_resource.crud_actions).each do |action|
-          define_method(action) { member_action(action) }
-        end
-
-        (effective_resource.collection_actions - effective_resource.crud_actions).each do |action|
-          define_method(action) { collection_action(action) }
-        end
-      end
     end
 
     def resource # @thing
@@ -53,7 +41,7 @@ module Effective
       send(:instance_variable_set, "@#{resource_plural_name}", instance)
     end
 
-    def effective_resource
+    def effective_resource(safe: false)
       @_effective_resource ||= begin
         relation = instance_exec(&resource_scope_relation) if respond_to?(:resource_scope_relation)
 
@@ -64,11 +52,28 @@ module Effective
         resource = Effective::Resource.new(controller_path, relation: relation)
 
         unless resource.relation.kind_of?(ActiveRecord::Relation) || resource.active_model?
-          raise("unable to build resource_scope for #{resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.")
+          raise("unable to build resource_scope for #{resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.") unless safe
+        else
+          resource
         end
+      end
+    end
+
+    def action_missing(action, *args, &block)
+      effective_resource = self.effective_resource(safe: true)
+      return super if effective_resource.blank?
+
+      action = action.to_sym
 
-        resource
+      if effective_resource.member_actions.include?(action)
+        return member_action(action)
       end
+
+      if effective_resource.collection_actions.include?(action)
+        return collection_action(action)
+      end
+
+      super
     end
 
     private

data/lib/effective_resources/effective_gem.rb

@@ -7,7 +7,7 @@ module EffectiveGem
     raise("expected self.config_keys method") unless respond_to?(:config_keys)
 
     config_keys.each do |key|
-      self.class.define_method(key) { config()[key] }
+      self.singleton_class.define_method(key) { config()[key] }
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.6'.freeze
+  VERSION = '1.8.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails