phlexible 3.0.0 → 3.1.1

data/lib/phlexible/rails/button_to_concerns.rb

@@ -20,6 +20,7 @@ module Phlexible
 
       included do
         include Phlex::Rails::Helpers::URLFor
+
         register_value_helper :protect_against_forgery?
         register_value_helper :request_forgery_protection_token
         register_value_helper :form_authenticity_token
@@ -51,90 +52,90 @@ module Phlexible
 
       private
 
-      def form_attributes
-        {
-          class: @options.delete(:form_class), # @deprecated
-          **(@options.delete(:form_attributes) || {})
-        }
-      end
+        def form_attributes
+          {
+            class: @options.delete(:form_class), # @deprecated
+            **(@options.delete(:form_attributes) || {})
+          }
+        end
 
-      def button_attrs
-        {
-          type: 'submit',
-          **@options
-        }
-      end
+        def button_attrs
+          {
+            type: 'submit',
+            **@options
+          }
+        end
 
-      def method_for_options(options)
-        if options.is_a?(Array)
-          method_for_options(options.last)
-        elsif options.respond_to?(:persisted?)
-          options.persisted? ? :patch : :post
-        elsif options.respond_to?(:to_model)
-          method_for_options(options.to_model)
+        def method_for_options(options)
+          if options.is_a?(Array)
+            method_for_options(options.last)
+          elsif options.respond_to?(:persisted?)
+            options.persisted? ? :patch : :post
+          elsif options.respond_to?(:to_model)
+            method_for_options(options.to_model)
+          end
         end
-      end
 
-      def token_input(action, method)
-        return unless protect_against_forgery?
+        def token_input(action, method)
+          return if !protect_against_forgery?
 
-        name = request_forgery_protection_token.to_s
-        value = form_authenticity_token(form_options: { action: action, method: method })
+          name = request_forgery_protection_token.to_s
+          value = form_authenticity_token(form_options: { action: action, method: method })
 
-        input type: 'hidden', name: name, value: value, autocomplete: 'off'
-      end
+          input type: 'hidden', name: name, value: value, autocomplete: 'off'
+        end
 
-      def method_tag(method)
-        return unless BUTTON_TAG_METHOD_VERBS.include?(method)
+        def method_tag(method)
+          return if BUTTON_TAG_METHOD_VERBS.exclude?(method)
 
-        input type: 'hidden', name: '_method', value: method.to_s, autocomplete: 'off'
-      end
+          input type: 'hidden', name: '_method', value: method.to_s, autocomplete: 'off'
+        end
 
-      def param_inputs
-        return unless (params = @options.delete(:params))
+        def param_inputs
+          return if !(params = @options.delete(:params))
 
-        to_form_params(params).each do |param|
-          input type: 'hidden', name: param[:name], value: param[:value], autocomplete: 'off'
+          to_form_params(params).each do |param|
+            input type: 'hidden', name: param[:name], value: param[:value], autocomplete: 'off'
+          end
         end
-      end
 
-      # Returns an array of hashes each containing :name and :value keys suitable for use as the
-      # names and values of form input fields:
-      #
-      #   to_form_params(name: 'David', nationality: 'Danish')
-      #   # => [{name: 'name', value: 'David'}, {name: 'nationality', value: 'Danish'}]
-      #
-      #   to_form_params(country: { name: 'Denmark' })
-      #   # => [{name: 'country[name]', value: 'Denmark'}]
-      #
-      #   to_form_params(countries: ['Denmark', 'Sweden']})
-      #   # => [{name: 'countries[]', value: 'Denmark'}, {name: 'countries[]', value: 'Sweden'}]
-      #
-      # An optional namespace can be passed to enclose key names:
-      #
-      #   to_form_params({ name: 'Denmark' }, 'country')
-      #   # => [{name: 'country[name]', value: 'Denmark'}]
-      def to_form_params(attribute, namespace = nil)
-        attribute = attribute.to_h if attribute.respond_to?(:permitted?)
-
-        params = []
-        case attribute
-        when Hash
-          attribute.each do |key, value|
-            prefix = namespace ? "#{namespace}[#{key}]" : key
-            params.push(*to_form_params(value, prefix))
+        # Returns an array of hashes each containing :name and :value keys suitable for use as the
+        # names and values of form input fields:
+        #
+        #   to_form_params(name: 'David', nationality: 'Danish')
+        #   # => [{name: 'name', value: 'David'}, {name: 'nationality', value: 'Danish'}]
+        #
+        #   to_form_params(country: { name: 'Denmark' })
+        #   # => [{name: 'country[name]', value: 'Denmark'}]
+        #
+        #   to_form_params(countries: ['Denmark', 'Sweden']})
+        #   # => [{name: 'countries[]', value: 'Denmark'}, {name: 'countries[]', value: 'Sweden'}]
+        #
+        # An optional namespace can be passed to enclose key names:
+        #
+        #   to_form_params({ name: 'Denmark' }, 'country')
+        #   # => [{name: 'country[name]', value: 'Denmark'}]
+        def to_form_params(attribute, namespace = nil)
+          attribute = attribute.to_h if attribute.respond_to?(:permitted?)
+
+          params = []
+          case attribute
+          when Hash
+            attribute.each do |key, value|
+              prefix = namespace ? "#{namespace}[#{key}]" : key
+              params.push(*to_form_params(value, prefix))
+            end
+          when Array
+            array_prefix = "#{namespace}[]"
+            attribute.each do |value|
+              params.push(*to_form_params(value, array_prefix))
+            end
+          else
+            params << { name: namespace.to_s, value: attribute.to_param }
           end
-        when Array
-          array_prefix = "#{namespace}[]"
-          attribute.each do |value|
-            params.push(*to_form_params(value, array_prefix))
-          end
-        else
-          params << { name: namespace.to_s, value: attribute.to_param }
-        end
 
-        params.sort_by { |pair| pair[:name] }
-      end
+          params.sort_by { |pair| pair[:name] }
+        end
     end
   end
 end

data/lib/phlexible/rails/controller_variables.rb

@@ -42,68 +42,71 @@ module Phlexible
 
       private
 
-      def define_controller_variables
-        return unless respond_to?(:__controller_variables__)
-
-        view_assigns = view_assigns()
-        view = @view
-
-        vars = (view&.__controller_variables__ || Set.new) + __controller_variables__
-        vars.each do |k, v|
-          allow_undefined = true
-          if k.ends_with?('!')
-            allow_undefined = false
-            k = k.chop
-          end
+        def define_controller_variables
+          return if !respond_to?(:__controller_variables__)
+
+          view_assigns = view_assigns()
+          view = @view
+
+          vars = (view&.__controller_variables__ || Set.new) + __controller_variables__
+          vars.each do |k, v|
+            allow_undefined = true
+            if k.ends_with?('!')
+              allow_undefined = false
+              k = k.chop
+            end
 
-          raise ControllerVariables::UndefinedVariable, k if !allow_undefined && !view_assigns.key?(k)
+            if !allow_undefined && !view_assigns.key?(k)
+              raise ControllerVariables::UndefinedVariable,
+                    k
+            end
 
-          instance_variable_set(:"@#{v}", view_assigns[k])
-          view&.instance_variable_set(:"@#{v}", view_assigns[k])
+            instance_variable_set(:"@#{v}", view_assigns[k])
+            view&.instance_variable_set(:"@#{v}", view_assigns[k])
+          end
         end
-      end
 
-      module ClassMethods
-        # /*
-        def controller_variable(*names, **kwargs)
-          if names.empty? && kwargs.empty?
-            raise ArgumentError, 'You must provide at least one variable name and/or a hash of ' \
-                                 'variable names and options.'
-          end
+        module ClassMethods
+          # /*
+          def controller_variable(*names, **kwargs)
+            if names.empty? && kwargs.empty?
+              raise ArgumentError, 'You must provide at least one variable name and/or a hash of ' \
+                                   'variable names and options.'
+            end
 
-          allow_undefined = kwargs.delete(:allow_undefined)
-          as = kwargs.delete(:as)
+            allow_undefined = kwargs.delete(:allow_undefined)
+            as = kwargs.delete(:as)
 
-          if names.count > 1 && as
-            raise ArgumentError, 'You cannot provide the `as:` option when passing multiple ' \
-                                 'variable names.'
-          end
-
-          names.each do |name|
-            name_as = as || name
-            name = "#{name}!" unless allow_undefined
+            if names.many? && as
+              raise ArgumentError, 'You cannot provide the `as:` option when passing multiple ' \
+                                   'variable names.'
+            end
 
-            self.__controller_variables__ += { name.to_s => name_as.to_s }
-          end
+            names.each do |name|
+              name_as = as || name
+              name = "#{name}!" if !allow_undefined
 
-          kwargs.each do |k, v|
-            if v.is_a?(Hash)
-              name = v.key?(:as) ? v[:as].to_s : k.to_s
+              self.__controller_variables__ += { name.to_s => name_as.to_s }
+            end
 
-              if v.key?(:allow_undefined)
-                k = "#{k}!" unless v[:allow_undefined]
-              elsif !allow_undefined
-                k = "#{k}!"
+            kwargs.each do |k, v|
+              if v.is_a?(Hash)
+                name = v.key?(:as) ? v[:as].to_s : k.to_s
+
+                if v.key?(:allow_undefined)
+                  k = "#{k}!" if !v[:allow_undefined]
+                elsif !allow_undefined
+                  k = "#{k}!"
+                end
+              else
+                name = v.to_s
+                k = "#{k}!" if !allow_undefined
               end
-            else
-              name = v.to_s
-              k = "#{k}!" unless allow_undefined
-            end
 
-            self.__controller_variables__ += { k.to_s => name }
+              self.__controller_variables__ += { k.to_s => name }
+            end
           end
         end
-      end
     end
   end
 end

data/lib/phlexible/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlexible
-  VERSION = '3.0.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: phlexible
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Joel Moss
-autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -96,33 +95,23 @@ files:
 - ".ruby-version"
 - Appraisals
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- config/render_helper.rb
-- config/sus.rb
-- fixtures/dummy/app/controllers/articles_controller.rb
-- fixtures/dummy/app/views/articles/index.html.erb
-- fixtures/dummy/app/views/articles/link.rb
-- fixtures/dummy/app/views/articles/show.rb
-- fixtures/dummy/config/database.yml
-- fixtures/dummy/config/routes.rb
-- fixtures/dummy/config/storage.yml
-- fixtures/dummy/db/schema.rb
-- fixtures/dummy/log/.gitignore
-- fixtures/dummy/public/favicon.ico
-- fixtures/rails_helper.rb
 - gemfiles/.bundle/config
-- gemfiles/phlex_1.gemfile
-- gemfiles/phlex_1.gemfile.lock
-- gemfiles/phlex_2.gemfile
-- gemfiles/phlex_2.gemfile.lock
+- gemfiles/phlex1_rails7.gemfile
+- gemfiles/phlex1_rails7.gemfile.lock
+- gemfiles/phlex1_rails8.gemfile
+- gemfiles/phlex1_rails8.gemfile.lock
+- gemfiles/phlex2_rails7.gemfile
+- gemfiles/phlex2_rails7.gemfile.lock
+- gemfiles/phlex2_rails8.gemfile
+- gemfiles/phlex2_rails8.gemfile.lock
 - lib/phlexible.rb
 - lib/phlexible/alias_view.rb
 - lib/phlexible/callbacks.rb
 - lib/phlexible/page_title.rb
+- lib/phlexible/process_attributes.rb
 - lib/phlexible/rails/a_element.rb
 - lib/phlexible/rails/action_controller/implicit_render.rb
 - lib/phlexible/rails/action_controller/meta_tags.rb
@@ -133,7 +122,6 @@ files:
 - lib/phlexible/rails/responder.rb
 - lib/phlexible/rails/view_assigns.rb
 - lib/phlexible/version.rb
-- phlexible.gemspec
 homepage: https://github.com/joelmoss/phlexible
 licenses:
 - MIT
