faml 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f188aeb028e6438b455033f6f2efe701297ad13
-  data.tar.gz: cac035f6c7671aef877c83ff47d7e772941b2d1a
+  metadata.gz: c643b558a5d6ef910d8545a6be0501d258c730ea
+  data.tar.gz: 35de29c371d213c3291c3a3c0f5816b3d9638285
 SHA512:
-  metadata.gz: 0e9c2a21ca2ad84c4cb9c219bfbf971c11e85bc07fa02910a177a9f081a82a18ea37a9e4b0ecf900f84150eb41f369f65ed14c1b6b5c3ea8dc5791500c9da58e
-  data.tar.gz: 2f0873cb28c9d275e2c11ca00d2ff3b0ca3d37d794ab2c76c747eaf82cd8f780a7dc376f615dccbaf736f8a6e32c510516c790002e544fed70d0696bb260d961
+  metadata.gz: 5cebe334bdd49fb358a07f2004df19eb9542d4d215be3197b1bd52c45a035e646b5375084e009031669a7e40908d653bb29eb186f263cabee3211a18b419671d
+  data.tar.gz: 028cadedad4e8cbbafcb7e62896b2389e40f3c2f18c42bedbc48f1818b5cadfa90d6db8a04af01d8ca9ccdecfeb3d6e873d959008470d0f5d86dad7d91a4c8fb

data/.rubocop.yml

@@ -11,31 +11,43 @@ Lint/HandleExceptions:
     - '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/FormatString:
+  EnforcedStyle: sprintf
+
 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'

data/.rubocop_todo.yml

@@ -1,43 +1,23 @@
-# 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
+  Enabled: false
 
-# Offense count: 1
 Metrics/BlockNesting:
-  Max: 4
+  Enabled: false
 
-# Offense count: 4
-# Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 341
+  Enabled: false
 
-# Offense count: 7
 Metrics/CyclomaticComplexity:
-  Max: 12
+  Enabled: false
 
-# Offense count: 214
-# Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 199
+  Enabled: false
 
-# Offense count: 20
-# Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 29
+  Enabled: false
 
-# Offense count: 5
 Metrics/PerceivedComplexity:
-  Max: 13
+  Enabled: false
 
-# Offense count: 45
-# Configuration parameters: Exclude.
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.3.4 (2015-10-19)
+- Support array, rational and complex literal optimization
+    - Now `%div{class: %w[foo bar], data: { foo: 1i, bar: 2r }}` is compiled into string literal.
+- Remove `Kernel#eval` from compiler
+- Improve `faml stats` subcommand
+    - Show more detailed attribute information
+    - Fix several bugs
+
 ## 0.3.3 (2015-10-07)
 - Improve `Faml::AttributeBuilder.build` performance
     - Optimize string conversions

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/gem_tasks'
 
-task :default => [:compile, :spec]
+task :default => [:compile, :spec, :rubocop]
 
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('attribute_builder') do |ext|
@@ -10,6 +10,9 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
 task :benchmark => ['benchmark:rendering', 'benchmark:compiling']
 
 namespace :benchmark do

data/ext/attribute_builder/attribute_builder.c

@@ -10,6 +10,8 @@
 # define rb_ary_new_capa rb_ary_new2
 #endif
 
+#define FOREACH_FUNC(func) ((int (*)(ANYARGS))(func))
+
 VALUE rb_mAttributeBuilder;
 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;
@@ -43,7 +45,7 @@ static VALUE
 stringify_keys(VALUE hash)
 {
   VALUE h = rb_hash_new();
-  rb_hash_foreach(hash, stringify_keys_i, h);
+  rb_hash_foreach(hash, FOREACH_FUNC(stringify_keys_i), h);
   return h;
 }
 
@@ -101,7 +103,7 @@ normalize_data_i(VALUE key, VALUE value, VALUE normalized)
     struct normalize_data_i2_arg arg;
     arg.key = key;
     arg.normalized = normalized;
