protos-protoform 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57b1b4645f529c7f8b132e92b0776a839448cd20eb3c689fbcf3689f2f7cfda
-  data.tar.gz: da70f9680fed7bb2815deaa61ffb049ab9edfac706bb9e8b9e60f2ac8e5904a4
+  metadata.gz: fc22975fd2a29b54b0e5f1f5a92ef569fc78a3ab35f3a5672b8705703357c8e1
+  data.tar.gz: d249529bf058a94369abb9aebd56b4d5b0a68faab4c00831c57a6aa9373fc9c5
 SHA512:
-  metadata.gz: 7dbee5d770d7efed179c43eb39892f8bf4fc8d7935b65160ab84876688a64bb3612a2226ffb421094c32412e895af9fbfcebe44872b54680b2cd7951f9d82c4d
-  data.tar.gz: 8bd336c38077d8c15855329c01c63a9897320b62117e06a4f747b7f2f3e9c9849b4bf37a0bd4bce8d854e9994fd6c0fa19ba0551e2275ee8511ac57d4dab1bfa
+  metadata.gz: d45f5a2705117c6b87a225ec72c8f72605b8573907f9cd71e232a968ec5b2f0f4014d0250ae19ab1b78a83a82cddbdd9608e6d258028159d8e40eaed955eb17e
+  data.tar.gz: 2dffae4a6e8875b96075542e0d5a5218f0639933f8cc2d10f4b9a502c5a7ec6066d0153e39bbef9ddc08b54e13c9e356a7c84aafa58752422b35bc31488b6806

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.2.0] - 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.1.0] - 2023-06-23
 
 - Initial release

data/Gemfile.lock

@@ -3,46 +3,48 @@ PATH
   specs:
     protos-protoform (0.0.1)
       phlex-rails (~> 1.0)
-      protos (~> 0.2)
+      protos (~> 0.4)
       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.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
       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.0)
+      activesupport (= 7.2.0)
       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.0)
+      activesupport (= 7.2.0)
+    activesupport (7.2.0)
       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 +54,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 +65,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 +78,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.0)
     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.0)
+    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.2)
+    parser (3.3.4.2)
       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.4.3)
       dry-core (~> 1.0)
       dry-initializer (~> 3.1)
       dry-types (~> 1.7)
@@ -124,9 +127,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 +144,92 @@ 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.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      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)
+    rexml (3.3.5)
+      strscan
     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-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       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.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.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-ast (1.32.0)
+      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.1.9)
       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.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.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)
+    strscan (3.1.0)
+    tailwind_merge (0.12.0)
       lru_redux (~> 1.1)
     thor (1.3.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.17)
 
 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/rails/component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Protoform
+  module Rails
+    Component = ::ApplicationComponent
+  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

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

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 :authenticity_token, reader: false, default: -> { true }
       option :helpers, reader: false, default: -> {}
       option :action, reader: false, default: -> {}
-      option :method, 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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Protoform
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 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,7 +10,7 @@ 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"
 
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "phlex-rails", "~> 1.0"
-  spec.add_dependency "protos", "~> 0.2"
+  spec.add_dependency "protos", "~> 0.4"
   spec.add_dependency "zeitwerk", "~> 2.6"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protos-protoform
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nolan Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex-rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ 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
@@ -91,14 +92,14 @@ files:
 - 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: []
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Phlex based form builder for Rails