temple 0.9.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5bd4c914592e35029369b132ae55d5ae56771b73d5c8710d3b6cbaf8c1409d
-  data.tar.gz: 379717f7a2b6580cfe6e3732dcb8da6ff76f6adf2ec725cfc32eacd988f8471a
+  metadata.gz: a2dfc92778763412687b4c4cefce7f8f01975463a4237b96e3931d246cfc9953
+  data.tar.gz: 782b6af3993bdb5179153a5eb6b12304de17f6d6b5661f64671a0aad52649dfe
 SHA512:
-  metadata.gz: 938451e922d130af494c37d73612b35c53e05a94143d1cabff3e725b4512fbc4a04e1bf7acc27be0e8b37ebc7b00a2d9859e4f073c0941aeada7a1ed396889db
-  data.tar.gz: f2925b82e2fb217f63d0afa4890c71f7ff6e209ee7775e33b9fb4a3885dce9bd638e46b8280f58f3f5002b020fd3e07792c560c3e44ed4b182dbfcefa2c66978
+  metadata.gz: 18269f8d2621a71d0eaf4050e56365cb1b734c4d14cda063503e308fe353808f81de4794b3226cbc0698327a8108d5c225500d19346bf04dce761783cd57374b
+  data.tar.gz: ddd93041cc83790c7c610a67401d8b10bad033bdeb1f209e3d87a056c67dc855d8f2861bb8d2dfceb087d787938020e91c4211539ae6b2da41eb2f0d36988caa

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,6 +1,27 @@
+0.10.3
+
+  * Remove test files from the gem package (#146)
+  * Add DynamicMerger filter (#147)
+
+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)
+  * Regression: Ensure that output buffer is not reused for capturing in Rails (#135)
+  * Drop support for Rails 4.x
+
 0.9.1
 
   * Fix Slim's error in AttributeMerger due to 0.9.0's :capture_generator (#137)
+  * Use specified :capture_generator for nested captures (#112)
   * Fix Temple::ERB::Engine's <%= to not escape and <%== to escape expressions
 
 0.9.0

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org/'
 gemspec
-gem 'escape_utils' if ENV['ESCAPE_UTILS']

data/Rakefile

@@ -3,16 +3,3 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << 'lib' << 'test'
-    t.pattern = 'test/**/test_*.rb'
-    t.verbose = false
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
-  end
-end

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
@@ -7,6 +8,8 @@ module Temple
       use Temple::ERB::Parser
       use Temple::ERB::Trimming
       filter :Escapable
+      filter :StringSplitter
+      filter :StaticAnalyzer
       filter :MultiFlattener
       filter :StaticMerger
       generator :ArrayBuffer

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/dynamic_merger.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+module Temple
+  module Filters
+    # Compile [:multi, [:static, 'foo'], [:dynamic, 'bar']] to [:dynamic, '"foo#{bar}"']
+    class DynamicMerger < Filter
+      def on_multi(*exps)
+        exps = exps.dup
+        result = [:multi]
+        buffer = []
+
+        until exps.empty?
+          type, arg = exps.first
+          if type == :dynamic && arg.count("\n") == 0
+            buffer << exps.shift
+          elsif type == :static && exps.size > (count = arg.count("\n")) &&
+                exps[1, count].all? { |e| e == [:newline] }
+            (1 + count).times { buffer << exps.shift }
+          elsif type == :newline && exps.size > (count = count_newline(exps)) &&
+                exps[count].first == :static && count == exps[count].last.count("\n")
+            (count + 1).times { buffer << exps.shift }
+          else
+            result.concat(merge_dynamic(buffer))
+            buffer = []
+            result << compile(exps.shift)
+          end
+        end
+        result.concat(merge_dynamic(buffer))
+
+        result.size == 2 ? result[1] : result
+      end
+
+      private
+
+      def merge_dynamic(exps)
+        # Merge exps only when they have both :static and :dynamic
+        unless exps.any? { |type,| type == :static } && exps.any? { |type,| type == :dynamic }
+          return exps
+        end
+
+        strlit_body = String.new
+        exps.each do |type, arg|
+          case type
+          when :static
+            strlit_body << arg.dump.sub!(/\A"/, '').sub!(/"\z/, '').gsub('\n', "\n")
+          when :dynamic
+            strlit_body << "\#{#{arg}}"
+          when :newline
+            # newline is added by `gsub('\n', "\n")`
+          else
+            raise "unexpected type #{type.inspect} is given to #merge_dynamic"
+          end
+        end
+        [[:dynamic, "%Q\0#{strlit_body}\0"]]
+      end
+
+      def count_newline(exps)
+        count = 0
+        exps.each do |exp|
+          if exp == [:newline]
+            count += 1
+          else
+            return count
+          end
+        end
+        return count
+      end
+    end
+  end
+end

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
@@ -7,7 +8,7 @@ module Temple
   module Filters
     # Compile [:dynamic, "foo#{bar}"] to [:multi, [:static, 'foo'], [:dynamic, 'bar']]
     class StringSplitter < Filter
-      if defined?(Ripper) && RUBY_VERSION >= "2.0.0" && Ripper.respond_to?(:lex)
+      if defined?(Ripper) && Ripper.respond_to?(:lex)
         class << self
           # `code` param must be valid string literal
           def compile(code)

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
@@ -10,9 +11,9 @@ module Temple
     include Mixins::Options
 
     define_options :save_buffer,
-                   capture_generator: :self,
+                   capture_generator: 'StringBuffer',
                    buffer: '_buf',
-                   freeze_static: RUBY_VERSION >= '2.1'
+                   freeze_static: true
 
     def call(exp)
       [preamble, compile(exp), postamble].flatten.compact.join('; ')
@@ -54,7 +55,9 @@ module Temple
     end
 
     def on_capture(name, exp)
-      capture_generator.new(**options, 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)
@@ -76,15 +79,9 @@ module Temple
     end
 
     def capture_generator
-      @capture_generator ||=
-        case options[:capture_generator]
-        when :self
-          self.class
-        when Class
-          options[:capture_generator]
-        else
-          Generators.const_get(options[:capture_generator])
-        end
+      @capture_generator ||= Class === options[:capture_generator] ?
+      options[:capture_generator] :
+        Generators.const_get(options[:capture_generator])
     end
 
     def concat(str)

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.
@@ -9,10 +10,9 @@ module Temple
     #
     # @api public
     class RailsOutputBuffer < StringBuffer
-      define_options :streaming,
+      define_options :streaming, # ignored
                      buffer_class: 'ActionView::OutputBuffer',
                      buffer: '@output_buffer',
-                     # output_buffer is needed for Rails 3.1 Streaming support
                      capture_generator: RailsOutputBuffer
 
       def call(exp)
@@ -20,7 +20,11 @@ module Temple
       end
 
       def create_buffer
-        "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
+        if buffer == '@output_buffer'
+          "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
+        else
+          "#{buffer} = #{options[:buffer_class]}.new"
+        end
       end
 
       def concat(str)

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
@@ -18,8 +19,8 @@ module Temple
 
       def self.register_as(*names)
         raise 'Rails is not loaded - Temple::Templates::Rails cannot be used' unless defined?(::ActionView)
-        if ::ActiveSupport::VERSION::MAJOR < 3 || ::ActiveSupport::VERSION::MAJOR == 3 && ::ActiveSupport::VERSION::MINOR < 1
-          raise "Temple supports only Rails 3.1 and greater, your Rails version is #{::ActiveSupport::VERSION::STRING}"
+        if ::ActiveSupport::VERSION::MAJOR < 5
+          raise "Temple supports only Rails 5 and greater, your Rails version is #{::ActiveSupport::VERSION::STRING}"
         end
         names.each do |name|
           ::ActionView::Template.register_template_handler name.to_sym, new

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
@@ -14,7 +15,8 @@ module Temple
     # @param html [String] The string to escape
     # @return [String] The escaped string
     def escape_html_safe(html)
-      html.html_safe? ? html : escape_html(html)
+      s = html.to_s
+      s.html_safe? || html.html_safe? ? s : escape_html(s)
     end
 
     if defined?(CGI.escapeHTML)

data/lib/temple/version.rb

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

data/lib/temple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple/version'
 
 module Temple
@@ -49,6 +50,7 @@ module Temple
     autoload :StaticMerger,       'temple/filters/static_merger'
     autoload :StringSplitter,     'temple/filters/string_splitter'
     autoload :DynamicInliner,     'temple/filters/dynamic_inliner'
+    autoload :DynamicMerger,      'temple/filters/dynamic_merger'
     autoload :Escapable,          'temple/filters/escapable'
     autoload :Eraser,             'temple/filters/eraser'
     autoload :Validator,          'temple/filters/validator'

data/temple.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/temple/version'
 require 'date'
 
@@ -13,8 +12,7 @@ Gem::Specification.new do |s|
   s.summary       = 'Template compilation framework in Ruby'
 
   s.require_paths = %w(lib)
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec)/}) }
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.license       = 'MIT'