-    rb_hash_foreach(normalize_data(value), normalize_data_i2, (VALUE)(&arg));
+    rb_hash_foreach(normalize_data(value), FOREACH_FUNC(normalize_data_i2), (VALUE)(&arg));
   } else if (RB_TYPE_P(value, T_TRUE)) {
     /* Keep Qtrue value */
     rb_hash_aset(normalized, key, value);
@@ -120,7 +122,7 @@ normalize_data(VALUE data)
 
   Check_Type(data, T_HASH);
   normalized = rb_hash_new();
-  rb_hash_foreach(data, normalize_data_i, normalized);
+  rb_hash_foreach(data, FOREACH_FUNC(normalize_data_i), normalized);
   return normalized;
 }
 
@@ -151,7 +153,7 @@ normalize(VALUE hash)
 
       rb_hash_delete(hash, key);
       data = normalize_data(value);
-      rb_hash_foreach(data, put_data_attribute, hash);
+      rb_hash_foreach(data, FOREACH_FUNC(put_data_attribute), hash);
     } else if (RB_TYPE_P(value, T_TRUE)) {
       /* Keep Qtrue value */
     } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.7
-- Faml 0.3.2
+- Faml 0.3.3
 - Hamlit 1.7.2
 
 ## Table of contents
@@ -15,6 +15,7 @@
 - [spec/render/filters/escaped_spec.md](spec/render/filters/escaped_spec.md) (Hamlit's incompatibility)
 - [spec/render/filters/javascript_spec.md](spec/render/filters/javascript_spec.md)
 - [spec/render/filters/markdown_spec.md](spec/render/filters/markdown_spec.md)
+- [spec/render/filters/plain_spec.md](spec/render/filters/plain_spec.md)
 - [spec/render/filters/preserve_spec.md](spec/render/filters/preserve_spec.md) (Hamlit's incompatibility)
 - [spec/render/helpers_spec.md](spec/render/helpers_spec.md) (Hamlit's incompatibility)
 - [spec/render/multiline_spec.md](spec/render/multiline_spec.md) (Hamlit's incompatibility)

data/incompatibilities/spec/render/filters/plain_spec.md

@@ -0,0 +1,78 @@
+# [./spec/render/filters/plain_spec.rb:4](../../../../spec/render/filters/plain_spec.rb#L4)
+## Input
+```haml
+%span
+  :plain
+    he#{'llo'}
+  %span world
+
+```
+
+## Faml
+```html
+<span>
+hello
+<span>world</span>
+</span>
+
+```
+
+## Haml, Hamlit
+```html
+<span>
+hello
+
+<span>world</span>
+</span>
+
+```
+
+# [./spec/render/filters/plain_spec.rb:13](../../../../spec/render/filters/plain_spec.rb#L13)
+## Input
+```haml
+%span
+  :plain
+    he#{'llo'}
+
+    abc
+
+  %span world
+
+```
+
+## Faml
+```html
+<span>
+hello
+
+abc
+<span>world</span>
+</span>
+
+```
+
+## Haml
+```html
+<span>
+hello
+
+abc
+
+
+<span>world</span>
+</span>
+
+```
+
+## Hamlit
+```html
+<span>
+hello
+
+abc
+
+<span>world</span>
+</span>
+
+```
+

data/lib/faml/compiler.rb

@@ -318,13 +318,23 @@ module Faml
       parser.static_attributes.each do |k, v|
         static_attributes[k.to_s] = v
       end
+
+      class_list = Array(static_attributes['class']).flat_map { |c| c.to_s.split(/ +/) }
       unless static_class.empty?
-        class_list = static_attributes.fetch('class', '').to_s.split(/ +/)
-        static_attributes['class'] = static_class.split(/ +/).concat(class_list).uniq.sort.join(' ')
+        class_list.concat(static_class.split(/ +/))
+      end
+      unless class_list.empty?
+        static_attributes['class'] = class_list.uniq.sort.join(' ')
       end
+
+      id_list = Array(static_attributes['id'])
       unless static_id.empty?
-        static_attributes['id'] = [static_id, static_attributes['id']].compact.join('_')
+        id_list = [static_id].concat(id_list)
       end
+      unless id_list.empty?
+        static_attributes['id'] = id_list.join('_')
+      end
+
       static_attributes
     end
 

data/lib/faml/static_hash_parser.rb

@@ -58,35 +58,23 @@ module Faml
       end
     end
 
-    SYMBOL_FIRST_CHARS = [
-      ':',  # { :'foo' => 'bar' } or { :"foo" => 'bar' }
-      "'",  # { 'foo': 'bar' }
-      '"',  # { "foo": 'bar' }
-    ].freeze
-
-    def eval_symbol(code)
-      if SYMBOL_FIRST_CHARS.include?(code[0])
-        eval(code).to_sym
-      else
-        code.to_sym
-      end
-    end
-
     def try_static_key(node)
       case node.type
-      when :sym
-        eval_symbol(node.location.expression.source)
-      when :int, :float, :str
-        eval(node.location.expression.source)
+      when :sym, :int, :float, :str, :rational, :complex
+        node.children[0]
       end
     end
 
     def try_static_value(key_static, node)
       case node.type
-      when :sym
-        @static_attributes[key_static] = eval_symbol(node.location.expression.source)
-      when :true, :false, :nil, :int, :float, :str
-        @static_attributes[key_static] = eval(node.location.expression.source)
+      when :sym, :int, :float, :str, :rational, :complex
+        @static_attributes[key_static] = node.children[0]
+      when :true
+        @static_attributes[key_static] = true
+      when :false
+        @static_attributes[key_static] = false
+      when :nil
+        @static_attributes[key_static] = nil
       when :dstr
         @dynamic_attributes[key_static] = node.location.expression.source
       when :send
@@ -97,7 +85,8 @@ module Faml
         end
       when :hash
         try_static_hash_value(key_static, node)
-        # TODO: Add array case
+      when :array
+        try_static_array_value(key_static, node)
       else
         throw FAILURE_TAG
       end
@@ -125,5 +114,12 @@ module Faml
         @dynamic_attributes[key_static] = "{#{expr}}"
       end
     end
+
+    def try_static_array_value(key_static, node)
+      arr = node.children.map do |child|
+        try_static_value(key_static, child)
+      end
+      @static_attributes[key_static] = arr
+    end
   end
 end

data/lib/faml/stats.rb

@@ -8,10 +8,12 @@ module Faml
     Info = Struct.new(
       :empty_attribute_count,
       :static_attribute_count,
+      :static_id_or_class_attribute_count,
       :dynamic_attribute_count,
       :dynamic_attribute_with_data_count,
       :dynamic_attribute_with_newline_count,
       :ruby_attribute_count,
+      :multi_attribute_count,
       :ast_types
     ) do
       def initialize(*)
@@ -101,7 +103,7 @@ module Faml
         if ast.static_class.empty? && ast.static_id.empty?
           info.empty_attribute_count += 1
         else
-          info.static_attribute_count += 1
+          info.static_id_or_class_attribute_count += 1
         end
       else
         static_hash_parser = StaticHashParser.new
@@ -109,7 +111,7 @@ module Faml
           if static_hash_parser.dynamic_attributes.empty?
             info.static_attribute_count += 1
           else
-            if static_hash_parser.dynamic_attributes.key?('data')
+            if static_hash_parser.dynamic_attributes.key?('data') || 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
@@ -118,7 +120,12 @@ module Faml
             end
           end
         else
-          info.ruby_attribute_count += 1
+          call_ast = Parser::CurrentRuby.parse("call(#{ast.attributes})")
+          if call_ast.type == :send && call_ast.children[0].nil? && call_ast.children[1] == :call && !call_ast.children[3].nil?
+            info.multi_attribute_count += 1
+          else
+            info.ruby_attribute_count += 1
+          end
         end
       end
     end
@@ -126,14 +133,17 @@ module Faml
     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
+      ruby = info.ruby_attribute_count + info.multi_attribute_count
       total = static + dynamic + ruby
       puts 'Attribute stats'
+      printf("  Empty attributes: %d\n", info.empty_attribute_count)
+      printf("  Attributes with id or class only: %d\n", info.static_id_or_class_attribute_count)
       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)
+      printf("    with multiple arguments: %d\n", info.multi_attribute_count)
     end
 
     def report_ast_stats(info)

data/lib/faml/version.rb

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

data/spec/render/attribute_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Attributes rendering', type: :render do
 
   it 'renders array class' do
     expect(render_string('%span.c2{class: "c1"}')).to eq("<span class='c1 c2'></span>\n")
-    expect(render_string('%span.c2{class: ["c1", "c3"]}')).to eq("<span class='c1 c2 c3'></span>\n")
+    expect(render_string('%span.c2{class: ["c1", "c3", :c2]}')).to eq("<span class='c1 c2 c3'></span>\n")
   end
 
   it 'renders boolean attributes' do
@@ -119,6 +119,7 @@ HAML
 
   it 'merges static id' do
     expect(render_string('#foo{id: "bar"} baz')).to eq("<div id='foo_bar'>baz</div>\n")
+    expect(render_string('#foo{id: %w[bar baz]} hoge')).to eq("<div id='foo_bar_baz'>hoge</div>\n")
   end
 
   it 'merges static class' do

data/spec/support/incompatibilities_generator.rb

@@ -72,7 +72,7 @@ class IncompatibilitiesGenerator
     obj = Object.new
     Haml::Engine.new(template, { ugly: true, escape_html: true }.merge(options)).def_method(obj, :haml)
     obj.haml
-  rescue => e
+  rescue StandardError, SyntaxError => 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 => e
+  rescue StandardError, SyntaxError => e
     e
   end
 
@@ -110,7 +110,7 @@ EOS
       file.write <<"EOS"
 ## #{render_section(title, result)}
 ```html
-#{result}
+#{render_body(result)}
 ```
 
 EOS
@@ -125,6 +125,22 @@ EOS
     end
   end
 
+  def render_body(result)
+    if result.is_a?(Exception)
+      result
+    else
+      result.gsub(/[[:cntrl:]]/) do |m|
+        n = m[0].ord
+        if n == 0x0a
+          # Print NL character as is
+          m[0]
+        else
+          "<0x#{sprintf('%02X', n)}>"
+        end
+      end
+    end
+  end
+
   def markdown_path(markdown_root, spec_path)
     markdown_root.join(spec_path).sub_ext('.md')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -339,6 +339,7 @@ files:
 - incompatibilities/spec/render/filters/escaped_spec.md
 - incompatibilities/spec/render/filters/javascript_spec.md
 - incompatibilities/spec/render/filters/markdown_spec.md
+- incompatibilities/spec/render/filters/plain_spec.md
 - incompatibilities/spec/render/filters/preserve_spec.md
 - incompatibilities/spec/render/helpers_spec.md
 - incompatibilities/spec/render/indent_spec.md
@@ -526,6 +527,7 @@ test_files:
 - incompatibilities/spec/render/filters/escaped_spec.md
 - incompatibilities/spec/render/filters/javascript_spec.md
 - incompatibilities/spec/render/filters/markdown_spec.md
+- incompatibilities/spec/render/filters/plain_spec.md
 - incompatibilities/spec/render/filters/preserve_spec.md
 - incompatibilities/spec/render/helpers_spec.md
 - incompatibilities/spec/render/indent_spec.md