phlexi-form 0.8.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7467adbbe9a8093e99978671b26fd071b8c85907f87eda8b1e01afc806af0f3
-  data.tar.gz: c116107c7c52c277e2793bf8f7705daa7d4aac256823f228becfd8e0acfd5f13
+  metadata.gz: d8ef146b4a3e5a10911b90b8593e26065efbc88f5f532972cef9d3181b320828
+  data.tar.gz: 4d3bbbfd5a9c808215c134fc4c1110a9e0b01ef39d10ab75d9051ae370f6c7c5
 SHA512:
-  metadata.gz: fe774524b8ba765e58e49d2e2e42ab6996de479b89d75b79f4560ce1696aa84d48d8f89e5dc035bbcb08196238f23306eaa60ea474b8fc08e9dde109d3e07329
-  data.tar.gz: 56894aa62eb3b1b667500097602d4743643f28cbc3a5ab6d917c1cabeec0afea6dcdaac4039da20f94eadf149355f6bd996aa5fad6254ef6baabff68009612e6
+  metadata.gz: 2d42262ece5062a97b5b817cba73599841f0d0654ebe3fbd60243eff3b1994af904bfe02e2d3549220bd7f78a9a434d7777631eaa7d9d22d0606972edec56ace
+  data.tar.gz: 7fd209a0829a4917c50b0204ddd2c328e12e5cbc8a8548e2308e61a5aa9c02ae3443d68a2e2f36a32233e95b38b120dd0dab1705df8aab2a940a19a3e41d3018

data/lib/phlexi/form/base.rb

@@ -68,15 +68,8 @@ module Phlexi
         captured = capture { form_template(&) }
         form_tag do
           form_errors
-          plain(captured)
+          raw(safe(captured))
         end
-
-        # TODO: phlex v2
-        # captured = capture { form_template(&) }
-        # form_tag do
-        #   form_errors
-        #   raw(safe(captured))
-        # end
       end
 
       def form_errors
@@ -109,7 +102,10 @@ module Phlexi
         params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
         params = {} unless params.is_a?(Hash)
 
-        call(view_context: view_context) unless @_rendered
+        unless @_state
+          raise ArgumentError, "view_context is required if Form has not been rendered" unless view_context
+          view_context.render(self) 
+        end
         @namespace.extract_input(params)
       end
 

data/lib/phlexi/form/components/base.rb

@@ -23,15 +23,14 @@ module Phlexi
         def append_attribute_classes
           return if attributes[:class] == false
 
-          default_classes = tokens(
-            component_name,
-            -> { attributes[:required] } => "required",
-            -> { !attributes[:required] } => "optional",
-            -> { field.has_errors? } => "invalid",
-            -> { attributes[:readonly] } => "readonly",
-            -> { attributes[:disabled] } => "disabled"
-          )
-          attributes[:class] = tokens(default_classes, attributes[:class])
+          classes = [component_name]
+          classes << "required" if attributes[:required]
+          classes << "optional" unless attributes[:required]
+          classes << "invalid" if field.has_errors?
+          classes << "readonly" if attributes[:readonly]
+          classes << "disabled" if attributes[:disabled]
+          classes << attributes[:class] if attributes[:class]
+          attributes[:class] = classes.join(" ")
         end
 
         def component_name

data/lib/phlexi/form/html.rb

@@ -13,6 +13,7 @@ module Phlexi
       end
 
       include Behaviour
+      include Phlexi::Field::Common::Tokens
     end
   end
 end

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.8.5"
+    VERSION = "0.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: phlexi-field
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement