haml_parser 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57fa4126042491041d5f4331f41515d43c83a589
-  data.tar.gz: 56cbec56b038d88ea9f624fb8f77e8d802adb0cc
+  metadata.gz: 9b06a7a145edcaee2bae05feafbd265c680a8e54
+  data.tar.gz: 70e85219456f494d6d3d0f8f337727ecbbede342
 SHA512:
-  metadata.gz: a959f007b23c072abf2521e3ad6a7ea6684b5dec4cd975cea09030fa43dcbded2505827c2c82f9fbe808e3dea0ae1c6a8d03388c126fdaaaf9357e730a670112
-  data.tar.gz: 72ec32afa7ee002abde26b19538ae2429d04afe55fe4d60b9bcf04155e8ff8486c545ad9d5a5375f657100d6597eb775f590d0baabe935dbb940abbe287a9e3e
+  metadata.gz: 88b446fd2edd5507ec973dd5926fc8b12b118c4e07f30bcb93a080d546905095ff87c08e683535d648b8801452d06188e1b9a41685911e356e2215a1545c206d
+  data.tar.gz: 65583c26a71fe5890e5f78dc9f885b17b9c5c169f8cb6ff95767971c50e82b7d3f8ae2f64f3a967b1612216db5590d7bdfe140fd5189d1fd22f52ae9b135d961

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0 (2015-11-21)
+- Old attributes and new attributes are no longer merged
+    - `Ast::Element#attributes` is left for compatibility
+
 # 0.3.0 (2015-11-16)
 - Add support for object reference syntax
 - Fix attribute parser for empty braces or parens

data/README.md

@@ -42,17 +42,19 @@ Simple CLI interface is also available.
     tag_name="p",
     static_class="",
     static_id="",
-    attributes="",
+    old_attributes=nil,
+    new_attributes=nil,
     oneline_child=
      #<struct HamlParser::Ast::Text
       text="hello world",
       escape_html=true,
-      filename="in.haml",
+      filename="input.haml",
       lineno=1>,
     self_closing=false,
     nuke_inner_whitespace=false,
     nuke_outer_whitespace=false,
-    filename="in.haml",
+    object_ref=nil,
+    filename="input.haml",
     lineno=1>]>
 ```
 
@@ -70,4 +72,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/eaglet
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/haml_parser/ast.rb

@@ -34,7 +34,8 @@ module HamlParser
       :tag_name,
       :static_class,
       :static_id,
-      :attributes,
+      :old_attributes,
+      :new_attributes,
       :oneline_child,
       :self_closing,
       :nuke_inner_whitespace,
@@ -49,7 +50,6 @@ module HamlParser
         super
         self.static_class ||= ''
         self.static_id ||= ''
-        self.attributes ||= ''
         self.self_closing ||= false
         self.nuke_inner_whitespace ||= false
         self.nuke_outer_whitespace ||= false
@@ -61,6 +61,19 @@ module HamlParser
           oneline_child: oneline_child && oneline_child.to_h,
         )
       end
+
+      # XXX: For compatibility
+      def attributes
+        attrs = old_attributes || ''
+        if new_attributes
+          if attrs.empty?
+            attrs = new_attributes
+          else
+            attrs += ", #{new_attributes}"
+          end
+        end
+        attrs
+      end
     end
 
     Script = Struct.new(

data/lib/haml_parser/element_parser.rb

@@ -26,7 +26,7 @@ module HamlParser
       element.static_class, element.static_id = parse_class_and_id(m[2])
       rest = m[3] || ''
 
-      element.attributes, element.object_ref, rest = parse_attributes(rest)
+      element.old_attributes, element.new_attributes, element.object_ref, rest = parse_attributes(rest)
       element.nuke_inner_whitespace, element.nuke_outer_whitespace, rest = parse_nuke_whitespace(rest)
       element.self_closing, rest = parse_self_closing(rest)
       element.oneline_child = ScriptParser.new(@line_parser).parse(rest)
@@ -86,15 +86,7 @@ module HamlParser
         end
       end
 
-      attributes = old_attributes || ''
-      if new_attributes
-        if attributes.empty?
-          attributes = new_attributes
-        else
-          attributes << ', ' << new_attributes
-        end
-      end
-      [attributes, object_ref, rest]
+      [old_attributes, new_attributes, object_ref, rest]
     end
 
     def parse_old_attributes(text)

data/lib/haml_parser/version.rb

@@ -1,3 +1,3 @@
 module HamlParser
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Parser of Haml template language