phlexi-field 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0be36da5b3ce1dae979b31c55d9a0ad18e9b4aa9f206e47f29ea97f55bc2c89b
-  data.tar.gz: 73584d4874fa1fa59746b34053f5e5d77edf6f3780f73be42b3d2ca677167c12
+  metadata.gz: 70fdd02c6979235fa18a95692de12b4ebefec2468e2bb71bb0a2a25d7692de78
+  data.tar.gz: 40feabf408438dc28b7907c8e66b5d04aa5d336e986ab5cbfc08c6a51b290f33
 SHA512:
-  metadata.gz: de662238d5a8716422335d4d33b21e5b317e78c0fd247eb9c6185f3a0cd1294faab5192fcd1d1887a548825953c04ebfb2fc5696e3c7762fed662ae0199ee7d5
-  data.tar.gz: 631cdd6a03e32750863c632e61b0a447dde1ce20ccb5f20e1b513aba7937ea120f0733b1a6327c39f729561898c3f7a99e7bbefaf81736f0b27bd359d2cf23b8
+  metadata.gz: ae593aa3bc1c50f6a4f4ff93caf9553de907ddf53759d282ab2ede1b5cba99b0a001ff8853f01fcf205e8eb0dfe237a0a5c378866dd4b7cc1793a901fefbfd24
+  data.tar.gz: 7abc8faa67e3a6b7a4baf232f507dc0d7923bb3e722852ff9b63e2d8b8771e09de538d5db05eb5a18ec97e16a4776d7b5bd93dafa6d30cef79162e45155761a5

data/lib/phlexi/field/builder.rb

@@ -13,13 +13,15 @@ module Phlexi
     # @attr_accessor [Object] value The value of the field.
     class Builder < Structure::Node
       include Phlex::Helpers
-      include Options::Associations
-      include Options::Attachments
-      include Options::Descriptions
-      include Options::Hints
+      include Options::Validators
       include Options::InferredTypes
+      include Options::Multiple
       include Options::Labels
       include Options::Placeholders
+      include Options::Descriptions
+      include Options::Hints
+      include Options::Associations
+      include Options::Attachments
 
       class DOM < Structure::DOM; end
 
@@ -52,12 +54,12 @@ module Phlexi
         self.class::FieldCollection.new(field: self, collection:, &)
       end
 
-      protected
-
       def has_value?
-        value.present?
+        attachment_reflection.present? ? value.attached? : (value.present? || value == false)
       end
 
+      protected
+
       def determine_initial_value(value)
         return value unless value == NIL_VALUE
 

data/lib/phlexi/field/options/associations.rb

@@ -4,12 +4,12 @@ module Phlexi
   module Field
     module Options
       module Associations
-        protected
-
         def association_reflection
           @association_reflection ||= find_association_reflection
         end
 
+        protected
+
         def find_association_reflection
           if object.class.respond_to?(:reflect_on_association)
             object.class.reflect_on_association(key)

data/lib/phlexi/field/options/attachments.rb

@@ -4,12 +4,12 @@ module Phlexi
   module Field
     module Options
       module Attachments
-        protected
-
         def attachment_reflection
           @attachment_reflection ||= find_attachment_reflection
         end
 
+        protected
+
         def find_attachment_reflection
           if object.class.respond_to?(:reflect_on_attachment)
             object.class.reflect_on_attachment(key)

data/lib/phlexi/field/options/inferred_types.rb

@@ -6,44 +6,38 @@ module Phlexi
   module Field
     module Options
       module InferredTypes
+        def inferred_field_component
+          @inferred_component ||= infer_field_component
+        end
+
         def inferred_field_type
           @inferred_field_type ||= infer_field_type
         end
 
-        def inferred_field_component
-          @inferred_component ||= infer_field_component
+        def inferred_string_field_type
+          @inferred_string_field_type || infer_string_field_type
         end
 
         private
 
         def infer_field_component
-          case inferred_field_type
-          when :string, :text
-            infer_string_field_component(key)
-          when :integer, :float, :decimal
-            :number
-          when :date, :datetime, :time
-            :date
-          when :boolean
-            :boolean
-          when :json, :jsonb, :hstore
-            :code
-          else
-            if association_reflection
-              :association
-            elsif attachment_reflection
-              :attachment
-            else
-              :text
-            end
-          end
+          inferred_field_type
         end
 
         def infer_field_type
+          # Check attachments first since they are implemented as associations
+          return :attachment if attachment_reflection
+
+          return :association if association_reflection
+
+          if object.class.respond_to?(:defined_enums)
+            return :enum if object.class.defined_enums.key?(key.to_s)
+          end
+
           if object.class.respond_to?(:columns_hash)
-            # ActiveRecord object
+            # ActiveRecord
             column = object.class.columns_hash[key.to_s]
-            return column.type if column
+            return column.type if column&.type
           end
 
           if object.class.respond_to?(:attribute_types)
@@ -58,6 +52,12 @@ module Phlexi
             return infer_field_type_from_value(object.send(key))
           end
 
+          # Check if object is a has that contains key
+          if object.respond_to?(:fetch)
+            # Fallback to inferring type from the value
+            return infer_field_type_from_value(object.fetch(key))
+          end
+
           # Default to string if we can't determine the type
           :string
         end
@@ -83,18 +83,24 @@ module Phlexi
           end
         end
 
-        def infer_string_field_component(key)
-          key = key.to_s.downcase
-
-          return :password if is_password_field?
+        def infer_string_field_type
+          infer_string_field_type_from_key || infer_string_field_type_from_validations
+        end
 
-          custom_type = custom_string_field_type(key)
-          return custom_type if custom_type
+        def infer_string_field_type_from_validations
+          return unless has_validators?
 
-          :text
+          if attribute_validators.find { |v| v.kind == :numericality }
+            :number
+          elsif attribute_validators.find { |v| v.kind == :format && v.options[:with] == URI::MailTo::EMAIL_REGEXP }
+            :email
+          end
         end
 
-        def custom_string_field_type(key)
+        def infer_string_field_type_from_key
+          key = self.key.to_s.downcase
+          return :password if is_password_field?(key)
+
           custom_mappings = {
             /url$|^link|^site/ => :url,
             /^email/ => :email,
@@ -103,7 +109,7 @@ module Phlexi
             /^time/ => :time,
             /^date/ => :date,
             /^number|_count$|_amount$/ => :number,
-            /^color/ => :color
+            /^color|_color$/ => :color
           }
 
           custom_mappings.each do |pattern, type|
@@ -113,9 +119,7 @@ module Phlexi
           nil
         end
 
-        def is_password_field?
-          key = self.key.to_s.downcase
-
+        def is_password_field?(key)
           exact_matches = ["password"]
           prefixes = ["encrypted_"]
           suffixes = ["_password", "_digest", "_hash", "_token"]

data/lib/phlexi/field/options/multiple.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Field
+    module Options
+      module Multiple
+        def multiple?
+          options[:multiple] = options.fetch(:multiple) { calculate_multiple_field_value }
+        end
+
+        def multiple!(multiple = true)
+          options[:multiple] = multiple
+          self
+        end
+
+        private
+
+        def calculate_multiple_field_value
+          return true if attachment_reflection&.macro == :has_many_attached
+          return true if %i[has_many has_and_belongs_to_many].include?(association_reflection&.macro)
+          return true if multiple_field_array_attribute?
+
+          check_multiple_field_from_validators
+        end
+
+        def multiple_field_array_attribute?
+          return false unless object.class.respond_to?(:columns_hash)
+
+          column = object.class.columns_hash[key.to_s]
+          return false unless column
+
+          case object.class.connection.adapter_name.downcase
+          when "postgresql"
+            column.array? || (column.type == :string && column.sql_type.include?("[]"))
+          end # || object.class.attribute_types[key.to_s].is_a?(ActiveRecord::Type::Serialized)
+        rescue
+          # Rails.logger.warn("Error checking multiple field array attribute: #{e.message}")
+          false
+        end
+
+        def check_multiple_field_from_validators
+          inclusion_validator = find_validator(:inclusion)
+          length_validator = find_validator(:length)
+
+          return false unless inclusion_validator || length_validator
+
+          check_multiple_field_inclusion_validator(inclusion_validator) ||
+            check_multiple_field_length_validator(length_validator)
+        end
+
+        def check_multiple_field_inclusion_validator(validator)
+          return false unless validator
+          in_option = validator.options[:in] || validator.options[:within]
+          return false unless in_option.is_a?(Array)
+
+          validator.options[:multiple] == true || (multiple_field_array_attribute? && in_option.size > 1)
+        end
+
+        def check_multiple_field_length_validator(validator)
+          return false unless validator
+          validator.options[:maximum].to_i > 1 if validator.options[:maximum]
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/field/options/validators.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Field
+    module Options
+      module Validators
+        private
+
+        def has_validators?
+          @has_validators ||= object.class.respond_to?(:validators_on)
+        end
+
+        def attribute_validators
+          object.class.validators_on(key)
+        end
+
+        def association_reflection_validators
+          association_reflection ? object.class.validators_on(association_reflection.name) : []
+        end
+
+        def valid_validator?(validator)
+          !conditional_validators?(validator) && action_validator_match?(validator)
+        end
+
+        def conditional_validators?(validator)
+          validator.options.include?(:if) || validator.options.include?(:unless)
+        end
+
+        def action_validator_match?(validator)
+          return true unless validator.options.include?(:on)
+
+          case validator.options[:on]
+          when :save
+            true
+          when :create
+            !object.persisted?
+          when :update
+            object.persisted?
+          end
+        end
+
+        def find_validator(kind)
+          attribute_validators.find { |v| v.kind == kind && valid_validator?(v) } if has_validators?
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/field/structure/dom.rb

@@ -53,7 +53,7 @@ module Phlexi
         def keys
           @keys ||= lineage.map do |node|
             # If the parent of a field is a field, the name should be nil.
-            node.key unless node.parent.is_a? FieldBuilder
+            node.key unless node.parent.is_a? Builder
           end
         end
       end

data/lib/phlexi/field/structure/field_collection.rb

@@ -7,6 +7,8 @@ module Phlexi
         include Enumerable
 
         class Builder
+          include Phlex::Helpers
+
           attr_reader :key, :index
 
           def initialize(key, field, index)

data/lib/phlexi/field/structure/namespace.rb

@@ -18,6 +18,8 @@ module Phlexi
       class Namespace < Structure::Node
         include Enumerable
 
+        class NamespaceCollection < Structure::NamespaceCollection; end
+
         attr_reader :builder_klass, :object
 
         def initialize(key, parent:, builder_klass:, object: nil)
@@ -71,7 +73,7 @@ module Phlexi
         # to another `Namespace` or `Field`.
         def nest_many(key, collection: nil, &)
           collection ||= Array(object_value_for(key: key))
-          create_child(key, NamespaceCollection, collection:, &)
+          create_child(key, self.class::NamespaceCollection, collection:, &)
         end
 
         # Iterates through the children of the current namespace, which could be `Namespace` or `Field`
@@ -84,10 +86,8 @@ module Phlexi
           @dom_id ||= begin
             id = if object.nil?
               nil
-            elsif object.class.respond_to?(:primary_key)
-              object.public_send(object.class.primary_key) || :new
-            elsif object.respond_to?(:id)
-              object.id || :new
+            elsif (primary_key = Phlexi::Field.object_primary_key(object))
+              primary_key&.to_s || :new
             end
             [key, id].compact.join("_").underscore
           end

data/lib/phlexi/field/structure/node.rb

@@ -20,7 +20,7 @@ module Phlexi
         end
 
         def inspect
-          "<#{self.class.name} key=#{key.inspect} parent=#{id.inspect} />"
+          "<#{self.class.name} key=#{key.inspect} parent=#{parent.inspect} />"
         end
       end
     end

data/lib/phlexi/field/theme.rb

@@ -2,11 +2,10 @@ require "fiber/local"
 
 module Phlexi
   module Field
-    module Theme
-      extend ActiveSupport::Concern
-
-      included do
-        extend Fiber::Local
+    class Theme
+      def self.inherited(subclass)
+        super
+        subclass.extend Fiber::Local
       end
 
       # Retrieves the theme hash
@@ -26,8 +25,12 @@ module Phlexi
       #
       # @example Theme inheritance
       #   theme[:email] # Returns :text, indicating email inherits text's theme
+      def self.theme
+        raise NotImplementedError, "#{self} must implement #self.theme"
+      end
+
       def theme
-        raise NotImplementedError, "#{self.class} must implement #theme"
+        @theme ||= self.class.theme.freeze
       end
 
       # Recursively resolves the theme for a given property, handling nested symbol references

data/lib/phlexi/field/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Field
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/phlexi/field.rb

@@ -5,6 +5,8 @@ require "phlex"
 require "active_support/core_ext/object/blank"
 
 module Phlexi
+  NIL_VALUE = :__i_phlexi_i__
+
   module Field
     Loader = Zeitwerk::Loader.new.tap do |loader|
       loader.tag = File.basename(__FILE__, ".rb")
@@ -19,8 +21,14 @@ module Phlexi
 
     COMPONENT_BASE = (defined?(::ApplicationComponent) ? ::ApplicationComponent : Phlex::HTML)
 
-    NIL_VALUE = :__i_phlexi_i__
-
     class Error < StandardError; end
+
+    def self.object_primary_key(object)
+      if object.class.respond_to?(:primary_key)
+        object.send(object.class.primary_key.to_sym)
+      elsif object.respond_to?(:id)
+        object.id
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-field
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2024-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -208,7 +208,9 @@ files:
 - lib/phlexi/field/options/hints.rb
 - lib/phlexi/field/options/inferred_types.rb
 - lib/phlexi/field/options/labels.rb
+- lib/phlexi/field/options/multiple.rb
 - lib/phlexi/field/options/placeholders.rb
+- lib/phlexi/field/options/validators.rb
 - lib/phlexi/field/structure/dom.rb
 - lib/phlexi/field/structure/field_collection.rb
 - lib/phlexi/field/structure/namespace.rb