protos-protoform 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57b1b4645f529c7f8b132e92b0776a839448cd20eb3c689fbcf3689f2f7cfda
-  data.tar.gz: da70f9680fed7bb2815deaa61ffb049ab9edfac706bb9e8b9e60f2ac8e5904a4
+  metadata.gz: d87996776d7c98ac20d0f3f043bda6364cfe22be19ed00820e5c48df504837a5
+  data.tar.gz: 506204d5092faccefb7eaab6506e437f43faa8b741322e84533589e8f5cd7334
 SHA512:
-  metadata.gz: 7dbee5d770d7efed179c43eb39892f8bf4fc8d7935b65160ab84876688a64bb3612a2226ffb421094c32412e895af9fbfcebe44872b54680b2cd7951f9d82c4d
-  data.tar.gz: 8bd336c38077d8c15855329c01c63a9897320b62117e06a4f747b7f2f3e9c9849b4bf37a0bd4bce8d854e9994fd6c0fa19ba0551e2275ee8511ac57d4dab1bfa
+  metadata.gz: d6d4dad661cafa7395860cd52f131f8a536311f2a8c150f4c673d0136c6fa9dd69b66b144d06dec171c72d868ac5b00e8b890eb693073bf4c530d938e1d470c1
+  data.tar.gz: f25ccd64a68b57a41be47590cc5d3ed4d4cc39f3f8f055fb69bf6ed60008aff768fef68158030313ffb2aa0df4b1d6250b1e26c8779120b0308d12b7cb2ebd55

data/.rubocop.yml

@@ -6,4 +6,4 @@ inherit_gem:
     - config/default.yml
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-06-23
+## [0.1.0] - 2024-09-04
+
+- Adds tests for all Rails components
+- Adds `Time`, `Datetime`, `Date`, and `RadioButton` components
+- Fixes a bug in `Button` component calling the wrong method on `attrs`
+- Bumps supported Ruby version to 3.2
+- Adds value suffix to labels allowing them to match radio button ids
+- Bumps `protos` dependency to `v0.6.0`
+
+## [0.0.2] - 2024-08-14
+
+- Adds handling client supplied values like files and images
+- Fixes overriding methods on forms when supplying a Rails model
+- Adds `include_blank` option on select component to match Rails API
+- Transfers ownership of repo from `nolantait` to `inhouse-work` organization to
+  match other `protos-` gems
+
+## [0.0.1] - 2023-06-23
 
 - Initial release

data/Gemfile.lock

@@ -1,48 +1,56 @@
 PATH
   remote: .
   specs:
-    protos-protoform (0.0.1)
+    protos-protoform (0.1.0)
+      activerecord (~> 7.0)
+      activesupport (~> 7.0)
       phlex-rails (~> 1.0)
-      protos (~> 0.2)
+      protos (~> 0.6)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    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.2)
-      activesupport (= 7.1.3.2)
+      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)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activesupport (7.1.3.2)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
+      timeout (>= 0.4.0)
+    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)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
-    builder (3.2.4)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     capybara (3.40.0)
       addressable
       matrix
@@ -52,7 +60,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     debug (1.9.2)
@@ -63,7 +71,7 @@ GEM
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
@@ -76,47 +84,48 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erubi (1.12.0)
-    i18n (1.14.4)
+    erubi (1.13.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
-    nokogiri (1.16.4-aarch64-linux)
+    minitest (5.25.1)
+    nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.4-arm-linux)
+    nokogiri (1.16.7-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.4-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86-linux)
+    nokogiri (1.16.7-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    phlex (1.10.0)
-    phlex-rails (1.2.1)
-      phlex (~> 1.10.0)
+    phlex (1.11.0)
+    phlex-rails (1.1.1)
+      phlex (~> 1.9)
       railties (>= 6.1, < 8)
+      zeitwerk (~> 2.6)
     phlex-testing-capybara (0.1.0)
       capybara (~> 3.38)
       phlex (>= 0.5)
-    protos (0.4.1)
+    protos (0.6.0)
       dry-core (~> 1.0)
       dry-initializer (~> 3.1)
       dry-types (~> 1.7)
@@ -124,9 +133,9 @@ GEM
       tailwind_merge (~> 0.10)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
-    racc (1.7.3)
-    rack (3.0.10)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -141,88 +150,89 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
-      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)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.5.1)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.63.1)
+    rubocop (1.66.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)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-ast (1.32.2)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-inhouse (0.1.5)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-inhouse (0.2.0)
       rubocop (>= 1.5)
       rubocop-capybara (>= 2.1)
+      rubocop-factory_bot (>= 2.2)
       rubocop-performance (>= 1.1)
       rubocop-rails (>= 2.2)
       rubocop-rake (>= 0.6)
       rubocop-rspec (>= 2.2)
-    rubocop-performance (1.21.0)
+      rubocop-rspec_rails (>= 2.2)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.4)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    stringio (3.1.0)
-    tailwind_merge (0.11.0)
+    securerandom (0.3.1)
+    stringio (3.1.1)
+    tailwind_merge (0.13.0)
       lru_redux (~> 1.1)
-    thor (1.3.1)
+    thor (1.3.2)
+    timeout (0.4.1)
     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.13)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux

data/lib/generators/protoform/install/templates/application_form.rb

@@ -3,6 +3,16 @@
 class ApplicationForm < Protoform::Rails::Form
   include Phlex::Rails::Helpers::Pluralize
 
+  # These are the current dry-initializer options for the base class:
+  #
+  # param :model, reader: false
+  # option :helpers, reader: false, default: -> {}
+  # option :action, reader: false, default: -> {}
+  # option :method, reader: false, default: -> {}
+  # option :namespace, reader: false, default: -> do
+  #   Namespace.root(key, object: @model, field_class: self.class::Field)
+  # end
+
   def row(component)
     div do
       render component.field.label(style: "display: block;")

data/lib/protoform/field_collection.rb

@@ -28,8 +28,8 @@ module Protoform
 
     private
 
-    def build_field(**kwargs)
-      @field.class.new(current_index, parent: @field, **kwargs)
+    def build_field(**)
+      @field.class.new(current_index, parent: @field, **)
     end
 
     def current_index

data/lib/protoform/namespace.rb

@@ -120,8 +120,8 @@ module Protoform
     end
 
     # Creates a root Namespace, which is essentially a form.
-    def self.root(*args, **kwargs, &block)
-      new(*args, parent: nil, **kwargs, &block)
+    def self.root(*, **, &block)
+      new(*, parent: nil, **, &block)
     end
 
     protected
@@ -141,7 +141,7 @@ module Protoform
 
     # Checks if the child exists. If it does then it returns that. If it
     # doesn't, it will build the child.
-    def create_child(key:, child_class:, **kwargs, &block)
+    def create_child(key:, child_class:, **, &block)
       if (child = @children.fetch(key, nil))
         # ensure that found children are also yielded
         child.tap { yield child if block }
@@ -150,7 +150,7 @@ module Protoform
         @children[key] = child_class.new(
           key,
           parent: self,
-          **kwargs,
+          **,
           &block
         )
       end

data/lib/protoform/namespace_collection.rb

@@ -37,12 +37,12 @@ module Protoform
       end
     end
 
-    def build_namespace(index, **kwargs)
+    def build_namespace(index, **)
       parent.class.new(
         index,
         parent: self,
         field_class: @field_class,
-        **kwargs,
+        **,
         &@template
       )
     end

data/lib/protoform/rails/component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/string/inflections"
+
+module Protoform
+  module Rails
+    Component = ::ApplicationComponent
+  end
+end

data/lib/protoform/rails/components/button.rb

@@ -12,7 +12,8 @@ module Protoform
         private
 
         def button_text
