faml 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3b36d8389b63138cf89889812b0fd7d4534090
-  data.tar.gz: fc0f8be17b23d50a7b921a7d8480a81d35d37bfd
+  metadata.gz: c8c5abc0e50c774fb988c861370ccbe38c61bace
+  data.tar.gz: d56eba69f346d05509da4cbdce6dccbd3d8f8666
 SHA512:
-  metadata.gz: 6894952372619bbb11ce192021df6b7640f0d509eee42f315087dc9009b6800f8f7437e519b1d11d3c93ee2d2bc8f86c8b08bd009ad493500400eab3f9ca7a91
-  data.tar.gz: 19d60336ee8bb7fb09837540de41db71bc3f368e693dcd9d39507aae9888aa49b7523215a2777c1177d178af80434f9448ad607e39280ccd24a992c8a876f38a
+  metadata.gz: 5b1d9821bddbb9c89a289a7190ca8af46921e88154c0a2baf6ecef7648d7720437f7a01c4f1166645400e3964843cb91195850bf8cf3132dfb27267cb5cb1f1b
+  data.tar.gz: 9a01b8763adad686ff59845d00d31d3fe4cc926ce94f6a034673ecf3b4736a30760e102b26a3b1a61553a5dd6eb9fcde6f976761f5998f2385590871a5042dd3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.1 (2015-11-21)
+- Fix handling duplicated old attributes and new attributes
+    - https://github.com/eagletmt/faml/pull/37
+    - `%span{class: 1}(class: 2)` now renders `<span class='1 2'></span>` . `class` and `id` are correctly merged.
+    - `%span{foo: 1}(foo: 2)` now renders `<span foo='1'></span>` . Old attributes has priority over new attributes.
+
 ## 0.6.0 (2015-11-21)
 - Disable Faml::Helpers by default
     - https://github.com/eagletmt/faml/pull/35

data/benchmark/compiling.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen-string-literal: true
 require 'benchmark/ips'
 require 'haml'
 require 'faml'

data/benchmark/context.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 class Context
   def header
     'Colors'

data/benchmark/rendering.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen-string-literal: true
 require 'benchmark/ips'
 require 'haml'
 require 'faml'

data/benchmark/slim.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen-string-literal: true
 require 'benchmark/ips'
 require 'haml'
 require 'faml'

data/ext/attribute_builder/extconf.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'mkmf'
 
 $CFLAGS << ' -Wall -W'

data/faml.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   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 'rspec', '>= 3.3'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'simplecov'

data/haml_spec_test.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'minitest/autorun'
 require 'json'
 require 'faml'

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.7
-- Faml 0.6.0
+- Faml 0.6.1
 - Hamlit 1.7.2
 
 ## Table of contents

data/incompatibilities/spec/compiler_newline_spec.md

@@ -1,4 +1,4 @@
-# [./spec/compiler_newline_spec.rb:209](../../spec/compiler_newline_spec.rb#L209)
+# [./spec/compiler_newline_spec.rb:210](../../spec/compiler_newline_spec.rb#L210)
 ## Input
 ```haml
 = [__LINE__,

data/incompatibilities/spec/render/attribute_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/attribute_spec.rb:48](../../../spec/render/attribute_spec.rb#L48)
+# [./spec/render/attribute_spec.rb:49](../../../spec/render/attribute_spec.rb#L49)
 ## Input
 ```haml
 - h1 = {class: 'c1', id: ['id1', 'id3']}
@@ -19,7 +19,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:61](../../../spec/render/attribute_spec.rb#L61)
+# [./spec/render/attribute_spec.rb:62](../../../spec/render/attribute_spec.rb#L62)
 ## Input
 ```haml
 %span.foo{class: "foo bar"}
@@ -37,7 +37,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:67](../../../spec/render/attribute_spec.rb#L67)
+# [./spec/render/attribute_spec.rb:68](../../../spec/render/attribute_spec.rb#L68)
 ## Input
 ```haml
 %span{class: []}
@@ -55,7 +55,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
+# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
 ## Input
 ```haml
 %span{class: [1, nil, false, true]}
@@ -73,7 +73,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
+# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
 ## Input
 ```haml
 - v = [1, nil, false, true]
@@ -92,7 +92,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
+# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
 ## Input
 ```haml
 - h = { class: [1, nil, false, true] }
@@ -111,7 +111,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:81](../../../spec/render/attribute_spec.rb#L81)
+# [./spec/render/attribute_spec.rb:82](../../../spec/render/attribute_spec.rb#L82)
 ## Input
 ```haml
 %span{id: []}
@@ -129,7 +129,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
 ## Input
 ```haml
 %span{id: [1, nil, false, true]}
@@ -147,7 +147,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
 ## Input
 ```haml
 - v = [1, nil, false, true]
@@ -166,7 +166,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
 ## Input
 ```haml
 - h = { id: [1, nil, false, true] }
@@ -185,7 +185,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:91](../../../spec/render/attribute_spec.rb#L91)
+# [./spec/render/attribute_spec.rb:92](../../../spec/render/attribute_spec.rb#L92)
 ## Input
 ```haml
 %span{class: "x\"y'z"} hello
@@ -203,7 +203,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
+# [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - foo = true
@@ -222,7 +222,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
+# [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true, bar: 1}
@@ -241,7 +241,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:116](../../../spec/render/attribute_spec.rb#L116)
+# [./spec/render/attribute_spec.rb:117](../../../spec/render/attribute_spec.rb#L117)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -259,7 +259,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:120](../../../spec/render/attribute_spec.rb#L120)
+# [./spec/render/attribute_spec.rb:121](../../../spec/render/attribute_spec.rb#L121)
 ## Input
 ```haml
 - attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
@@ -285,7 +285,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:134](../../../spec/render/attribute_spec.rb#L134)
+# [./spec/render/attribute_spec.rb:135](../../../spec/render/attribute_spec.rb#L135)
 ## Input
 ```haml
 - data = { foo: 1 }
@@ -305,7 +305,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:141](../../../spec/render/attribute_spec.rb#L141)
+# [./spec/render/attribute_spec.rb:142](../../../spec/render/attribute_spec.rb#L142)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -323,7 +323,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:164](../../../spec/render/attribute_spec.rb#L164)
+# [./spec/render/attribute_spec.rb:165](../../../spec/render/attribute_spec.rb#L165)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -341,7 +341,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:172](../../../spec/render/attribute_spec.rb#L172)
+# [./spec/render/attribute_spec.rb:173](../../../spec/render/attribute_spec.rb#L173)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -359,7 +359,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:176](../../../spec/render/attribute_spec.rb#L176)
+# [./spec/render/attribute_spec.rb:177](../../../spec/render/attribute_spec.rb#L177)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -379,7 +379,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:194](../../../spec/render/attribute_spec.rb#L194)
+# [./spec/render/attribute_spec.rb:195](../../../spec/render/attribute_spec.rb#L195)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -399,7 +399,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
+# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -417,7 +417,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
+# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
 ## Input
 ```haml
 - val = "hello"
@@ -437,7 +437,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
+# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
 ## Input
 ```haml
 - key = "foo\0bar"
@@ -459,7 +459,7 @@
 ...                               ^
 ```
 
-# [./spec/render/attribute_spec.rb:215](../../../spec/render/attribute_spec.rb#L215)
+# [./spec/render/attribute_spec.rb:216](../../../spec/render/attribute_spec.rb#L216)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123)] hello
@@ -477,7 +477,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:219](../../../spec/render/attribute_spec.rb#L219)
+# [./spec/render/attribute_spec.rb:220](../../../spec/render/attribute_spec.rb#L220)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123), :hello] hello
@@ -495,7 +495,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:223](../../../spec/render/attribute_spec.rb#L223)
+# [./spec/render/attribute_spec.rb:224](../../../spec/render/attribute_spec.rb#L224)
 ## Input
 ```haml
 %span[Faml::TestRefStruct.new(123)] hello
@@ -513,7 +513,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:227](../../../spec/render/attribute_spec.rb#L227)
+# [./spec/render/attribute_spec.rb:228](../../../spec/render/attribute_spec.rb#L228)
 ## Input
 ```haml
 %span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello
@@ -531,3 +531,289 @@
 
 ```
 
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+%span{foo: 1}(foo=2)
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' foo='2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+%span(foo=2){foo: 1}
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='2' foo='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+- v = 2
+%span{foo: v-1}(foo=v)
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' foo='2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+- v = 2
+%span(foo=v){foo: v-1}
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='2' foo='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+- h = {foo: 1}
+%span{h}(foo=2)
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' foo='2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+## Input
+```haml
+- h = {foo: 1}
+%span(foo=2){h}
+```
+
+## Faml, Haml
+```html
+<span foo='1'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' foo='2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:245](../../../spec/render/attribute_spec.rb#L245)
+## Input
+```haml
+%span{class: 1}(class=2)
+```
+
+## Faml, Hamlit
+```html
+<span class='1 2'></span>
+
+```
+
+## Haml
+```html
+<span class='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:245](../../../spec/render/attribute_spec.rb#L245)
+## Input
+```haml
+- v = 2
+%span{class: v-1}(class=v)
+```
+
+## Faml, Hamlit
+```html
+<span class='1 2'></span>
+
+```
+
+## Haml
+```html
+<span class='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:245](../../../spec/render/attribute_spec.rb#L245)
+## Input
+```haml
+- h = {class: 1}
+%span{h}(class=2)
+```
+
+## Faml, Hamlit
+```html
+<span class='1 2'></span>
+
+```
+
+## Haml
+```html
+<span class='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+%span{id: 1}(id=2)
+```
+
+## Faml
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+
+## Hamlit
+```html
+<span id='1_2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+%span(id=2){id: 1}
+```
+
+## Faml, Hamlit
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+- v = 2
+%span{id: v-1}(id=v)
+```
+
+## Faml, Hamlit
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+- v = 2
+%span(id=v){id: v-1}
+```
+
+## Faml, Hamlit
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+- h = {id: 1}
+%span{h}(id=2)
+```
+
+## Faml, Hamlit
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
+## Input
+```haml
+- h = {id: 1}
+%span(id=2){h}
+```
+
+## Faml, Hamlit
+```html
+<span id='2_1'></span>
+
+```
+
+## Haml
+```html
+<span id='1'></span>
+
+```
+