phlexible 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a5772f23aaab09628e1f250674e02196ed67245779f66d542a322f8fae0ccc
-  data.tar.gz: a861b4de7b33edfbbc2c16f688ab2de1cc5806c3d2715c77e67f4bc91144e23a
+  metadata.gz: 70c94bf6c1a9eb6c37f22444fb384f9083ade53cee6939d1d651dc5ac3d9d43e
+  data.tar.gz: 48740ed58950fe01c78f8fdc5cb8953839e416f8d4b0d50337fc8b063cc9fc77
 SHA512:
-  metadata.gz: 56bceb89cf1707f6159487538e69447abbf0e069aaf62c0acc7eff9e87e7254d24ef7e3223f51ea5d393bbf706306845e9a06c3ab70ed5b94c54012b65f94d1f
-  data.tar.gz: 7a34ba21a321dc20b86e71d1973e13e76dc2ac6d01d6fd79705a7e86841715ce55bb49c28c5469a1c1ffd72d23bb6c366a94b6847bfc188e5c2fb697bfb8a85e
+  metadata.gz: 8c31e7fd6181675ca02be9d25939adc858777224844c9cfaa0c767551ffad050cb1078d9f537a25887a3226b7b693901a62ec06faabf604a7c8d698ee5217e37
+  data.tar.gz: 1de0fab43ab9d7ec708b5b6388d1071cf1a9002a7d29967095f7e4fffa89d7cc07e6f47c9ebb24384c6baeed6bc9cbcb1393b07a28417232c334e54508e55364

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 3.3.0
   SuggestExtensions: false
   NewCops: enable
 

data/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'combustion'
+gem 'debug'
 gem 'phlex-testing-nokogiri'
 gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.55'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phlexible (2.0.1)
+    phlexible (2.2.0)
       phlex (>= 1.10.0, < 2.0.0)
       phlex-rails (>= 1.2.1, < 2.0.0)
 
@@ -50,6 +50,9 @@ GEM
     connection_pool (2.5.0)
     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)
     i18n (1.14.7)
@@ -148,12 +151,14 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   arm64-darwin-24
   x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
   combustion
+  debug
   phlex-testing-nokogiri
   phlexible!
   rake (~> 13.0)

data/README.md

@@ -36,6 +36,32 @@ class UsersController
 end
 ```
 
+#### `Callbacks`
+
+While Phlex does have `before_template`, `after_template`, and `around_template` hooks, they must be defined as regular Ruby methods, meaning you have to always remember to call `super` when redefining any hook method.
+
+This module provides a more Rails-like interface for defining callbacks in your Phlex views, using `ActiveSupport::Callbacks`. It implements the same `before_template`, `after_template`, and `around_template` hooks as callbacks.
+
+```ruby
+class Views::Users::Index < Views::Base
+  include Phlexible::Callbacks
+
+  before_template :set_title
+
+  def view_template
+    h1 { @title }
+  end
+
+  private
+
+    def set_title
+      @title = 'Users'
+    end
+end
+```
+
+You can still use the regular `before_template`, `after_template`, and `around_template` hooks as well, but I recommend that if you include this module, that you use callbacks instead.
+
 #### `ControllerVariables`
 
 > Available in **>= 1.0.0**

data/lib/phlexible/callbacks.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'active_support/callbacks'
+
+module Phlexible
+  module Callbacks
+    extend ActiveSupport::Concern
+    include ActiveSupport::Callbacks
+
+    included do
+      define_callbacks :initialize, :template
+    end
+
+    class_methods do
+      def new(...)
+        obj = super
+        obj.run_callbacks :initialize, :after
+        obj
+      end
+
+      def after_initialize(*names, &block)
+        set_callback(:initialize, :after, *names, &block)
+      end
+
+      def around_template(*names, &block)
+        set_callback(:template, :around, *names, &block)
+      end
+
+      def before_template(*names, &block)
+        set_callback(:template, :before, *names, &block)
+      end
+
+      def after_template(*names, &block)
+        set_callback(:template, :after, *names, &block)
+      end
+    end
+
+    def around_template
+      run_callbacks :template do
+        super
+      end
+    end
+  end
+end

data/lib/phlexible/rails/a_element.rb

@@ -4,8 +4,8 @@ module Phlexible
   module Rails
     # Calls `url_for` for the `href` attribute.
     module AElement
-      def a(href:, **kwargs, &block)
-        super(href: helpers.url_for(href), **kwargs, &block)
+      def a(href:, **, &)
+        super(href: helpers.url_for(href), **, &)
       end
     end
   end

data/lib/phlexible/rails/controller_variables.rb

@@ -26,6 +26,8 @@ module Phlexible
       def self.included(klass)
         klass.class_attribute :__controller_variables__, instance_predicate: false, default: Set.new
         klass.extend ClassMethods
+        klass.include Callbacks
+        klass.before_template :define_controller_variables
       end
 
       class UndefinedVariable < NameError
@@ -36,27 +38,27 @@ module Phlexible
         end
       end
 
-      def before_template # rubocop:disable Metrics
-        if respond_to?(:__controller_variables__)
-          view_assigns = helpers.controller.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
+      private
+
+      def define_controller_variables # rubocop:disable Metrics
+        return unless respond_to?(:__controller_variables__)
 
-            raise ControllerVariables::UndefinedVariable, k if !allow_undefined && !view_assigns.key?(k)
+        view_assigns = helpers.controller.view_assigns
+        view = @view
 
-            instance_variable_set(:"@#{v}", view_assigns[k])
-            view&.instance_variable_set(:"@#{v}", view_assigns[k])
+        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
-        end
 
-        super
+          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
 
       module ClassMethods

data/lib/phlexible/version.rb

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

data/lib/phlexible.rb

@@ -6,5 +6,6 @@ require 'phlex'
 module Phlexible
   autoload :AliasView, 'phlexible/alias_view'
   autoload :PageTitle, 'phlexible/page_title'
+  autoload :Callbacks, 'phlexible/callbacks'
   autoload :Rails, 'phlexible/rails'
 end

data/phlexible.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   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.required_ruby_version = '>= 3.3.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/joelmoss/phlexible'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: phlexible
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Joel Moss
 bindir: exe
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -79,6 +79,7 @@ files:
 - fixtures/rails_helper.rb
 - lib/phlexible.rb
 - lib/phlexible/alias_view.rb
+- lib/phlexible/callbacks.rb
 - lib/phlexible/page_title.rb
 - lib/phlexible/rails.rb
 - lib/phlexible/rails/a_element.rb
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="