-          attrs.fetch(:value, dom.value).titleize
+          text = attrs[:value] || dom.value
+          text.titleize
         end
 
         def default_attrs

data/lib/protoform/rails/components/component.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/inflections"
+
 module Protoform
   module Rails
     module Components
@@ -9,6 +11,10 @@ module Protoform
         def dom
           field.dom
         end
+
+        def title
+          field.key.to_s.titleize
+        end
       end
     end
   end

data/lib/protoform/rails/components/date.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Protoform
+  module Rails
+    module Components
+      class Date < Input
+        option :value, default: -> { field.value }
+        option :min, default: -> { }
+        option :max, default: -> { }
+
+        private
+
+        def default_attrs
+          super.merge(
+            {
+              type: "date",
+              value: date_value(value)
+            }
+          ).tap do |attrs|
+            attrs[:min] = date_value(min) if min
+            attrs[:max] = date_value(max) if max
+          end
+        end
+
+        def date_value(value)
+          return unless value
+
+          if value.is_a?(String)
+            value = begin
+              Datetime.parse(value)
+            rescue Date::Error
+              nil
+            end
+          end
+
+          value.strftime("%Y-%m-%d")
+        end
+      end
+    end
+  end
+end

data/lib/protoform/rails/components/datetime.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Protoform
+  module Rails
+    module Components
+      class Datetime < Input
+        option :value, default: -> { field.value }
+        option :include_seconds, default: -> { true }, reader: false
+        option :min, default: -> { }
+        option :max, default: -> { }
+
+        private
+
+        def default_attrs
+          super.merge(
+            {
+              type: "datetime-local",
+              value: datetime_value(value)
+            }
+          ).tap do |attrs|
+            attrs[:min] = datetime_value(min) if min
+            attrs[:max] = datetime_value(max) if max
+          end
+        end
+
+        def datetime_value(value)
+          return unless value
+
+          if value.is_a?(String)
+            value = begin
+              Datetime.parse(value)
+            rescue Date::Error
+              nil
+            end
+          end
+
+          if @include_seconds
+            value.strftime("%Y-%m-%dT%T")
+          else
+            value.strftime("%Y-%m-%dT%H:%M")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/protoform/rails/components/input.rb

@@ -16,10 +16,20 @@ module Protoform
           {
             id: dom.id,
             name: dom.name,
-            type: @type
-          }.tap do |hash|
-            hash[:value] = field.value unless @type.to_sym == :file
-          end
+            type: @type,
+            value:
+          }
+        end
+
+        def client_provided_value?
+          {
+            file: true,
+            image: true
+          }.fetch(@type.to_sym, false)
+        end
+
+        def value
+          dom.value unless client_provided_value?
         end
 
         def inferred_type
@@ -28,9 +38,9 @@ module Protoform
             "url"
           when Integer
             "number"
-          when Date, DateTime
+          when ::Date, ::DateTime
             "date"
-          when Time
+          when ::Time
             "time"
           else
             "text"

data/lib/protoform/rails/components/label.rb

@@ -4,16 +4,24 @@ module Protoform
   module Rails
     module Components
       class Label < Component
+        option :value, default: -> { }
+
         def view_template(&content)
-          content ||= proc { field.key.to_s.titleize }
+          content ||= proc { title }
           label(**attrs, &content)
         end
 
         private
 
+        def label_id
+          return dom.id unless value
+
+          [dom.id, value.parameterize.underscore].join("_")
+        end
+
         def default_attrs
           {
-            for: dom.id
+            for: label_id
           }
         end
       end

data/lib/protoform/rails/components/radio_button.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Protoform
+  module Rails
+    module Components
+      class RadioButton < Input
+        # This makes value manditory in this class instead of being absorbed by
+        # the html_options hash from Protos.
+        option :value
+
+        private
+
+        def radio_id
+          return dom.id if dom.value.nil?
+
+          [dom.id, dom.value.parameterize.underscore].join("_")
+        end
+
+        def checked?
+          dom.value == field.value
+        end
+
+        def default_attrs
+          {
+            id: radio_id,
+            name: dom.name,
+            value: dom.value,
+            type: "radio",
+            checked: checked? ? "checked" : false
+          }
+        end
+      end
+    end
+  end
+end

data/lib/protoform/rails/components/select.rb

@@ -5,7 +5,7 @@ module Protoform
     module Components
       class Select < FieldComponent
         option :collection, default: -> { [] }
-        option :include_blank, default: -> { true }
+        option :include_blank, default: -> { true }, reader: false
         option :multiple, reader: false, default: -> { false }
 
         def view_template(&options)
@@ -23,7 +23,7 @@ module Protoform
             select(multiple: @multiple, **attrs, name:, &options)
           else
             select(multiple: @multiple, **attrs, name:) do
-              blank_option
+              blank_option if @include_blank
               options(*@collection)
             end
           end
@@ -31,10 +31,7 @@ module Protoform
 
         def options(*collection)
           map_options(collection).each do |key, value|
-            option(
-              selected: selected_value_for(key) ? "selected" : false,
-              value: key
-            ) { value }
+            option(selected: selected_value_for(key), value: key) { value }
           end
         end
 
@@ -53,6 +50,10 @@ module Protoform
         protected
 
         def selected_value_for(key)
+          selected?(key) ? "selected" : false
+        end
+
+        def selected?(key)
           case field.value
           when String, Symbol
             field.value.to_s == key.to_s

data/lib/protoform/rails/components/time.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Protoform
+  module Rails
+    module Components
+      class Time < Input
+        option :value, default: -> { field.value }
+        option :include_seconds, default: -> { true }, reader: false
+        option :min, default: -> { }
+        option :max, default: -> { }
+
+        private
+
+        def default_attrs
+          super.merge(
+            {
+              type: "time",
+              value: time_value(value)
+            }
+          ).tap do |attrs|
+            attrs[:min] = time_value(min) if min
+            attrs[:max] = time_value(max) if max
+          end
+        end
+
+        def time_value(value)
+          return unless value
+
+          if value.is_a?(String)
+            value = begin
+              Datetime.parse(value)
+            rescue Date::Error
+              nil
+            end
+          end
+
+          if @include_seconds
+            value.strftime("%T.%L")
+          else
+            value.strftime("%H:%M")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/protoform/rails/form/field.rb

@@ -36,6 +36,22 @@ module Protoform
           Components::Checkbox.new(self, ...)
         end
 
+        def date(...)
+          Components::Date.new(self, ...)
+        end
+
+        def time(...)
+          Components::Time.new(self, ...)
+        end
+
+        def datetime(...)
+          Components::Datetime.new(self, ...)
+        end
+
+        def radio_button(value, **)
+          Components::RadioButton.new(self, value:, **)
+        end
+
         def label(...)
           Components::Label.new(self, ...)
         end

data/lib/protoform/rails/form.rb

@@ -2,7 +2,6 @@
 
 module Protoform
   module Rails
-    Component = ::ApplicationComponent
     # A Protos::Component class that accepts a model and sets
     # a `Protoform::Namespace` with the `Object#model_name` as the key and maps
     # the object to form fields and namespaces.
@@ -16,9 +15,12 @@ module Protoform
     # `_method_field`.
     class Form < Component
       param :model, reader: false
-      option :helpers, reader: false, default: -> {}
-      option :action, reader: false, default: -> {}
-      option :method, reader: false, default: -> {}
+      option :authenticity_token, reader: false, default: -> { true }
+      option :helpers, reader: false, default: -> { }
+      option :action, reader: false, default: -> { }
+      option :method,
+             reader: false,
+             default: -> { }
       option :namespace, reader: false, default: -> do
         Namespace.root(key, object: @model, field_class: self.class::Field)
       end
@@ -45,14 +47,20 @@ module Protoform
 
       def around_template(&block)
         form_tag do
-          authenticity_token_field
+          authenticity_token_field if @authenticity_token
+
           _method_field
           super
         end
       end
 
       def form_tag(&block)
-        form action:, method: form_method, **attrs, &block
+        form(
+          action: form_action,
+          method: form_method,
+          **attrs,
+          &block
+        )
       end
 
       def view_template(&block)
@@ -100,15 +108,17 @@ module Protoform
       end
 
       def resource_action
+        return :update if @method == :patch
+
         @model.persisted? ? :update : :create
       end
 
-      def action
-        @action ||= helpers.url_for(action: resource_action)
+      def form_action
+        @form_action ||= @action || helpers.url_for(action: resource_action)
       end
 
       def form_method
-        @method.to_s.downcase == "get" ? "get" : "post"
+        @method == :get ? :get : :post
       end
 
       private

data/lib/protoform/rails/option_mapper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_record"
+
 module Protoform
   module Rails
     # Accept a collection of objects and map them to options suitable for form

data/lib/protoform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Protoform
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/protoform.rb

@@ -7,7 +7,6 @@ module Protoform
   Loader = Zeitwerk::Loader.for_gem.tap do |loader|
     loader.ignore "#{__dir__}/generators"
     loader.inflector.inflect(
-      # rubocop:disable Style/StringHashKeys
       "dom" => "DOM"
       # rubocop:enable Style/StringHashKeys
     )

data/protos-protoform.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
 
   spec.summary = "Phlex based form builder for Rails"
   spec.description = "Build phlex based forms using Rails conventions"
-  spec.homepage = "https://github.com/nolantait/protos-protoform"
+  spec.homepage = "https://github.com/inhouse-work/protos-protoform"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -42,8 +42,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord", "~> 7.0"
+  spec.add_dependency "activesupport", "~> 7.0"
   spec.add_dependency "phlex-rails", "~> 1.0"
-  spec.add_dependency "protos", "~> 0.2"
+  spec.add_dependency "protos", "~> 0.6"
   spec.add_dependency "zeitwerk", "~> 2.6"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: protos-protoform
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Nolan Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -77,28 +105,33 @@ files:
 - lib/protoform/namespace.rb
 - lib/protoform/namespace_collection.rb
 - lib/protoform/node.rb
+- lib/protoform/rails/component.rb
 - lib/protoform/rails/components/button.rb
 - lib/protoform/rails/components/checkbox.rb
 - lib/protoform/rails/components/component.rb
+- lib/protoform/rails/components/date.rb
+- lib/protoform/rails/components/datetime.rb
 - lib/protoform/rails/components/field_component.rb
 - lib/protoform/rails/components/input.rb
 - lib/protoform/rails/components/label.rb
+- lib/protoform/rails/components/radio_button.rb
 - lib/protoform/rails/components/select.rb
 - lib/protoform/rails/components/textarea.rb
+- lib/protoform/rails/components/time.rb
 - lib/protoform/rails/form.rb
 - lib/protoform/rails/form/field.rb
 - lib/protoform/rails/option_mapper.rb
 - lib/protoform/rails/strong_parameters.rb
 - lib/protoform/version.rb
 - protos-protoform.gemspec
-homepage: https://github.com/nolantait/protos-protoform
+homepage: https://github.com/inhouse-work/protos-protoform
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/nolantait/protos-protoform
-  source_code_uri: https://github.com/nolantait/protos-protoform
-  changelog_uri: https://github.com/nolantait/protos-protoform
+  homepage_uri: https://github.com/inhouse-work/protos-protoform
+  source_code_uri: https://github.com/inhouse-work/protos-protoform
+  changelog_uri: https://github.com/inhouse-work/protos-protoform
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -108,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Phlex based form builder for Rails