protos-protoform 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc22975fd2a29b54b0e5f1f5a92ef569fc78a3ab35f3a5672b8705703357c8e1
-  data.tar.gz: d249529bf058a94369abb9aebd56b4d5b0a68faab4c00831c57a6aa9373fc9c5
+  metadata.gz: d87996776d7c98ac20d0f3f043bda6364cfe22be19ed00820e5c48df504837a5
+  data.tar.gz: 506204d5092faccefb7eaab6506e437f43faa8b741322e84533589e8f5cd7334
 SHA512:
-  metadata.gz: d45f5a2705117c6b87a225ec72c8f72605b8573907f9cd71e232a968ec5b2f0f4014d0250ae19ab1b78a83a82cddbdd9608e6d258028159d8e40eaed955eb17e
-  data.tar.gz: 2dffae4a6e8875b96075542e0d5a5218f0639933f8cc2d10f4b9a502c5a7ec6066d0153e39bbef9ddc08b54e13c9e356a7c84aafa58752422b35bc31488b6806
+  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,6 +1,15 @@
 ## [Unreleased]
 
-## [0.2.0] - 2024-08-14
+## [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
@@ -8,6 +17,6 @@
 - Transfers ownership of repo from `nolantait` to `inhouse-work` organization to
   match other `protos-` gems
 
-## [0.1.0] - 2023-06-23
+## [0.0.1] - 2023-06-23
 
 - Initial release

data/Gemfile.lock

@@ -1,17 +1,19 @@
 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.4)
+      protos (~> 0.6)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.0)
-      actionview (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -20,15 +22,19 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.0)
-      activesupport (= 7.2.0)
+    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.2.0)
-      activesupport (= 7.2.0)
-    activesupport (7.2.0)
+    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.3.1)
@@ -87,14 +93,14 @@ GEM
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    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.25.0)
+    minitest (5.25.1)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.16.7-arm-linux)
@@ -107,8 +113,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.26.2)
-    parser (3.3.4.2)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     phlex (1.11.0)
@@ -119,7 +125,7 @@ GEM
     phlex-testing-capybara (0.1.0)
       capybara (~> 3.38)
       phlex (>= 0.5)
-    protos (0.4.3)
+    protos (0.6.0)
       dry-core (~> 1.0)
       dry-initializer (~> 3.1)
       dry-types (~> 1.7)
@@ -144,9 +150,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -159,39 +165,36 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    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-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 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.65.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 (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
+    rubocop-ast (1.32.2)
       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.1.9)
+    rubocop-inhouse (0.2.0)
       rubocop (>= 1.5)
       rubocop-capybara (>= 2.1)
       rubocop-factory_bot (>= 2.2)
@@ -203,10 +206,10 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.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)
@@ -218,10 +221,10 @@ GEM
     ruby-progressbar (1.13.0)
     securerandom (0.3.1)
     stringio (3.1.1)
-    strscan (3.1.0)
-    tailwind_merge (0.12.0)
+    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)
@@ -229,7 +232,7 @@ GEM
     webrick (1.8.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux

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

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

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

@@ -38,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

@@ -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

@@ -16,11 +16,11 @@ module Protoform
     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 :helpers, reader: false, default: -> { }
+      option :action, reader: false, default: -> { }
       option :method,
              reader: false,
-             default: -> {}
+             default: -> { }
       option :namespace, reader: false, default: -> do
         Namespace.root(key, object: @model, field_class: self.class::Field)
       end

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.2"
+  VERSION = "0.1.0"
 end

data/protos-protoform.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Build phlex based forms using Rails conventions"
   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.4"
+  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.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Nolan Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-15 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.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -81,11 +109,15 @@ files:
 - 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
@@ -109,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.17
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Phlex based form builder for Rails