hamlit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50a51777e07c1765575e17d91f655ce47a11be6
-  data.tar.gz: e22d32256fbd305a75a48bfe6801468da1252f43
+  metadata.gz: d5a1e096423ee86064c348eb368f24123485c237
+  data.tar.gz: 4eea016823ef282a698e59cf75af15a98aad9d19
 SHA512:
-  metadata.gz: 3d0436c3c221d564f568ba11ccae65dc1876c048067614a1102612a58028d752d5a69518fc303b10bd5626f6155549ed1b49fde0aa692695f83cfa1bf9f0c701
-  data.tar.gz: 2438e651b2b48e2d7158162004f4de35f9a084363331f1684434d5238905ed1a422bfe172720e8919f93c8cd59c94b0c2ceed64460f93c7550eb293c120d5c8c
+  metadata.gz: 70ca8fad5f406015583d08a0e80e2d878e879ebaf15aa3d6139e8bb91d8871dce7897d23eb9d6bb066854cab88140c0bd6782b176dcf7753e361bd21d0a80153
+  data.tar.gz: 1e78de32103cd32ec2a277ed95eefc1e1cacbd70431db6b8c812982d488d0fbe292e288bf834ab8569a7dba26e02b17575d79404c2f27233e2bc13c07fca1bcb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.0
+
+- Join id and class attributes
+  - https://github.com/k0kubun/hamlit/issues/23
+  - Thanks to @felixbuenemann
+
 ## v1.0.0
 
 - Use escape\_utils gem for faster escape\_html

data/README.md

@@ -15,19 +15,21 @@ or just replace `gem "haml"` with `gem "hamlit"`.
 ## Features
 ### Fast rendering
 
-Hamlit's rendering is **7.24x times faster** than original haml.
+![](http://i.gyazo.com/4fe00ff2ac2fa959dfcf86a5e27dc914.png)
+
+Hamlit's rendering is **7.16x times faster** than original haml.
 
 ```
-    erubis:   114417.8 i/s
-    hamlit:   107367.5 i/s - 1.07x slower
-      slim:   104728.0 i/s - 1.09x slower
-      faml:    87624.2 i/s - 1.31x slower
-      haml:    15796.0 i/s - 7.24x slower
+    erubis:   114501.6 i/s
+    hamlit:   112888.1 i/s - 1.01x slower
+      slim:   103298.5 i/s - 1.11x slower
+      faml:    88675.4 i/s - 1.29x slower
+      haml:    15750.6 i/s - 7.27x slower
 ```
 
-[This benchmark](https://github.com/k0kubun/hamlit/blob/b6f112aa1f51816ab9a3a81bd7810ed9cffd26aa/benchmarks/benchmark.rb)
+[This benchmark](https://github.com/k0kubun/hamlit/blob/4e5655c4ba1d51c85b4551c3b22baa6d7780d208/benchmarks/benchmark.rb)
 is the same as [slim-template/slim](https://github.com/slim-template/slim)'s one for fairness.
-([The result on travis CI](https://travis-ci.org/k0kubun/hamlit/jobs/57333515))
+([The result on travis CI](https://travis-ci.org/k0kubun/hamlit/jobs/58162910))
 
 ### Better parser
 

data/hamlit.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "escape_utils"
   spec.add_dependency "temple", "~> 0.7.3"

data/lib/hamlit/attribute.rb

@@ -27,6 +27,7 @@ module Hamlit
           next
         end
 
+        value = refine_joinable_value(key, value) if value.is_a?(Array)
         escaped = Temple::Utils.escape_html(value)
         result += " #{key}=#{@quote}#{escaped}#{@quote}"
       end
@@ -35,6 +36,15 @@ module Hamlit
 
     private
 
+    def refine_joinable_value(key, value)
+      case key
+      when :id
+        value = value.join('_')
+      when :class
+        value = value.join(' ')
+      end
+    end
+
     def merge_attributes(base, target)
       result = {}
       base   = flatten_attributes(base)
@@ -46,7 +56,7 @@ module Hamlit
           when :id
             result[key] = [base[key], target[key]].compact.join('_')
           else
-            result[key] = [base[key], target[key]].compact.join(' ')
+            result[key] = [base[key], target[key]].compact.map(&:to_s).sort.join(' ')
           end
         else
           result[key] = base[key].nil? ? target[key] : base[key]

data/lib/hamlit/compilers/old_attribute.rb

@@ -19,6 +19,10 @@ module Hamlit
       NESTABLE_ATTRIBUTES = %w[data].freeze
       IGNORED_EXPRESSIONS = %w[false nil].freeze
 
+      # Class and id are joined if the value is an array.
+      JOIN_ATTRIBUTES = %w[class id].freeze
+      JOINABLE_TOKENS = %i[on_ident on_qwords_beg on_lbracket].freeze
+
       # Only boolean attributes can be deleted for performance.
       BOOLEAN_ATTRIBUTES  = %w[
         autofocus
@@ -38,7 +42,8 @@ module Hamlit
 
         format_attributes(attrs).map do |key, value|
           next true_attribute(key) if value == 'true'
-          assert_static_value!(value) if NESTABLE_ATTRIBUTES.include?(key)
+          assert_static_value!(value)   if NESTABLE_ATTRIBUTES.include?(key)
+          detect_joinable_value!(value) if JOIN_ATTRIBUTES.include?(key)
 
           [:html, :attr, key, [:dynamic, value]]
         end
@@ -69,6 +74,14 @@ module Hamlit
         end
       end
 
+      # Give up static compilation when the value is a variable or an array.
+      def detect_joinable_value!(value)
+        tokens = Ripper.lex(value)
+        tokens.each do |(row, col), type, str|
+          raise RuntimeBuild if JOINABLE_TOKENS.include?(type)
+        end
+      end
+
       # Give up static compilation when attributes have deletable
       # attributes, such as 'checked'.
       def assert_no_boolean_attributes!(attrs)

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -73,6 +73,34 @@ describe Hamlit::Engine do
       HTML
     end
 
+    describe 'joinable attributes' do
+      it 'joins class with a space' do
+        assert_render(<<-'HAML', <<-HTML)
+          - val = ['a', 'b', 'c']
+          %p{ class: val }
+          %p{ class: %w[a b c] }
+          %p{ class: ['a', 'b', 'c'] }
+        HAML
+          <p class='a b c'></p>
+          <p class='a b c'></p>
+          <p class='a b c'></p>
+        HTML
+      end
+
+      it 'joins id with an underscore' do
+        assert_render(<<-'HAML', <<-HTML)
+          - val = ['a', 'b', 'c']
+          %p{ id: val }
+          %p{ id: %w[a b c] }
+          %p{ id: ['a', 'b', 'c'] }
+        HAML
+          <p id='a_b_c'></p>
+          <p id='a_b_c'></p>
+          <p id='a_b_c'></p>
+        HTML
+      end
+    end
+
     describe 'deletable attributes' do
       it 'deletes attributes whose value is nil or false' do
         assert_render(<<-'HAML', <<-HTML)
@@ -118,15 +146,11 @@ describe Hamlit::Engine do
         assert_render(<<-'HAML', <<-HTML)
           - val = false
           %a{ href: val }
-          %a{ class: val }
           - val = nil
           %a{ href: val }
-          %a{ class: val }
         HAML
           <a href='false'></a>
-          <a class='false'></a>
           <a href=''></a>
-          <a class=''></a>
         HTML
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -468,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -568,4 +568,3 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
-has_rdoc: