eac_rails_utils 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69ab406dd1dd999da6a2fdefa92e15ad6c1a2faeb14f0474fa7fd20938a71ef
-  data.tar.gz: f91fdd425c80747f432acbcdd4ed80c399eed2e80f3d1e862699dbb0839d9077
+  metadata.gz: 3e4525483ddef206757144a407560d2b7569db1933b16935da157aef0e8645c4
+  data.tar.gz: 163bb84353cde0a519afaba18890920cf8f04920291f8e457d81431743e61bf4
 SHA512:
-  metadata.gz: 0f772b792fb6684dfff2e450286e5f014d04e4b9c45630a8cc7d3486c9a70cb895381ba4480e973a4b2cdc4cde5a29bfa94392c8e2efc9e141a08e2ce0e126d4
-  data.tar.gz: 2a5cc246cb003b694e2701bb70409cc7df7e2e69fc80d093a47912dbed5d50c2e1cdab740e4e9d36f29469cc84fd8bc83a50fd15f66cbda35b4ecd328093139a
+  metadata.gz: 7313d2b4e45e6893a574df04e25ef627d0edea64820eda383a22ead2bd21243d377fb659ced3c58c84726f1f06d1c0904678510a6a60263e4aac88c45742d414
+  data.tar.gz: 8d5b6f1ab06c37696f0dd780e4017c519c41e1a2c717e9bbe3fa066824a30766fd84641546bdabe20978cb3adbba8808b06384bc3ec8ef3a4e93bf61c378f678

data/app/helpers/eac_rails_utils/data_table_helper/column.rb

@@ -1,48 +1,51 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module EacRailsUtils
   module DataTableHelper
     class Column
       EMPTY_VALUE = '-'
 
-      attr_reader :label
+      common_constructor :args, :block
+
+      # @return [String]
+      def label
+        args[0]
+      end
 
-      def initialize(label, path, block)
-        @label = label
-        @path = path.to_s.split('.')
-        @block = block
+      # @return [String]
+      def path
+        args[1].to_s.split('.')
       end
 
       def record_value(record)
-        v = Node.new(record, @path).value
+        v = ::EacRailsUtils::DataTableHelper::ColumnNode.new(record, path).value
         if v.present?
-          @block ? @block.call(v) : v
+          block ? block.call(v) : v
         else
           EMPTY_VALUE
         end
       end
 
-      private
+      # @param attribute [Symbol]
+      # @param value [Proc, Object]
+      # @return [self]
+      def value_cell(attribute, value = nil, &block)
+        value_cell_attributes[attribute.to_sym] = block.if_present(value)
 
-      def node_value(node, subpath)
-        return node if subpath.empty?
+        self
       end
 
-      class Node
-        def initialize(node, path)
-          @node = node
-          @path = path
-        end
-
-        def value
-          return @node if @node.nil? || @path.empty?
+      # @return [Hash]
+      def value_cell_attributes
+        @value_cell_attributes ||= {}
+      end
 
-          subpath = @path.dup
-          n = subpath.shift
-          return Node.new(@node.send(n), subpath).value if @node.respond_to?(n)
+      private
 
-          raise "Instance of #{@node.class} does not respond to #{n}"
-        end
+      def node_value(node, subpath)
+        return node if subpath.empty?
       end
     end
   end

data/app/helpers/eac_rails_utils/data_table_helper/column_node.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module DataTableHelper
+    class ColumnNode
+      common_constructor :node, :path
+
+      # @return [Boolean]
+      def ended?
+        node.nil? || path.empty?
+      end
+
+      # @return [Object]
+      def value
+        ended? ? node : child_value
+      end
+
+      private
+
+      # @return [Object]
+      def child_value
+        subpath = path.dup
+        n = subpath.shift
+        return self.class.new(node.send(n), subpath).value if node.respond_to?(n)
+
+        raise "Instance of #{node.class} does not respond to #{n}"
+      end
+    end
+  end
+end

data/app/helpers/eac_rails_utils/data_table_helper/data_table/value_cell.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module DataTableHelper
+    class DataTable
+      class ValueCell
+        enable_method_class
+        common_constructor :data_table, :column, :record
+        delegate :view, to: :data_table
+
+        # @return [ActiveSupport::SafeBuffer]
+        def result
+          view.content_tag('td', column.record_value(record), tag_attributes)
+        end
+
+        # @return [Object]
+        def tag_attribute_value(value)
+          value.is_a?(::Proc) ? value.call(record) : value
+        end
+
+        # @return [Hash]
+        def tag_attributes
+          column.value_cell_attributes.map { |k, v| [k, tag_attribute_value(v)] }.to_h
+        end
+      end
+    end
+  end
+end

data/app/helpers/eac_rails_utils/data_table_helper/data_table.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module EacRailsUtils
   module DataTableHelper
     class DataTable
-      def initialize(view, dataset)
-        @view = view
-        @dataset = dataset
-        @setup = ::EacRailsUtils::DataTableHelper::Setup.new
-        yield(@setup)
-      end
+      common_constructor :view, :dataset, :setup_block, block_arg: true
 
       def output
-        @view.content_tag(:table, id: id) do
+        view.content_tag(:table, id: id) do
           head << body
         end << script
       end
@@ -19,29 +16,29 @@ module EacRailsUtils
       private
 
       def head
-        @view.content_tag(:thead) do
-          @view.content_tag(:tr) do
-            @view.safe_join(@setup.columns.map { |c| @view.content_tag('th', c.label) })
+        view.content_tag(:thead) do
+          view.content_tag(:tr) do
+            view.safe_join(setup.columns.map { |c| view.content_tag('th', c.label) })
           end
         end
       end
 
       def body
-        @view.content_tag(:tbody) do
-          @view.safe_join(@dataset.map { |r| row(r) })
+        view.content_tag(:tbody) do
+          view.safe_join(dataset.map { |r| row(r) })
         end
       end
 
       def row(record)
-        @view.content_tag(:tr) do
-          @view.safe_join(
-            @setup.columns.map { |c| @view.content_tag('td', c.record_value(record)) << "\n" }
+        view.content_tag(:tr) do
+          view.safe_join(
+            setup.columns.map { |c| value_cell(c, record) << "\n" }
           )
         end << "\n"
       end
 
       def script
-        @view.javascript_tag <<~JS_CODE
+        view.javascript_tag <<~JS_CODE
           $(document).ready(function () {
             $('##{id}').DataTable({
               paging: #{@setup.paging ? 'true' : 'false'}
@@ -53,6 +50,17 @@ module EacRailsUtils
       def id
         @id ||= SecureRandom.hex(32)
       end
+
+      # @return [EacRailsUtils::DataTableHelper::Setup]
+      def setup
+        @setup ||= begin
+          r = ::EacRailsUtils::DataTableHelper::Setup.new
+          setup_block.call(r)
+          r
+        end
+      end
+
+      require_sub __FILE__, require_mode: :kernel
     end
   end
 end

data/app/helpers/eac_rails_utils/data_table_helper/setup.rb

@@ -11,8 +11,11 @@ module EacRailsUtils
         @paging = true
       end
 
-      def column(label, path = nil, &block)
-        @columns << ::EacRailsUtils::DataTableHelper::Column.new(label, path, block)
+      # @return [EacRailsUtils::DataTableHelper::Column]
+      def column(*args, &block)
+        column = ::EacRailsUtils::DataTableHelper::Column.new(args, block)
+        @columns << column
+        column
       end
     end
   end

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
@@ -193,7 +193,9 @@ files:
 - app/helpers/eac_rails_utils/common_form_helper/form_builder/year_month_field.rb
 - app/helpers/eac_rails_utils/data_table_helper.rb
 - app/helpers/eac_rails_utils/data_table_helper/column.rb
+- app/helpers/eac_rails_utils/data_table_helper/column_node.rb
 - app/helpers/eac_rails_utils/data_table_helper/data_table.rb
+- app/helpers/eac_rails_utils/data_table_helper/data_table/value_cell.rb
 - app/helpers/eac_rails_utils/data_table_helper/setup.rb
 - app/helpers/eac_rails_utils/formatter_helper.rb
 - app/helpers/eac_rails_utils/links_helper.rb