phlexi-form 0.3.0.rc1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0a5677bd380aa749f9de4f25243f6c7367839c66a3bfe3f59dfae0f1b32ab6
-  data.tar.gz: 9107d443cb28c47c1c0a113af182af3b2b6c0a386451e913447a3b834676bbbe
+  metadata.gz: 275c0339b1d6b87503e8acf312fe8fa7f4dddeb2cc8a54840b3adfa66d3b61a6
+  data.tar.gz: b7f6fe52cfb50974dfec86e3c45ffb22a4ea2a0c1a65cb28d947ed325b0f6965
 SHA512:
-  metadata.gz: 0bedfa08fae8602d5cfc632d4907fb12a41c3ac7a64deaad4cc977c82fb3451f976c37e404e449388f6f88127921fe235cec2f42ffedeadc118865c341f924d8
-  data.tar.gz: db75b28ad2166e117054c2f5eccd5e73e0efcfc7de330d17b02e46468cf46d0aa80934ab31fbd273910c9c80a66b1fdff4184ccf88dd3cbb814b758f36023c38
+  metadata.gz: d55f3d6c19be8cab8fe158085730b81bd199c0c4ec4912209b8ec3273b4d5e312412036f534330da6f357adcdff0bd327686736fcba3a078d60270e904c8da26
+  data.tar.gz: 547e96dc75e481b0a645ff2156a92f6ff9c3629af5658b5612649df713f81c024bc44b91f53e053db35728d0420572fc831bc6786a0b90bb6e3244768d6c343f

data/README.md

@@ -159,14 +159,16 @@ Phlexi::Form supports theming through a flexible theming system:
 
 ```ruby
 class ThemedForm < Phlexi::Form::Base
-  private
-
-  def default_theme
-    {
-      input: "border rounded px-2 py-1",
-      label: "font-bold text-gray-700",
-      # Add more theme options here
-    }
+  class Builder < Builder
+    private
+    
+    def default_theme
+      {
+        input: "border rounded px-2 py-1",
+        label: "font-bold text-gray-700",
+        # Add more theme options here
+      }
+    end
   end
 end
 ```

data/gemfiles/default.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.2.0)
+    phlexi-form (0.3.1)
       activesupport
       phlex (~> 1.11)
       zeitwerk
@@ -9,32 +9,34 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
@@ -48,7 +50,7 @@ GEM
     builder (3.3.0)
     bundle-audit (0.1.0)
       bundler-audit
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     capybara (3.40.0)
@@ -64,7 +66,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     drb (2.2.1)
@@ -78,22 +80,22 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.25.1)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mutex_m (0.2.0)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     phlex (1.11.0)
@@ -119,10 +121,10 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -132,31 +134,31 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.2)
-      strscan
-    rubocop (1.64.1)
+    rexml (3.3.7)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    standard (1.39.2)
+    securerandom (0.3.1)
+    standard (1.40.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.64.0)
+      rubocop (~> 1.65.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.4)
     standard-custom (1.0.2)
@@ -166,15 +168,15 @@ GEM
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.21.0)
     stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    useragent (0.16.10)
     webrick (1.8.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   x86_64-darwin

data/gemfiles/rails_7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.2.0)
+    phlexi-form (0.3.1)
       activesupport
       phlex (~> 1.11)
       zeitwerk
@@ -96,7 +96,7 @@ GEM
     builder (3.3.0)
     bundle-audit (0.1.0)
       bundler-audit
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     capybara (3.40.0)
@@ -112,7 +112,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
@@ -140,14 +140,14 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.25.1)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mutex_m (0.2.0)
-    net-imap (0.4.14)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
@@ -159,8 +159,8 @@ GEM
     nio4r (2.7.3)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     phlex (1.11.0)
@@ -213,32 +213,31 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
-    rexml (3.3.2)
-      strscan
-    rubocop (1.64.1)
+    rexml (3.3.7)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     sqlite3 (1.7.3-x86_64-darwin)
-    standard (1.39.2)
+    standard (1.40.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.64.0)
+      rubocop (~> 1.65.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.4)
     standard-custom (1.0.2)
@@ -248,8 +247,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.21.0)
     stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -260,7 +258,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   x86_64-darwin

data/lib/phlexi/form/base.rb

@@ -10,23 +10,23 @@ module Phlexi
     # A form component for building flexible and customizable forms.
     #
     # @example Basic usage
-    #   Phlexi::Form.new(user, action: '/users', method: 'post') do |f|
+    #   Phlexi::Form(user, action: '/users', method: 'post') do
     #     render field(:name).placeholder("Name").input_tag
     #     render field(:email).placeholder("Email").input_tag
     #   end
     #
     # @attr_reader [Symbol] key The form's key, derived from the record or explicitly set
     # @attr_reader [ActiveModel::Model, nil] object The form's associated object
-    class Base < COMPONENT_BASE
-      class Namespace < Structure::Namespace; end
+    class Base < Phlexi::Form::HTML
+      class Namespace < Phlexi::Form::Structure::Namespace; end
 
-      class FieldBuilder < Structure::FieldBuilder; end
+      class Builder < Phlexi::Form::Builder; end
 
-      class << self
-        def inherited(subclass)
-          subclass.const_set(:Namespace, Class.new(self::Namespace)) unless subclass.const_defined?(:Namespace)
-          subclass.const_set(:FieldBuilder, Class.new(self::FieldBuilder)) unless subclass.const_defined?(:FieldBuilder)
-          super
+      def self.inline(*, **, &block)
+        raise ArgumentError, "block is required" unless block
+
+        new(*, **) do |f|
+          f.instance_exec(&block)
         end
       end
 
@@ -47,7 +47,6 @@ module Phlexi
       def initialize(record, action: nil, method: nil, attributes: {}, **options)
         @form_action = action
         @form_method = method
-        @form_class = options.delete(:class)
         @attributes = attributes
         @namespace_klass = options.delete(:namespace_klass) || default_namespace_klass
         @builder_klass = options.delete(:builder_klass) || default_builder_klass
@@ -61,8 +60,8 @@ module Phlexi
       # Renders the form template.
       #
       # @return [void]
-      def view_template
-        form_tag { form_template }
+      def view_template(&)
+        form_tag { form_template(&) }
       end
 
       # Executes the form's content block.
@@ -70,19 +69,7 @@ module Phlexi
       #
       # @return [void]
       def form_template
-        instance_exec(&@_content_block) if @_content_block
-      end
-
-      # Renders the form tag with its contents.
-      #
-      # @yield The form's content
-      # @return [void]
-      def form_tag(&)
-        form(**form_attributes) do
-          render_hidden_method_field
-          render_authenticity_token if authenticity_token?
-          yield
-        end
+        yield if block_given?
       end
 
       def extract_input(params)
@@ -110,10 +97,11 @@ module Phlexi
         else
           @object = record
           if @key.nil?
-            unless object.respond_to?(:model_name) && object.model_name.respond_to?(:param_key) && object.model_name.param_key.present?
-              raise ArgumentError, "record must respond to #model_name.param_key with a non nil value or set `key` option e.g. Phlexi::Form(record, key: :record)"
+            @key = if object.respond_to?(:model_name) && object.model_name.respond_to?(:param_key) && object.model_name.param_key.present?
+              object.model_name.param_key
+            else
+              object.class.name.demodulize.underscore
             end
-            @key = object.model_name.param_key
           end
         end
         @key = @key.to_sym
@@ -133,6 +121,25 @@ module Phlexi
         attributes.fetch(:accept_charset) { attributes[:accept_charset] = "UTF-8" }
       end
 
+      # Retrieves the form's CSS classes.
+      #
+      # @return [String] The form's CSS classes
+      def form_class
+        themed(:base, nil)
+      end
+
+      # Renders the form tag with its contents.
+      #
+      # @yield The form's content
+      # @return [void]
+      def form_tag(&)
+        form(**form_attributes) do
+          render_hidden_method_field
+          render_authenticity_token if has_authenticity_token?
+          yield
+        end
+      end
+
       # Determines the form's action URL.
       #
       # @return [String, nil] The form's action URL
@@ -156,16 +163,11 @@ module Phlexi
         ActiveSupport::StringInquirer.new(@form_method)
       end
 
-      # Retrieves the form's CSS classes.
-      #
-      # @return [String] The form's CSS classes
-      attr_reader :form_class
-
       # Checks if the authenticity token should be included.
       #
       # @return [Boolean] True if the authenticity token should be included, false otherwise
-      def authenticity_token?
-        defined?(helpers) && options.fetch(:authenticity_token) { !form_method.get? }
+      def has_authenticity_token?
+        !form_method.get? && ((defined?(helpers) && helpers) || options[:authenticity_token])
       end
 
       # Retrieves the authenticity token.
@@ -221,13 +223,12 @@ module Phlexi
       #
       # @return [Hash] The form attributes
       def form_attributes
-        {
+        mix({
           id: @namespace.dom_id,
-          action: form_action,
-          method: standardized_form_method,
           class: form_class,
-          **attributes
-        }
+          action: form_action,
+          method: standardized_form_method
+        }, attributes)
       end
 
       # Renders the authenticity token if required.
@@ -244,7 +245,7 @@ module Phlexi
       end
 
       def default_builder_klass
-        self.class::FieldBuilder
+        self.class::Builder
       end
     end
   end