temple 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7475d628203a95d9ec067ac1388f8428cb213f4534a2fd2ed1b9cf0be7d3293
-  data.tar.gz: d828006ab486aee65e70e8e321022d28191deba994d43c1141dccad2815f41f2
+  metadata.gz: 3fdf456fd2d277a110681cc1d0dd228bba3b75306b3caa78fb12ad668a7665c6
+  data.tar.gz: 7dfdd5001be5c652254aab301e391d7652c0bc1e44a00ee9fe5002c1899e99c1
 SHA512:
-  metadata.gz: d74cc956889989a4d65f6727d7f521cbcbf3d9c2de1a6abda92b4957a7e3992de2b7de6c7634b4dfafe9d4ce1a505f22b8f5af1ef9a217876d6d67f276e04557
-  data.tar.gz: 1958e441fbab605e06f560db0f4c26e5fecf7c673a12a5aad843a3bd5bb4c0ce77e3c2ea13f46b22d962770898587b7f76bd0ad2b11377898e61924e7bc20c87
+  metadata.gz: 4d5847567944020f1be6ddf6b96b056ff0154cb26b00e71d4c736337cddc3e1ceb402ef4eabc3fa8a150ec56fd560cb0ac22358c8f1673bc2dfabb8407a482b9
+  data.tar.gz: f8f766aeb193a7bf781297dff7628d2e9d09840a241130f4a04f60b72e16d237c965f327696788e29f58ddadc1ce843392a52619363fc19dc5da66966d42ed09

data/.github/workflows/test.yml

@@ -22,10 +22,11 @@ jobs:
           - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
           - jruby
           - truffleruby-head
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGES

@@ -1,3 +1,12 @@
+0.10.2
+
+  * Fix Sinatra capture_generator problem (#145)
+
+0.10.1
+
+  * Use specified :capture_generator for nested captures (#112, #144)
+  * Compatibility with frozen string literals
+
 0.10.0
 
   * Regression: Revert changes to :capture_generator since 0.8.2 (#112, #113, #137)

data/lib/temple/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # An engine is simply a chain of compilers (that often includes a parser,
   # some filters and a generator).

data/lib/temple/erb/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module ERB
     # Example ERB engine implementation

data/lib/temple/erb/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module ERB
     # Example ERB parser

data/lib/temple/erb/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # ERB example implementation
   #

data/lib/temple/erb/trimming.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module ERB
     # ERB trimming like in erubis

data/lib/temple/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Exception raised if invalid temple expression is found
   #

data/lib/temple/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Temple base filter
   # @api public

data/lib/temple/filters/ambles.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     class Ambles < Filter

data/lib/temple/filters/code_merger.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # @api public

data/lib/temple/filters/control_flow.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Control flow filter which processes [:if, condition, yes-exp, no-exp]

data/lib/temple/filters/dynamic_inliner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Inlines several static/dynamic into a single dynamic.
@@ -36,7 +37,7 @@ module Temple
               # another one, we add both then.
               state = :single
               prev = [exp]
-              curr = [:dynamic, '"']
+              curr = [:dynamic, '"'.dup]
             when :single
               # Yes! We found another one. Add the current dynamic to the result.
               state = :several

data/lib/temple/filters/encoding.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Try to encode input string

data/lib/temple/filters/eraser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Erase expressions with a certain type

data/lib/temple/filters/escapable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Escape dynamic or static expressions.

data/lib/temple/filters/multi_flattener.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Flattens nested multi expressions

data/lib/temple/filters/remove_bom.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Remove BOM from input string

data/lib/temple/filters/static_analyzer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Convert [:dynamic, code] to [:static, text] if code is static Ruby expression.

data/lib/temple/filters/static_merger.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Merges several statics into a single static.  Example:

data/lib/temple/filters/string_splitter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'ripper'
 rescue LoadError

data/lib/temple/filters/validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Filters
     # Validates temple expression with given grammar

data/lib/temple/generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Abstract generator base class
   # Generators should inherit this class and
@@ -54,7 +55,9 @@ module Temple
     end
 
     def on_capture(name, exp)
-      capture_generator.new(buffer: name).call(exp)
+      capture_generator.new(capture_generator: options[:capture_generator],
+                            freeze_static: options[:freeze_static],
+                            buffer: name).call(exp)
     end
 
     def on_static(text)

data/lib/temple/generators/array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Generators
     # Implements an array buffer.

data/lib/temple/generators/array_buffer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Generators
     # Just like Array, but calls #join on the array.

data/lib/temple/generators/erb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Generators
     # Implements an ERB generator.

data/lib/temple/generators/rails_output_buffer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Generators
     # Implements a rails output buffer.

data/lib/temple/generators/string_buffer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Generators
     # Implements a string buffer.
@@ -10,7 +11,7 @@ module Temple
     # @api public
     class StringBuffer < ArrayBuffer
       def create_buffer
-        "#{buffer} = ''"
+        "#{buffer} = ''.dup"
       end
 
       def return_buffer

data/lib/temple/grammar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Temple expression grammar which can be used to validate Temple expressions.
   #

data/lib/temple/html/attribute_merger.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # This filter merges html attributes (e.g. used for id and class)

data/lib/temple/html/attribute_remover.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # This filter removes empty attributes

data/lib/temple/html/attribute_sorter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # This filter sorts html attributes.

data/lib/temple/html/dispatcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # @api private

data/lib/temple/html/fast.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # @api public

data/lib/temple/html/filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # @api public

data/lib/temple/html/pretty.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     # @api public

data/lib/temple/html/safe.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module HTML
     class SafeString < String

data/lib/temple/map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Immutable map class which supports map merging
   # @api public

data/lib/temple/mixins/dispatcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Mixins
     # @api private

data/lib/temple/mixins/engine_dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Mixins
     # @api private

data/lib/temple/mixins/grammar_dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Mixins
     # @api private
@@ -67,7 +68,7 @@ module Temple
             unmatched.reverse_each do |u|
               entry = u if u.flatten.size < entry.flatten.size
             end
-            raise(InvalidExpression, PP.pp(entry.last, "#{@grammar}::#{entry.first} did not match\n"))
+            raise(InvalidExpression, PP.pp(entry.last, "#{@grammar}::#{entry.first} did not match\n".dup))
           end
         end
 

data/lib/temple/mixins/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Mixins
     # @api public

data/lib/temple/mixins/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Mixins
     # @api private

data/lib/temple/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # Temple base parser
   # @api public

data/lib/temple/static_analyzer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'ripper'
 rescue LoadError

data/lib/temple/templates/rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   module Templates
     class Rails

data/lib/temple/templates/tilt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tilt'
 
 module Temple

data/lib/temple/templates.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
   # @api public
   module Templates

data/lib/temple/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'cgi/escape'
 rescue LoadError

data/lib/temple/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Temple
-  VERSION = '0.10.0'
+  VERSION = '0.10.2'
 end

data/lib/temple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple/version'
 
 module Temple

data/spec/generator_spec.rb

@@ -22,6 +22,12 @@ class SimpleGenerator < Temple::Generator
   end
 end
 
+class SimpleCaptureGenerator < SimpleGenerator
+  def preamble
+    "#{buffer} = CAPTURE_BUFFER"
+  end
+end
+
 describe Temple::Generator do
   it 'should compile simple expressions' do
     gen = SimpleGenerator.new
@@ -62,6 +68,21 @@ describe Temple::Generator do
       'foo << (D:dynamic); C:code; foo; VAR << (S:after); VAR')
   end
 
+  it 'should compile nested captures with the same capture_generator' do
+    gen = SimpleGenerator.new(buffer: "VAR", capture_generator: SimpleCaptureGenerator)
+    expect(gen.call(
+      [:capture, "foo", [:multi,
+        [:static, "a"],
+        [:capture, "bar", [:multi,
+          [:static, "b"],
+          [:capture, "baz", [:multi,
+            [:static, "c"],
+          ]]
+        ]]
+      ]]
+    )).to eq "VAR = BUFFER; foo = CAPTURE_BUFFER; foo << (S:a); bar = CAPTURE_BUFFER; bar << (S:b); baz = CAPTURE_BUFFER; baz << (S:c); baz; bar; foo; VAR"
+  end
+
   it 'should compile newlines' do
     gen = SimpleGenerator.new(buffer: "VAR")
     expect(gen.call([:multi,
@@ -115,16 +136,16 @@ describe Temple::Generators::StringBuffer do
     gen = Temple::Generators::StringBuffer.new(freeze_static: false)
     expect(gen.call([:static,  'test'])).to eq('_buf = "test"')
     expect(gen.call([:dynamic, 'test'])).to eq('_buf = (test).to_s')
-    expect(gen.call([:code,    'test'])).to eq('_buf = \'\'; test; _buf')
+    expect(gen.call([:code,    'test'])).to eq('_buf = \'\'.dup; test; _buf')
 
-    expect(gen.call([:multi, [:static, 'a'], [:static,  'b']])).to eq('_buf = \'\'; _buf << ("a"); _buf << ("b"); _buf')
-    expect(gen.call([:multi, [:static, 'a'], [:dynamic, 'b']])).to eq('_buf = \'\'; _buf << ("a"); _buf << ((b).to_s); _buf')
+    expect(gen.call([:multi, [:static, 'a'], [:static,  'b']])).to eq('_buf = \'\'.dup; _buf << ("a"); _buf << ("b"); _buf')
+    expect(gen.call([:multi, [:static, 'a'], [:dynamic, 'b']])).to eq('_buf = \'\'.dup; _buf << ("a"); _buf << ((b).to_s); _buf')
   end
 
   it 'should freeze static' do
     gen = Temple::Generators::StringBuffer.new(freeze_static: true)
     expect(gen.call([:static,  'test'])).to eq('_buf = "test"')
-    expect(gen.call([:multi, [:dynamic, '1'], [:static,  'test']])).to eq('_buf = \'\'; _buf << ((1).to_s); _buf << ("test".freeze); _buf')
+    expect(gen.call([:multi, [:dynamic, '1'], [:static,  'test']])).to eq('_buf = \'\'.dup; _buf << ((1).to_s); _buf << ("test".freeze); _buf')
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt