temple 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70234f9ea5cb84da4b1a8cdcfc8f63056d8af5ce
-  data.tar.gz: 4b76d19c5643183eb268c83dffc968f777c8d97a
+  metadata.gz: 524637aaba62c678fcfe02760bb49ec94a2073c3
+  data.tar.gz: a342126edf52f3e3578c4cc9f70540aed6b32b84
 SHA512:
-  metadata.gz: 9c7ec6543f4fc8d3d95fc5046a606135605886b5e0ab67deb50e311ae50b5ff7b3030971173ca42d1ca8b67a45c33427b2b2cbaaac0b071f02d17dfcae0ef274
-  data.tar.gz: a8fb82e723319e0b4f1b11cd33c7b155f1cebda73345bf418b22626bd23b566b85904e45474535c8406fdd9693c6e1a7d75547b9c9d323d8b298cb9bffa86c50
+  metadata.gz: 1bbc62f26373b9fb48c57cad57672ef3c379af1b991ba2538f3d7b699f6f0c22b19199520849869463349af07b810946a52029c345e7ec532aa81fb8b893d1e8
+  data.tar.gz: 98da558eb0435b349b4c5ee44c407c92c07ee7eba8d08619d8a5158e447c423e16693707a052077ac4822aea810b1784f7fa0cc446fcf2648267b17dced0f421

data/.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
+dist: trusty
+
+cache: bundler
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
   - ruby-head
   - jruby-19mode
-  - rbx-2
+  - rbx-3
 
 sudo: false
 
@@ -18,3 +22,9 @@ env:
 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/CHANGES

@@ -1,6 +1,15 @@
+0.8.0
+
+  * Add Temple::StaticAnalyzer to analyze Ruby expressions
+  * Support newlines in Temple::Filters::StaticAnalyzer
+
+0.7.8
+
+  * Fix an warning in StaticAnalyzer
+
 0.7.7
 
-  * Add StaticAnalyzer, StringSplitter
+  * Add Temple::Filters::StaticAnalyzer, Temple::Filters::StringSplitter
   * Freeze string literals
 
 0.7.6

data/EXPRESSIONS.md

@@ -227,6 +227,7 @@ Example:
     [:html, :tag, 'img', [:html, :attrs, [:html, :attr, 'src', 'image.png']]]
     [:html, :tag, 'p', [:multi], [:static, 'Content']]
 generates:
+    
     <img src="image.png"/>
     <p>Content</p>
 

data/lib/temple.rb

@@ -13,6 +13,7 @@ module Temple
   autoload :ImmutableMap,         'temple/map'
   autoload :MutableMap,           'temple/map'
   autoload :OptionMap,            'temple/map'
+  autoload :StaticAnalyzer,       'temple/static_analyzer'
 
   module Mixins
     autoload :Dispatcher,         'temple/mixins/dispatcher'

data/lib/temple/filters/static_analyzer.rb

@@ -1,85 +1,28 @@
-begin
-  require 'ripper'
-rescue LoadError
-end
-
 module Temple
   module Filters
     # Convert [:dynamic, code] to [:static, text] if code is static Ruby expression.
     class StaticAnalyzer < Filter
-      STATIC_TOKENS = [
-        :on_tstring_beg, :on_tstring_end, :on_tstring_content,
-        :on_embexpr_beg, :on_embexpr_end,
-        :on_lbracket, :on_rbracket,
-        :on_qwords_beg, :on_words_sep, :on_qwords_sep,
-        :on_lparen, :on_rparen,
-        :on_lbrace, :on_rbrace, :on_label,
-        :on_int, :on_float, :on_imaginary,
-        :on_comma, :on_sp,
-      ].freeze
-
-      DYNAMIC_TOKENS = [
-        :on_ident, :on_period,
-      ].freeze
-
-      STATIC_KEYWORDS = [
-        'true', 'false', 'nil',
-      ].freeze
-
-      STATIC_OPERATORS = [
-        '=>',
-      ].freeze
-
-      if defined?(Ripper)
-        def self.static?(code)
-          return false if code.nil? || code.strip.empty?
-          return false if SyntaxChecker.syntax_error?(code)
-
-          Ripper.lex(code).each do |(_, col), token, str|
-            case token
-            when *STATIC_TOKENS
-              # noop
-            when :on_kw
-              return false unless STATIC_KEYWORDS.include?(str)
-            when :on_op
-              return false unless STATIC_OPERATORS.include?(str)
-            when *DYNAMIC_TOKENS
-              return false
-            else
-              return false
-            end
-          end
-          true
-        end
-
-        def on_dynamic(code)
-          if StaticAnalyzer.static?(code)
-            [:static, eval(code).to_s]
-          else
-            [:dynamic, code]
-          end
+      def call(exp)
+        # Optimize only when Ripper is available.
+        if ::Temple::StaticAnalyzer.available?
+          super
+        else
+          exp
         end
+      end
 
-        class SyntaxChecker < Ripper
-          class ParseError < StandardError; end
-
-          def self.syntax_error?(code)
-            self.new(code).parse
-            false
-          rescue ParseError
-            true
-          end
-
-          private
+      def on_dynamic(code)
+        if ::Temple::StaticAnalyzer.static?(code)
+          exp = [:static, eval(code).to_s]
 
-          def on_parse_error(*)
-            raise ParseError
+          newlines = code.count("\n")
+          if newlines == 0
+            exp
+          else
+            [:multi, exp, *newlines.times.map { [:newline] }]
           end
-        end
-      else
-        # Do nothing if ripper is unavailable
-        def call(ast)
-          ast
+        else
+          [:dynamic, code]
         end
       end
     end

data/lib/temple/filters/string_splitter.rb

@@ -16,7 +16,7 @@ module Temple
               tokens.pop while tokens.last && [:on_comment, :on_sp].include?(tokens.last[1])
 
               if tokens.size < 2
-                raise "Expected token size >= 2 but got: #{tokens.size}"
+                raise(FilterError, "Expected token size >= 2 but got: #{tokens.size}")
               end
               compile_tokens!(exps, tokens)
             end
@@ -27,12 +27,12 @@ module Temple
           def strip_quotes!(tokens)
             _, type, beg_str = tokens.shift
             if type != :on_tstring_beg
-              raise "Expected :on_tstring_beg but got: #{type}"
+              raise(FilterError, "Expected :on_tstring_beg but got: #{type}")
             end
 
             _, type, end_str = tokens.pop
             if type != :on_tstring_end
-              raise "Expected :on_tstring_end but got: #{type}"
+              raise(FilterError, "Expected :on_tstring_end but got: #{type}")
             end
 
             [beg_str, end_str]

data/lib/temple/static_analyzer.rb

@@ -0,0 +1,77 @@
+begin
+  require 'ripper'
+rescue LoadError
+end
+
+module Temple
+  module StaticAnalyzer
+    STATIC_TOKENS = [
+      :on_tstring_beg, :on_tstring_end, :on_tstring_content,
+      :on_embexpr_beg, :on_embexpr_end,
+      :on_lbracket, :on_rbracket,
+      :on_qwords_beg, :on_words_sep, :on_qwords_sep,
+      :on_lparen, :on_rparen,
+      :on_lbrace, :on_rbrace, :on_label,
+      :on_int, :on_float, :on_imaginary,
+      :on_comma, :on_sp, :on_ignored_nl,
+    ].freeze
+
+    DYNAMIC_TOKENS = [
+      :on_ident, :on_period,
+    ].freeze
+
+    STATIC_KEYWORDS = [
+      'true', 'false', 'nil',
+    ].freeze
+
+    STATIC_OPERATORS = [
+      '=>',
+    ].freeze
+
+    class << self
+      def available?
+        defined?(Ripper)
+      end
+
+      def static?(code)
+        return false if code.nil? || code.strip.empty?
+        return false if syntax_error?(code)
+
+        Ripper.lex(code).each do |_, token, str|
+          case token
+          when *STATIC_TOKENS
+            # noop
+          when :on_kw
+            return false unless STATIC_KEYWORDS.include?(str)
+          when :on_op
+            return false unless STATIC_OPERATORS.include?(str)
+          when *DYNAMIC_TOKENS
+            return false
+          else
+            return false
+          end
+        end
+        true
+      end
+
+      def syntax_error?(code)
+        SyntaxChecker.new(code).parse
+        false
+      rescue SyntaxChecker::ParseError
+        true
+      end
+    end
+
+    if defined?(Ripper)
+      class SyntaxChecker < Ripper
+        class ParseError < StandardError; end
+
+        private
+
+        def on_parse_error(*)
+          raise ParseError
+        end
+      end
+    end
+  end
+end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.7.7'
+  VERSION = '0.8.0'
 end

data/test/filters/test_static_analyzer.rb

@@ -1,15 +1,12 @@
 require 'helper'
-begin
-  require 'ripper'
-rescue LoadError
-end
 
-if defined?(Ripper)
-  describe Temple::Filters::StaticAnalyzer do
-    before do
-      @filter = Temple::Filters::StaticAnalyzer.new
-    end
+describe Temple::Filters::StaticAnalyzer do
+  before do
+    @filter = Temple::Filters::StaticAnalyzer.new
+    @generator = Temple::Generator.new
+  end
 
+  if Temple::StaticAnalyzer.available?
     it 'should convert :dynamic to :static if code is static' do
       @filter.call([:dynamic, '"#{"hello"}#{100}"']
       ).should.equal [:static, 'hello100']
@@ -19,5 +16,22 @@ if defined?(Ripper)
       exp = [:dynamic, '"#{hello}#{100}"']
       @filter.call(exp).should.equal(exp)
     end
+
+    it 'should not change number of newlines in generated code' do
+      exp = [:dynamic, "[100,\n200,\n]"]
+      @filter.call(exp).should.equal([:multi, [:static, '[100, 200]'], [:newline], [:newline]])
+
+      @generator.call(@filter.call(exp)).count("\n").
+        should.equal(@generator.call(exp).count("\n"))
+    end
+  else
+    it 'should do nothing' do
+      [
+        [:dynamic, '"#{"hello"}#{100}"'],
+        [:dynamic, '"#{hello}#{100}"'],
+      ].each do |exp|
+        @filter.call(exp).should.equal(exp)
+      end
+    end
   end
 end

data/test/filters/test_string_splitter.rb

@@ -14,5 +14,12 @@ if defined?(Ripper) && RUBY_VERSION >= "2.0.0"
       @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

data/test/test_static_analyzer.rb

@@ -0,0 +1,39 @@
+require '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))
+    end
+  end
+
+  if Temple::StaticAnalyzer.available?
+    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)
+        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)
+        end
+      end
+    end
+
+    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)
+        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)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -126,6 +126,7 @@ files:
 - lib/temple/mixins/options.rb
 - lib/temple/mixins/template.rb
 - lib/temple/parser.rb
+- lib/temple/static_analyzer.rb
 - lib/temple/templates.rb
 - lib/temple/templates/rails.rb
 - lib/temple/templates/tilt.rb
@@ -155,6 +156,7 @@ files:
 - 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:
@@ -176,8 +178,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby
-test_files: []
+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