temple 0.8.2 → 0.10.4

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.4'
 end

data/lib/temple.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple/version'
 
 module Temple
@@ -41,6 +42,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'
@@ -48,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,17 +12,16 @@ 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'
 
-  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('rspec')
   s.add_development_dependency('rake')
-  s.add_development_dependency('erubis')
+  s.add_development_dependency('erubi')
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Magnus Holm
 - Daniel Mendler
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -26,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - judofyr@gmail.com
 - mail@daniel-mendler.de
@@ -75,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - EXPRESSIONS.md
@@ -92,9 +90,11 @@ 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
+- lib/temple/filters/dynamic_merger.rb
 - lib/temple/filters/encoding.rb
 - lib/temple/filters/eraser.rb
 - lib/temple/filters/escapable.rb
@@ -133,36 +133,10 @@ files:
 - lib/temple/utils.rb
 - lib/temple/version.rb
 - temple.gemspec
-- 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
 homepage: https://github.com/judofyr/temple
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -170,41 +144,14 @@ 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
-signing_key: 
+rubygems_version: 3.6.7
 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

data/test/filters/test_code_merger.rb

@@ -1,38 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::CodeMerger do
-  before do
-    @filter = Temple::Filters::CodeMerger.new
-  end
-
-  it 'should merge serveral codes' do
-    @filter.call([:multi,
-      [:code, "a"],
-      [:code, "b"],
-      [:code, "c"]
-    ]).should.equal [:code, "a; b; c"]
-  end
-
-  it 'should merge serveral codes around static' do
-    @filter.call([:multi,
-      [:code, "a"],
-      [:code, "b"],
-      [:static, "123"],
-      [:code, "a"],
-      [:code, "b"]
-    ]).should.equal [:multi,
-      [:code, "a; b"],
-      [:static, "123"],
-      [:code, "a; b"]
-    ]
-  end
-
-  it 'should merge serveral codes with newlines' do
-    @filter.call([:multi,
-      [:code, "a"],
-      [:code, "b"],
-      [:newline],
-      [:code, "c"]
-    ]).should.equal [:code, "a; b\nc"]
-  end
-end

data/test/filters/test_control_flow.rb

@@ -1,90 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::ControlFlow do
-  before do
-    @filter = Temple::Filters::ControlFlow.new
-  end
-
-  it 'should process blocks' do
-    @filter.call([:block, 'loop do',
-      [:static, 'Hello']
-    ]).should.equal [:multi,
-                     [:code, 'loop do'],
-                     [:static, 'Hello'],
-                     [:code, 'end']]
-  end
-
-  it 'should process if' do
-    @filter.call([:if, 'condition',
-      [:static, 'Hello']
-    ]).should.equal [:multi,
-      [:code, 'if condition'],
-      [:static, 'Hello'],
-      [:code, 'end']
-    ]
-  end
-
-  it 'should process if with else' do
-    @filter.call([:if, 'condition',
-      [:static, 'True'],
-      [:static, 'False']
-    ]).should.equal [:multi,
-      [:code, 'if condition'],
-      [:static, 'True'],
-      [:code, 'else'],
-      [:static, 'False'],
-      [:code, 'end']
-    ]
-  end
-
-  it 'should create elsif' do
-    @filter.call([:if, 'condition1',
-      [:static, '1'],
-      [:if, 'condition2',
-       [:static, '2'],
-       [:static, '3']]
-    ]).should.equal [:multi,
-      [:code, 'if condition1'],
-      [:static, '1'],
-      [:code, 'elsif condition2'],
-      [:static, '2'],
-      [:code, 'else'],
-      [:static, '3'],
-      [:code, 'end']
-    ]
-  end
-
-  it 'should process cond' do
-    @filter.call([:cond,
-      ['cond1', [:exp1]],
-      ['cond2', [:exp2]],
-      [:else,   [:exp3]],
-    ]).should.equal [:multi,
-      [:code, 'case'],
-      [:code, 'when cond1'],
-      [:exp1],
-      [:code, 'when cond2'],
-      [:exp2],
-      [:code, 'else'],
-      [:exp3],
-      [:code, 'end']
-    ]
-  end
-
-  it 'should process case' do
-    @filter.call([:case, 'var',
-      ['Array',  [:exp1]],
-      ['String', [:exp2]],
-      [:else,    [:exp3]],
-    ]).should.equal [:multi,
-      [:code, 'case (var)'],
-      [:code, 'when Array'],
-      [:exp1],
-      [:code, 'when String'],
-      [:exp2],
-      [:code, 'else'],
-      [:exp3],
-      [:code, 'end']
-    ]
-  end
-end

data/test/filters/test_dynamic_inliner.rb

@@ -1,95 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::DynamicInliner do
-  before do
-    @filter = Temple::Filters::DynamicInliner.new
-  end
-
-  it 'should compile several statics into dynamic' do
-    @filter.call([:multi,
-      [:static, "Hello "],
-      [:static, "World\n "],
-      [:static, "Have a nice day"]
-    ]).should.equal [:dynamic, '"Hello World\n Have a nice day"']
-  end
-
-  it 'should compile several dynamics into dynamic' do
-    @filter.call([:multi,
-      [:dynamic, "@hello"],
-      [:dynamic, "@world"],
-      [:dynamic, "@yeah"]
-    ]).should.equal [:dynamic, '"#{@hello}#{@world}#{@yeah}"']
-  end
-
-  it 'should compile static and dynamic into dynamic' do
-    @filter.call([:multi,
-      [:static, "Hello"],
-      [:dynamic, "@world"],
-      [:dynamic, "@yeah"],
-      [:static, "Nice"]
-    ]).should.equal [:dynamic, '"Hello#{@world}#{@yeah}Nice"']
-  end
-
-  it 'should merge statics and dynamics around a code' do
-    exp = @filter.call([:multi,
-      [:static, "Hello "],
-      [:dynamic, "@world"],
-      [:code, "Oh yeah"],
-      [:dynamic, "@yeah"],
-      [:static, "Once more"]
-    ]).should.equal [:multi,
-      [:dynamic, '"Hello #{@world}"'],
-      [:code, "Oh yeah"],
-      [:dynamic, '"#{@yeah}Once more"']
-    ]
-  end
-
-  it 'should keep codes intact' do
-    @filter.call([:multi, [:code, 'foo']]).should.equal [:code, 'foo']
-  end
-
-  it 'should keep single statics intact' do
-    @filter.call([:multi, [:static, 'foo']]).should.equal [:static, 'foo']
-  end
-
-  it 'should keep single dynamic intact' do
-    @filter.call([:multi, [:dynamic, 'foo']]).should.equal [:dynamic, 'foo']
-  end
-
-  it 'should inline inside multi' do
-    @filter.call([:multi,
-      [:static, "Hello "],
-      [:dynamic, "@world"],
-      [:multi,
-        [:static, "Hello "],
-        [:dynamic, "@world"]],
-      [:static, "Hello "],
-      [:dynamic, "@world"]
-    ]).should.equal [:multi,
-      [:dynamic, '"Hello #{@world}"'],
-      [:dynamic, '"Hello #{@world}"'],
-      [:dynamic, '"Hello #{@world}"']
-    ]
-  end
-
-  it 'should merge across newlines' do
-    exp = @filter.call([:multi,
-      [:static, "Hello \n"],
-      [:newline],
-      [:dynamic, "@world"],
-      [:newline]
-    ]).should.equal [:dynamic, ['"Hello \n"', '"#{@world}"', '""'].join("\\\n")]
-  end
-
-  it 'should compile static followed by newline' do
-    @filter.call([:multi,
-      [:static, "Hello \n"],
-      [:newline],
-      [:code, "world"]
-    ]).should.equal [:multi,
-      [:static, "Hello \n"],
-      [:newline],
-      [:code, "world"]
-    ]
-  end
-end

data/test/filters/test_eraser.rb

@@ -1,55 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::Eraser do
-  it 'should respect keep' do
-    eraser = Temple::Filters::Eraser.new(keep: [:a])
-    eraser.call([:multi,
-      [:a],
-      [:b],
-      [:c]
-    ]).should.equal [:multi,
-      [:a],
-      [:multi],
-      [:multi]
-    ]
-  end
-
-  it 'should respect erase' do
-    eraser = Temple::Filters::Eraser.new(erase: [:a])
-    eraser.call([:multi,
-      [:a],
-      [:b],
-      [:c]
-    ]).should.equal [:multi,
-      [:multi],
-      [:b],
-      [:c]
-    ]
-  end
-
-  it 'should choose erase over keep' do
-    eraser = Temple::Filters::Eraser.new(keep: [:a, :b], erase: [:a])
-    eraser.call([:multi,
-      [:a],
-      [:b],
-      [:c]
-    ]).should.equal [:multi,
-      [:multi],
-      [:b],
-      [:multi]
-    ]
-  end
-
-  it 'should erase nested types' do
-    eraser = Temple::Filters::Eraser.new(erase: [[:a, :b]])
-    eraser.call([:multi,
-      [:a, :a],
-      [:a, :b],
-      [:b]
-    ]).should.equal [:multi,
-      [:a, :a],
-      [:multi],
-      [:b]
-    ]
-  end
-end

data/test/filters/test_escapable.rb

@@ -1,49 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::Escapable do
-  before do
-    @filter = Temple::Filters::Escapable.new
-  end
-
-  it 'should handle escape expressions' do
-    @filter.call([:escape, true,
-                  [:multi,
-                   [:static, "a < b"],
-                   [:dynamic, "ruby_method"]]
-    ]).should.equal [:multi,
-      [:static, "a &lt; b"],
-      [:dynamic, "::Temple::Utils.escape_html((ruby_method))"],
-    ]
-  end
-
-  it 'should keep codes intact' do
-    exp = [:multi, [:code, 'foo']]
-    @filter.call(exp).should.equal exp
-  end
-
-  it 'should keep statics intact' do
-    exp = [:multi, [:static, '<']]
-    @filter.call(exp).should.equal exp
-  end
-
-  it 'should keep dynamic intact' do
-    exp = [:multi, [:dynamic, 'foo']]
-    @filter.call(exp).should.equal exp
-  end
-
-  it 'should have use_html_safe option' do
-    with_html_safe do
-      filter = Temple::Filters::Escapable.new(use_html_safe: true)
-      filter.call([:escape, true,
-        [:static, Temple::HTML::SafeString.new("a < b")]
-      ]).should.equal [:static, "a < b"]
-    end
-  end
-
-  it 'should support censoring' do
-    filter = Temple::Filters::Escapable.new(escape_code: '(%s).gsub("Temple sucks", "Temple rocks")')
-    filter.call([:escape, true,
-      [:static, "~~ Temple sucks ~~"]
-    ]).should.equal [:static, "~~ Temple rocks ~~"]
-  end
-end

data/test/filters/test_multi_flattener.rb

@@ -1,33 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::MultiFlattener do
-  before do
-    @filter = Temple::Filters::MultiFlattener.new
-  end
-
-  it 'should flatten nested multi expressions' do
-    @filter.call([:multi,
-      [:static, "a"],
-      [:multi,
-       [:dynamic, "aa"],
-       [:multi,
-        [:static, "aaa"],
-        [:static, "aab"],
-       ],
-       [:dynamic, "ab"],
-      ],
-      [:static, "b"],
-    ]).should.equal [:multi,
-      [:static, "a"],
-      [:dynamic, "aa"],
-      [:static, "aaa"],
-      [:static, "aab"],
-      [:dynamic, "ab"],
-      [:static, "b"],
-    ]
-  end
-
-  it 'should return first element' do
-    @filter.call([:multi, [:code, 'foo']]).should.equal [:code, 'foo']
-  end
-end