@@ -142,7 +130,6 @@ metadata:
   source_code_uri: https://github.com/joelmoss/phlexible
   changelog_uri: https://github.com/joelmoss/phlexible/releases
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.4
 specification_version: 4
 summary: A bunch of helpers and goodies intended to make life with Phlex even easier!
 test_files: []

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in phlexible.gemspec
-gemspec
-
-gem 'appraisal'
-gem 'combustion'
-gem 'debug'
-gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.55'
-gem 'sus'

data/Gemfile.lock

@@ -1,257 +0,0 @@
-PATH
-  remote: .
-  specs:
-    phlexible (3.0.0)
-      phlex (>= 1.10.0, < 3.0.0)
-      phlex-rails (>= 1.2.0, < 3.0.0)
-      rails (>= 7.2.0, < 9.0.0)
-      zeitwerk (~> 2.7.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
-      mail (>= 2.8.0)
-    actionmailer (8.0.2)
-      actionpack (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activesupport (= 8.0.2)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (8.0.2)
-      actionview (= 8.0.2)
-      activesupport (= 8.0.2)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.0.2)
-      actionpack (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
-      globalid (>= 0.3.6)
-    activemodel (8.0.2)
-      activesupport (= 8.0.2)
-    activerecord (8.0.2)
-      activemodel (= 8.0.2)
-      activesupport (= 8.0.2)
-      timeout (>= 0.4.0)
-    activestorage (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activesupport (= 8.0.2)
-      marcel (~> 1.0)
-    activesupport (8.0.2)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    ast (2.4.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    builder (3.3.0)
-    combustion (1.5.0)
-      activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-      thor (>= 0.14.6)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.1)
-    crass (1.0.6)
-    date (3.4.1)
-    debug (1.10.0)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
-    drb (2.2.1)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
-    lint_roller (1.1.0)
-    logger (1.7.0)
-    loofah (2.24.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.7)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.18.8-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
-      racc (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.8.0)
-      ast (~> 2.4.1)
-      racc
-    phlex (2.2.1)
-      zeitwerk (~> 2.7)
-    phlex-rails (2.2.0)
-      phlex (~> 2.2.1)
-      railties (>= 7.1, < 9)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.4.0)
-    psych (5.2.3)
-      date
-      stringio
-    racc (1.8.1)
-    rack (3.1.13)
-    rack-session (2.1.0)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails (8.0.2)
-      actioncable (= 8.0.2)
-      actionmailbox (= 8.0.2)
-      actionmailer (= 8.0.2)
-      actionpack (= 8.0.2)
-      actiontext (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activemodel (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
-      bundler (>= 1.15.0)
-      railties (= 8.0.2)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
-      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.13.1)
-      psych (>= 4.0.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
-      io-console (~> 0.5)
-    rubocop (1.75.3)
-      json (~> 2.3)
-      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.44.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
-    stringio (3.1.7)
-    sus (0.32.0)
-    thor (1.3.2)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
-    useragent (0.16.11)
-    websocket-driver (0.7.7)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.7.2)
-
-PLATFORMS
-  arm64-darwin-22
-  arm64-darwin-23
-  arm64-darwin-24
-  x86_64-darwin-19
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  combustion
-  debug
-  phlexible!
-  rake (~> 13.0)
-  rubocop (~> 1.55)
-  sus
-
-BUNDLED WITH
-   2.4.1

data/config/render_helper.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module RenderHelper
-  def render_to_html(component)
-    view_context.render(component)
-  end
-
-  def render_to_nokogiri_fragment(...)
-    html = render_to_html(...)
-    Nokogiri::HTML5.fragment(html)
-  end
-
-  def render_to_nokogiri_document(...)
-    html = render_to_html(...)
-    Nokogiri::HTML5(html)
-  end
-
-  private
-
-  def view_context
-    controller.view_context
-  end
-
-  def controller
-    @controller ||= ActionView::TestCase::TestController.new
-  end
-end

data/config/sus.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'phlexible'
-require 'bundler'
-
-Bundler.require :test
-
-require_relative 'render_helper'