phlexible 2.2.0 → 3.0.0

data/gemfiles/phlex_2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "combustion"
+gem "debug"
+gem "rake", "~> 13.0"
+gem "rubocop", "~> 1.55"
+gem "sus"
+gem "phlex", ">= 2.1.0", "< 3.0.0"
+gem "phlex-rails", ">= 2.1.0", "< 3.0.0"
+
+gemspec path: "../"

data/gemfiles/phlex_2.gemfile.lock

@@ -0,0 +1,254 @@
+PATH
+  remote: ..
+  specs:
+    phlexible (2.2.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-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-24
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  combustion
+  debug
+  phlex (>= 2.1.0, < 3.0.0)
+  phlex-rails (>= 2.1.0, < 3.0.0)
+  phlexible!
+  rake (~> 13.0)
+  rubocop (~> 1.55)
+  sus
+
+BUNDLED WITH
+   2.4.1

data/lib/phlexible/rails/a_element.rb

@@ -4,8 +4,14 @@ module Phlexible
   module Rails
     # Calls `url_for` for the `href` attribute.
     module AElement
+      extend ActiveSupport::Concern
+
+      included do
+        include Phlex::Rails::Helpers::URLFor
+      end
+
       def a(href:, **, &)
-        super(href: helpers.url_for(href), **, &)
+        super(href: url_for(href), **, &)
       end
     end
   end

data/lib/phlexible/rails/button_to.rb

@@ -15,119 +15,6 @@
 # - :params - Hash of parameters to be rendered as hidden fields within the form.
 module Phlexible
   module Rails
-    module ButtonToConcerns
-      BUTTON_TAG_METHOD_VERBS = %w[patch put delete].freeze
-      DEFAULT_OPTIONS = { method: 'post', form_class: 'button_to', params: {} }.freeze
-
-      def initialize(url, options = nil)
-        @url = url
-        @options = options
-      end
-
-      def view_template(&block) # rubocop:disable Metrics/AbcSize
-        action = helpers.url_for(@url)
-        @options = DEFAULT_OPTIONS.merge((@options || {}).symbolize_keys)
-
-        method = (@options.delete(:method).presence || method_for_options(@options)).to_s
-        form_method = method == 'get' ? 'get' : 'post'
-
-        form action: action, method: form_method, **form_attributes do
-          method_tag method
-          form_method == 'post' && token_input(action, method.empty? ? 'post' : method)
-          param_inputs
-
-          block_given? ? button(**button_attrs, &block) : button(**button_attrs) { @name }
-        end
-      end
-
-      private
-
-      def form_attributes
-        {
-          class: @options.delete(:form_class), # @deprecated
-          **(@options.delete(:form_attributes) || {})
-        }
-      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)
-        end
-      end
-
-      def token_input(action, method)
-        return unless helpers.protect_against_forgery?
-
-        name = helpers.request_forgery_protection_token.to_s
-        value = helpers.form_authenticity_token(form_options: { action: action, method: method })
-
-        input type: 'hidden', name: name, value: value, autocomplete: 'off'
-      end
-
-      def method_tag(method)
-        return unless BUTTON_TAG_METHOD_VERBS.include?(method)
-
-        input type: 'hidden', name: '_method', value: method.to_s, autocomplete: 'off'
-      end
-
-      def param_inputs
-        return unless (params = @options.delete(:params))
-
-        to_form_params(params).each do |param|
-          input type: 'hidden', name: param[:name], value: param[:value], autocomplete: 'off'
-        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))
-          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
-    end
-
     class ButtonTo < Phlex::HTML
       include ButtonToConcerns
     end

data/lib/phlexible/rails/button_to_concerns.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+# Generates a form containing a single button that submits to the URL created by the set of options.
+# Similar to Rails `button_to` helper.
+#
+# The form submits a POST request by default. You can specify a different HTTP verb via the :method
+# option.
+#
+# Additional arguments are passed through to the button element, with a few exceptions:
+# - :method - Symbol of HTTP verb. Supported verbs are :post, :get, :delete, :patch, and :put.
+#   Default is :post.
+# - :form_attributes - Hash of HTML attributes to be rendered on the form tag.
+# - :form_class - This controls the class of the form within which the submit button will be placed.
+#   Default is 'button_to'. @deprecated: use :form_attributes instead if you want to override this.
+# - :params - Hash of parameters to be rendered as hidden fields within the form.
+module Phlexible
+  module Rails
+    module ButtonToConcerns
+      extend ActiveSupport::Concern
+
+      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
+      end
+
+      BUTTON_TAG_METHOD_VERBS = %w[patch put delete].freeze
+      DEFAULT_OPTIONS = { method: 'post', form_class: 'button_to', params: {} }.freeze
+
+      def initialize(url, options = nil)
+        @url = url
+        @options = options
+      end
+
+      def view_template(&block)
+        action = url_for(@url)
+        @options = DEFAULT_OPTIONS.merge((@options || {}).symbolize_keys)
+
+        method = (@options.delete(:method).presence || method_for_options(@options)).to_s
+        form_method = method == 'get' ? 'get' : 'post'
+
+        form action: action, method: form_method, **form_attributes do
+          method_tag method
+          form_method == 'post' && token_input(action, method.empty? ? 'post' : method)
+          param_inputs
+
+          block_given? ? button(**button_attrs, &block) : button(**button_attrs) { @name }
+        end
+      end
+
+      private
+
+      def form_attributes
+        {
+          class: @options.delete(:form_class), # @deprecated
+          **(@options.delete(:form_attributes) || {})
+        }
+      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)
+        end
+      end
+
+      def token_input(action, method)
+        return unless protect_against_forgery?
+
+        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
+
+      def method_tag(method)
+        return unless BUTTON_TAG_METHOD_VERBS.include?(method)
+
+        input type: 'hidden', name: '_method', value: method.to_s, autocomplete: 'off'
+      end
+
+      def param_inputs
+        return unless (params = @options.delete(:params))
+
+        to_form_params(params).each do |param|
+          input type: 'hidden', name: param[:name], value: param[:value], autocomplete: 'off'
+        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))
+          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
+    end
+  end
+end

data/lib/phlexible/rails/controller_variables.rb

@@ -23,6 +23,8 @@
 module Phlexible
   module Rails
     module ControllerVariables
+      include ViewAssigns
+
       def self.included(klass)
         klass.class_attribute :__controller_variables__, instance_predicate: false, default: Set.new
         klass.extend ClassMethods
@@ -40,10 +42,10 @@ module Phlexible
 
       private
 
-      def define_controller_variables # rubocop:disable Metrics
+      def define_controller_variables
         return unless respond_to?(:__controller_variables__)
 
-        view_assigns = helpers.controller.view_assigns
+        view_assigns = view_assigns()
         view = @view
 
         vars = (view&.__controller_variables__ || Set.new) + __controller_variables__
@@ -62,7 +64,8 @@ module Phlexible
       end
 
       module ClassMethods
-        def controller_variable(*names, **kwargs) # rubocop:disable Metrics/*
+        # /*
+        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.'

data/lib/phlexible/rails/meta_tags_component.rb

@@ -3,8 +3,10 @@
 module Phlexible
   module Rails
     class MetaTagsComponent < Phlex::HTML
+      include ViewAssigns
+
       def view_template
-        helpers.controller.view_assigns['meta_tags']&.each do |name, content|
+        view_assigns['meta_tags']&.each do |name, content|
           meta name: name, content: content.is_a?(String) ? content : content.to_json
         end
       end

data/lib/phlexible/rails/view_assigns.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Phlexible
+  module Rails
+    module ViewAssigns
+      def view_assigns
+        if respond_to?(:view_context)
+          # Phlex 2
+          view_context.controller.view_assigns
+        else
+          # Phlex 1
+          helpers.controller.view_assigns
+        end
+      end
+    end
+  end
+end

data/lib/phlexible/version.rb

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

data/lib/phlexible.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require_relative 'phlexible/version'
-require 'phlex'
+require 'zeitwerk'
+require 'rails'
+require 'phlex-rails'
+
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module Phlexible
-  autoload :AliasView, 'phlexible/alias_view'
-  autoload :PageTitle, 'phlexible/page_title'
-  autoload :Callbacks, 'phlexible/callbacks'
-  autoload :Rails, 'phlexible/rails'
 end

data/phlexible.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'phlex', '>= 1.10.0', '< 2.0.0'
-  spec.add_dependency 'phlex-rails', '>= 1.2.1', '< 2.0.0'
+  spec.add_dependency 'phlex', '>= 1.10.0', '< 3.0.0'
+  spec.add_dependency 'phlex-rails', '>= 1.2.0', '< 3.0.0'
+  spec.add_dependency 'rails', '>= 7.2.0', '< 9.0.0'
+  spec.add_dependency 'zeitwerk', '~> 2.7.2'
 end