Simplify syntax of pipe procs for text & html

Author: jaredcwhite

.rubocop.yml

@@ -48,6 +48,9 @@ Metrics/MethodLength:
 Naming/BlockForwarding:
   Enabled: false
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 # Disabled to aid in template readability
 Style/NestedParenthesizedCalls:
   Enabled: false

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.5.0 - 2024-04-06
+
+- Simplify syntax of pipe procs for text & html
+
 ## [0.4.0] — 2024-04-04
 
 - Provide Roda plugin to mix in Streamlined helpers.

Gemfile

@@ -13,7 +13,7 @@ gem "minitest-reporters", "~> 1.5"
 gem "rubocop", "~> 1.21"
 gem "rubocop-bridgetown", "~> 0.4"
 
-gem "solargraph", "~> 0.49.0"
+gem "solargraph", "~> 0.50"
 
 gem "rails-dom-testing", "~> 2.0"
 

Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    streamlined (0.4.0)
+    streamlined (0.5.0)
       serbea (>= 2.1)
       zeitwerk (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -21,39 +21,38 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     backport (1.2.0)
-    base64 (0.1.1)
-    benchmark (0.2.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    benchmark (0.3.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
-    drb (2.1.1)
-      ruby2_keywords
+    diff-lcs (1.5.1)
+    drb (2.2.1)
     e2mmap (0.1.0)
     erubi (1.12.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
-    json (2.6.3)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
+    minitest (5.22.3)
     minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mutex_m (0.1.2)
-    nokogiri (1.15.4-arm64-darwin)
+    mutex_m (0.2.0)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
@@ -62,41 +61,40 @@ GEM
       minitest
       nokogiri (>= 1.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.0)
     rbs (2.8.4)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
-    rubocop (1.57.2)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      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.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-bridgetown (0.4.1)
       rubocop (~> 1.23)
       rubocop-performance (~> 1.12)
     rubocop-minitest (0.20.1)
       rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     serbea (2.1.0)
       erubi (>= 1.10)
       tilt (~> 2.0)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -112,13 +110,13 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    yard (0.9.34)
-    zeitwerk (2.6.12)
+    yard (0.9.36)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-21
@@ -133,7 +131,7 @@ DEPENDENCIES
   rubocop-bridgetown (~> 0.4)
   rubocop-minitest (~> 0.20.0)
   rubocop-rake (~> 0.6.0)
-  solargraph (~> 0.49.0)
+  solargraph (~> 0.50)
   streamlined!
 
 BUNDLED WITH

lib/streamlined/helpers.rb

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
+require "tilt/erubi"
+
 module Streamlined
   module Helpers
-    module PipeableProc
-      include Serbea::Pipeline::Helper
-
-      attr_accessor :pipe_block, :touched
-
-      def pipe(&block)
-        return super(self.(), &pipe_block) if pipe_block && !block
+    module TouchableProc
+      attr_accessor :touched
 
+      def touch
         self.touched = true
-        return self unless block
-
-        tap { _1.pipe_block = block }
+        self
       end
 
       def html_safe
@@ -36,7 +32,7 @@ def encode(...)
       end
     end
 
-    ::Proc.prepend(PipeableProc)
+    ::Proc.prepend(TouchableProc)
 
     # Create a set of attributes from a hash.
     #
@@ -82,16 +78,20 @@ def attribute_segment(attr, value)
       "#{attr}=#{value.to_s.encode(xml: :attr)}"
     end
 
-    def text(callback)
-      (callback.is_a?(Proc) ? callback.pipe : callback).to_s.then do |str|
+    def text(callback, piping = nil)
+      callback = Serbea::Pipeline.new(binding, callback).tap { _1.instance_exec(&piping) } if piping
+
+      (callback.is_a?(Proc) ? callback.touch : callback).to_s.then do |str|
         next str if str.html_safe?
 
         str.encode(xml: :attr).gsub(%r{\A"|"\Z}, "")
       end
     end
 
-    def html(callback)
-      callback.html_safe.pipe
+    def html(callback, piping = nil)
+      callback = Serbea::Pipeline.new(binding, callback).tap { _1.instance_exec(&piping) } if piping
+
+      callback.html_safe.touch
     end
 
     def html_map(input, &callback)

lib/streamlined/renderable.rb

@@ -45,10 +45,8 @@ def helpers
       @_view_context
     end
 
-    # rubocop:disable Style/ArgumentsForwarding
     def capture(*args, &block)
       helpers ? helpers.capture(*args, &block) : yield(*args)
     end
-    # rubocop:enable Style/ArgumentsForwarding
   end
 end

lib/streamlined/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Streamlined
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

test/test_streamlined.rb

@@ -54,8 +54,8 @@ def template(&block)
       <section>
         <h1 #{html_attributes(false_value:, nil_value:, other_value:)}>#{text -> { heading }}</h1>
         <h2 class="#{text -> { tags_in_attribute }}">#{text -> { @name }}</h2>
-        #{html -> { capture(self, &block) }}
-        <footer>#{text -> { @number }.pipe { multiplied_by(10) }}</footer>
+        #{html self, -> { capture -> { block } }}
+        <footer>#{text @number, -> { multiplied_by(10) }}</footer>
       </section>
     HTML
     }