haml_parser 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2018bdc583b86d3e184e4f98d1ac356d41641ef7
-  data.tar.gz: ce85adf4d59e27557bfa16670094a771be76d6bd
+  metadata.gz: 57fa4126042491041d5f4331f41515d43c83a589
+  data.tar.gz: 56cbec56b038d88ea9f624fb8f77e8d802adb0cc
 SHA512:
-  metadata.gz: adf34f95177de3d6cedc65536405fe387b5b9ff10ffd9b7a3fc21344731d692253468629ddc87aa2b2d536163462e71e3323f529710f402fd05375e9cef98b28
-  data.tar.gz: 5cee1370ebfa90524568fec5948549b7cbd890872eb6a538ba7c5825e5d12450859ff5b3547da54d94fb31e7d3cad29570fefbc7b9fa192269135c49a89db75a
+  metadata.gz: a959f007b23c072abf2521e3ad6a7ea6684b5dec4cd975cea09030fa43dcbded2505827c2c82f9fbe808e3dea0ae1c6a8d03388c126fdaaaf9357e730a670112
+  data.tar.gz: 72ec32afa7ee002abde26b19538ae2429d04afe55fe4d60b9bcf04155e8ff8486c545ad9d5a5375f657100d6597eb775f590d0baabe935dbb940abbe287a9e3e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.0 (2015-11-16)
+- Add support for object reference syntax
+- Fix attribute parser for empty braces or parens
+
 # 0.2.0 (2015-11-15)
 - Remove `Ast::SilentScript#mid_block_keyword` attribute
 - Add `Ast::Script#keyword` and `Ast::SilentScript#keyword` attribute

data/lib/haml_parser/ast.rb

@@ -39,6 +39,7 @@ module HamlParser
       :self_closing,
       :nuke_inner_whitespace,
       :nuke_outer_whitespace,
+      :object_ref,
       :filename,
       :lineno,
     ) do

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, rest = parse_attributes(rest)
+      element.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)
@@ -57,37 +57,44 @@ module HamlParser
 
     OLD_ATTRIBUTE_BEGIN = '{'
     NEW_ATTRIBUTE_BEGIN = '('
+    OBJECT_REF_BEGIN = '['
 
     def parse_attributes(rest)
-      old_attributes = ''
-      new_attributes = ''
+      old_attributes = nil
+      new_attributes = nil
+      object_ref = nil
 
       loop do
         case rest[0]
         when OLD_ATTRIBUTE_BEGIN
-          unless old_attributes.empty?
+          if old_attributes
             break
           end
           old_attributes, rest = parse_old_attributes(rest)
         when NEW_ATTRIBUTE_BEGIN
-          unless new_attributes.empty?
+          if new_attributes
             break
           end
           new_attributes, rest = parse_new_attributes(rest)
+        when OBJECT_REF_BEGIN
+          if object_ref
+            break
+          end
+          object_ref, rest = parse_object_ref(rest)
         else
           break
         end
       end
 
-      attributes = old_attributes
-      unless new_attributes.empty?
+      attributes = old_attributes || ''
+      if new_attributes
         if attributes.empty?
           attributes = new_attributes
         else
           attributes << ', ' << new_attributes
         end
       end
-      [attributes, rest]
+      [attributes, object_ref, rest]
     end
 
     def parse_old_attributes(text)
@@ -204,6 +211,17 @@ module HamlParser
       end
     end
 
+    def parse_object_ref(text)
+      s = StringScanner.new(text)
+      s.pos = 1
+      depth = Utils.balance(s, '[', ']')
+      if depth == 0
+        [s.pre_match[1, s.pre_match.size - 1], s.rest]
+      else
+        syntax_error!('Unmatched brackets for object reference')
+      end
+    end
+
     def parse_nuke_whitespace(rest)
       m = rest.match(/\A(><|<>|[><])(.*)\z/)
       if m

data/lib/haml_parser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips