hamlit 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c9c817fb445372b286dad6f6d91cb2d34ac599
-  data.tar.gz: 65dd7e5a3e4779e50c6832ebcb6713abcb523b7d
+  metadata.gz: 36ec14e388895690831d2699c9d2bf4f8d3c37f3
+  data.tar.gz: 0151505b707e2808531677275487282eb9603fea
 SHA512:
-  metadata.gz: 46e30855eb79ed33bf267c8063220b86174efcb9a9f9639db5615b04c0d3e7b4f2167f2893cfb1673577e97f50511a00617d431347e527b71a664cdd51735f1f
-  data.tar.gz: d656ca8590ac92d82ff795656c39a9880bb57eb054b526b8c820f74e0547095ee41c83661dbb1f270eb3ad1c167c249e3e729c9cef0df977932752aee510e5d8
+  metadata.gz: f94ea2e429770cd4cd28879a2300bd59877b25a8ce4be65a4c87834b9ba0098a992380b1c371db466c412817c598757273f8c863f76fd4e0e1de8a50ed286fe6
+  data.tar.gz: f0889755f2165762003d9e5d8092b4a88f7a22cb23900f0da9f51ed4559156eae17547f5dee51fe62a80080389019c42d611aab224debe3c237ae1c345fff0cd

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.2](https://github.com/k0kubun/hamlit/compare/v2.8.1...v2.8.2) - 2017-06-19
+
+### Added
+
+- Add `--no-color` option to disable coloring in `hamlit compile` command
+  [#111](https://github.com/k0kubun/hamlit/issues/111).
+
 ## [2.8.1](https://github.com/k0kubun/hamlit/compare/v2.8.0...v2.8.1) - 2017-04-03
 
 ### Fixed
@@ -11,8 +18,6 @@ project adheres to [Semantic Versioning](http://semver.org/). This change log is
 - Fix SEGV caused by nil in old attributes
   [#101](https://github.com/k0kubun/hamlit/issues/101). *Thanks to @FND*
 
-### Fixed
-
 ## [2.8.0](https://github.com/k0kubun/hamlit/compare/v2.7.5...v2.8.0) - 2017-02-12
 
 ### Changed

data/Gemfile

@@ -1,5 +1,10 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 # Specify your gem's dependencies in hamlit.gemspec
 gemspec
 

data/README.md

@@ -10,17 +10,17 @@ Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation
 ### What is Hamlit?
 Hamlit is another implementation of [Haml](https://github.com/haml/haml).
 With some [limitations](REFERENCE.md#limitations) by design for performance,
-Hamlit is **8.54x times faster** than original haml gem in [this benchmark](benchmark/slim/run-benchmarks.rb),
-which is an HTML-escaped version of [slim-template/slim's one](https://github.com/slim-template/slim/blob/v3.0.6/benchmarks/run-benchmarks.rb) for fairness. ([Result on Travis](https://travis-ci.org/k0kubun/hamlit/jobs/93928561))
+Hamlit is **2.39x times faster** than original haml gem in [this benchmark](benchmark/slim/run-benchmarks.rb),
+which is an HTML-escaped version of [slim-template/slim's one](https://github.com/slim-template/slim/blob/v3.0.8/benchmarks/run-benchmarks.rb) for fairness. ([Result on Travis](https://travis-ci.org/k0kubun/hamlit/jobs/236567391))
 
-![Hamlit Benchmark](https://i.gyazo.com/ac9eb910c7261cc0181bd7427c860d79.png)
+<img src="https://i.gyazo.com/0f0c0362b6bd69f82715bec1d8caa191.png" width="600px" alt="Hamlit Benchmark"/>
 
 ```
-       hamlit v2.0.1:   122622.3 i/s
-         faml v0.7.0:    94239.1 i/s - 1.30x slower
-         slim v3.0.6:    89143.0 i/s - 1.38x slower
-       erubis v2.7.0:    65047.8 i/s - 1.89x slower
-  haml v5.0.0.beta.2:    14363.6 i/s - 8.54x slower
+       hamlit v2.8.1:   131048.9 i/s
+        erubi v1.6.0:   125445.4 i/s - 1.04x slower
+         slim v3.0.8:   121390.4 i/s - 1.08x slower
+         faml v0.8.1:   100750.5 i/s - 1.30x slower
+         haml v5.0.1:    54882.6 i/s - 2.39x slower
 ```
 
 ### Why is Hamlit faster?
@@ -30,11 +30,6 @@ As written in [limitations](REFERENCE.md#limitations), Hamlit drops some not-so-
 works on runtime. With the optimized language design, we can reduce the string concatenation
 to build attributes.
 
-#### Temple optimizers
-Hamlit is built with [Temple](https://github.com/judofyr/temple), which is a framework to build
-template engines and also used in Slim. By using the framework and its optimizers, Hamlit can
-reduce string allocation and concatenation easily.
-
 #### Static analyzer
 Hamlit analyzes Ruby expressions with Ripper and render it on compilation if the expression
 is static. And Hamlit can also compile string literal with string interpolation to reduce

data/REFERENCE.md

@@ -73,12 +73,6 @@ for full features in original implementation.
 
 ## Limitations
 
-### No pretty mode
-Haml has :pretty mode and :ugly mode. :pretty mode is used on development and indented beautifully.
-On production environment, :ugly mode is used and Hamlit currently supports only this mode.
-
-So you'll see difference rendering result on development environment, but it'll be the same on production.
-
 ### No Haml buffer
 Hamlit uses `Array` as buffer for performance. So you can't touch Haml::Buffer from template when using Hamlit.
 

data/benchmark/slim/run-benchmarks.rb

@@ -40,7 +40,7 @@ require 'context'
 
 require 'benchmark/ips'
 require 'tilt'
-require 'erubis'
+require 'erubi'
 require 'erb'
 require 'haml'
 require 'faml'
@@ -59,19 +59,18 @@ class SlimBenchmarks
   end
 
   def init_compiled_benches
-    haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true, escape_html: true)
-
-    context  = Context.new
+    context = Context.new
 
+    haml_ugly = Haml::Engine.new(@haml_code, format: :html5, escape_html: true)
     haml_ugly.def_method(context, :run_haml_ugly)
     context.instance_eval %{
-      def run_erubis; #{Erubis::Eruby.new(@erb_code).src}; end
+      def run_erubi; #{Erubi::Engine.new(@erb_code).src}; end
       def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
       def run_faml; #{Faml::Engine.new.call @haml_code}; end
       def run_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
     }
 
-    bench("erubis v#{Erubis::VERSION}") { context.run_erubis }    unless @only_haml
+    bench("erubi v#{Erubi::VERSION}")   { context.run_erubi }     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 }

data/hamlit.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
-  spec.add_development_dependency 'erubis'
-  spec.add_development_dependency 'haml', '4.1.0.beta.1'
+  spec.add_development_dependency 'erubi'
+  spec.add_development_dependency 'haml'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0.0'

data/lib/hamlit/cli.rb

@@ -18,8 +18,14 @@ module Hamlit
 
     desc 'compile HAML', 'Show compile result'
     option :actionview, type: :boolean, default: false, aliases: %w[-a]
+    option :color, type: :boolean, default: false, aliases: %w[-c]
     def compile(file)
-      print_code generate_code(file)
+      code = generate_code(file)
+      if options[:color]
+        colored_puts generate_code(file)
+      else
+        puts code
+      end
     end
 
     desc 'temple HAML', 'Show temple intermediate expression'
@@ -95,11 +101,9 @@ module Hamlit
       render(args.first.to_s)
     end
 
-    def print_code(code)
+    def colored_puts(code)
       require 'pry'
       puts Pry.Code(code).highlighted
-    rescue LoadError
-      puts code
     end
 
     # Enable colored pretty printing only for development environment.

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,16 +98,16 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation