hamlit 2.7.5 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab6a059796afc90a30c0e1ee9849266d7fdf1fb
-  data.tar.gz: 8c378702fb387e90139b7f06cf4a2f6ac79b27f9
+  metadata.gz: 76bc9ab1e8d7db1673f0e064e6c49df5c90b314f
+  data.tar.gz: ea809b1885e208feda51f67dedc79c9fb6603f0a
 SHA512:
-  metadata.gz: 0a3850facd865215052496f265f1ea037aeb81cacb0a51c9427f3f1865d422493670513665c0ce3cfe789fa82deec9e4750b665c18b0c21c051260d4461770bc
-  data.tar.gz: f491cdfedee20750ac82fc492295d4aaa51d79f798286b984e52387826b8ceb41f4a5ad72ae81ea1eb20bdb2dde77958d81b286bd12e3bd3db33ad0b8db264fa
+  metadata.gz: 5e2e1820481a329f96c02256a0bc106f4ab0fbf10776cb8ac931f30a27c565f5a584da7f5eb77703690d7b77864c50bf7aad0f7d3a2e72f9b493d35f59b2995e
+  data.tar.gz: 48658e6ad6370dd1d2805755deb800cb576e74102fe1cd3448bf08e6686c99bc78ac183e8da7df576f76dd9fc4022661d755e671c1ad2bb0a5cd12bf020cc37f

data/.travis.yml

@@ -9,25 +9,27 @@ matrix:
   include:
     - rvm: 2.1.10
       env: TASK=test
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: TASK=test
-    - rvm: 2.3.1
+    - rvm: 2.3.3
+      env: TASK=test
+    - rvm: 2.4.0
       env: TASK=test
     - rvm: ruby-head
       env: TASK=test
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.8.0](https://github.com/k0kubun/hamlit/compare/v2.7.5...v2.8.0) - 2017-02-12
+
+### Changed
+
+- Support Temple >= 0.8.0 and change to use StaticAnalyzer in Temple
+- Optimize attribute building code a little
+
 ## [2.7.5](https://github.com/k0kubun/hamlit/compare/v2.7.4...v2.7.5) - 2016-10-15
 
 ### Fixed

data/Gemfile

@@ -3,12 +3,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hamlit.gemspec
 gemspec
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
+  gem 'rack', '< 2'
+end
+
 gem 'benchmark-ips', '2.3.0'
 gem 'minitest-line'
 gem 'pry-byebug'
 
 if RUBY_PLATFORM !~ /mswin|mingw|bccwin|wince/
   gem 'faml'
-  gem 'lineprof'
   gem 'stackprof'
 end

data/REFERENCE.md

@@ -10,16 +10,16 @@ See [Haml's tutorial](http://haml.info/tutorial.html) if you are not familiar wi
 See [Haml's reference](http://haml.info/docs/yardoc/file.REFERENCE.html)
 for full features in original implementation.
 
-- [x] Using Haml
+- [ ] Using Haml
   - [x] Rails XSS Protection
   - [x] Ruby Module
   - [x] Options
   - [ ] Encodings
 - [x] Plain Text
   - [x] Escaping: \
-- [x] HTML Elements
+- [ ] HTML Elements
   - [x] Element Name: %
-  - [x] Attributes: `
+  - [ ] Attributes: `
      - [x] :class and :id Attributes
      - [x] HTML-style Attributes: ()
      - [x] Ruby 1.9-style Hashes
@@ -44,7 +44,7 @@ for full features in original implementation.
   - [x] Ruby Interpolation: #{}
   - [x] Escaping HTML: &=
   - [x] Unescaping HTML: !=
-- [x] Filters
+- [ ] Filters
   - [x] :cdata
   - [x] :coffee
   - [x] :css
@@ -61,7 +61,7 @@ for full features in original implementation.
   - [x] :scss
   - [ ] :textile
   - [ ] Custom Filters
-- [ ] Helper Methods
+- [x] Helper Methods
   - [x] preserve
   - [x] surround
   - [x] precede

data/benchmark/etc/tags_loop.haml

@@ -0,0 +1,2 @@
+- 100.times do
+  %span hello

data/benchmark/slim/run-benchmarks.rb

@@ -47,8 +47,9 @@ require 'faml'
 require 'hamlit'
 
 class SlimBenchmarks
-  def initialize(slow)
-    @benches    = []
+  def initialize(only_haml)
+    @only_haml = only_haml
+    @benches   = []
 
     @erb_code  = File.read(File.dirname(__FILE__) + '/view.erb')
     @haml_code = File.read(File.dirname(__FILE__) + '/view.haml')
@@ -70,8 +71,8 @@ class SlimBenchmarks
       def run_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
     }
 
-    bench("erubis v#{Erubis::VERSION}") { context.run_erubis }
-    bench("slim v#{Slim::VERSION}")     { context.run_slim_ugly }
+    bench("erubis v#{Erubis::VERSION}") { context.run_erubis }    unless @only_haml
+    bench("slim v#{Slim::VERSION}")     { context.run_slim_ugly } unless @only_haml
     bench("haml v#{Haml::VERSION}")     { context.run_haml_ugly }
     bench("faml v#{Faml::VERSION}")     { context.run_faml }
     bench("hamlit v#{Hamlit::VERSION}") { context.run_hamlit }
@@ -91,4 +92,4 @@ class SlimBenchmarks
   end
 end
 
-SlimBenchmarks.new(ENV['slow']).run
+SlimBenchmarks.new(ENV['ONLY_HAML'] == '1').run

data/hamlit.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_dependency 'temple', '~> 0.7.6'
+  spec.add_dependency 'temple', '>= 0.8.0'
   spec.add_dependency 'thor'
   spec.add_dependency 'tilt'
 

data/lib/hamlit/attribute_compiler.rb

@@ -2,7 +2,6 @@
 require 'hamlit/attribute_builder'
 require 'hamlit/attribute_parser'
 require 'hamlit/ruby_expression'
-require 'hamlit/static_analyzer'
 
 module Hamlit
   class AttributeCompiler
@@ -30,7 +29,7 @@ module Hamlit
       attrs = node.value[:attributes_hashes]
       attrs.unshift(node.value[:attributes].inspect) if node.value[:attributes] != {}
 
-      args = [@escape_attrs, @quote, @format].map(&:inspect).push(node.value[:object_ref]) + attrs
+      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect].push(node.value[:object_ref]) + attrs
       [:html, :attrs, [:dynamic, "::Hamlit::AttributeBuilder.build(#{args.join(', ')})"]]
     end
 
@@ -59,7 +58,7 @@ module Hamlit
 
     def compile_id!(temple, key, values)
       build_code = attribute_builder(:id, values)
-      if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
+      if values.all? { |type, exp| type == :static || Temple::StaticAnalyzer.static?(exp) }
         temple << [:html, :attr, key, [:static, eval(build_code).to_s]]
       else
         temple << [:html, :attr, key, [:dynamic, build_code]]
@@ -68,7 +67,7 @@ module Hamlit
 
     def compile_class!(temple, key, values)
       build_code = attribute_builder(:class, values)
-      if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
+      if values.all? { |type, exp| type == :static || Temple::StaticAnalyzer.static?(exp) }
         temple << [:html, :attr, key, [:static, eval(build_code).to_s]]
       else
         temple << [:html, :attr, key, [:dynamic, build_code]]
@@ -76,10 +75,10 @@ module Hamlit
     end
 
     def compile_data!(temple, key, values)
-      args = [@escape_attrs.inspect, @quote.inspect, values.map { |v| literal_for(v) }]
+      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", values.map { |v| literal_for(v) }]
       build_code = "::Hamlit::AttributeBuilder.build_data(#{args.join(', ')})"
 
-      if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
+      if values.all? { |type, exp| type == :static || Temple::StaticAnalyzer.static?(exp) }
         temple << [:static, eval(build_code).to_s]
       else
         temple << [:dynamic, build_code]
@@ -89,7 +88,7 @@ module Hamlit
     def compile_boolean!(temple, key, values)
       exp = literal_for(values.last)
 
-      if StaticAnalyzer.static?(exp)
+      if Temple::StaticAnalyzer.static?(exp)
         value = eval(exp)
         case value
         when true then temple << [:html, :attr, key, @format == :xhtml ? [:static, key] : [:multi]]
@@ -118,7 +117,7 @@ module Hamlit
 
     def literal_for(value)
       type, exp = value
-      type == :static ? exp.inspect : exp
+      type == :static ? "#{exp.inspect}.freeze" : exp
     end
   end
 end

data/lib/hamlit/compiler/script_compiler.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'hamlit/ruby_expression'
-require 'hamlit/static_analyzer'
 require 'hamlit/string_splitter'
 
 module Hamlit
@@ -17,7 +16,7 @@ module Hamlit
           compile_interpolated_plain(node)
         when no_children && RubyExpression.string_literal?(node.value[:text])
           delegate_optimization(node)
-        when no_children && StaticAnalyzer.static?(node.value[:text])
+        when no_children && Temple::StaticAnalyzer.static?(node.value[:text])
           static_compile(node)
         else
           dynamic_compile(node, &block)

data/lib/hamlit/compiler/tag_compiler.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'hamlit/parser/haml_util'
 require 'hamlit/attribute_compiler'
-require 'hamlit/static_analyzer'
 require 'hamlit/string_splitter'
 
 module Hamlit
@@ -30,7 +29,7 @@ module Hamlit
         when node.value[:parse]
           return compile_interpolated_plain(node) if node.value[:escape_interpolation]
           return delegate_optimization(node) if RubyExpression.string_literal?(node.value[:value])
-          return delegate_optimization(node) if StaticAnalyzer.static?(node.value[:value])
+          return delegate_optimization(node) if Temple::StaticAnalyzer.static?(node.value[:value])
 
           var = @identity.generate
           [:multi,

data/lib/hamlit/engine.rb

@@ -6,7 +6,6 @@ require 'hamlit/escapable'
 require 'hamlit/force_escapable'
 require 'hamlit/html'
 require 'hamlit/string_splitter'
-require 'hamlit/static_analyzer'
 
 module Hamlit
   class Engine < Temple::Engine
@@ -27,7 +26,7 @@ module Hamlit
     use Compiler
     use HTML
     use StringSplitter
-    use StaticAnalyzer
+    filter :StaticAnalyzer
     use Escapable
     use ForceEscapable
     filter :ControlFlow

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.7.5'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,7 @@ files:
 - benchmark/etc/static_analyzer.haml
 - benchmark/etc/string_interpolation.haml
 - benchmark/etc/tags.haml
+- benchmark/etc/tags_loop.haml
 - benchmark/ext/build_data.rb
 - benchmark/ext/build_id.rb
 - benchmark/id_attribute.haml
@@ -281,7 +282,6 @@ files:
 - benchmark/utils/benchmark_ips_extension.rb
 - bin/bench
 - bin/console
-- bin/lineprof
 - bin/ruby
 - bin/setup
 - bin/stackprof
@@ -344,7 +344,6 @@ files:
 - lib/hamlit/rails_template.rb
 - lib/hamlit/railtie.rb
 - lib/hamlit/ruby_expression.rb
-- lib/hamlit/static_analyzer.rb
 - lib/hamlit/string_splitter.rb
 - lib/hamlit/template.rb
 - lib/hamlit/utils.rb
@@ -369,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation

data/bin/lineprof

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'hamlit'
-require 'lineprof'
-require 'tempfile'
-require 'thor'
-
-class CLI < Thor
-  desc 'render HAML', 'Benchmark render'
-  def render(file)
-    haml = File.read(file)
-    compiled = Hamlit::Engine.new.call(haml)
-    code = [
-      'require "lineprof"',
-      'require "hamlit"',
-
-      'Lineprof.profile(/./) do',
-        '100.times do',
-          compiled,
-        'end',
-      'end',
-    ].join("\n")
-
-    file = Tempfile.create('compiled')
-    file.write(code)
-    file.close
-
-    system("bundle exec ruby #{file.path}")
-  end
-
-  desc 'compile HAML', 'Benchmark compile'
-  def compile(file)
-    haml = File.read(file)
-    Lineprof.profile(/./) do
-      100.times { Hamlit::Engine.new.call(haml) }
-    end
-  end
-
-  private
-
-  def method_missing(*args)
-    return super if args.length > 1
-    render(args.first.to_s)
-  end
-end
-
-CLI.start

data/lib/hamlit/static_analyzer.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-require 'hamlit/ruby_expression'
-
-module Hamlit
-  class StaticAnalyzer < Temple::Filter
-    STATIC_TOKENS = %i[
-      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 = %i[
-      on_ident on_period
-    ].freeze
-
-    STATIC_KEYWORDS = %w[
-      true false nil
-    ].freeze
-
-    STATIC_OPERATORS = %w[
-      =>
-    ].freeze
-
-    def self.static?(code)
-      return false if code.nil? || code.strip.empty?
-      return false if RubyExpression.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
-    end
-  end
-end