temple 0.8.2 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95a7b68d7ea63e7673e183765ce0a64838ee4bdb
-  data.tar.gz: 00e2072a5e6577a07a754bfe9c39bee365e87ebb
+SHA256:
+  metadata.gz: 3fdf456fd2d277a110681cc1d0dd228bba3b75306b3caa78fb12ad668a7665c6
+  data.tar.gz: 7dfdd5001be5c652254aab301e391d7652c0bc1e44a00ee9fe5002c1899e99c1
 SHA512:
-  metadata.gz: 8a685000159a7f3e0ba41c4d7a6f8e7b8167755d020f05725020ce64dd2526aa19cf5007f78e071b9dd9521787756fee24cf30edc224cce701b6596020858dfc
-  data.tar.gz: 71f2c6edfe191aa6ff7b90a245e2dbe8139fa03181a3d787236924b385c17a898dcad47a89e263cc2598769caf9b2767bdf32e6fcb4cac1d8d5421b1b8cf0562
+  metadata.gz: 4d5847567944020f1be6ddf6b96b056ff0154cb26b00e71d4c736337cddc3e1ceb402ef4eabc3fa8a150ec56fd560cb0ac22358c8f1673bc2dfabb8407a482b9
+  data.tar.gz: f8f766aeb193a7bf781297dff7628d2e9d09840a241130f4a04f60b72e16d237c965f327696788e29f58ddadc1ce843392a52619363fc19dc5da66966d42ed09

data/.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "00 15 * * *"
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - jruby
+          - truffleruby-head
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec

data/.gitignore

@@ -2,3 +2,4 @@ coverage
 .yardoc
 doc
 Gemfile.lock
+/pkg/

data/CHANGES

@@ -1,3 +1,36 @@
+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
+
+  * Require Ruby 2.5+ (#131)
+  * Change default :capture_generator to self (#113)
+  * Improve compatibility with Rails 7.1 (#135)
+  * Support Rails 6.1's annotate_rendered_view_with_filenames
+    with Temple::Filters::Ambles (#134)
+  * Fix a crash in StringSplitter filter (#138)
+  * Fix a warning by Object#=~ since Ruby 2.6 (#129)
+  * Fix deprecated Tilt template mime type (#108)
+  * Stop using deprecated EscapeUtils from Temple::Utils (#136)
+
 0.8.2
 
   * Support TruffleRuby in Temple::Filters::StaticAnalyzer (#127)
@@ -16,7 +49,7 @@
 
 0.7.8
 
-  * Fix an warning in StaticAnalyzer
+  * Fix a warning in StaticAnalyzer
 
 0.7.7
 

data/Gemfile

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

data/README.md

@@ -1,7 +1,7 @@
 Temple
 ======
 
-[![Build Status](https://secure.travis-ci.org/judofyr/temple.svg?branch=master)](http://travis-ci.org/judofyr/temple) [![Code Climate](https://codeclimate.com/github/judofyr/temple.svg)](https://codeclimate.com/github/judofyr/temple) [![Gem Version](https://badge.fury.io/rb/temple.svg)](https://rubygems.org/gems/temple)
+[![test](https://github.com/judofyr/temple/actions/workflows/test.yml/badge.svg)](https://github.com/judofyr/temple/actions/workflows/test.yml) [![Code Climate](https://codeclimate.com/github/judofyr/temple.svg)](https://codeclimate.com/github/judofyr/temple) [![Gem Version](https://badge.fury.io/rb/temple.svg)](https://rubygems.org/gems/temple) [![Yard Docs](https://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/gems/temple/frames)
 
 Temple is an abstraction and a framework for compiling templates to pure Ruby.
 It's all about making it easier to experiment, implement and optimize template

data/Rakefile

@@ -1,15 +1,8 @@
-require 'rake/testtask'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-task default: :test
-task :test do
-  sh "bacon -Ilib -Itest --automatic --quiet"
-end
-
-#Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib' << 'test'
-#  t.pattern = 'test/**/test_*.rb'
-#  t.verbose = false
-#end
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec
 
 begin
   require 'rcov/rcovtask'

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
@@ -27,7 +28,7 @@ module Temple
             when '#'
               result << [:code, "\n" * code.count("\n")]
             when /=/
-              result << [:escape, indicator.size <= 1, [:dynamic, code]]
+              result << [:escape, indicator.size == 2, [:dynamic, code]]
             else
               result << [:code, code]
             end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Temple
+  module Filters
+    class Ambles < Filter
+      define_options :preamble, :postamble
+
+      def initialize(*)
+        super
+        @preamble = options[:preamble]
+        @postamble = options[:postamble]
+      end
+
+      def call(ast)
+        ret = [:multi]
+        ret << [:static, @preamble] if @preamble
+        ret << ast
+        ret << [:static, @postamble] if @postamble
+        ret
+      end
+    end
+  end
+end

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
@@ -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)
@@ -46,6 +47,7 @@ module Temple
 
               case type
               when :on_tstring_content
+                beg_str, end_str = escape_quotes(beg_str, end_str)
                 exps << [:static, eval("#{beg_str}#{str}#{end_str}").to_s]
               when :on_embexpr_beg
                 embedded = shift_balanced_embexpr(tokens)
@@ -54,6 +56,16 @@ module Temple
             end
           end
 
+          # Some quotes are split-unsafe. Replace such quotes with null characters.
+          def escape_quotes(beg_str, end_str)
+            case [beg_str[-1], end_str]
+            when ['(', ')'], ['[', ']'], ['{', '}']
+              [beg_str.sub(/.\z/) { "\0" }, "\0"]
+            else
+              [beg_str, end_str]
+            end
+          end
+
           def shift_balanced_embexpr(tokens)
             String.new.tap do |embedded|
               embexpr_open = 1

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
@@ -12,7 +13,7 @@ module Temple
     define_options :save_buffer,
                    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(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.
@@ -9,10 +10,9 @@ module Temple
     #
     # @api public
     class RailsOutputBuffer < StringBuffer
-      define_options :streaming,
-                     buffer_class: 'ActiveSupport::SafeBuffer',
+      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,7 @@ module Temple
       end
 
       def create_buffer
-        if options[:streaming] && options[:buffer] == '@output_buffer'
+        if buffer == '@output_buffer'
           "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
         else
           "#{buffer} = #{options[:buffer_class]}.new"

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
 
@@ -143,7 +144,8 @@ module Temple
           start = Or.new(self)
           curr = [start]
           rule.each do |elem|
-            if elem =~ /^(.*)(\*|\?|\+)$/
+            case elem
+            when /^(.*)(\*|\?|\+)$/
               elem = Element.new(self, const_get($1))
               curr.each {|c| c << elem }
               elem << elem if $2 != '?'

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
@@ -5,6 +6,10 @@ module Temple
 
       def call(template, source = nil)
         opts = {}.update(self.class.options).update(file: template.identifier)
+        if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
+          opts[:preamble] = "<!-- BEGIN #{template.short_identifier} -->\n"
+          opts[:postamble] = "<!-- END #{template.short_identifier} -->\n"
+        end
         self.class.compile((source || template.source), opts)
       end
 
@@ -14,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
@@ -7,14 +8,6 @@ module Temple
 
       define_options mime_type: 'text/html'
 
-      def self.default_mime_type
-        options[:mime_type]
-      end
-
-      def self.default_mime_type=(mime_type)
-        options[:mime_type] = mime_type
-      end
-
       # Prepare Temple template
       #
       # Called immediately after template data is loaded.
@@ -22,7 +15,7 @@ module Temple
       # @return [void]
       def prepare
         opts = {}.update(self.class.options).update(options).update(file: eval_file)
-        opts.delete(:mime_type)
+        metadata[:mime_type] = opts.delete(:mime_type)
         if opts.include?(:outvar)
           opts[:buffer] = opts.delete(:outvar)
           opts[:save_buffer] = true

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,10 +1,7 @@
+# frozen_string_literal: true
 begin
-  require 'escape_utils'
+  require 'cgi/escape'
 rescue LoadError
-  begin
-    require 'cgi/escape'
-  rescue LoadError
-  end
 end
 
 module Temple
@@ -18,18 +15,11 @@ 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?(EscapeUtils)
-      # Returns an escaped copy of `html`.
-      #
-      # @param html [String] The string to escape
-      # @return [String] The escaped string
-      def escape_html(html)
-        EscapeUtils.escape_html(html.to_s, false)
-      end
-    elsif defined?(CGI.escapeHTML)
+    if defined?(CGI.escapeHTML)
       # Returns an escaped copy of `html`.
       #
       # @param html [String] The string to escape

data/lib/temple/version.rb

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