effective_resources 1.8.2 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc4db438688ecdd123360281ec6cfbe5b7aede01451615bcee92c566f186081c
-  data.tar.gz: fa9154d7b1942bd0e8023f8795b670313260bc0cb7c22b84f2cd9c8d993e8ee1
+  metadata.gz: 79cab109b01cb0133d18f3530e8ed872c183c8e637c8279da87bbd068ddbee21
+  data.tar.gz: 20e8cb596ab2181fde595dc430c2e57fa1396b7d91490827d496e20438f59575
 SHA512:
-  metadata.gz: 80b67a72b7a4f700b788d906a4db3c7e6e58f758f1d8f64d31178875c11c8021df2c706b86763efeba151a44b62cd07d19b46b0c2d354a20dd0831ee04aef89f
-  data.tar.gz: 1f18e82c58fdae3ff884659c7166825727a19e90a28a55add1d952dea32e7ee3cdabe1bf251b7bbb83d8c72017c99df22defffedf8d9720092a24876c212175b
+  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/app/helpers/effective_resources_helper.rb

@@ -148,6 +148,7 @@ module EffectiveResourcesHelper
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
 
     action = atts.delete(:action)
+    safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?("form_#{action}", controller._prefixes, :partial)
@@ -168,7 +169,10 @@ module EffectiveResourcesHelper
       end
     end
 
-    render('form', atts) # Will raise the regular error
+    # Will raise the regular error
+    return ''.html_safe if safe
+
+    render('form', atts)
   end
 
   # Similar to render_resource_form
@@ -182,6 +186,7 @@ module EffectiveResourcesHelper
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
 
     action = atts.delete(:action)
+    safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
@@ -194,7 +199,10 @@ module EffectiveResourcesHelper
       end
     end
 
-    render(resource, atts)  # Will raise the regular error
+    # Will raise the regular error
+    return ''.html_safe if safe
+
+    render(resource, atts)
   end
   alias_method :render_resource, :render_resource_partial
 

data/app/models/concerns/has_many_rich_texts.rb

@@ -1,6 +1,9 @@
 # HasManyRichTexts
 #
-# Mark your model with 'has_many_rich_texts' and then any method missing is a rich text region
+# Mark your model with 'has_many_rich_texts'
+# Then it will automatically create a region when using a method named rich_text_*
+# object.rich_text_body = "<p>Stuff</p>"
+# object.rich_text_body => ActionText::RichText<name="body" body="<p>Stuff</p>">
 
 module HasManyRichTexts
   extend ActiveSupport::Concern
@@ -25,31 +28,26 @@ module HasManyRichTexts
     rich_texts.find { |rt| rt.name == name } || rich_texts.build(name: name)
   end
 
-  def rich_text_body=(name, body)
+  def assign_rich_text_body(name, body)
     rich_text(name).assign_attributes(body: body)
   end
 
   # Prevents an ActiveModel::UnknownAttributeError
   # https://github.com/rails/rails/blob/main/activemodel/lib/active_model/attribute_assignment.rb#L48
   def respond_to?(*args)
-    method = args.first.to_s
-    return false if ['to_a', 'to_ary'].any? { |str| method == str }
-    return false if ['_by', '_at', '_id', '_by=', '_at=', 'id='].any? { |str| method.end_with?(str) }
-    true
+    args.first.to_s.start_with?('rich_text_') ? true : super
   end
 
   def method_missing(method, *args, &block)
-    super if block_given?
-    super unless respond_to?(method)
-
     method = method.to_s
+    super unless method.start_with?('rich_text_')
+
+    name = method.chomp('=').sub('rich_text_', '')
 
-    if method.end_with?('=') && args.length == 1 && (args.first.kind_of?(String) || args.first.kind_of?(NilClass))
-      send(:rich_text_body=, method.chomp('='), *args)
-    elsif args.length == 0
-      send(:rich_text, method, *args)
+    if method.end_with?('=')
+      send(:assign_rich_text_body, name, *args)
     else
-      super
+      send(:rich_text, name, *args)
     end
   end
 

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

@@ -70,7 +70,8 @@ module Effective
       end
 
       def action_texts
-        klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' }
+        klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' } +
+        klass.reflect_on_all_associations(:has_many).select { |ass| ass.class_name == 'ActionText::RichText' }
       end
 
       def action_texts_has_ones_ids

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

@@ -80,6 +80,7 @@ module Effective
         action_texts
           .map { |ass| instance.send(ass.name) }
           .compact
+          .flatten
           .select { |obj| obj.previous_changes['body'].present? }
           .inject({}) { |h, obj| h[obj.name.to_sym] = obj.previous_changes['body']; h }
       end

data/app/views/application/member_action.js.erb

@@ -1,7 +1,7 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action, safe: true) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 

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.2'.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.2
+  version: 1.8.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails