fast_haml 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18511a93b15141a266bc26d9fda1c988c6ed09a
-  data.tar.gz: adb2246bc9102aa0983ef003b1351e5effa3a80c
+  metadata.gz: 8b27cfffdd8647b6badef2bce9bc9696c5fabdac
+  data.tar.gz: bd9776dd0a37157e8fabfcfb1d81a90d7f84f341
 SHA512:
-  metadata.gz: e9ba91139b2222b4d8c4e172c8e694f6d8dc107c474402cb8e115f0d8869886a89659eb35a1b4aa84010943675ebfe235539dfd872b610a27b63caa068096d6f
-  data.tar.gz: 1b111f4bf03b525f4ca15201907103654a8213fd1d20d47ac8b36412af2c70acfc3b6aaae462b7a9eb37ab5c587bff9420c92693c3a3e493523532526252a3ff
+  metadata.gz: 268d5ce19f97c7b2c5fdd6ef20fa2f4e5ac490ef2b974f4c8ea3db50d59fecd5c661f49fc2966bd432fa44c77126495f71c0ec1452f6ab0db2f905b79609c07c
+  data.tar.gz: 71dbcabdf836323d3a23070ec9d443f9e94912b05b6715fa455640f70a698741337105442e3692a0436de2a8cc2f208b950fcfef7d0513170c98ff906b3c8c7e

data/.travis.yml

@@ -10,6 +10,8 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_edge.gemfile
+after_script:
+  - bundle exec rake benchmark:rendering
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+## 0.1.1 (2015-02-23)
+- Fix attribute parsing with `%span {foo}` or `%span (foo)` cases.
+- Fix comparison with statically-compilable class attributes like `%span.foo{class: bar}` .
+
 ## 0.1.0 (2015-02-23)
 - Initial release

data/README.md

@@ -1,4 +1,5 @@
 # FastHaml
+[![Gem Version](https://badge.fury.io/rb/fast_haml.svg)](http://badge.fury.io/rb/fast_haml)
 [![Build Status](https://travis-ci.org/eagletmt/fast_haml.svg)](https://travis-ci.org/eagletmt/fast_haml)
 [![Coverage Status](https://coveralls.io/repos/eagletmt/fast_haml/badge.svg)](https://coveralls.io/r/eagletmt/fast_haml)
 [![Code Climate](https://codeclimate.com/github/eagletmt/fast_haml/badges/gpa.svg)](https://codeclimate.com/github/eagletmt/fast_haml)

data/Rakefile

@@ -9,3 +9,20 @@ end
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+
+namespace :benchmark do
+  task :rendering => ['benchmark:rendering:haml', 'benchmark:rendering:attributes']
+  namespace :rendering do
+    desc "Run benchmark with Haml's standard template"
+    task :haml do
+      haml_gem = Gem::Specification.find_by_name('haml')
+      standard_haml_path = File.join(haml_gem.gem_dir, 'test', 'templates', 'standard.haml')
+      sh 'ruby', 'benchmark/rendering.rb', standard_haml_path
+    end
+
+    desc "Run benchmark for attribute builder"
+    task :attributes do
+      sh 'ruby', 'benchmark/rendering.rb', File.join('benchmark/attribute_builder.haml')
+    end
+  end
+end

data/benchmark/attribute_builder.haml

@@ -0,0 +1,5 @@
+- h = { 'user' => { id: 1234, name: 'eagletmt' }, book_id: 5432 }
+- c = %w[content active]
+
+%span.book{data: h, class: c}
+  Book

data/lib/fast_haml/compiler.rb

@@ -252,10 +252,10 @@ module FastHaml
     def build_optimized_attributes(parser, static_id, static_class)
       static_attributes = {}
       parser.static_attributes.each do |k, v|
-        static_attributes[k.to_s] = v;
+        static_attributes[k.to_s] = v
       end
       unless static_class.empty?
-        static_attributes['class'] = [static_class.split(/ +/), static_attributes['class']].compact.flatten.sort.join(' ')
+        static_attributes['class'] = [static_class.split(/ +/), static_attributes['class']].compact.flatten.map(&:to_s).sort.join(' ')
       end
       unless static_id.empty?
         static_attributes['id'] = [static_id, static_attributes['id']].compact.join('_')

data/lib/fast_haml/element_parser.rb

@@ -25,7 +25,7 @@ module FastHaml
       element.static_class, element.static_id = parse_class_and_id(m[2])
       rest = m[3] || ''
 
-      element.attributes, rest = parse_attributes(rest.lstrip)
+      element.attributes, rest = parse_attributes(rest)
       element.nuke_inner_whitespace, element.nuke_outer_whitespace, rest = parse_nuke_whitespace(rest)
       element.self_closing, rest = parse_self_closing(rest)
       element.oneline_child = parse_oneline_child(rest)

data/lib/fast_haml/railtie.rb

@@ -2,6 +2,11 @@ module FastHaml
   class Railtie < ::Rails::Railtie
     initializer :fast_haml do |app|
       require 'fast_haml/rails_handler'
+      begin
+        # Load Haml::Plugin earlier to overwrite template handler with fast_haml.
+        require 'haml/plugin'
+      rescue LoadError
+      end
       ActionView::Template.register_template_handler(:haml, FastHaml::RailsHandler.new)
     end
   end

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/render/attribute_spec.rb

@@ -30,6 +30,15 @@ RSpec.describe 'Attributes rendering', type: :render do
 HAML
   end
 
+  it 'strigify non-string classes' do
+    expect(render_string('%span.foo{class: :bar} hello')).to eq("<span class='bar foo'>hello</span>\n")
+    expect(render_string('%span.foo{class: 1} hello')).to eq("<span class='1 foo'>hello</span>\n")
+  end
+
+  it 'strigify non-string ids' do
+    expect(render_string('%span.#foo{id: :bar} hello')).to eq("<span id='foo_bar'>hello</span>\n")
+  end
+
   it 'escapes' do
     expect(render_string(%q|%span{class: "x\"y'z"} hello|)).to eq(%Q{<span class='x&quot;y&#39;z'>hello</span>\n})
   end

data/spec/render/element_spec.rb

@@ -63,6 +63,11 @@ HAML
     expect(render_string('%span.foo#foo-bar.bar hello')).to eq(%Q{<span class='foo bar' id='foo-bar'>hello</span>\n})
   end
 
+  it "doesn't skip spaces before attribute list" do
+    expect(render_string('%span {hello}')).to eq("<span>{hello}</span>\n")
+    expect(render_string('%span (hello)')).to eq("<span>(hello)</span>\n")
+  end
+
   context 'with invalid tag name' do
     it 'raises error' do
       expect { render_string('%.foo') }.to raise_error(FastHaml::SyntaxError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -211,6 +211,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/attribute_builder.haml
 - benchmark/rendering.rb
 - bin/fast_haml
 - ext/attribute_builder/attribute_builder.c