effective_bootstrap 1.14.17 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af2549f2ba32f64fc74a0ae241dd5ff3e5f426f36f5af01680de3f14adcd6c3b
-  data.tar.gz: ec2bebf9c1c4c7f6b94e9f655960e186908d01f4b5f2d35de995c299f52c5d5d
+  metadata.gz: 5cfaf018bf0d9801faa459d991cc6831c09878bf7d7395c8eceeb247c2b8efb8
+  data.tar.gz: 7441f4d44bf47958d9a1bb85466750f2a55031436af91c34a53f9dc9a7328898
 SHA512:
-  metadata.gz: '09b9c54ade1926de6b3643665d375ef2490c0b2bee23415b719f98fae8aed04d414bc499f569d95c3aade9f6639c5f7783f6ffba619afa4136f8cde2ec0e45a9'
-  data.tar.gz: d2b3953a4470819ad35324b503b29046635c84ba736f9d11808ef172ccc2f8791366510f411050a3e03403f6d1252e88de2e4c53f6a24e7bac1f2b16bfc8863f
+  metadata.gz: acec024092be3e7a9ad139f88cac0651971bc3cde9e49857080b60cbfa10b3cd959be6e98002b8d103dea75b21382b4c67e644b9aadcfac0bacd078e55655dba
+  data.tar.gz: 2c0107069432b98107335a6827239e8b3ec61fc53ff3ae0d8f0e4ece573cc2e9af53bcc360d7281231466c6e7db82244abf567f54beceb45220521ab592fab27

data/app/models/effective/table_builder.rb

@@ -27,17 +27,25 @@ module Effective
       # This runs the form partial over this table builder
       capture(&block) if block_given?
 
-      # Build from the resource if we didn't do anything in the block
-      build_resource_rows if rows.blank? && !block_given?
-
+      # Consider content
       only = Array(options[:only])
       except = Array(options[:except])
+      additionally = Array(options[:additionally])
       filtered = filter_parameters
 
+      # Rows are created when we use the block syntax and call a f.text_field or other f.form_field
+      # Using = f.content_for does not create a row.
+      # So rows wille be blank when using the default syntax
+      # And rows will be present when we render a form, or any form fields
+      build_resource_rows(only: only, except: except) if rows.blank?
+
+      # This gives us a second run through the rows, if you pass additionally
+      build_resource_rows(only: additionally) if additionally.present?
+
+      # Use f.content_for :name to override the content
       content = rows.merge(content_fors)
 
-      content = content.slice(*only) if only.present?
-      content = content.except(*except) if except.present?
+      # Filter out some hardcoded ones
       content = content.except(*filtered) if filtered.present?
 
       content_tag(:table, class: options.fetch(:class, 'table table-sm table-striped table-hover effective-table-summary')) do
@@ -54,8 +62,11 @@ module Effective
       end
     end
 
-    def build_resource_rows
+    def build_resource_rows(only: nil, except: nil)
       Effective::Resource.new(object).resource_attributes.each do |name, options|
+        next if only.present? && only.exclude?(name)
+        next if except.present? && except.include?(name)
+
         case options.first
         when :belongs_to
           belongs_to(name)
@@ -64,7 +75,13 @@ module Effective
         when :boolean
           boolean_row(name)
         when :integer
-          ['price', 'discount', '_fee'].any? { |p| name.to_s.include?(p) } ? price_field(name) : text_field(name)
+          if ['price', 'discount', '_fee'].any? { |p| name.to_s.include?(p) }
+            price_field(name)
+          elsif ['_percent'].any? { |p| name.to_s.include?(p) }
+            percent_field(name)
+          else
+            text_field(name)
+          end
         when :string
           name.to_s.include?('email') ? email_field(name) : text_field(name)
         when :text
@@ -100,6 +117,10 @@ module Effective
       rows[name] = TableRow.new(name, options, builder: self).to_html
     end
 
+    def article_editor(name, options = {})
+      rows[name] = TableRows::ArticleEditor.new(name, options, builder: self).to_html
+    end
+
     def boolean_row(name, options = {})
       rows[name] = TableRows::Boolean.new(name, options, builder: self).to_html
     end

data/app/models/effective/table_rows/article_editor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Effective
+  module TableRows
+    class ArticleEditor < Effective::TableRow
+
+      def content
+        return unless value.present?
+
+        if value.start_with?('<') && value.end_with?('>')
+          value.html_safe
+        else
+          template.simple_format(value)
+        end
+      end
+
+    end
+  end
+end

data/app/models/effective/table_rows/collection.rb

@@ -13,11 +13,15 @@ module Effective
         values = Array(value) - [nil, '']
 
         if values.length > 1
-          values.map { |v| content_tag(:div, v) }.join.html_safe
+          values.map { |v| content_tag(:div, item_content(v)) }.join.html_safe
         elsif values.length == 1
-          values.first
+          item_content(values.first)
         end
+      end
 
+      def item_content(value)
+        item = @collection.find { |k, v| (k && k == value) || (v && v == value) || k.try(:id) == value }
+        (item || value).to_s
       end
 
     end

data/app/models/effective/table_rows/text_area.rb

@@ -5,7 +5,16 @@ module Effective
     class TextArea < Effective::TableRow
 
       def content
-        template.simple_format(value) if value.kind_of?(String)
+        return unless value.present?
+
+        # Might be an Array or Hash. Serialized something.
+        return value.to_s unless value.kind_of?(String)
+
+        if value.start_with?('<') && value.end_with?('>')
+          value.html_safe
+        else
+          template.simple_format(value)
+        end
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.14.17'.freeze
+  VERSION = '1.15.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.14.17
+  version: 1.15.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -696,6 +696,7 @@ files:
 - app/models/effective/form_logics/show_if_any.rb
 - app/models/effective/table_builder.rb
 - app/models/effective/table_row.rb
+- app/models/effective/table_rows/article_editor.rb
 - app/models/effective/table_rows/belongs_to.rb
 - app/models/effective/table_rows/boolean.rb
 - app/models/effective/table_rows/collection.rb