faml 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11898f802ec5a7c2db4ee3dddda380478dc5cbff
-  data.tar.gz: 4151d81c63cc375de89f7eb5f165cb63fa9388a3
+  metadata.gz: 9f188aeb028e6438b455033f6f2efe701297ad13
+  data.tar.gz: cac035f6c7671aef877c83ff47d7e772941b2d1a
 SHA512:
-  metadata.gz: d8917747df51adc7d2df2606657e659760eecab5ea673d1241c9acaa024edb6c88884d1e8560093b1faca4a3c5fec77fe345c5b6c3fbfbf713e98e9f7221c4ed
-  data.tar.gz: 3b667d9450d939a47690b906c3b25f1be9708914c07435f5485305374729a2a33ff9c366a1a278ed63fc710c846785d77900f42ab3416b081030a9442481d87f
+  metadata.gz: 0e9c2a21ca2ad84c4cb9c219bfbf971c11e85bc07fa02910a177a9f081a82a18ea37a9e4b0ecf900f84150eb41f369f65ed14c1b6b5c3ea8dc5791500c9da58e
+  data.tar.gz: 2f0873cb28c9d275e2c11ca00d2ff3b0ca3d37d794ab2c76c747eaf82cd8f780a7dc376f615dccbaf736f8a6e32c510516c790002e544fed70d0696bb260d961

data/.rubocop.yml

@@ -0,0 +1,44 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - 'haml-spec/**/*'
+
+Lint/HandleExceptions:
+  Exclude:
+    # Ignore LoadError
+    - 'lib/faml.rb'
+    - 'lib/faml/tilt.rb'
+Lint/Eval:
+  Exclude:
+    - 'lib/faml/static_hash_parser.rb'
+    - 'spec/spec_helper.rb'
+
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+Style/CaseEquality:
+  Enabled: false
+Style/GlobalVars:
+  Exclude:
+    - '**/extconf.rb'
+Style/GuardClause:
+  Enabled: false
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+Style/IfUnlessModifier:
+  Enabled: false
+Style/PercentLiteralDelimiters:
+  Enabled: false
+Style/RaiseArgs:
+  EnforcedStyle: compact
+Style/SignalException:
+  Enabled: false
+Style/TrailingComma:
+  Enabled: false
+Style/TrailingWhitespace:
+  Exclude:
+    - 'spec/render/multiline_spec.rb'
+
+Style/UnneededPercentQ:
+  Enabled: false  # buggy

data/.rubocop_todo.yml

@@ -0,0 +1,43 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-10-06 23:31:05 +0900 using RuboCop version 0.34.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 17
+Metrics/AbcSize:
+  Max: 32
+
+# Offense count: 1
+Metrics/BlockNesting:
+  Max: 4
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 341
+
+# Offense count: 7
+Metrics/CyclomaticComplexity:
+  Max: 12
+
+# Offense count: 214
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 199
+
+# Offense count: 20
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 29
+
+# Offense count: 5
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 45
+# Configuration parameters: Exclude.
+Style/Documentation:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.3 (2015-10-07)
+- Improve `Faml::AttributeBuilder.build` performance
+    - Optimize string conversions
+- Fix handling true/false/nil values in data attribute
+- Add `stats` subcommand
+    - Currently, it shows AST ratio and element attribute's ratio.
+
 ## 0.3.2 (2015-09-24)
 - Fix illegal constant name
 - Use `require_relative` if possible

data/Rakefile

@@ -22,7 +22,7 @@ namespace :benchmark do
       sh 'ruby', 'benchmark/rendering.rb', standard_haml_path
     end
 
-    desc "Run rendering benchmark for attribute builder"
+    desc 'Run rendering benchmark for attribute builder'
     task :attributes do
       sh 'ruby', 'benchmark/rendering.rb', 'benchmark/attribute_builder.haml', 'benchmark/attribute_builder.slim'
     end

data/benchmark/compiling.rb

@@ -7,7 +7,7 @@ require 'slim'
 require 'escape_utils/html/haml'
 
 unless ARGV[0]
-  $stderr.puts "Usage: #{$0} template.haml [template.slim]"
+  $stderr.puts "Usage: #{$PROGRAM_NAME} template.haml [template.slim]"
   exit 1
 end
 

data/benchmark/context.rb

@@ -4,8 +4,8 @@ class Context
   end
 
   def item
-    [ { name: 'red',   current: true,  url: '#red'   },
-      { name: 'green', current: false, url: '#green' },
-      { name: 'blue',  current: false, url: '#blue'  } ]
+    [{ name: 'red',   current: true,  url: '#red'   },
+     { name: 'green', current: false, url: '#green' },
+     { name: 'blue',  current: false, url: '#blue'  }]
   end
 end

data/benchmark/rendering.rb

@@ -7,7 +7,7 @@ require 'slim'
 require 'escape_utils/html/haml'
 
 unless ARGV[0]
-  $stderr.puts "Usage: #{$0} template.haml [template.slim]"
+  $stderr.puts "Usage: #{$PROGRAM_NAME} template.haml [template.slim]"
   exit 1
 end
 
@@ -18,17 +18,17 @@ Benchmark.ips do |x|
   obj = Object.new
 
   Haml::Engine.new(haml_code, ugly: true, escape_html: true).def_method(obj, :haml)
-  obj.instance_eval %{
+  obj.instance_eval "
     def faml_array; #{Faml::Engine.new.call(haml_code)}; end
     def faml_string; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
     def hamlit_array; #{Hamlit::Engine.new.call(haml_code)}; end
     def hamlit_string; #{Hamlit::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
-  }
+  "
   if slim_code
-    obj.instance_eval %{
+    obj.instance_eval "
       def slim_array; #{Slim::Engine.new.call(slim_code)}; end
       def slim_string; #{Slim::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(slim_code)}; end
-    }
+    "
   end
 
   x.report('Haml') { obj.haml }

data/benchmark/slim.rb

@@ -13,11 +13,11 @@ slim_code = File.read(File.join(__dir__, 'view.slim'))
 
 context = Context.new
 Haml::Engine.new(haml_code, ugly: true, escape_html: true).def_method(context, :haml)
-context.instance_eval %{
+context.instance_eval "
   def faml; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   def hamlit; #{Hamlit::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   def slim; #{Slim::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(slim_code)}; end
-}
+"
 
 Benchmark.ips do |x|
   x.report('Haml') { context.haml }

data/ext/attribute_builder/attribute_builder.c

@@ -11,7 +11,7 @@
 #endif
 
 VALUE rb_mAttributeBuilder;
-static ID id_keys, id_sort_bang, id_uniq_bang, id_merge_bang, id_to_s;
+static ID id_keys, id_sort_bang, id_uniq_bang, id_merge_bang;
 static ID id_id, id_class, id_underscore, id_hyphen, id_space, id_equal;
 
 static void
@@ -34,7 +34,7 @@ concat_array_attribute(VALUE attributes, VALUE hash, VALUE key)
 static int
 stringify_keys_i(VALUE key, VALUE value, VALUE arg)
 {
-  key = rb_funcall(key, id_to_s, 0);
+  key = rb_convert_type(key, T_STRING, "String", "to_s");
   rb_hash_aset(arg, key, value);
   return ST_CONTINUE;
 }
@@ -77,16 +77,15 @@ substitute_underscores(VALUE str)
 static int
 normalize_data_i2(VALUE key, VALUE value, VALUE ptr)
 {
-  struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
-  VALUE k = rb_funcall(arg->key, id_to_s, 0);
-
-  k = substitute_underscores(k);
-  if (OBJ_FROZEN(k)) {
-    k = rb_str_dup(k);
+  if (!(RB_TYPE_P(value, T_FALSE) || NIL_P(value))) {
+    struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
+    VALUE k = rb_str_dup(arg->key);
+
+    k = rb_str_dup(arg->key);
+    rb_str_cat(k, "-", 1);
+    rb_str_append(k, key);
+    rb_hash_aset(arg->normalized, k, value);
   }
-  rb_str_cat(k, "-", 1);
-  rb_str_append(k, key);
-  rb_hash_aset(arg->normalized, k, value);
   return ST_CONTINUE;
 }
 
@@ -95,15 +94,21 @@ static VALUE normalize_data(VALUE data);
 static int
 normalize_data_i(VALUE key, VALUE value, VALUE normalized)
 {
+  key = rb_convert_type(key, T_STRING, "String", "to_s");
+  key = substitute_underscores(key);
+
   if (RB_TYPE_P(value, T_HASH)) {
     struct normalize_data_i2_arg arg;
     arg.key = key;
     arg.normalized = normalized;
     rb_hash_foreach(normalize_data(value), normalize_data_i2, (VALUE)(&arg));
-  } else {
-    key = rb_funcall(key, id_to_s, 0);
-    key = substitute_underscores(key);
+  } else if (RB_TYPE_P(value, T_TRUE)) {
+    /* Keep Qtrue value */
     rb_hash_aset(normalized, key, value);
+  } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
+    /* Delete falsey values */
+  } else {
+    rb_hash_aset(normalized, key, rb_convert_type(value, T_STRING, "String", "to_s"));
   }
   return ST_CONTINUE;
 }
@@ -138,19 +143,21 @@ normalize(VALUE hash)
   for (i = 0; i < len; i++) {
     VALUE key = RARRAY_AREF(keys, i);
     VALUE value = rb_hash_lookup(hash, key);
-    VALUE key_str = key;
 
-    if (!RB_TYPE_P(key, T_STRING)) {
-      key_str = rb_funcall(key, id_to_s, 0);
-    }
-    if (RB_TYPE_P(value, T_HASH) && RSTRING_LEN(key_str) == 4 && memcmp(RSTRING_PTR(key_str), "data", 4) == 0) {
+    /* key must be String because it is already stringified by stringify_keys */
+    Check_Type(key, T_STRING);
+    if (RB_TYPE_P(value, T_HASH) && RSTRING_LEN(key) == 4 && memcmp(RSTRING_PTR(key), "data", 4) == 0) {
       VALUE data;
 
       rb_hash_delete(hash, key);
       data = normalize_data(value);
       rb_hash_foreach(data, put_data_attribute, hash);
-    } else if (!(RB_TYPE_P(value, T_TRUE) || RB_TYPE_P(value, T_FALSE) || NIL_P(value))) {
-      rb_hash_aset(hash, key_str, rb_funcall(value, id_to_s, 0));
+    } else if (RB_TYPE_P(value, T_TRUE)) {
+      /* Keep Qtrue value */
+    } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
+      rb_hash_delete(hash, key);
+    } else {
+      rb_hash_aset(hash, key, rb_convert_type(value, T_STRING, "String", "to_s"));
     }
   }
 }
@@ -177,7 +184,6 @@ put_attribute(VALUE buf, VALUE attr_quote, VALUE key, VALUE value)
 {
   gh_buf ob = GH_BUF_INIT;
 
-  value = rb_funcall(value, id_to_s, 0);
   Check_Type(value, T_STRING);
   if (houdini_escape_html(&ob, (const uint8_t *)RSTRING_PTR(value), RSTRING_LEN(value))) {
     value = rb_enc_str_new(ob.ptr, ob.size, rb_utf8_encoding());
@@ -195,9 +201,6 @@ put_attribute(VALUE buf, VALUE attr_quote, VALUE key, VALUE value)
 static void
 build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value)
 {
-  if (!RB_TYPE_P(key, T_STRING)) {
-    key = rb_funcall(key, id_to_s, 0);
-  }
   Check_Type(key, T_STRING);
   if (RSTRING_LEN(key) == 5 && memcmp(RSTRING_PTR(key), "class", 5) == 0) {
     long len;
@@ -209,7 +212,7 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
         VALUE v = RARRAY_AREF(value, i);
-        rb_ary_push(ary, rb_funcall(v, id_to_s, 0));
+        rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
       }
       rb_funcall(ary, id_sort_bang, 0);
       rb_funcall(ary, id_uniq_bang, 0);
@@ -225,7 +228,7 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
         VALUE v = RARRAY_AREF(value, i);
-        rb_ary_push(ary, rb_funcall(v, id_to_s, 0));
+        rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
       }
       put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_underscore)));
     }
@@ -236,8 +239,6 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
     } else {
       put_attribute(buf, attr_quote, key, key);
     }
-  } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
-    /* do nothing */
   } else {
     put_attribute(buf, attr_quote, key, value);
   }
@@ -288,7 +289,6 @@ Init_attribute_builder(void)
   id_sort_bang = rb_intern("sort!");
   id_uniq_bang = rb_intern("uniq!");
   id_merge_bang = rb_intern("merge!");
-  id_to_s = rb_intern("to_s");
 
   id_id = rb_intern("ID");
   id_class = rb_intern("CLASS");

data/faml.gemspec

@@ -4,39 +4,40 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'faml/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "faml"
+  spec.name          = 'faml'
   spec.version       = Faml::VERSION
-  spec.authors       = ["Kohei Suzuki"]
-  spec.email         = ["eagletmt@gmail.com"]
-  spec.summary       = %q{Faster implementation of Haml template language.}
-  spec.description   = %q{Faster implementation of Haml template language.}
-  spec.homepage      = "https://github.com/eagletmt/faml"
-  spec.license       = "MIT"
+  spec.authors       = ['Kohei Suzuki']
+  spec.email         = ['eagletmt@gmail.com']
+  spec.summary       = 'Faster implementation of Haml template language.'
+  spec.description   = 'Faster implementation of Haml template language.'
+  spec.homepage      = 'https://github.com/eagletmt/faml'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0") + `git -C vendor/houdini ls-files -z`.split("\x0").map { |path| "vendor/houdini/#{path}" }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.extensions    = ['ext/attribute_builder/extconf.rb']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|incompatibilities)/})
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "escape_utils"
-  spec.add_dependency "haml_parser", ">= 0.1.0"
-  spec.add_dependency "parser"
-  spec.add_dependency "temple", ">= 0.7.0"
-  spec.add_dependency "tilt"
-  spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "benchmark-ips"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coffee-script"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "haml"  # for benchmark
-  spec.add_development_dependency "hamlit", ">= 0.6.0"  # for benchmark
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "redcarpet"
-  spec.add_development_dependency "rspec", ">= 3"
-  spec.add_development_dependency "sass"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "slim"  # for benchmark
+  spec.add_dependency 'escape_utils'
+  spec.add_dependency 'haml_parser', '>= 0.1.0'
+  spec.add_dependency 'parser'
+  spec.add_dependency 'temple', '>= 0.7.0'
+  spec.add_dependency 'tilt'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coffee-script'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'haml' # for benchmark
+  spec.add_development_dependency 'hamlit', '>= 0.6.0' # for benchmark
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake-compiler'
+  spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'rspec', '>= 3'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'sass'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'slim' # for benchmark
 end

data/haml_spec_test.rb

@@ -7,10 +7,10 @@ class HamlTest < Minitest::Test
   contexts.each do |context|
     context[1].each do |name, test|
       define_method("test_spec: #{name} (#{context[0]})") do
-        html             = test["html"]
-        haml             = test["haml"]
-        locals           = Hash[(test["locals"] || {}).map {|x, y| [x.to_sym, y]}]
-        options          = Hash[(test["config"] || {}).map {|x, y| [x.to_sym, y]}]
+        html             = test['html']
+        haml             = test['haml']
+        locals           = Hash[(test['locals'] || {}).map { |x, y| [x.to_sym, y] }]
+        options          = Hash[(test['config'] || {}).map { |x, y| [x.to_sym, y] }]
         options[:format] = options[:format].to_sym if options.key?(:format)
         tilt = Tilt.new("#{name}.haml", nil, options) { haml }
         result = tilt.render(Object.new, locals)

data/lib/faml/cli.rb

@@ -25,6 +25,12 @@ module Faml
       pp Faml::Compiler.new(filename: file, format: options[:format].to_sym).call(parse_file(file))
     end
 
+    desc 'stats FILE/DIR ...', 'Show statistics'
+    def stats(*paths)
+      require_relative 'stats'
+      Stats.new(*paths).report
+    end
+
     desc 'version', 'Print version'
     option :numeric, type: :boolean, default: false, desc: 'Print version number only'
     def version

data/lib/faml/compiler.rb

@@ -45,10 +45,10 @@ module Faml
 
     def self.find_and_preserve(input)
       # Taken from the original haml code
-      re = /<(#{options[:preserve].map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im
+      re = %r{<(#{options[:preserve].map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)}im
       input.to_s.gsub(re) do |s|
-        s =~ re # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
-        "<#{$1}#{$2}>#{Helpers.preserve($3)}</#{$1}>"
+        m = s.match(re) # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
+        "<#{m[1]}#{m[2]}>#{Helpers.preserve(m[3])}</#{m[1]}>"
       end
     end
 
@@ -166,7 +166,7 @@ module Faml
         end
         compile_children(ast, temple)
         unless ast.conditional.empty?
-          temple << [:static, "<![endif]"]
+          temple << [:static, '<![endif]']
         end
         [:multi, [:html, :comment, temple]]
       end
@@ -228,7 +228,8 @@ module Faml
         return compile_static_id_and_class(static_id, static_class)
       end
 
-      if attrs = try_optimize_attributes(text, static_id, static_class)
+      attrs = try_optimize_attributes(text, static_id, static_class)
+      if attrs
         line_count = text.count("\n")
         return [:multi, [:html, :attrs, *attrs]].concat([[:newline]] * line_count)
       end
@@ -275,7 +276,7 @@ module Faml
         return nil
       end
 
-      if dynamic_attributes.has_key?('data')
+      if dynamic_attributes.key?('data')
         # XXX: Quit optimization...
         return nil
       end
@@ -287,7 +288,7 @@ module Faml
       end
 
       (static_attributes.keys + dynamic_attributes.keys).sort.flat_map do |k|
-        if static_attributes.has_key?(k)
+        if static_attributes.key?(k)
           compile_static_attribute(k, static_attributes[k])
         else
           compile_dynamic_attribute(k, dynamic_attributes[k])
@@ -331,7 +332,7 @@ module Faml
       dynamic_attributes = {}
       parser.dynamic_attributes.each do |k, v|
         k = k.to_s
-        if static_attributes.has_key?(k)
+        if static_attributes.key?(k)
           if StaticHashParser::SPECIAL_ATTRIBUTES.include?(k)
             # XXX: Quit optimization
             return nil
@@ -343,18 +344,24 @@ module Faml
     end
 
     def compile_static_attribute(key, value)
-      case
-      when value == true
-        [[:haml, :attr, key, [:multi]]]
-      when value == false || value == nil
-        [[:multi]]
-      when value.is_a?(Hash) && key == 'data'
+      if value.is_a?(Hash) && key == 'data'
         data = AttributeBuilder.normalize_data(value)
         data.keys.sort.map do |k|
-          [:haml, :attr, "data-#{k}", [:static, Temple::Utils.escape_html(data[k])]]
+          compile_static_simple_attribute("data-#{k}", data[k])
         end
       else
-        [[:haml, :attr, key, [:static, Temple::Utils.escape_html(value)]]]
+        [compile_static_simple_attribute(key, value)]
+      end
+    end
+
+    def compile_static_simple_attribute(key, value)
+      case
+      when value == true
+        [:haml, :attr, key, [:multi]]
+      when value == false || value.nil?
+        [:multi]
+      else
+        [:haml, :attr, key, [:static, Temple::Utils.escape_html(value)]]
       end
     end
 

data/lib/faml/engine.rb

@@ -20,7 +20,7 @@ module Faml
     use Newline
     filter :StaticMerger
     use :Generator do
-      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].options.valid_key?(k) })
+      options[:generator].new(options.to_hash.reject { |k, _| !options[:generator].options.valid_key?(k) })
     end
   end
 end

data/lib/faml/filter_compilers.rb

@@ -19,7 +19,7 @@ module Faml
 
     def self.find(name)
       name = name.to_s
-      if compilers.has_key?(name.to_s)
+      if compilers.key?(name.to_s)
         compilers[name].new
       else
         raise NotFound.new(name)

data/lib/faml/filter_compilers/escaped.rb

@@ -12,8 +12,8 @@ module Faml
         escape_code = Temple::Filters::Escapable.new(use_html_safe: false).instance_variable_get(:@escape_code)
         sym = unique_name
         [:multi,
-          [:capture, sym, temple],
-          [:dynamic, escape_code % sym],
+         [:capture, sym, temple],
+         [:dynamic, escape_code % sym],
         ]
       end
     end

data/lib/faml/filter_compilers/preserve.rb

@@ -11,8 +11,8 @@ module Faml
         compile_texts(temple, ast.lineno, ast.texts, keep_last_empty_lines: true)
         sym = unique_name
         [:multi,
-          [:capture, sym, temple],
-          [:dynamic, "::Faml::FilterCompilers::Preserve.preserve(#{sym})"],
+         [:capture, sym, temple],
+         [:dynamic, "::Faml::FilterCompilers::Preserve.preserve(#{sym})"],
         ]
       end
 

data/lib/faml/html.rb

@@ -3,8 +3,8 @@ require 'faml/attribute_builder'
 module Faml
   class Html < Temple::HTML::Fast
     # Override temple's default
-    self.options[:format] = :html
-    self.options[:attr_quote] = "'"
+    options[:format] = :html
+    options[:attr_quote] = "'"
 
     def on_haml_tag(name, self_closing, attrs, content = nil)
       name = name.to_s
@@ -12,7 +12,7 @@ module Faml
       result = [:multi, [:static, "<#{name}"], compile(attrs)]
       result << [:static, (closed && @format != :html ? ' /' : '') + '>']
       result << compile(content) if content
-      result << [:static, "</#{name}>"] if !closed
+      result << [:static, "</#{name}>"] unless closed
       result
     end
 
@@ -26,22 +26,22 @@ module Faml
       elsif value[0] == :dvalue
         sym = unique_name
         [:multi,
-          [:code, "#{sym} = (#{value[1]})"],
-          [:case, sym,
-            ['true', true_attribute(name)],
-            ['false, nil', [:multi]],
-            [:else, [:multi,
-              [:static, " #{name}=#{options[:attr_quote]}"],
-              [:escape, true, [:dynamic, sym]],
-              [:static, options[:attr_quote]],
-            ]],
-          ],
+         [:code, "#{sym} = (#{value[1]})"],
+         [:case, sym,
+          ['true', true_attribute(name)],
+          ['false, nil', [:multi]],
+          [:else, [:multi,
+                   [:static, " #{name}=#{options[:attr_quote]}"],
+                   [:escape, true, [:dynamic, sym]],
+                   [:static, options[:attr_quote]],
+                  ]],
+         ],
         ]
       else
         [:multi,
-          [:static, " #{name}=#{options[:attr_quote]}"],
-          compile(value),
-          [:static, options[:attr_quote]]]
+         [:static, " #{name}=#{options[:attr_quote]}"],
+         compile(value),
+         [:static, options[:attr_quote]]]
       end
     end
 

data/lib/faml/newline.rb

@@ -3,7 +3,7 @@ require 'temple'
 module Faml
   class Newline < Temple::Filter
     def on_multi(*exprs)
-      i = exprs.size-1
+      i = exprs.size - 1
       marker = false
       while i >= 0
         case exprs[i]

data/lib/faml/railtie.rb

@@ -1,6 +1,6 @@
 module Faml
   class Railtie < ::Rails::Railtie
-    initializer :faml do |app|
+    initializer :faml do
       require_relative 'rails_handler'
       ActionView::Template.register_template_handler(:haml, Faml::RailsHandler.new)
       ActionView::Template.register_template_handler(:faml, Faml::RailsHandler.new)

data/lib/faml/static_hash_parser.rb

@@ -50,8 +50,8 @@ module Faml
       end
       key = node.children[0]
       val = node.children[1]
-
-      if key_static = try_static_key(key)
+      key_static = try_static_key(key)
+      if key_static
         try_static_value(key_static, val)
       else
         throw FAILURE_TAG

data/lib/faml/stats.rb

@@ -0,0 +1,148 @@
+require 'find'
+require 'pathname'
+require 'haml_parser/parser'
+require_relative 'static_hash_parser'
+
+module Faml
+  class Stats
+    Info = Struct.new(
+      :empty_attribute_count,
+      :static_attribute_count,
+      :dynamic_attribute_count,
+      :dynamic_attribute_with_data_count,
+      :dynamic_attribute_with_newline_count,
+      :ruby_attribute_count,
+      :ast_types
+    ) do
+      def initialize(*)
+        super
+        self.ast_types ||= Hash.new { |h, k| h[k] = 0 }
+        members.each do |k|
+          self[k] ||= 0
+        end
+      end
+    end
+
+    def initialize(*paths)
+      @files = find_files(paths)
+    end
+
+    def report
+      info = Info.new
+      @files.each do |file|
+        collect_info(info, file)
+      end
+
+      report_attribute_stats(info)
+      report_ast_stats(info)
+    end
+
+    private
+
+    def find_files(paths)
+      paths.flat_map do |path|
+        if File.directory?(path)
+          find_haml_files(path)
+        else
+          [path.to_s]
+        end
+      end
+    end
+
+    def find_haml_files(dir)
+      files = []
+      Find.find(dir) do |file|
+        if File.extname(file) == '.haml'
+          files << file
+        end
+      end
+      files
+    end
+
+    def collect_info(info, file)
+      ast = HamlParser::Parser.new(filename: file).call(File.read(file))
+      walk_ast(info, ast)
+    end
+
+    def walk_ast(info, ast)
+      info.ast_types[ast.class.to_s.sub(/\A.*::(.+)\z/, '\1')] += 1
+      case ast
+      when HamlParser::Ast::Root
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::Doctype
+        :noop
+      when HamlParser::Ast::Element
+        collect_attribute_info(info, ast)
+        if ast.oneline_child
+          walk_ast(info, ast.oneline_child)
+        end
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::Script
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::SilentScript
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::HtmlComment
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::HamlComment
+        ast.children.each { |c| walk_ast(info, c) }
+      when HamlParser::Ast::Text
+        :noop
+      when HamlParser::Ast::Filter
+        :noop
+      when HamlParser::Ast::Empty
+        :noop
+      else
+        raise "InternalError: Unknown ast #{ast.class}: #{ast.inspect}"
+      end
+    end
+
+    def collect_attribute_info(info, ast)
+      if ast.attributes.empty?
+        if ast.static_class.empty? && ast.static_id.empty?
+          info.empty_attribute_count += 1
+        else
+          info.static_attribute_count += 1
+        end
+      else
+        static_hash_parser = StaticHashParser.new
+        if static_hash_parser.parse("{#{ast.attributes}}")
+          if static_hash_parser.dynamic_attributes.empty?
+            info.static_attribute_count += 1
+          else
+            if static_hash_parser.dynamic_attributes.key?('data')
+              info.dynamic_attribute_with_data_count += 1
+            elsif ast.attributes.include?("\n")
+              info.dynamic_attribute_with_newline_count += 1
+            else
+              info.dynamic_attribute_count += 1
+            end
+          end
+        else
+          info.ruby_attribute_count += 1
+        end
+      end
+    end
+
+    def report_attribute_stats(info)
+      static = info.static_attribute_count
+      dynamic = info.dynamic_attribute_count + info.dynamic_attribute_with_data_count + info.dynamic_attribute_with_newline_count
+      ruby = info.ruby_attribute_count
+      total = static + dynamic + ruby
+      puts 'Attribute stats'
+      printf("  Static attributes: %d (%.2f%%)\n", static, static * 100.0 / total)
+      printf("  Dynamic attributes: %d (%.2f%%)\n", dynamic, dynamic * 100.0 / total)
+      printf("    with data: %d\n", info.dynamic_attribute_with_data_count)
+      printf("    with newline: %d\n", info.dynamic_attribute_with_newline_count)
+      printf("  Ruby attributes: %d (%.2f%%)\n", ruby, ruby * 100.0 / total)
+    end
+
+    def report_ast_stats(info)
+      total = info.ast_types.values.inject(0, :+)
+      puts 'AST stats'
+      info.ast_types.keys.sort.each do |type|
+        v = info.ast_types[type]
+        printf("  %s: %d (%.2f%%)\n", type, v, v * 100.0 / total)
+      end
+    end
+  end
+end

data/lib/faml/text_compiler.rb

@@ -33,9 +33,9 @@ module Faml
       pos = s.pos
       while s.scan_until(INTERPOLATION_BEGIN)
         escapes = s[1].size
-        pre = s.string.byteslice(pos ... (s.pos - s.matched.size))
-        temple << [:static, pre] << [:static, "\\" * (escapes/2)]
-        if escapes % 2 == 0
+        pre = s.string.byteslice(pos...(s.pos - s.matched.size))
+        temple << [:static, pre] << [:static, '\\' * (escapes / 2)]
+        if escapes.even?
           # perform interpolation
           if s[2] == '#{'
             temple << [:escape, escape_html, [:dynamic, find_close_brace(s, lineno)]]
@@ -63,7 +63,7 @@ module Faml
       if depth != 0
         raise InvalidInterpolation.new(scanner.string, lineno)
       else
-        scanner.string.byteslice(pos ... (scanner.pos-1))
+        scanner.string.byteslice(pos...(scanner.pos - 1))
       end
     end
   end

data/lib/faml/tilt.rb

@@ -18,7 +18,7 @@ module Faml
       @code = Engine.new(options.merge(filename: filename)).call(data)
     end
 
-    def precompiled_template(locals = {})
+    def precompiled_template(_locals = {})
       @code
     end
   end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.3.2"
+  VERSION = '0.3.3'
 end

data/spec/rails/bin/setup

@@ -2,15 +2,15 @@
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file:
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
@@ -18,12 +18,12 @@ Dir.chdir APP_ROOT do
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system 'bin/rake db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system 'touch tmp/restart.txt'
 end

data/spec/rails/spec/requests/faml_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe 'Faml with Rails', type: :request do
   it 'works with :escaped filter' do
     get '/books/escaped'
     expect(response).to be_ok
-    expect(response.body).to include("<marquee>escape me</marquee>")
+    expect(response.body).to include('<marquee>escape me</marquee>')
   end
 
   describe 'preserve helper' do

data/spec/rails_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 require 'spec_helper'
-require File.expand_path("../rails/config/environment", __FILE__)
+require File.expand_path('../rails/config/environment', __FILE__)
 require 'rspec/rails'

data/spec/render/attribute_spec.rb

@@ -17,9 +17,9 @@ RSpec.describe 'Attributes rendering', type: :render do
 
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
     it 'renders attributes with 2.2-style symbol literals' do
-      expect(render_string(%Q|%span{"foo": 'bar'}|)).to eq("<span foo='bar'></span>\n")
+      expect(render_string(%q|%span{"foo": 'bar'}|)).to eq("<span foo='bar'></span>\n")
       expect(render_string(%Q|- x = 'bar'\n%span{"foo": x}|)).to eq("<span foo='bar'></span>\n")
-      expect(render_string(%Q|%span{'foo': 'bar'}|)).to eq("<span foo='bar'></span>\n")
+      expect(render_string(%q|%span{'foo': 'bar'}|)).to eq("<span foo='bar'></span>\n")
       expect(render_string(%Q|- x = 'bar'\n%span{'foo': x}|)).to eq("<span foo='bar'></span>\n")
     end
   end
@@ -33,7 +33,7 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string('%span.c2{class: ["c1", "c3"]}')).to eq("<span class='c1 c2 c3'></span>\n")
   end
 
-  it "renders boolean attributes" do
+  it 'renders boolean attributes' do
     expect(render_string('%input{checked: true}')).to eq("<input checked>\n")
     expect(render_string('%input{checked: false}')).to eq("<input>\n")
     expect(render_string('%input{checked: nil}')).to eq("<input>\n")
@@ -153,6 +153,16 @@ HAML
 %span{data: data} hello
 HAML
     end
+
+    it 'skips falsey data attributes' do
+      expect(render_string('%span{data: { foo: nil }}')).to eq("<span></span>\n")
+      expect(render_string("- v = nil\n%span{data: { foo: v }}")).to eq("<span></span>\n")
+    end
+
+    it 'renders true data attributes' do
+      expect(render_string('%span{data: { foo: true }}')).to eq("<span data-foo></span>\n")
+      expect(render_string("- v = true\n%span{data: { foo: v }}")).to eq("<span data-foo></span>\n")
+    end
   end
 
   it 'renders __LINE__ correctly' do

data/spec/render/filters/escaped_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Escaped filter rendering', type: :render do
-  it' renders escaped filter' do
+  it ' renders escaped filter' do
     expect(render_string(<<'HAML')).to eq("<span>start</span>\nhello\n  &lt;p&gt;world&lt;/p&gt;\n&lt;span&gt;hello&lt;/span&gt;\n\n<span>end</span>\n")
 %span start
 :escaped

data/spec/render/filters/plain_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Plain filter rendering', type: :render do
   it 'renders plain filter' do
-    expect(render_string(<<HAML)).to eq("<span>\nhello\n<span>world</span>\n</span>\n")
+    expect(render_string(<<'HAML')).to eq("<span>\nhello\n<span>world</span>\n</span>\n")
 %span
   :plain
     he#{'llo'}
@@ -11,7 +11,7 @@ HAML
   end
 
   it 'strips last empty lines' do
-    expect(render_string(<<HAML)).to eq("<span>\nhello\n\nabc\n<span>world</span>\n</span>\n")
+    expect(render_string(<<'HAML')).to eq("<span>\nhello\n\nabc\n<span>world</span>\n</span>\n")
 %span
   :plain
     he#{'llo'}

data/spec/render/filters/sass_spec.rb

@@ -14,7 +14,7 @@ HAML
     expect(html).to include('content: "hello"')
   end
 
-   it 'parses string interpolation' do
+  it 'parses string interpolation' do
     html = render_string(<<'HAML')
 :sass
   nav

data/spec/render/filters/scss_spec.rb

@@ -16,7 +16,7 @@ HAML
     expect(html).to include('content: "hello"')
   end
 
-   it 'parses string interpolation' do
+  it 'parses string interpolation' do
     html = render_string(<<'HAML')
 :scss
   nav {

data/spec/render/newline_spec.rb

@@ -86,7 +86,7 @@ HAML
     end
 
     it 'allows double rmnl' do
-      expect(render_string(<<HAML)).to eq("<div><span>hello</span></div>")
+      expect(render_string(<<HAML)).to eq('<div><span>hello</span></div>')
 %div><
   %span><= 'hello'
 HAML

data/spec/support/incompatibilities_generator.rb

@@ -6,7 +6,7 @@ require 'hamlit/version'
 class IncompatibilitiesGenerator
   include Singleton
 
-  class Record < Struct.new(:template, :options, :spec_path, :line_number, :faml_result, :haml_result, :hamlit_result)
+  Record = Struct.new(:template, :options, :spec_path, :line_number, :faml_result, :haml_result, :hamlit_result) do
     def incompatible?
       !all_error? && (faml_result != haml_result || faml_result != hamlit_result || haml_result != hamlit_result)
     end
@@ -70,9 +70,9 @@ class IncompatibilitiesGenerator
 
   def render_haml(template, options)
     obj = Object.new
-    Haml::Engine.new(template, {ugly: true, escape_html: true}.merge(options)).def_method(obj, :haml)
+    Haml::Engine.new(template, { ugly: true, escape_html: true }.merge(options)).def_method(obj, :haml)
     obj.haml
-  rescue Exception => e
+  rescue => e
     e
   end
 
@@ -80,7 +80,7 @@ class IncompatibilitiesGenerator
     obj = Object.new
     obj.instance_eval "def hamlit; #{Hamlit::Engine.new(options).call(template)}; end"
     obj.hamlit
-  rescue Exception => e
+  rescue => e
     e
   end
 
@@ -99,7 +99,7 @@ EOS
 
   def render_input_title(options)
     title = 'Input'
-    if !options.empty?
+    unless options.empty?
       title << " (with options=#{options.inspect})"
     end
     title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +302,8 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -359,6 +375,7 @@ files:
 - lib/faml/railtie.rb
 - lib/faml/ruby_syntax_checker.rb
 - lib/faml/static_hash_parser.rb
+- lib/faml/stats.rb
 - lib/faml/text_compiler.rb
 - lib/faml/tilt.rb
 - lib/faml/version.rb