effective_resources 1.8.1 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1ab3c1064882ff12132711f5b5e52baffd2448ca53097739f6fc5da17ded8e
-  data.tar.gz: 0444d91c34c0e2bccae26dbd042d80d491d829e19f6f0dccf720ad975eb0ee14
+  metadata.gz: 3054f246623c2920a43e74b98bdb52aa03501ca936da01036523ac76e6f35049
+  data.tar.gz: 2121fdfa7914e4b0c4c516a26d030f6ff3c1bda0d60ff54a5f683fe0c4280c51
 SHA512:
-  metadata.gz: 1bed68ed75113db85e5a10372dd148847464855f7bee2d4699366efdb3df2046a1e8ca001c9c6fadee838b6f67b5f900ca7429a9888b286c66db1db17d2e7996
-  data.tar.gz: 0caf48a95cb7600b104fe0ca679c9780552fc99f61e1f8ce005b5e24f241a93cd340c6222ee3ce43a6ab85e93380511d1b5184c25795a5138423fb35b2cbd78c
+  metadata.gz: c714c8640357cbb5c52aeca16a5cef0a6e0caf9eafe1a54cccf8c9aee79f27afb65ae022a8512c4297c379b96b9dc9c98275345709a24591aa8b1544051d64fc
+  data.tar.gz: be065c497d1b2b664b9d82dedf8fa2e3fd77bc25f89b06d51a1841ce9069fdd41e933d681cf11a66a2f76d2846c09b9f1c2353e75d88c69d48d8df0cbdacde27

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/acts_as_slugged.rb

@@ -42,6 +42,11 @@ module ActsAsSlugged
 
       where(slug: args.first).or(where(id: args.first)).first || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'slug'=#{args.first}"))
     end
+
+    def find_by_slug_or_id(*args)
+      where(slug: args.first).or(where(id: args.first)).first
+    end
+
   end
 
   # Instance Methods

data/app/models/concerns/has_many_rich_texts.rb

@@ -0,0 +1,54 @@
+# HasManyRichTexts
+#
+# 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
+
+  module Base
+    def has_many_rich_texts(options = nil)
+      include ::HasManyRichTexts
+    end
+  end
+
+  included do
+    has_many :rich_texts, class_name: 'ActionText::RichText', as: :record, inverse_of: :record, dependent: :destroy
+    accepts_nested_attributes_for :rich_texts, allow_destroy: true
+  end
+
+  module ClassMethods
+  end
+
+  # Find or build
+  def rich_text(name)
+    name = name.to_s
+    rich_texts.find { |rt| rt.name == name } || rich_texts.build(name: name)
+  end
+
+  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)
+    args.first.to_s.start_with?('rich_text_') ? true : super
+  end
+
+  def method_missing(method, *args, &block)
+    method = method.to_s
+    super unless method.start_with?('rich_text_')
+
+    name = method.chomp('=').sub('rich_text_', '')
+
+    if method.end_with?('=')
+      send(:assign_rich_text_body, name, *args)
+    else
+      send(:rich_text, name, *args)
+    end
+  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/engine.rb

@@ -27,6 +27,7 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
+        ActiveRecord::Base.extend(HasManyRichTexts::Base)
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)
         ActiveRecord::Base.extend(EffectiveResource::Base)

data/lib/effective_resources/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,7 @@ files:
 - app/models/concerns/acts_as_wizard.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
+- app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb
 - app/models/effective/attribute.rb