temple 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95a7b68d7ea63e7673e183765ce0a64838ee4bdb
-  data.tar.gz: 00e2072a5e6577a07a754bfe9c39bee365e87ebb
+SHA256:
+  metadata.gz: 527609e09539e1854fc16e48ac864d23ce89584ec8c0cb3f3cf1f4ee4d6e8101
+  data.tar.gz: eee6b6dd3a38dde73365469c10b5cf7f8b6a35dd6797268b104e50cef27b4863
 SHA512:
-  metadata.gz: 8a685000159a7f3e0ba41c4d7a6f8e7b8167755d020f05725020ce64dd2526aa19cf5007f78e071b9dd9521787756fee24cf30edc224cce701b6596020858dfc
-  data.tar.gz: 71f2c6edfe191aa6ff7b90a245e2dbe8139fa03181a3d787236924b385c17a898dcad47a89e263cc2598769caf9b2767bdf32e6fcb4cac1d8d5421b1b8cf0562
+  metadata.gz: 17e8c7410950492aa3fdc41cb91f1ad40613324a411d77fcded2667ecb6ac137956e4bee64a9d0b038bb7cd9dc1098ae9e095ca59ba2a4a370e7a7a3cd62a4bd
+  data.tar.gz: 317d066d2e989072f0182d688845691573a74a31a7365883534c66571986bc2f0503df0a6a389d086cfba1eb0da69734a751a91691efa49772ebfb7a6c58f1b2

data/.github/workflows/test.yml

@@ -0,0 +1,40 @@
+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'
+          - jruby
+          - truffleruby-head
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - name: bundle install
+        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
+      - run: bundle exec rake test

data/CHANGES

@@ -1,3 +1,15 @@
+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 +28,7 @@
 
 0.7.8
 
-  * Fix an warning in StaticAnalyzer
+  * Fix a warning in StaticAnalyzer
 
 0.7.7
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 task default: :test

data/lib/temple/filters/ambles.rb

@@ -0,0 +1,21 @@
+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/string_splitter.rb

@@ -46,6 +46,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 +55,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/generator.rb

@@ -10,7 +10,7 @@ module Temple
     include Mixins::Options
 
     define_options :save_buffer,
-                   capture_generator: 'StringBuffer',
+                   capture_generator: self,
                    buffer: '_buf',
                    freeze_static: RUBY_VERSION >= '2.1'
 

data/lib/temple/generators/rails_output_buffer.rb

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

data/lib/temple/mixins/grammar_dsl.rb

@@ -143,7 +143,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/templates/rails.rb

@@ -5,6 +5,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
 

data/lib/temple/templates/tilt.rb

@@ -7,14 +7,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 +14,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/utils.rb

@@ -1,10 +1,6 @@
 begin
-  require 'escape_utils'
+  require 'cgi/escape'
 rescue LoadError
-  begin
-    require 'cgi/escape'
-  rescue LoadError
-  end
 end
 
 module Temple
@@ -21,15 +17,7 @@ module Temple
       html.html_safe? ? html : escape_html(html)
     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,3 @@
 module Temple
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/lib/temple.rb

@@ -41,6 +41,7 @@ module Temple
   end
 
   module Filters
+    autoload :Ambles,             'temple/filters/ambles'
     autoload :CodeMerger,         'temple/filters/code_merger'
     autoload :ControlFlow,        'temple/filters/control_flow'
     autoload :MultiFlattener,     'temple/filters/multi_flattener'

data/temple.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.license       = 'MIT'
 
-  s.required_ruby_version = '>=1.9.2'
+  s.required_ruby_version = '>= 2.5.0'
 
   # Tilt is only development dependency because most parts of Temple
   # can be used without it.
   s.add_development_dependency('tilt')
   s.add_development_dependency('bacon')
   s.add_development_dependency('rake')
-  s.add_development_dependency('erubis')
+  s.add_development_dependency('erubi')
 end

data/test/filters/test_string_splitter.rb

@@ -10,9 +10,30 @@ if defined?(Ripper) && RUBY_VERSION >= "2.0.0"
       @filter = Temple::Filters::StringSplitter.new
     end
 
-    it 'should split :dynamic with string literal' do
-      @filter.call([:dynamic, '"static#{dynamic}"']
-      ).should.equal [:multi, [:static, 'static'], [:dynamic, 'dynamic']]
+    {
+      %q|''|                     => [:multi],
+      %q|""|                     => [:multi],
+      %q|"hello"|                => [:multi, [:static, 'hello']],
+      %q|"hello #{}world"|       => [:multi, [:static, 'hello '], [:static, 'world']],
+      %q|"#{hello}"|             => [:multi, [:dynamic, 'hello']],
+      %q|"nya#{123}"|            => [:multi, [:static, 'nya'], [:dynamic, '123']],
+      %q|"#{()}()"|              => [:multi, [:dynamic, '()'], [:static, '()']],
+      %q|" #{ " #{ '#{}' } " }"| => [:multi, [:static, ' '], [:multi, [:static, ' '], [:multi, [:static, '#{}']], [:static, ' ']]],
+      %q|%Q[a#{b}c#{d}e]|        => [:multi, [:static, 'a'], [:dynamic, 'b'], [:static, 'c'], [:dynamic, 'd'], [:static, 'e']],
+      %q|%q[a#{b}c#{d}e]|        => [:multi, [:static, 'a#{b}c#{d}e']],
+      %q|"\#{}#{123}"|           => [:multi, [:static, '#{}'], [:dynamic, '123']],
+      %q|"#{ '}' }"|             => [:multi, [:multi, [:static, '}']]],
+      %q| "a" # hello |          => [:multi, [:static, 'a']],
+      %q|"\""|                   => [:multi, [:static, '"']],
+      %q|"\\\\\\""|              => [:multi, [:static, '\\"']],
+      %q|'\"'|                   => [:multi, [:static, '\"']],
+      %q|'\\\"'|                 => [:multi, [:static, '\\"']],
+      %q|"static#{dynamic}"|     => [:multi, [:static, 'static'], [:dynamic, 'dynamic']],
+    }.each do |code, expected|
+      it "should split #{code}" do
+        actual = @filter.call([:dynamic, code])
+        actual.should.equal expected
+      end
     end
 
     describe '.compile' do
@@ -20,6 +41,11 @@ if defined?(Ripper) && RUBY_VERSION >= "2.0.0"
         lambda { Temple::Filters::StringSplitter.compile('1') }.
           should.raise(Temple::FilterError)
       end
+
+      it 'should compile strings quoted with parenthesis' do
+        tokens = Temple::Filters::StringSplitter.compile('%Q(href("#{1 + 1}");)')
+        tokens.should.equal [[:static, "href(\""], [:dynamic, "1 + 1"], [:static, "\");"]]
+      end
     end
   end
 end

data/test/helper.rb

@@ -20,8 +20,8 @@ module TestHelper
     Temple::ERB::Template.new(options) { src }.render
   end
 
-  def erubis(src, options = {})
-    Tilt::ErubisTemplate.new(options) { src }.render
+  def erubi(src, options = {})
+    Tilt::ErubiTemplate.new(options) { src }.render
   end
 end
 

data/test/test_erb.rb

@@ -1,5 +1,5 @@
 require 'helper'
-require 'tilt/erubis'
+require 'tilt/erubi'
 
 describe Temple::ERB::Engine do
   it 'should compile erb' do
@@ -11,7 +11,7 @@ describe Temple::ERB::Engine do
 <% end %>
 }
 
-    erb(src).should.equal erubis(src)
+    erb(src).should.equal erubi(src)
   end
 
   it 'should recognize comments' do
@@ -20,7 +20,7 @@ hello
   <%# comment -- ignored -- useful in testing %>
 world}
 
-    erb(src).should.equal erubis(src)
+    erb(src).should.equal erubi(src)
   end
 
   it 'should recognize <%% and %%>' do
@@ -55,7 +55,7 @@ world}
 <% end %>
 }
 
-    erb(src, trim: true).should.equal erubis(src, trim: true)
-    erb(src, trim: false).should.equal erubis(src, trim: false)
+    erb(src, trim: true).should.equal erubi(src, trim: true)
+    erb(src, trim: false).should.equal erubi(src, trim: false)
   end
 end

data/test/test_generator.rb

@@ -143,16 +143,16 @@ end
 describe Temple::Generators::RailsOutputBuffer do
   it 'should compile simple expressions' do
     gen = Temple::Generators::RailsOutputBuffer.new(freeze_static: false)
-    gen.call([:static,  'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
+    gen.call([:static,  'test']).should.equal '@output_buffer = output_buffer || ActionView::OutputBuffer.new; ' +
       '@output_buffer.safe_concat(("test")); @output_buffer'
-    gen.call([:dynamic, 'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
+    gen.call([:dynamic, 'test']).should.equal '@output_buffer = output_buffer || ActionView::OutputBuffer.new; ' +
       '@output_buffer.safe_concat(((test).to_s)); @output_buffer'
-    gen.call([:code,    'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
+    gen.call([:code,    'test']).should.equal '@output_buffer = output_buffer || ActionView::OutputBuffer.new; ' +
       'test; @output_buffer'
   end
 
   it 'should freeze static' do
     gen = Temple::Generators::RailsOutputBuffer.new(freeze_static: true)
-    gen.call([:static,  'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; @output_buffer.safe_concat(("test".freeze)); @output_buffer'
+    gen.call([:static,  'test']).should.equal '@output_buffer = output_buffer || ActionView::OutputBuffer.new; @output_buffer.safe_concat(("test".freeze)); @output_buffer'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,8 +75,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - EXPRESSIONS.md
@@ -92,6 +92,7 @@ files:
 - lib/temple/erb/trimming.rb
 - lib/temple/exceptions.rb
 - lib/temple/filter.rb
+- lib/temple/filters/ambles.rb
 - lib/temple/filters/code_merger.rb
 - lib/temple/filters/control_flow.rb
 - lib/temple/filters/dynamic_inliner.rb
@@ -170,41 +171,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby
-test_files:
-- test/filters/test_code_merger.rb
-- test/filters/test_control_flow.rb
-- test/filters/test_dynamic_inliner.rb
-- test/filters/test_eraser.rb
-- test/filters/test_escapable.rb
-- test/filters/test_multi_flattener.rb
-- test/filters/test_static_analyzer.rb
-- test/filters/test_static_merger.rb
-- test/filters/test_string_splitter.rb
-- test/helper.rb
-- test/html/test_attribute_merger.rb
-- test/html/test_attribute_remover.rb
-- test/html/test_attribute_sorter.rb
-- test/html/test_fast.rb
-- test/html/test_pretty.rb
-- test/mixins/test_dispatcher.rb
-- test/mixins/test_grammar_dsl.rb
-- test/test_engine.rb
-- test/test_erb.rb
-- test/test_filter.rb
-- test/test_generator.rb
-- test/test_grammar.rb
-- test/test_map.rb
-- test/test_static_analyzer.rb
-- test/test_utils.rb
+test_files: []

data/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-dist: trusty
-
-cache: bundler
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - ruby-head
-  - jruby-19mode
-  - rbx-3
-
-sudo: false
-
-env:
-  - ESCAPE_UTILS=1
-  - ""
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-3
-  exclude:
-    - rvm: jruby-19mode
-      env: ESCAPE_UTILS=1
-    - rvm: rbx-3
-      env: ESCAPE_UTILS=1