debride-erb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d4ebf45842d991313fc528425c0ef355fac5c0f
-  data.tar.gz: 5ecc380d48d635109791a47acab3bfb0876ff612
+SHA256:
+  metadata.gz: 81c551fc516b4b0008e5ad8baa6fbbe97d82eefb884ffeea51cba53b1d6cb51f
+  data.tar.gz: 5f84aabef77af827bacb91b2f420a62db4909dacfb840ad9377b9458a6e945ad
 SHA512:
-  metadata.gz: 776bb16cffbdb6f6346b1e4696fe07ffc3da38a1bc2fca0912414abc01c03bde8063a17bb8350d0510aaae33fbd5e11caf6aa89dfd868897f6ae795ee894357b
-  data.tar.gz: 41d636e2e6f54b8ef7ede2dc9389ec031436ae46b4b70f01e691dd0833a2174f7f70487c811db01ebac05158df0765a5df71399bbac55aeb22b4b84d8387d7fd
+  metadata.gz: 296e8b21a2b7ada3f91435b2d93c9a173f1ae3037fd55b76d99620798a177e21affd2bcbcf2bed02456bc5146c89873209768ba7e7743a6535401bd20266a4ed
+  data.tar.gz: c449998879e46d947fd1df7a285aed79e43533d8a3d53f9317ef5a569123e6c6a04d08ffa0bc179db043aabaeb299f33d9f1f4877bcaaca3087d29a83faffacd

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 1.0.2 / 2023-05-02
+
+* 1 major enhancement:
+
+  * Switched from erubis to to erubi.
+
+* 1 minor enhancement:
+
+  * Brought in action_view hacks to enable block calls w/ <%= forms.
+
 === 1.0.1 / 2015-04-13
 
 * 1 bug fix:
@@ -9,4 +19,3 @@
 * 1 major enhancement
 
   * Birthday!
-

data/Manifest.txt

@@ -4,5 +4,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 lib/debride_erb.rb
+test/block.erb
 test/file.erb
 test/test_debride_erb.rb

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec "debride-erb" do
   license "MIT"
 
   dependency "debride", "~> 1.2"
-  dependency "erubis", "~> 2.7.0"
+  dependency "erubi",   "~> 1.10"
 end
 
 # vim: syntax=ruby

data/lib/debride_erb.rb

@@ -2,11 +2,11 @@
 
 require "debride"
 require "erb"
-require "erubis"
+require "erubi"
 
 class Debride
   module Erb
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 
   ##
@@ -16,7 +16,7 @@ class Debride
   def process_erb file
     erb = File.read file
 
-    ruby = Erubis.new(erb).src
+    ruby = Erubi.new(erb).src
 
     begin
       RubyParser.new.process ruby, file
@@ -26,22 +26,66 @@ class Debride
     end
   end
 
-  class Erubis < ::Erubis::Eruby # :nodoc:
-    BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+  # stolen (and munged) from lib/action_view/template/handlers/erb/erubi.rb
+  class Erubi < ::Erubi::Engine
+    # :nodoc: all
+    def initialize(input, properties = {})
+      @newline_pending = 0
 
-    def add_expr_literal(src, code)
-      if code =~ BLOCK_EXPR
-        src << '@output_buffer.append= ' << code
+      properties[:postamble]  = "_buf.to_s"
+      properties[:bufvar]     = "_buf"
+      properties[:freeze_template_literals] = false
+
+      super
+    end
+
+    def add_text(text)
+      return if text.empty?
+
+      if text == "\n"
+        @newline_pending += 1
       else
-        src << '@output_buffer.append=(' << code << ');'
+        src << "_buf.safe_append='"
+        src << "\n" * @newline_pending if @newline_pending > 0
+        src << text.gsub(/['\\]/, '\\\\\&')
+        src << "';"
+
+        @newline_pending = 0
       end
     end
 
-    def add_expr_escaped(src, code)
-      if code =~ BLOCK_EXPR
-        src << "@output_buffer.safe_append= " << code
+    BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+    def add_expression(indicator, code)
+      flush_newline_if_pending(src)
+
+      if (indicator == "==") || @escape
+        src << "_buf.safe_expr_append="
       else
-        src << "@output_buffer.safe_append=(" << code << ");"
+        src << "_buf.append="
+      end
+
+      if BLOCK_EXPR.match?(code)
+        src << " " << code
+      else
+        src << "(" << code << ");"
+      end
+    end
+
+    def add_code(code)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def add_postamble(_)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def flush_newline_if_pending(src)
+      if @newline_pending > 0
+        src << "_buf.safe_append='#{"\n" * @newline_pending}';"
+        @newline_pending = 0
       end
     end
   end

data/test/block.erb

@@ -0,0 +1,5 @@
+<%= block_call(1,
+2
+  ) do |f| %>
+woot?
+  <% end %>

data/test/file.erb

@@ -1 +1 @@
-woot
+woot <%= 42 %>

data/test/test_debride_erb.rb

@@ -4,12 +4,31 @@ require "debride_erb"
 module TestDebride; end
 
 class TestDebride::TestErb < Minitest::Test
+  make_my_diffs_pretty!
+
   def test_process_erb
     sexp = Debride.new.process_erb "test/file.erb"
 
     exp = s(:block,
-            s(:lasgn, :_buf, s(:str, "")),
-            s(:call, s(:lvar, :_buf), :<<, s(:str, "woot")),
+            s(:lasgn, :_buf, s(:call, s(:colon3, :String), :new)),
+            s(:attrasgn, s(:lvar, :_buf), :safe_append=, s(:str, "woot ")),
+            s(:attrasgn, s(:lvar, :_buf), :append=,      s(:lit, 42)),
+            s(:attrasgn, s(:lvar, :_buf), :safe_append=, s(:str, "\n")),
+            s(:call, s(:lvar, :_buf), :to_s))
+
+    assert_equal exp, sexp
+  end
+
+  def test_process_block
+    sexp = Debride.new.process_erb "test/block.erb"
+
+    exp = s(:block,
+            s(:lasgn, :_buf, s(:call, s(:colon3, :String), :new)),
+            s(:attrasgn, s(:lvar, :_buf), :append=,
+              s(:iter,
+                s(:call, nil, :block_call, s(:lit, 1), s(:lit, 2)),
+                s(:args, :f),
+                s(:attrasgn, s(:lvar, :_buf), :safe_append=, s(:str, "\nwoot?\n")))),
             s(:call, s(:lvar, :_buf), :to_s))
 
     assert_equal exp, sexp

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: debride-erb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,86 +21,78 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debride
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.0'
 description: Extends debride to analyze erb files (erubis ala rails, actually).
 email:
 - ryand-ruby@zenspider.com
@@ -111,39 +103,39 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .autotest
-- .gemtest
+- ".autotest"
 - History.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/debride_erb.rb
+- test/block.erb
 - test/file.erb
 - test/test_debride_erb.rb
 homepage: https://github.com/seattlerb/debride-erb
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/debride-erb
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Extends debride to analyze erb files (erubis ala rails, actually).
 test_files: []