faml 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8c5abc0e50c774fb988c861370ccbe38c61bace
-  data.tar.gz: d56eba69f346d05509da4cbdce6dccbd3d8f8666
+  metadata.gz: 70be9578e244e136f47caf610ffde1a3e7edf582
+  data.tar.gz: c3673597a734dcf1822656f55e4868396bf242c8
 SHA512:
-  metadata.gz: 5b1d9821bddbb9c89a289a7190ca8af46921e88154c0a2baf6ecef7648d7720437f7a01c4f1166645400e3964843cb91195850bf8cf3132dfb27267cb5cb1f1b
-  data.tar.gz: 9a01b8763adad686ff59845d00d31d3fe4cc926ce94f6a034673ecf3b4736a30760e102b26a3b1a61553a5dd6eb9fcde6f976761f5998f2385590871a5042dd3
+  metadata.gz: f370900646f37e6f58d4d2ef43ff98c1f72c6a74f10ea7e9733b506a85dca85e75a53b82267ec2dd5d151ea86b10c647e0de372b82e6e13b2841933ed5480df8
+  data.tar.gz: c268cc69b1de1723be7f79e8377026e34b712fbdecd4cea73f01f450bcad11cac600fee873f34db7394a168e9109e4f8882018f1ec7e3e52d55ed8643e23749f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.2 (2015-11-22)
+- Fix data-id and data-class attribute
+    - https://github.com/eagletmt/faml/pull/39
+    - It's regression in v0.6.1
+
 ## 0.6.1 (2015-11-21)
 - Fix handling duplicated old attributes and new attributes
     - https://github.com/eagletmt/faml/pull/37

data/ext/attribute_builder/attribute_builder.c

@@ -83,7 +83,6 @@ normalize_data_i2(VALUE key, VALUE value, VALUE ptr)
     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);

data/faml.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   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 'haml', '>= 4.1.0.beta.1' # for benchmark and compatibility check
+  spec.add_development_dependency 'hamlit', '>= 0.6.0' # for benchmark and compatibility check
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'redcarpet'

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
-- Haml 4.0.7
-- Faml 0.6.1
+- Haml 4.1.0.beta.1
+- Faml 0.6.2
 - Hamlit 1.7.2
 
 ## Table of contents

data/incompatibilities/spec/render/attribute_spec.md

@@ -43,13 +43,13 @@
 %span{class: []}
 ```
 
-## Faml, Haml
+## Faml
 ```html
 <span></span>
 
 ```
 
-## Hamlit
+## Haml, Hamlit
 ```html
 <span class=''></span>
 
@@ -117,13 +117,13 @@
 %span{id: []}
 ```
 
-## Faml, Haml
+## Faml
 ```html
 <span></span>
 
 ```
 
-## Hamlit
+## Haml, Hamlit
 ```html
 <span id=''></span>
 
@@ -305,7 +305,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:142](../../../spec/render/attribute_spec.rb#L142)
+# [./spec/render/attribute_spec.rb:149](../../../spec/render/attribute_spec.rb#L149)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -323,7 +323,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:165](../../../spec/render/attribute_spec.rb#L165)
+# [./spec/render/attribute_spec.rb:172](../../../spec/render/attribute_spec.rb#L172)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -341,7 +341,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:173](../../../spec/render/attribute_spec.rb#L173)
+# [./spec/render/attribute_spec.rb:180](../../../spec/render/attribute_spec.rb#L180)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -359,7 +359,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:177](../../../spec/render/attribute_spec.rb#L177)
+# [./spec/render/attribute_spec.rb:184](../../../spec/render/attribute_spec.rb#L184)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -379,7 +379,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:195](../../../spec/render/attribute_spec.rb#L195)
+# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -399,7 +399,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
+# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -417,7 +417,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
+# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
 ## Input
 ```haml
 - val = "hello"
@@ -437,7 +437,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
+# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
 ## Input
 ```haml
 - key = "foo\0bar"
@@ -459,7 +459,7 @@
 ...                               ^
 ```
 
-# [./spec/render/attribute_spec.rb:216](../../../spec/render/attribute_spec.rb#L216)
+# [./spec/render/attribute_spec.rb:223](../../../spec/render/attribute_spec.rb#L223)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123)] hello
@@ -477,7 +477,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:220](../../../spec/render/attribute_spec.rb#L220)
+# [./spec/render/attribute_spec.rb:227](../../../spec/render/attribute_spec.rb#L227)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123), :hello] hello
@@ -495,7 +495,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:224](../../../spec/render/attribute_spec.rb#L224)
+# [./spec/render/attribute_spec.rb:231](../../../spec/render/attribute_spec.rb#L231)
 ## Input
 ```haml
 %span[Faml::TestRefStruct.new(123)] hello
@@ -513,7 +513,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:228](../../../spec/render/attribute_spec.rb#L228)
+# [./spec/render/attribute_spec.rb:235](../../../spec/render/attribute_spec.rb#L235)
 ## Input
 ```haml
 %span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello
@@ -531,7 +531,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 %span{foo: 1}(foo=2)
@@ -549,7 +549,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 %span(foo=2){foo: 1}
@@ -567,7 +567,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 - v = 2
@@ -586,7 +586,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 - v = 2
@@ -605,7 +605,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -624,7 +624,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:234](../../../spec/render/attribute_spec.rb#L234)
+# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -643,177 +643,21 @@
 
 ```
 
-# [./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)
+# [./spec/render/attribute_spec.rb:260](../../../spec/render/attribute_spec.rb#L260)
 ## Input
 ```haml
 %span{id: 1}(id=2)
 ```
 
-## Faml
+## Faml, Haml
 ```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>
-
-```
-

data/lib/faml/attribute_optimizer.rb

@@ -11,6 +11,10 @@ module Faml
         assert_valid_ruby_code!(old_attributes)
         return [nil, nil]
       end
+      if old_attributes && new_attributes
+        # TODO: Quit optimization. Merge id and class correctly.
+        return [nil, nil]
+      end
 
       static_attributes, dynamic_attributes = build_optimized_attributes(parser, static_id, static_class)
       if optimizable?(old_attributes, new_attributes, static_attributes, dynamic_attributes)

data/lib/faml/static_hash_parser.rb

@@ -129,14 +129,7 @@ module Faml
     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
+      @static_attributes[key] = val
     end
 
     def set_dynamic_attributes(key, val)

data/lib/faml/version.rb

@@ -1,4 +1,4 @@
 # frozen-string-literal: true
 module Faml
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/render/attribute_spec.rb

@@ -139,6 +139,13 @@ HAML
 HAML
   end
 
+  it 'renders data-id and data-class (#38)' do
+    aggregate_failures do
+      expect(render_string('%span{data: {id: 1}}')).to eq("<span data-id='1'></span>\n")
+      expect(render_string('%span{data: {class: 1}}')).to eq("<span data-class='1'></span>\n")
+    end
+  end
+
   it 'optimize send case' do
     expect(render_string('%span{foo: {bar: 1+2}} hello')).to eq("<span foo='{:bar=&gt;3}'>hello</span>\n")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement