phlexi-field 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ff865f069b2361127071190b6f17cd58a553d9eadcb3084acce2e3cefbe6df
-  data.tar.gz: 6af6e7c11737780a668ea39f86a6436540afa31e2f76a14d0201177e336ff649
+  metadata.gz: 5a93196112cf2988e3893ae65133271d65cfe8a3c118c274dd7170bd30735a67
+  data.tar.gz: 9f8c007cbbe91c52d856485a30ad0db0f72a5d687e62c2202a4c1e6703a5bfd9
 SHA512:
-  metadata.gz: 617357cb149cc34431f4615ecc041207565a00e3855400fe804bd18c162af9c4e7b182a49d73c8d01deb122a087969531883316e3b1571595d72a7dbab56e84e
-  data.tar.gz: afbfa1cefd2b4a31898e9aa90636f642395fc4d33d57b58989d3aaa8977232ce9d4d1b91602f1f63b4375854f2961de82935b88a5b11c5291fe90a0b55336907
+  metadata.gz: 1937ee5a4b0d478a67a38b0d098e305ffcafb27556957dfca8bcc1b827688feabfc29fffd0bb7f91159b0519b017cb4da8fa2bb3e62c3651f53d5cf58ef6ca76
+  data.tar.gz: 1b43ffa71ec09cf7a8c959b564485ed9d0486e031a4627c7c12f4b611d063ec19115128e9210e3e43981a887e71d11544169cd24395b793d990c13b0856329a2

data/lib/phlexi/field/builder.rb

@@ -67,7 +67,7 @@ module Phlexi
       end
 
       def determine_value_from_object
-        object.respond_to?(key) ? object.public_send(key) : nil
+        Phlexi::Field::Support::Value.from(object, key)
       end
     end
   end

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

@@ -46,17 +46,9 @@ module Phlexi
             return custom_type.type if custom_type&.type
           end
 
-          # Check if object responds to the key
-          if object.respond_to?(key)
-            # Fallback to inferring type from the value
-            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[key])
-          end
+          # Fallback to inferring type from the value
+          value = Phlexi::Field::Support::Value.from(object, key)
+          return infer_field_type_from_value(value) unless value.nil?
 
           # Default to string if we can't determine the type
           :string

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

@@ -22,7 +22,11 @@ module Phlexi
         def id
           @id ||= begin
             root, *rest = lineage
-            root_key = root.respond_to?(:dom_id) ? root.dom_id : root.key
+            root_key = if root.respond_to?(:dom_id)
+              root.dom_id
+            else
+              root.key
+            end
             rest.map(&:key).unshift(root_key).join("_")
           end
         end

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

@@ -22,10 +22,11 @@ module Phlexi
 
         attr_reader :builder_klass, :object
 
-        def initialize(key, parent:, builder_klass:, object: nil)
+        def initialize(key, parent:, builder_klass:, object: nil, dom_id: nil)
           super(key, parent: parent)
           @builder_klass = builder_klass
           @object = object
+          @dom_id = dom_id
           @children = {}
           yield self if block_given?
         end
@@ -84,12 +85,12 @@ module Phlexi
 
         def dom_id
           @dom_id ||= begin
-            id = if object.nil?
+            object_id = if object.nil?
               nil
             elsif (primary_key = Phlexi::Field.object_primary_key(object))
               primary_key&.to_s || :new
             end
-            [key, id].compact.join("_").underscore
+            [key, object_id].compact.join("_").underscore
           end
         end
 
@@ -100,15 +101,8 @@ module Phlexi
 
         protected
 
-        # Calls the corresponding method on the object for the `key` name, if it exists. For example
-        # if the `key` is `email` on `User`, this method would call `User#email` if the method is
-        # present.
-        #
-        # This method could be overwritten if the mapping between the `@object` and `key` name is not
-        # a method call. For example, a `Hash` would be accessed via `user[:email]` instead of `user.send(:email)`
         def object_value_for(key:)
-          return @object.send(key) if @object.respond_to?(key)
-          @object[key] if @object.is_a?(Hash)
+          Phlexi::Field::Support::Value.from(@object, key)
         end
 
         private

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

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

data/lib/phlexi/field/support/value.rb

@@ -0,0 +1,12 @@
+module Phlexi
+  module Field
+    module Support
+      module Value
+        def self.from(object, key)
+          return object[key] if object.is_a?(Hash)
+          object.public_send(key) if object.respond_to?(key)
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/field/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Field
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-field
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -216,6 +216,7 @@ files:
 - lib/phlexi/field/structure/namespace.rb
 - lib/phlexi/field/structure/namespace_collection.rb
 - lib/phlexi/field/structure/node.rb
+- lib/phlexi/field/support/value.rb
 - lib/phlexi/field/theme.rb
 - lib/phlexi/field/version.rb
 - sig/phlexi/field.rbs