faml 0.6.0 → 0.6.1

data/incompatibilities/spec/render/comment_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/comment_spec.rb:31](../../../spec/render/comment_spec.rb#L31)
+# [./spec/render/comment_spec.rb:32](../../../spec/render/comment_spec.rb#L32)
 ## Input
 ```haml
 / [if IE] hello

data/incompatibilities/spec/render/doctype_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/doctype_spec.rb:9](../../../spec/render/doctype_spec.rb#L9)
+# [./spec/render/doctype_spec.rb:10](../../../spec/render/doctype_spec.rb#L10)
 ## Input
 ```haml
 !!! xml

data/incompatibilities/spec/render/element_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/element_spec.rb:56](../../../spec/render/element_spec.rb#L56)
+# [./spec/render/element_spec.rb:57](../../../spec/render/element_spec.rb#L57)
 ## Input
 ```haml
 - @var = '</span>'

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/cdata_spec.rb:4](../../../../spec/render/filters/cdata_spec.rb#L4)
+# [./spec/render/filters/cdata_spec.rb:5](../../../../spec/render/filters/cdata_spec.rb#L5)
 ## Input
 ```haml
 :cdata

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/css_spec.rb:24](../../../../spec/render/filters/css_spec.rb#L24)
+# [./spec/render/filters/css_spec.rb:25](../../../../spec/render/filters/css_spec.rb#L25)
 ## Input
 ```haml
 %div

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/escaped_spec.rb:4](../../../../spec/render/filters/escaped_spec.rb#L4)
+# [./spec/render/filters/escaped_spec.rb:5](../../../../spec/render/filters/escaped_spec.rb#L5)
 ## Input
 ```haml
 %span start

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/javascript_spec.rb:23](../../../../spec/render/filters/javascript_spec.rb#L23)
+# [./spec/render/filters/javascript_spec.rb:24](../../../../spec/render/filters/javascript_spec.rb#L24)
 ## Input
 ```haml
 %div

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/markdown_spec.rb:12](../../../../spec/render/filters/markdown_spec.rb#L12)
+# [./spec/render/filters/markdown_spec.rb:13](../../../../spec/render/filters/markdown_spec.rb#L13)
 ## Input
 ```haml
 :markdown

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/plain_spec.rb:4](../../../../spec/render/filters/plain_spec.rb#L4)
+# [./spec/render/filters/plain_spec.rb:5](../../../../spec/render/filters/plain_spec.rb#L5)
 ## Input
 ```haml
 %span
@@ -27,7 +27,7 @@ hello
 
 ```
 
-# [./spec/render/filters/plain_spec.rb:13](../../../../spec/render/filters/plain_spec.rb#L13)
+# [./spec/render/filters/plain_spec.rb:14](../../../../spec/render/filters/plain_spec.rb#L14)
 ## Input
 ```haml
 %span

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

@@ -1,4 +1,4 @@
-# [./spec/render/filters/preserve_spec.rb:4](../../../../spec/render/filters/preserve_spec.rb#L4)
+# [./spec/render/filters/preserve_spec.rb:5](../../../../spec/render/filters/preserve_spec.rb#L5)
 ## Input
 ```haml
 %span start

data/incompatibilities/spec/render/helpers_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/helpers_spec.rb:4](../../../spec/render/helpers_spec.rb#L4)
+# [./spec/render/helpers_spec.rb:5](../../../spec/render/helpers_spec.rb#L5)
 ## Input (with options={:extend_helpers=>true})
 ```haml
 %span!= preserve "hello\nworld !"
@@ -12,6 +12,6 @@
 
 ## Hamlit (Error)
 ```html
-undefined method `preserve' for #<Object:0x00000002ca2b08>
+undefined method `preserve' for #<Object:0x000000047293c8>
 ```
 

data/incompatibilities/spec/render/multiline_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/multiline_spec.rb:22](../../../spec/render/multiline_spec.rb#L22)
+# [./spec/render/multiline_spec.rb:23](../../../spec/render/multiline_spec.rb#L23)
 ## Input
 ```haml
 %p
@@ -24,7 +24,7 @@ foo bar baz
 
 ```
 
-# [./spec/render/multiline_spec.rb:47](../../../spec/render/multiline_spec.rb#L47)
+# [./spec/render/multiline_spec.rb:48](../../../spec/render/multiline_spec.rb#L48)
 ## Input
 ```haml
 :javascript

data/incompatibilities/spec/render/newline_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/newline_spec.rb:19](../../../spec/render/newline_spec.rb#L19)
+# [./spec/render/newline_spec.rb:20](../../../spec/render/newline_spec.rb#L20)
 ## Input
 ```haml
 %div
@@ -20,7 +20,7 @@
 
 ```
 
-# [./spec/render/newline_spec.rb:27](../../../spec/render/newline_spec.rb#L27)
+# [./spec/render/newline_spec.rb:28](../../../spec/render/newline_spec.rb#L28)
 ## Input
 ```haml
 %div
@@ -46,7 +46,7 @@
 
 ```
 
-# [./spec/render/newline_spec.rb:36](../../../spec/render/newline_spec.rb#L36)
+# [./spec/render/newline_spec.rb:37](../../../spec/render/newline_spec.rb#L37)
 ## Input
 ```haml
 %div
@@ -72,7 +72,7 @@
 
 ```
 
-# [./spec/render/newline_spec.rb:71](../../../spec/render/newline_spec.rb#L71)
+# [./spec/render/newline_spec.rb:72](../../../spec/render/newline_spec.rb#L72)
 ## Input
 ```haml
 %div(foo="bar") <b>hello</b>

data/incompatibilities/spec/render/plain_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/plain_spec.rb:8](../../../spec/render/plain_spec.rb#L8)
+# [./spec/render/plain_spec.rb:9](../../../spec/render/plain_spec.rb#L9)
 ## Input
 ```haml
 %span foo\\#{1 + 2}bar

data/incompatibilities/spec/render/sanitize_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/sanitize_spec.rb:24](../../../spec/render/sanitize_spec.rb#L24)
+# [./spec/render/sanitize_spec.rb:25](../../../spec/render/sanitize_spec.rb#L25)
 ## Input
 ```haml
 &~ "<p>hello</p>"
@@ -16,7 +16,7 @@
 
 ```
 
-# [./spec/render/sanitize_spec.rb:24](../../../spec/render/sanitize_spec.rb#L24)
+# [./spec/render/sanitize_spec.rb:25](../../../spec/render/sanitize_spec.rb#L25)
 ## Input
 ```haml
 %span&~ "<p>hello</p>"

data/incompatibilities/spec/render/silent_script_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/silent_script_spec.rb:51](../../../spec/render/silent_script_spec.rb#L51)
+# [./spec/render/silent_script_spec.rb:52](../../../spec/render/silent_script_spec.rb#L52)
 ## Input
 ```haml
 %div

data/incompatibilities/spec/render/unescape_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/unescape_spec.rb:17](../../../spec/render/unescape_spec.rb#L17)
+# [./spec/render/unescape_spec.rb:18](../../../spec/render/unescape_spec.rb#L18)
 ## Input
 ```haml
 !<p>hello</p>
@@ -16,7 +16,7 @@
 
 ```
 
-# [./spec/render/unescape_spec.rb:33](../../../spec/render/unescape_spec.rb#L33)
+# [./spec/render/unescape_spec.rb:34](../../../spec/render/unescape_spec.rb#L34)
 ## Input
 ```haml
 !~ "<p>hello\n<pre>pre\nworld</pre></p>"
@@ -35,7 +35,7 @@
 
 ```
 
-# [./spec/render/unescape_spec.rb:33](../../../spec/render/unescape_spec.rb#L33)
+# [./spec/render/unescape_spec.rb:34](../../../spec/render/unescape_spec.rb#L34)
 ## Input
 ```haml
 %span!~ "<p>hello\n<pre>pre\nworld</pre></p>"

data/lib/faml.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'faml/engine'
 require_relative 'faml/tilt'
 require_relative 'faml/version'

data/lib/faml/attribute_compiler.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'attribute_optimizer'
 require_relative 'object_ref'
 

data/lib/faml/attribute_optimizer.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'error'
 require_relative 'ruby_syntax_checker'
 require_relative 'static_hash_parser'
@@ -40,11 +41,21 @@ module Faml
 
     def build_optimized_static_attributes(parser, static_id, static_class)
       static_attributes = {}
+      class_list = []
+      id_list = []
       parser.static_attributes.each do |k, v|
-        static_attributes[k.to_s] = v
+        k = k.to_s
+        case k
+        when 'id'
+          id_list.concat(Array(v))
+        when 'class'
+          class_list.concat(Array(v))
+        else
+          static_attributes[k] = v
+        end
       end
 
-      class_list = Array(static_attributes.delete('class')).select { |v| v }.flat_map { |c| c.to_s.split(/ +/) }
+      class_list = class_list.select { |v| v }.flat_map { |c| c.to_s.split(/ +/) }
       unless static_class.empty?
         class_list.concat(static_class.split(/ +/))
       end
@@ -52,7 +63,7 @@ module Faml
         static_attributes['class'] = class_list.uniq.sort.join(' ')
       end
 
-      id_list = Array(static_attributes.delete('id')).select { |v| v }
+      id_list = id_list.select { |v| v }
       unless static_id.empty?
         id_list = [static_id].concat(id_list)
       end

data/lib/faml/cli.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative '../faml'
 require 'thor'
 

data/lib/faml/compiler.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'ripper'
 require 'temple'
 require 'haml_parser/ast'

data/lib/faml/engine.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'haml_parser/parser'
 require 'temple'
 require_relative 'compiler'

data/lib/faml/error.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
   class Error < StandardError
     attr_accessor :lineno

data/lib/faml/filter_compilers.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'error'
 
 module Faml

data/lib/faml/filter_compilers/base.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative '../text_compiler'
 
 module Faml

data/lib/faml/filter_compilers/cdata.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/coffee.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'tilt_base'
 
 module Faml

data/lib/faml/filter_compilers/css.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/escaped.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/javascript.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/markdown.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'tilt_base'
 
 module Faml

data/lib/faml/filter_compilers/plain.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/preserve.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/ruby.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'base'
 
 module Faml

data/lib/faml/filter_compilers/sass.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'tilt_base'
 
 module Faml

data/lib/faml/filter_compilers/scss.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'tilt_base'
 
 module Faml

data/lib/faml/filter_compilers/tilt_base.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'temple'
 require 'tilt'
 require_relative 'base'

data/lib/faml/helpers.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
   # Don't use these methods!
 

data/lib/faml/html.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'faml/attribute_builder'
 
 module Faml

data/lib/faml/newline.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'temple'
 
 module Faml

data/lib/faml/object_ref.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
   module ObjectRef
     class << self

data/lib/faml/rails_handler.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
   class RailsHandler
     def call(template)

data/lib/faml/rails_helpers.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require_relative 'helpers'
 
 module Faml

data/lib/faml/railtie.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
   class Railtie < ::Rails::Railtie
     initializer :faml do

data/lib/faml/ruby_syntax_checker.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'ripper'
 
 module Faml

data/lib/faml/script_end.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'temple'
 
 module Faml

data/lib/faml/static_hash_parser.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'parser/current'
 
 module Faml
@@ -65,24 +66,26 @@ module Faml
       end
     end
 
-    def try_static_value(key_static, node)
+    def try_static_value(key_static, node, force_static: false)
       case node.type
       when :sym, :int, :float, :str, :rational, :complex
-        @static_attributes[key_static] = node.children[0]
+        set_static_attribute(key_static, node.children[0])
       when :true
-        @static_attributes[key_static] = true
+        set_static_attribute(key_static, true)
       when :false
-        @static_attributes[key_static] = false
+        set_static_attribute(key_static, false)
       when :nil
-        @static_attributes[key_static] = nil
+        set_static_attribute(key_static, nil)
       when :dstr
-        @dynamic_attributes[key_static] = node.location.expression.source
+        if force_static
+          throw FAILURE_TAG
+        end
+        set_dynamic_attributes(key_static, node.location.expression.source)
       when :send
-        if SPECIAL_ATTRIBUTES.include?(key_static.to_s)
+        if force_static
           throw FAILURE_TAG
-        else
-          @dynamic_attributes[key_static] = node.location.expression.source
         end
+        set_dynamic_attributes(key_static, node.location.expression.source)
       when :hash
         try_static_hash_value(key_static, node)
       when :array
@@ -91,6 +94,7 @@ module Faml
         throw FAILURE_TAG
       end
     end
+    protected :try_static_value
 
     def try_static_hash_value(key_static, node)
       parser = self.class.new
@@ -104,7 +108,7 @@ module Faml
 
     def merge_attributes(key_static, parser)
       unless parser.static_attributes.empty?
-        @static_attributes[key_static] = parser.static_attributes
+        set_static_attribute(key_static, parser.static_attributes)
       end
 
       unless parser.dynamic_attributes.empty?
@@ -116,10 +120,30 @@ module Faml
     end
 
     def try_static_array_value(key_static, node)
-      arr = node.children.map do |child|
-        try_static_value(key_static, child)
+      parser = self.class.new
+      arr = node.children.map.with_index do |child, i|
+        # TODO: Support dynamic_attributes?
+        parser.try_static_value(i, child, force_static: true)
+      end
+      set_static_attribute(key_static, arr)
+    end
+
+    def set_static_attribute(key, val)
+      case key.to_s
+      when 'id', 'class'
+        @static_attributes[key] ||= []
+        @static_attributes[key].concat(Array(val))
+      else
+        @static_attributes[key] = val
+      end
+      val
+    end
+
+    def set_dynamic_attributes(key, val)
+      if SPECIAL_ATTRIBUTES.include?(key.to_s)
+        throw FAILURE_TAG
       end
-      @static_attributes[key_static] = arr
+      @dynamic_attributes[key] = val
     end
   end
 end