protos-protoform 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc26745e32d0e8702d9fdb3606083afbe57843fa28ccd02672bf9e03e9d2e03
-  data.tar.gz: 44765738946f4fdd500bbb9e120ba9fa0d744206606bdac925a7abae9fa19ade
+  metadata.gz: b9c6a8ce3964ea0d3c2fc908717bbce4d4d8351c44406a771f2c3e3a43317cda
+  data.tar.gz: 6ae4693df543d43e4b1825e58f4a3c859cd9fab82e13e2110b8025a73c3328ab
 SHA512:
-  metadata.gz: a4268976b1a3658b4f2de87f45570c78d92867931a2712c855bd45022471fda6981e8c2c06ef146bab9b4d740a69984d71cd22c77c3723e59dc0b5f2fefeeb7b
-  data.tar.gz: f39dda31e9dd6527326b09e23111630f407d4c1adb53c2d21e113c668f5684691f78f142a9a43603d40abcd96f18a8b14c319a657aaccc9215de0e27d61b9bd6
+  metadata.gz: 1bb2157045f037a1deedd303f1da8d6a20eb446dc2168f1a13f89d238488770e98933196521790bce0e5bfa906ab7f334912281e037153ce207def8e20cf8068
+  data.tar.gz: 2f5cc878190c728c38b15be679cbef642c5587df7d4c1e5010239d667df2e98da0ae2f473ed91b9a4ff0f052d054505c10cc32cc6771c02089ae0fc4bff400f3

data/Gemfile

@@ -6,8 +6,8 @@ source "https://rubygems.org"
 gemspec
 
 gem "activemodel"
+gem "capybara"
 gem "debug"
-gem "phlex-testing-capybara"
 gem "rake"
 gem "rspec"
 gem "rubocop-inhouse"

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    protos-protoform (0.1.0)
-      activerecord (~> 8.0)
-      activesupport (~> 8.0)
-      phlex-rails (~> 1.0)
-      protos (~> 0.7)
-      zeitwerk (~> 2.7)
+    protos-protoform (1.0.0)
+      activerecord (~> 8)
+      activesupport (~> 8)
+      phlex-rails (~> 2)
+      protos (~> 1)
+      zeitwerk (~> 2)
 
 GEM
   remote: https://rubygems.org/
@@ -69,7 +69,7 @@ GEM
     debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     drb (2.2.1)
     dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
@@ -82,7 +82,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-types (1.8.1)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -97,9 +97,10 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.9.1)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.5)
+    json (2.10.1)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -107,45 +108,41 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
-    nokogiri (1.18.2)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.2-aarch64-linux-gnu)
+    nokogiri (1.18.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.2-arm-linux-gnu)
+    nokogiri (1.18.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.2-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    phlex (1.11.0)
-    phlex-rails (1.2.2)
-      phlex (>= 1.10, < 2)
+    phlex (2.0.2)
+    phlex-rails (2.0.2)
+      phlex (~> 2.0.2)
       railties (>= 6.1, < 9)
-    phlex-testing-capybara (0.1.0)
-      capybara (~> 3.38)
-      phlex (>= 0.5)
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    protos (0.7.0)
-      dry-core (~> 1.0)
-      dry-initializer (~> 3.1)
-      dry-types (~> 1.7)
-      phlex (~> 1.10)
-      tailwind_merge (~> 0.10)
+    protos (1.0.1)
+      dry-initializer (~> 3.2)
+      dry-types (~> 1.8)
+      phlex (~> 2)
+      tailwind_merge (~> 1)
     psych (5.2.3)
       date
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -170,7 +167,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.11.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)
@@ -179,7 +176,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -188,51 +185,56 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.71.0)
+    rubocop (1.73.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-inhouse (0.2.2)
-      rubocop (>= 1.5)
-      rubocop-capybara (>= 2.1)
-      rubocop-factory_bot (>= 2.2)
-      rubocop-performance (>= 1.1)
+    rubocop-inhouse (0.2.3)
+      rubocop (>= 1.72)
+      rubocop-capybara (>= 2.21)
+      rubocop-factory_bot (>= 2.26)
+      rubocop-performance (>= 1.24)
       rubocop-rails (>= 2.2)
-      rubocop-rake (>= 0.6)
-      rubocop-rspec (>= 2.2)
-      rubocop-rspec_rails (>= 2.2)
-    rubocop-performance (1.23.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.29.1)
+      rubocop-rake (>= 0.7)
+      rubocop-rspec (>= 3.5)
+      rubocop-rspec_rails (>= 2.30)
+    rubocop-performance (1.24.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.30.2)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.4.0)
-      rubocop (~> 1.61)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     sin_lru_redux (2.5.0)
-    stringio (3.1.2)
-    tailwind_merge (0.16.0)
+    stringio (3.1.5)
+    tailwind_merge (1.0.0)
       sin_lru_redux (~> 2.5)
     thor (1.3.2)
     timeout (0.4.3)
