temple 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fdf456fd2d277a110681cc1d0dd228bba3b75306b3caa78fb12ad668a7665c6
-  data.tar.gz: 7dfdd5001be5c652254aab301e391d7652c0bc1e44a00ee9fe5002c1899e99c1
+  metadata.gz: a2dfc92778763412687b4c4cefce7f8f01975463a4237b96e3931d246cfc9953
+  data.tar.gz: 782b6af3993bdb5179153a5eb6b12304de17f6d6b5661f64671a0aad52649dfe
 SHA512:
-  metadata.gz: 4d5847567944020f1be6ddf6b96b056ff0154cb26b00e71d4c736337cddc3e1ceb402ef4eabc3fa8a150ec56fd560cb0ac22358c8f1673bc2dfabb8407a482b9
-  data.tar.gz: f8f766aeb193a7bf781297dff7628d2e9d09840a241130f4a04f60b72e16d237c965f327696788e29f58ddadc1ce843392a52619363fc19dc5da66966d42ed09
+  metadata.gz: 18269f8d2621a71d0eaf4050e56365cb1b734c4d14cda063503e308fe353808f81de4794b3226cbc0698327a8108d5c225500d19346bf04dce761783cd57374b
+  data.tar.gz: ddd93041cc83790c7c610a67401d8b10bad033bdeb1f209e3d87a056c67dc855d8f2861bb8d2dfceb087d787938020e91c4211539ae6b2da41eb2f0d36988caa

data/CHANGES

@@ -1,3 +1,8 @@
+0.10.3
+
+  * Remove test files from the gem package (#146)
+  * Add DynamicMerger filter (#147)
+
 0.10.2
 
   * Fix Sinatra capture_generator problem (#145)

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

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

data/lib/temple.rb

@@ -50,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

@@ -12,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'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -96,6 +96,7 @@ files:
 - 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,31 +134,6 @@ 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
 homepage: https://github.com/judofyr/temple
 licenses:
@@ -178,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby

data/spec/engine_spec.rb

@@ -1,189 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-
-class Callable1
-  def call(exp)
-    exp
-  end
-end
-
-class Callable2
-  def call(exp)
-    exp
-  end
-end
-
-class MySpecialFilter
-  def initialize(opts = {})
-  end
-
-  def call(exp)
-    exp
-  end
-end
-
-class TestEngine < Temple::Engine
-  use(:Parser) do |input|
-    [:static, input]
-  end
-  use :MyFilter1, proc {|exp| exp }
-  use :MyFilter2, proc {|exp| exp }
-  use Temple::HTML::Pretty, pretty: true
-  filter :MultiFlattener
-  generator :ArrayBuffer
-  use(:BeforeBeforeLast) { MySpecialFilter }
-  use :BeforeLast, Callable1.new
-  use(:Last) { Callable2.new }
-end
-
-describe Temple::Engine do
-  it 'should build chain' do
-    expect(TestEngine.chain.size).to eq(9)
-
-    expect(TestEngine.chain[0].first).to eq(:Parser)
-    expect(TestEngine.chain[0].size).to eq(2)
-    expect(TestEngine.chain[0].last).to be_a(Proc)
-
-    expect(TestEngine.chain[1].first).to eq(:MyFilter1)
-    expect(TestEngine.chain[1].size).to eq(2)
-    expect(TestEngine.chain[1].last).to be_a(Proc)
-
-    expect(TestEngine.chain[2].first).to eq(:MyFilter2)
-    expect(TestEngine.chain[2].size).to eq(2)
-    expect(TestEngine.chain[2].last).to be_a(Proc)
-
-    expect(TestEngine.chain[3].first).to eq(:'Temple::HTML::Pretty')
-    expect(TestEngine.chain[3].size).to eq(2)
-    expect(TestEngine.chain[3].last).to be_a(Proc)
-
-    expect(TestEngine.chain[4].first).to eq(:MultiFlattener)
-    expect(TestEngine.chain[4].size).to eq(2)
-    expect(TestEngine.chain[4].last).to be_a(Proc)
-
-    expect(TestEngine.chain[5].first).to eq(:ArrayBuffer)
-    expect(TestEngine.chain[5].size).to eq(2)
-    expect(TestEngine.chain[5].last).to be_a(Proc)
-
-    expect(TestEngine.chain[6].first).to eq(:BeforeBeforeLast)
-    expect(TestEngine.chain[6].size).to eq(2)
-    expect(TestEngine.chain[6].last).to be_a(Proc)
-
-    expect(TestEngine.chain[7].first).to eq(:BeforeLast)
-    expect(TestEngine.chain[7].size).to eq(2)
-    expect(TestEngine.chain[7].last).to be_a(Proc)
-
-    expect(TestEngine.chain[8].first).to eq(:Last)
-    expect(TestEngine.chain[8].size).to eq(2)
-    expect(TestEngine.chain[8].last).to be_a(Proc)
-  end
-
-  it 'should instantiate chain' do
-    call_chain = TestEngine.new.send(:call_chain)
-    expect(call_chain[0]).to be_a(Method)
-    expect(call_chain[1]).to be_a(Method)
-    expect(call_chain[2]).to be_a(Method)
-    expect(call_chain[3]).to be_a(Temple::HTML::Pretty)
-    expect(call_chain[4]).to be_a(Temple::Filters::MultiFlattener)
-    expect(call_chain[5]).to be_a(Temple::Generators::ArrayBuffer)
-    expect(call_chain[6]).to be_a(MySpecialFilter)
-    expect(call_chain[7]).to be_a(Callable1)
-    expect(call_chain[8]).to be_a(Callable2)
-  end
-
-  it 'should have #append' do
-    engine = TestEngine.new
-    call_chain = engine.send(:call_chain)
-    expect(call_chain.size).to eq(9)
-
-    engine.append :MyFilter3 do |exp|
-      exp
-    end
-
-    expect(TestEngine.chain.size).to eq(9)
-    expect(engine.chain.size).to eq(10)
-    expect(engine.chain[9].first).to eq(:MyFilter3)
-    expect(engine.chain[9].size).to eq(2)
-    expect(engine.chain[9].last).to be_a(Proc)
-
-    call_chain = engine.send(:call_chain)
-    expect(call_chain.size).to eq(10)
-    expect(call_chain[9]).to be_a(Method)
-  end
-
-  it 'should have #prepend' do
-    engine = TestEngine.new
-    call_chain = engine.send(:call_chain)
-    expect(call_chain.size).to eq(9)
-
-    engine.prepend :MyFilter0 do |exp|
-      exp
-    end
-
-    expect(TestEngine.chain.size).to eq(9)
-    expect(engine.chain.size).to eq(10)
-    expect(engine.chain[0].first).to eq(:MyFilter0)
-    expect(engine.chain[0].size).to eq(2)
-    expect(engine.chain[0].last).to be_a(Proc)
-    expect(engine.chain[1].first).to eq(:Parser)
-
-    call_chain = engine.send(:call_chain)
-    expect(call_chain.size).to eq(10)
-    expect(call_chain[0]).to be_a(Method)
-  end
-
-  it 'should have #after' do
-    engine = TestEngine.new
-    engine.after :Parser, :MyFilter0 do |exp|
-      exp
-    end
-    expect(TestEngine.chain.size).to eq(9)
-    expect(engine.chain.size).to eq(10)
-    expect(engine.chain[0].first).to eq(:Parser)
-    expect(engine.chain[1].first).to eq(:MyFilter0)
-    expect(engine.chain[2].first).to eq(:MyFilter1)
-  end
-
-  it 'should have #before' do
-    engine = TestEngine.new
-    engine.before :MyFilter1, :MyFilter0 do |exp|
-      exp
-    end
-    expect(TestEngine.chain.size).to eq(9)
-    expect(engine.chain.size).to eq(10)
-    expect(engine.chain[0].first).to eq(:Parser)
-    expect(engine.chain[1].first).to eq(:MyFilter0)
-    expect(engine.chain[2].first).to eq(:MyFilter1)
-  end
-
-  it 'should have #remove' do
-    engine = TestEngine.new
-    engine.remove :MyFilter1
-    expect(TestEngine.chain.size).to eq(9)
-    expect(engine.chain.size).to eq(8)
-    expect(engine.chain[0].first).to eq(:Parser)
-    expect(engine.chain[1].first).to eq(:MyFilter2)
-
-    engine = TestEngine.new
-    engine.remove /Last/
-    expect(engine.chain.size).to eq(6)
-  end
-
-  it 'should have #replace' do
-    engine = TestEngine.new
-    engine.replace :Parser, :MyParser do |exp|
-      exp
-    end
-    expect(engine.chain.size).to eq(9)
-    expect(engine.chain[0].first).to eq(:MyParser)
-  end
-
-  it 'should work with inheritance' do
-    inherited_engine = Class.new(TestEngine)
-    expect(inherited_engine.chain.size).to eq(9)
-    inherited_engine.append :MyFilter3 do |exp|
-      exp
-    end
-    expect(inherited_engine.chain.size).to eq(10)
-    expect(TestEngine.chain.size).to eq(9)
-  end
-end

data/spec/erb_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-require 'tilt/erubi'
-
-describe Temple::ERB::Engine do
-  it 'should compile erb' do
-    src = %q{
-%% hi
-= hello
-<% 3.times do |n| %>
-* <%= n %>
-<% end %>
-}
-
-    expect(erb(src)).to eq(erubi(src))
-  end
-
-  it 'should recognize comments' do
-    src = %q{
-hello
-  <%# comment -- ignored -- useful in testing %>
-world}
-
-    expect(erb(src)).to eq(erubi(src))
-  end
-
-  it 'should recognize <%% and %%>' do
-    src = %q{
-<%%
-<% if true %>
-  %%>
-<% end %>
-}
-
-    expect(erb(src)).to eq("\n<%\n  %>\n")
-  end
-
-  it 'should escape automatically' do
-    src = '<%== "<" %>'
-    ans = '&lt;'
-    expect(erb(src)).to eq(ans)
-  end
-
-  it 'should support = to disable automatic escape' do
-    src = '<%= "<" %>'
-    ans = '<'
-    expect(erb(src)).to eq(ans)
-  end
-
-  it 'should support trim mode' do
-    src = %q{
-%% hi
-= hello
-<% 3.times do |n| %>
-* <%= n %>
-<% end %>
-}
-
-    expect(erb(src, trim: true)).to eq(erubi(src, trim: true))
-    expect(erb(src, trim: false)).to eq(erubi(src, trim: false))
-  end
-end

data/spec/filter_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-class SimpleFilter < Temple::Filter
-  define_options :key
-
-  def on_test(arg)
-    [:on_test, arg]
-  end
-end
-
-describe Temple::Filter do
-  it 'should support options' do
-    expect(Temple::Filter).to respond_to(:default_options)
-    expect(Temple::Filter).to respond_to(:set_default_options)
-    expect(Temple::Filter).to respond_to(:define_options)
-    expect(Temple::Filter.new.options).to be_a(Temple::ImmutableMap)
-    expect(SimpleFilter.new(key: 3).options[:key]).to eq(3)
-  end
-
-  it 'should implement call' do
-    expect(Temple::Filter.new.call([:exp])).to eq([:exp])
-  end
-
-  it 'should process expressions' do
-    filter = SimpleFilter.new
-    expect(filter.call([:unhandled])).to eq([:unhandled])
-    expect(filter.call([:test, 42])).to eq([:on_test, 42])
-  end
-end

data/spec/filters/code_merger_spec.rb

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

data/spec/filters/control_flow_spec.rb

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