temple 0.8.2 → 0.10.2

data/{test/html/test_pretty.rb → spec/html/pretty_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 describe Temple::HTML::Pretty do
   before do
@@ -6,9 +6,9 @@ describe Temple::HTML::Pretty do
   end
 
   it 'should indent nested tags' do
-    @html.call([:html, :tag, 'div', [:multi],
+    expect(@html.call([:html, :tag, 'div', [:multi],
       [:html, :tag, 'p', [:multi], [:multi, [:static, 'text'], [:dynamic, 'code']]]
-    ]).should.equal [:multi,
+    ])).to eq [:multi,
                      [:code, "_temple_html_pretty1 = /<code|<pre|<textarea/"],
                      [:multi,
                       [:static, "<div"],
@@ -26,9 +26,9 @@ describe Temple::HTML::Pretty do
   end
 
   it 'should not indent preformatted tags' do
-    @html.call([:html, :tag, 'pre', [:multi],
+    expect(@html.call([:html, :tag, 'pre', [:multi],
       [:html, :tag, 'p', [:multi], [:static, 'text']]
-    ]).should.equal [:multi,
+    ])).to eq [:multi,
                      [:code, "_temple_html_pretty1 = /<code|<pre|<textarea/"],
                      [:multi,
                       [:static, "<pre"],
@@ -45,9 +45,9 @@ describe Temple::HTML::Pretty do
 
   it 'should not escape html_safe strings' do
     with_html_safe do
-      @html.call(
+      expect(@html.call(
         [:dynamic, '"text<".html_safe']
-      ).should.equal [:multi,
+      )).to eq [:multi,
                       [:code, "_temple_html_pretty1 = /<code|<pre|<textarea/"],
                       [:dynamic, "::Temple::Utils.indent_dynamic((\"text<\".html_safe), nil, \"\\n\", _temple_html_pretty1)"]]
     end

data/spec/map_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Temple::ImmutableMap do
+  it 'has read accessor' do
+    hash = Temple::ImmutableMap.new({a: 1},{b: 2, a: 3})
+    expect(hash[:a]).to eq(1)
+    expect(hash[:b]).to eq(2)
+  end
+
+  it 'has include?' do
+    hash = Temple::ImmutableMap.new({a: 1},{b: 2, a: 3})
+    expect(hash).to include(:a)
+    expect(hash).to include(:b)
+    expect(hash).not_to include(:c)
+  end
+
+  it 'has values' do
+    expect(Temple::ImmutableMap.new({a: 1},{b: 2, a: 3}).values.sort).to eq([1,2])
+  end
+
+  it 'has keys' do
+    expect(Temple::ImmutableMap.new({a: 1},{b: 2, a: 3}).keys).to eq([:a,:b])
+  end
+
+  it 'has to_a' do
+    expect(Temple::ImmutableMap.new({a: 1},{b: 2, a: 3}).to_a).to eq([[:a, 1], [:b, 2]])
+  end
+end
+
+describe Temple::MutableMap do
+  it 'has write accessor' do
+    parent = {a: 1}
+    hash = Temple::MutableMap.new(parent)
+    expect(hash[:a]).to eq(1)
+    hash[:a] = 2
+    expect(hash[:a]).to eq(2)
+    expect(parent[:a]).to eq(1)
+  end
+end

data/{test/mixins/test_dispatcher.rb → spec/mixins/dispatcher_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 class FilterWithDispatcherMixin
   include Temple::Mixins::Dispatcher
@@ -40,31 +40,31 @@ describe Temple::Mixins::Dispatcher do
   end
 
   it 'should return unhandled expressions' do
-    @filter.call([:unhandled]).should.equal [:unhandled]
+    expect(@filter.call([:unhandled])).to eq([:unhandled])
   end
 
   it 'should dispatch first level' do
-    @filter.call([:test, 42]).should.equal [:on_test, 42]
+    expect(@filter.call([:test, 42])).to eq([:on_test, 42])
   end
 
   it 'should dispatch second level' do
-    @filter.call([:second, :test, 42]).should.equal [:on_second_test, 42]
+    expect(@filter.call([:second, :test, 42])).to eq([:on_second_test, 42])
   end
 
   it 'should dispatch second level if prefixed' do
-    @filter.call([:test, :check, 42]).should.equal [:on_check, 42]
+    expect(@filter.call([:test, :check, 42])).to eq([:on_check, 42])
   end
 
   it 'should dispatch parent level' do
-    @filter.call([:a, 42]).should == [:a, 42]
-    @filter.call([:a, :b, 42]).should == [:on_ab, 42]
-    @filter.call([:a, :b, :test, 42]).should == [:on_ab_test, 42]
-    @filter.call([:a, :b, :c, 42]).should == [:on_ab, :c, 42]
-    @filter.call([:a, :b, :c, :d, 42]).should == [:on_ab, :c, :d, 42]
-    @filter.call([:a, :b, :c, :d, :test, 42]).should == [:on_abcd_test, 42]
+    expect(@filter.call([:a, 42])).to eq [:a, 42]
+    expect(@filter.call([:a, :b, 42])).to eq [:on_ab, 42]
+    expect(@filter.call([:a, :b, :test, 42])).to eq [:on_ab_test, 42]
+    expect(@filter.call([:a, :b, :c, 42])).to eq [:on_ab, :c, 42]
+    expect(@filter.call([:a, :b, :c, :d, 42])).to eq [:on_ab, :c, :d, 42]
+    expect(@filter.call([:a, :b, :c, :d, :test, 42])).to eq [:on_abcd_test, 42]
   end
 
   it 'should dispatch zero level' do
-    FilterWithDispatcherMixinAndOn.new.call([:foo,42]).should == [:on_zero, :foo, 42]
+    expect(FilterWithDispatcherMixinAndOn.new.call([:foo,42])).to eq [:on_zero, :foo, 42]
   end
 end

data/{test/mixins/test_grammar_dsl.rb → spec/mixins/grammar_dsl_spec.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require 'spec_helper'
 
 module BasicGrammar
   extend Temple::Mixins::GrammarDSL
@@ -28,42 +28,42 @@ end
 
 describe Temple::Mixins::GrammarDSL do
   it 'should support class types' do
-    BasicGrammar.should.match :symbol
-    BasicGrammar.should.not.match [:symbol]
-    BasicGrammar.should.not.match 'string'
-    BasicGrammar.should.not.match ['string']
+    expect(BasicGrammar).to be_match(:symbol)
+    expect(BasicGrammar).not_to be_match([:symbol])
+    expect(BasicGrammar).not_to be_match('string')
+    expect(BasicGrammar).not_to be_match(['string'])
   end
 
   it 'should support value types' do
-    BasicGrammar.should.match 42
-    BasicGrammar.should.not.match 43
+    expect(BasicGrammar).to be_match(42)
+    expect(BasicGrammar).not_to be_match(43)
   end
 
   it 'should support nesting' do
-    BasicGrammar.should.match [:zero_or_more, [:zero_or_more]]
+    expect(BasicGrammar).to be_match([:zero_or_more, [:zero_or_more]])
   end
 
   it 'should support *' do
-    BasicGrammar.should.match [:zero_or_more]
-    BasicGrammar.should.match [:zero_or_more, nil, 42]
+    expect(BasicGrammar).to be_match([:zero_or_more])
+    expect(BasicGrammar).to be_match([:zero_or_more, nil, 42])
   end
 
   it 'should support +' do
-    BasicGrammar.should.not.match [:one_or_more]
-    BasicGrammar.should.match     [:one_or_more, 42]
-    BasicGrammar.should.match     [:one_or_more, 42, nil]
+    expect(BasicGrammar).not_to be_match([:one_or_more])
+    expect(BasicGrammar).to be_match(    [:one_or_more, 42])
+    expect(BasicGrammar).to be_match(    [:one_or_more, 42, nil])
   end
 
   it 'should support ?' do
-    BasicGrammar.should.not.match [:zero_or_one, nil, 42]
-    BasicGrammar.should.match     [:zero_or_one]
-    BasicGrammar.should.match     [:zero_or_one, 42]
+    expect(BasicGrammar).not_to be_match([:zero_or_one, nil, 42])
+    expect(BasicGrammar).to be_match(    [:zero_or_one])
+    expect(BasicGrammar).to be_match(    [:zero_or_one, 42])
   end
 
   it 'should support extended grammars' do
-    ExtendedGrammar.should.match [:extended, [:extended, 42]]
-    BasicGrammar.should.not.match [:zero_or_more, [:extended, nil]]
-    BasicGrammar.should.not.match [:extended, [:extended, 42]]
+    expect(ExtendedGrammar).to be_match([:extended, [:extended, 42]])
+    expect(BasicGrammar).not_to be_match([:zero_or_more, [:extended, nil]])
+    expect(BasicGrammar).not_to be_match([:extended, [:extended, 42]])
   end
 
   it 'should have validate!' do

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,4 +1,3 @@
-require 'bacon'
 require 'temple'
 
 module TestHelper
@@ -13,18 +12,18 @@ module TestHelper
   end
 
   def grammar_validate(grammar, exp, message)
-    lambda { grammar.validate!(exp) }.should.raise(Temple::InvalidExpression).message.should.equal message
+    expect { grammar.validate!(exp) }.to raise_error(Temple::InvalidExpression, message)
   end
 
   def erb(src, options = {})
     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
 
-class Bacon::Context
-  include TestHelper
+RSpec.configure do |config|
+  config.include TestHelper
 end

data/{test/test_static_analyzer.rb → spec/static_analyzer_spec.rb}

@@ -1,9 +1,9 @@
-require 'helper'
+require 'spec_helper'
 
 describe Temple::StaticAnalyzer do
   describe '.available?' do
     it 'should return true if its dependency is available' do
-      Temple::StaticAnalyzer.available?.should.equal(defined?(Ripper) && Ripper.respond_to?(:lex))
+      expect(Temple::StaticAnalyzer.available?).to eq(defined?(Ripper) && Ripper.respond_to?(:lex))
     end
   end
 
@@ -11,13 +11,13 @@ describe Temple::StaticAnalyzer do
     describe '.static?' do
       it 'should return true if given Ruby expression is static' do
         ['true', 'false', '"hello world"', "[1, { 2 => 3 }]", "[\n1,\n]"].each do |exp|
-          Temple::StaticAnalyzer.static?(exp).should.equal(true)
+          expect(Temple::StaticAnalyzer.static?(exp)).to eq(true)
         end
       end
 
       it 'should return false if given Ruby expression is dynamic' do
         ['1 + 2', 'variable', 'method_call(a)', 'CONSTANT'].each do |exp|
-          Temple::StaticAnalyzer.static?(exp).should.equal(false)
+          expect(Temple::StaticAnalyzer.static?(exp)).to eq(false)
         end
       end
     end
@@ -25,13 +25,13 @@ describe Temple::StaticAnalyzer do
     describe '.syntax_error?' do
       it 'should return false if given Ruby expression is valid' do
         ['Foo.bar.baz { |c| c.d! }', '{ foo: bar }'].each do |exp|
-          Temple::StaticAnalyzer.syntax_error?(exp).should.equal(false)
+          expect(Temple::StaticAnalyzer.syntax_error?(exp)).to eq(false)
         end
       end
 
       it 'should return true if given Ruby expression is invalid' do
         ['Foo.bar.baz { |c| c.d! ', ' foo: bar '].each do |exp|
-          Temple::StaticAnalyzer.syntax_error?(exp).should.equal(true)
+          expect(Temple::StaticAnalyzer.syntax_error?(exp)).to eq(true)
         end
       end
     end

data/spec/utils_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+class UniqueTest
+  include Temple::Utils
+end
+
+describe Temple::Utils do
+  it 'has empty_exp?' do
+    expect(Temple::Utils.empty_exp?([:multi])).to eq(true)
+    expect(Temple::Utils.empty_exp?([:multi, [:multi]])).to eq(true)
+    expect(Temple::Utils.empty_exp?([:multi, [:multi, [:newline]], [:newline]])).to eq(true)
+    expect(Temple::Utils.empty_exp?([:multi])).to eq(true)
+    expect(Temple::Utils.empty_exp?([:multi, [:multi, [:static, 'text']]])).to eq(false)
+    expect(Temple::Utils.empty_exp?([:multi, [:newline], [:multi, [:dynamic, 'text']]])).to eq(false)
+  end
+
+  it 'has unique_name' do
+    u = UniqueTest.new
+    expect(u.unique_name).to eq('_uniquetest1')
+    expect(u.unique_name).to eq('_uniquetest2')
+    expect(UniqueTest.new.unique_name).to eq('_uniquetest1')
+  end
+
+  it 'has escape_html' do
+    expect(Temple::Utils.escape_html('<')).to eq('&lt;')
+  end
+
+  it 'should escape unsafe html strings' do
+    with_html_safe do
+      expect(Temple::Utils.escape_html_safe('<')).to eq('&lt;')
+    end
+  end
+
+  it 'should not escape safe html strings' do
+    with_html_safe do
+      expect(Temple::Utils.escape_html_safe('<'.html_safe)).to eq('<')
+    end
+  end
+end

data/temple.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/temple/version'
 require 'date'
 
@@ -18,12 +17,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('rspec')
   s.add_development_dependency('rake')
-  s.add_development_dependency('erubis')
+  s.add_development_dependency('erubi')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.10.2
 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: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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
@@ -132,32 +133,32 @@ files:
 - lib/temple/templates/tilt.rb
 - lib/temple/utils.rb
 - lib/temple/version.rb
+- spec/engine_spec.rb
+- spec/erb_spec.rb
+- spec/filter_spec.rb
+- spec/filters/code_merger_spec.rb
+- spec/filters/control_flow_spec.rb
+- spec/filters/dynamic_inliner_spec.rb
+- spec/filters/eraser_spec.rb
+- spec/filters/escapable_spec.rb
+- spec/filters/multi_flattener_spec.rb
+- spec/filters/static_analyzer_spec.rb
+- spec/filters/static_merger_spec.rb
+- spec/filters/string_splitter_spec.rb
+- spec/generator_spec.rb
+- spec/grammar_spec.rb
+- spec/html/attribute_merger_spec.rb
+- spec/html/attribute_remover_spec.rb
+- spec/html/attribute_sorter_spec.rb
+- spec/html/fast_spec.rb
+- spec/html/pretty_spec.rb
+- spec/map_spec.rb
+- spec/mixins/dispatcher_spec.rb
+- spec/mixins/grammar_dsl_spec.rb
+- spec/spec_helper.rb
+- spec/static_analyzer_spec.rb
+- spec/utils_spec.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
@@ -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.2.5
 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

data/test/filters/test_string_splitter.rb

@@ -1,25 +0,0 @@
-require 'helper'
-begin
-  require 'ripper'
-rescue LoadError
-end
-
-if defined?(Ripper) && RUBY_VERSION >= "2.0.0"
-  describe Temple::Filters::StringSplitter do
-    before do
-      @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']]
-    end
-
-    describe '.compile' do
-      it 'should raise CompileError for non-string literals' do
-        lambda { Temple::Filters::StringSplitter.compile('1') }.
-          should.raise(Temple::FilterError)
-      end
-    end
-  end
-end