phlexible 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3f2d54135dc708dc50f837b8dc9011c56e180aab472d58f47b8381289ea166
-  data.tar.gz: 7d01c32e4597aaa907b3bbae4482b54e14166562f239430679a8073a405f0ecd
+  metadata.gz: 67a5772f23aaab09628e1f250674e02196ed67245779f66d542a322f8fae0ccc
+  data.tar.gz: a861b4de7b33edfbbc2c16f688ab2de1cc5806c3d2715c77e67f4bc91144e23a
 SHA512:
-  metadata.gz: 165a9a1d766643dc7957d5c52a5eb91d6d97e48d634effc8f2a3e877536dfb6f95ebd8948c47924d4a637bda6c81618975c5831e252098661ad5478184973c65
-  data.tar.gz: ba5c5b1f6b433b0e93af5e35b954706f9cb93f43cfee5280776b7475b56048142d14507cc50f4cf2ca39c86d024000c246ac5f3d8a94b6e9a24ff1dffaabb5b1
+  metadata.gz: 56bceb89cf1707f6159487538e69447abbf0e069aaf62c0acc7eff9e87e7254d24ef7e3223f51ea5d393bbf706306845e9a06c3ab70ed5b94c54012b65f94d1f
+  data.tar.gz: 7a34ba21a321dc20b86e71d1973e13e76dc2ac6d01d6fd79705a7e86841715ce55bb49c28c5469a1c1ffd72d23bb6c366a94b6847bfc188e5c2fb697bfb8a85e

data/Gemfile.lock

@@ -1,150 +1,154 @@
 PATH
   remote: .
   specs:
-    phlexible (1.0.0)
-      phlex (>= 1.8.1)
-      phlex-rails (>= 1.0.0)
+    phlexible (2.0.1)
+      phlex (>= 1.10.0, < 2.0.0)
+      phlex-rails (>= 1.2.1, < 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+      useragent (~> 0.16)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       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)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    builder (3.2.4)
-    cgi (0.4.1)
-    combustion (1.4.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.2.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    drb (2.2.0)
-      ruby2_keywords
-    erb (4.0.4)
-      cgi (>= 0.3.3)
-    erubi (1.12.0)
-    i18n (1.14.1)
+    date (3.4.1)
+    drb (2.2.1)
+    erubi (1.13.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.11.2)
-      rdoc
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
+    json (2.9.1)
+    language_server-protocol (3.17.0.4)
+    logger (1.6.5)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
-    nokogiri (1.16.2-arm64-darwin)
+    minitest (5.25.4)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    phlex (1.9.0)
-      concurrent-ruby (~> 1.2)
-      erb (>= 4)
-      zeitwerk (~> 2.6)
-    phlex-rails (1.1.1)
-      phlex (~> 1.9)
-      railties (>= 6.1, < 8)
-      zeitwerk (~> 2.6)
+    phlex (1.11.0)
+    phlex-rails (1.2.2)
+      phlex (>= 1.10, < 2)
+      railties (>= 6.1, < 9)
     phlex-testing-nokogiri (0.1.0)
       nokogiri (~> 1.13)
       phlex (>= 0.5)
-    psych (5.1.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
+      date
       stringio
-    racc (1.7.3)
-    rack (3.0.9)
-    rack-session (2.0.0)
+    racc (1.8.1)
+    rack (3.1.9)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
-      irb
+      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.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
+      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.1.0)
-    rdoc (6.6.2)
+    rake (13.2.1)
+    rdoc (6.11.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.4.2)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.2.6)
-    rubocop (1.60.2)
+    rubocop (1.71.2)
       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)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    stringio (3.1.0)
-    sus (0.24.6)
-    thor (1.3.0)
+    securerandom (0.4.1)
+    stringio (3.1.2)
+    sus (0.32.0)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.13)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+    useragent (0.16.11)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
   x86_64-darwin-19
   x86_64-linux
 

data/README.md

@@ -50,7 +50,7 @@ class Views::Users::Index < Views::Base
 
   controller_variable :first_name, :last_name
 
-  def template
+  def view_template
     h1 { "#{@first_name} #{@last_name}" }
   end
 end
@@ -73,7 +73,7 @@ class Views::Users::Index < Views::Base
 
   controller_variable last_name: :surname, first_name: { as: :given_name, allow_undefined: true }
 
-  def template
+  def view_template
     h1 { "#{@given_name} #{@surname}" }
   end
 end
@@ -128,7 +128,7 @@ end
 class MyView < Phlex::HTML
   include Phlexible::Rails::AElement
 
-  def template
+  def view_template
     a(href: :articles) { 'View articles' }
   end
 end
@@ -165,7 +165,6 @@ Phlexible::Rails::ButtonTo.new(:root, method: :patch) { 'My Button' }
 
 > Available in **>= 1.0.0**
 
-
 A super simple way to define and render meta tags in your Phlex views. Just render the
 `Phlexible::Rails::MetaTagsComponent` component in the head element of your page, and define the
 meta tags using the `meta_tag` method in your controllers.
@@ -179,7 +178,7 @@ end
 
 ```ruby
 class MyView < Phlex::HTML
-  def template
+  def view_template
     html do
       head do
         render Phlexible::Rails::MetaTagsComponent
@@ -200,7 +199,7 @@ So instead of:
 
 ```ruby
 class MyView < Phlex::HTML
-  def template
+  def view_template
     div do
       render My::Awesome::Component.new
     end
@@ -216,7 +215,7 @@ class MyView < Phlex::HTML
 
   alias_view :awesome, -> { My::Awesome::Component }
 
-  def template
+  def view_template
     div do
       awesome
     end

data/fixtures/dummy/app/views/articles/link.rb

@@ -3,7 +3,7 @@
 class Views::Articles::Link < Phlex::HTML
   include Phlexible::Rails::AElement
 
-  def template
+  def view_template
     a(href: :root, class: :foo) { 'A link to root' }
   end
 end

data/fixtures/dummy/app/views/articles/show.rb

@@ -3,5 +3,5 @@
 class Views::Articles::Show < Phlex::HTML
   include Phlexible::Rails::ControllerVariables
 
-  def template; end
+  def view_template; end
 end

data/lib/phlexible/alias_view.rb

@@ -7,7 +7,7 @@ module Phlexible
   # So instead of:
   #
   #   class MyView < Phlex::HTML
-  #     def template
+  #     def view_template
   #       div do
   #         render My::Awesome::Component.new
   #       end
@@ -21,7 +21,7 @@ module Phlexible
   #
   #     alias_view :awesome, -> { My::Awesome::Component }
   #
-  #     def template
+  #     def view_template
   #       div do
   #         awesome
   #       end

data/lib/phlexible/rails/button_to.rb

@@ -24,7 +24,7 @@ module Phlexible
         @options = options
       end
 
-      def template(&block) # rubocop:disable Metrics/AbcSize
+      def view_template(&block) # rubocop:disable Metrics/AbcSize
         action = helpers.url_for(@url)
         @options = DEFAULT_OPTIONS.merge((@options || {}).symbolize_keys)
 

data/lib/phlexible/rails/controller_variables.rb

@@ -9,7 +9,7 @@
 #   class Views::Users::Index < Views::Base
 #     controller_variable :user_name
 #
-#     def template
+#     def view_template
 #       h1 { @user_name }
 #     end
 #   end
@@ -31,16 +31,18 @@ module Phlexible
       class UndefinedVariable < NameError
         def initialize(name)
           @variable_name = name
-          super "Attempted to expose controller variable `#{@variable_name}`, but instance " \
-                'variable is not defined in the controller.'
+          super("Attempted to expose controller variable `#{@variable_name}`, but instance " \
+                'variable is not defined in the controller.')
         end
       end
 
-      def before_template
+      def before_template # rubocop:disable Metrics
         if respond_to?(:__controller_variables__)
           view_assigns = helpers.controller.view_assigns
+          view = @view
 
-          __controller_variables__.each do |k, v|
+          vars = (view&.__controller_variables__ || Set.new) + __controller_variables__
+          vars.each do |k, v|
             allow_undefined = true
             if k.ends_with?('!')
               allow_undefined = false
@@ -50,6 +52,7 @@ module Phlexible
             raise ControllerVariables::UndefinedVariable, k if !allow_undefined && !view_assigns.key?(k)
 
             instance_variable_set(:"@#{v}", view_assigns[k])
+            view&.instance_variable_set(:"@#{v}", view_assigns[k])
           end
         end
 

data/lib/phlexible/rails/meta_tags_component.rb

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

data/lib/phlexible/version.rb

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

data/phlexible.gemspec

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'lib/phlexible/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'phlexible'
+  spec.version = Phlexible::VERSION
+  spec.authors = ['Joel Moss']
+  spec.email = ['joel@developwithstyle.com']
+
+  spec.summary = 'A bunch of helpers and goodies intended to make life with Phlex even easier!'
+  spec.description = 'A bunch of helpers and goodies intended to make life with Phlex even easier!'
+  spec.homepage = 'https://github.com/joelmoss/phlexible'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 3.0.0'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/joelmoss/phlexible'
+  spec.metadata['changelog_uri'] = 'https://github.com/joelmoss/phlexible/releases'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = 'exe'
+  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'
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: phlexible
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Joel Moss
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,28 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: A bunch of helpers and goodies intended to make life with Phlex even
   easier!
 email:
@@ -78,6 +89,7 @@ files:
 - lib/phlexible/rails/meta_tags_component.rb
 - lib/phlexible/rails/responder.rb
 - lib/phlexible/version.rb
+- phlexible.gemspec
 homepage: https://github.com/joelmoss/phlexible
 licenses:
 - MIT
@@ -86,7 +98,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
@@ -101,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A bunch of helpers and goodies intended to make life with Phlex even easier!
 test_files: []