@@ -241,11 +243,11 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
+    uri (1.0.3)
     useragent (0.16.11)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   aarch64-linux
@@ -257,8 +259,8 @@ PLATFORMS
 
 DEPENDENCIES
   activemodel
+  capybara
   debug
-  phlex-testing-capybara
   protos-protoform!
   rake
   rspec

data/lib/generators/protoform/install/install_generator.rb

@@ -27,7 +27,7 @@ module Protoform
 
     def create_application_form
       template "application_form.rb",
-               Rails.root.join("app/views/forms/application_form.rb")
+        Rails.root.join("app/views/forms/application_form.rb")
     end
 
     private

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

@@ -20,7 +20,7 @@ class ApplicationForm < Protoform::Rails::Form
     end
   end
 
-  def around_template(&block)
+  def around_template(&)
     super do
       error_messages
       yield
@@ -34,7 +34,7 @@ class ApplicationForm < Protoform::Rails::Form
     div(style: "color: red;") do
       h2 do
         "#{pluralize model.errors.count,
-                     "error"} prohibited this post from being saved:"
+          "error"} prohibited this post from being saved:"
       end
       ul do
         model.errors.each do |error|

data/lib/protoform/field.rb

@@ -31,8 +31,8 @@ module Protoform
 
     # Wraps a field that's an array of values with a bunch of fields
     # that are indexed with the array's index.
-    def collection(&block)
-      @collection ||= FieldCollection.new(field: self, &block)
+    def collection(&)
+      @collection ||= FieldCollection.new(field: self, &)
     end
   end
 end

data/lib/protoform/namespace.rb

@@ -38,13 +38,13 @@ module Protoform
     #   end
     # end
     # ```
-    def namespace(key, &block)
+    def namespace(key, &)
       create_child(
         key:,
         child_class: self.class,
         field_class: @field_class,
         object: object_for(key:),
-        &block
+        &
       )
     end
 
@@ -84,12 +84,12 @@ module Protoform
     # ```
     # The object within the block is a `Namespace` object that maps each object
     # within the enumerable to another `Namespace` or `Field`.
-    def collection(key, &block)
+    def collection(key, &)
       create_child(
         key:,
         child_class: NamespaceCollection,
         field_class: @field_class,
-        &block
+        &
       )
     end
 
@@ -106,8 +106,8 @@ module Protoform
 
     # Iterates through the children of the current namespace, which could be
     # `Namespace` or `Field` objects.
-    def each(&block)
-      @children.values.each(&block)
+    def each(&)
+      @children.values.each(&)
     end
 
     # Assigns a hash to the current namespace and children namespace.
@@ -120,8 +120,8 @@ module Protoform
     end
 
     # Creates a root Namespace, which is essentially a form.
-    def self.root(*, **, &block)
-      new(*, parent: nil, **, &block)
+    def self.root(*, **, &)
+      new(*, parent: nil, **, &)
     end
 
     protected

data/lib/protoform/namespace_collection.rb

@@ -23,8 +23,8 @@ module Protoform
       end
     end
 
-    def each(&block)
-      @namespaces.each(&block)
+    def each(&)
+      @namespaces.each(&)
     end
 
     private

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

@@ -31,20 +31,28 @@ module Protoform
 
         def options(*collection)
           map_options(collection).each do |key, value|
-            option(selected: selected_value_for(key), value: key) { value }
+            option(selected: selected_value_for(key), value: key.to_s) { value }
           end
         end
 
-        def blank_option(&block)
-          option(selected: field.value.nil?, &block)
+        def blank_option(&)
+          option(selected: field.value.nil?, &)
         end
 
-        def true_option(&block)
-          option(selected: field.value == true, value: true.to_s, &block)
+        def true_option(&)
+          option(
+            selected: field.value == true,
+            value: true.to_s,
+            &
+          )
         end
 
-        def false_option(&block)
-          option(selected: field.value == false, value: false.to_s, &block)
+        def false_option(&)
+          option(
+            selected: field.value == false,
+            value: false.to_s,
+            &
+          )
         end
 
         protected

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

@@ -60,12 +60,12 @@ module Protoform
           Components::Textarea.new(self, ...)
         end
 
-        def select(*collection, **attributes, &block)
+        def select(*collection, **attributes, &)
           Components::Select.new(
             self,
             collection:,
             **attributes,
-            &block
+            &
           )
         end
 

data/lib/protoform/rails/form.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "phlex-rails"
+
 module Protoform
   module Rails
     # A Protos::Component class that accepts a model and sets
@@ -14,13 +16,15 @@ module Protoform
     # `authenticity_toklen_field` method and the HTTP verb via the
     # `_method_field`.
     class Form < Component
+      include Phlex::Rails::Helpers::URLFor
+      include Phlex::Rails::Helpers::FormAuthenticityToken
+
       param :model, reader: false
       option :authenticity_token, reader: false, default: -> { true }
-      option :helpers, reader: false, default: -> { }
       option :action, reader: false, default: -> { }
       option :method,
-             reader: false,
-             default: -> { }
+        reader: false,
+        default: -> { }
       option :namespace, reader: false, default: -> do
         Namespace.root(key, object: @model, field_class: self.class::Field)
       end
@@ -45,7 +49,7 @@ module Protoform
         @namespace.serialize(...)
       end
 
-      def around_template(&block)
+      def around_template(&)
         form_tag do
           authenticity_token_field if authenticity_token?
           _method_field if method_field?
@@ -54,26 +58,25 @@ module Protoform
         end
       end
 
-      def form_tag(&block)
+      def form_tag(&)
         form(
           action: form_action,
           method: form_method,
           **attrs,
-          &block
+          &
         )
       end
 
-      def view_template(&block)
-        yield_content(&block)
+      def view_template(&)
+        yield_content(&)
       end
 
       def submit(value = submit_value, **attributes)
         input(
-          **attributes.merge(
-            name: "commit",
-            type: "submit",
-            value:
-          )
+          **attributes,
+          name: "commit",
+          type: "submit",
+          value:
         )
       end
 
@@ -100,7 +103,7 @@ module Protoform
         input(
           name: "authenticity_token",
           type: "hidden",
-          value: helpers.form_authenticity_token
+          value: @authenticity_token || form_authenticity_token
         )
       end
 
@@ -127,18 +130,12 @@ module Protoform
       end
 
       def form_action
-        @form_action ||= @action || helpers.url_for(action: resource_action)
+        @form_action ||= @action || url_for(action: resource_action)
       end
 
       def form_method
         @method == :get ? :get : :post
       end
-
-      private
-
-      def helpers
-        @helpers ||= super
-      end
     end
   end
 end

data/lib/protoform/version.rb

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

data/protos-protoform.gemspec

@@ -42,10 +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", "~> 8.0"
-  spec.add_dependency "activesupport", "~> 8.0"
-  spec.add_dependency "phlex-rails", "~> 1.0"
-  spec.add_dependency "protos", "~> 0.7"
-  spec.add_dependency "zeitwerk", "~> 2.7"
+  spec.add_dependency "activerecord", "~> 8"
+  spec.add_dependency "activesupport", "~> 8"
+  spec.add_dependency "phlex-rails", "~> 2"
+  spec.add_dependency "protos", "~> 1"
+  spec.add_dependency "zeitwerk", "~> 2"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: protos-protoform
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nolan Tait
 bindir: exe
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -15,70 +15,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: protos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2'
 description: Build phlex based forms using Rails conventions
 email:
 - nolanjtait@gmail.com