rexleparser 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184b302c376712daab6a0df650cfe03ac5a40c4d
-  data.tar.gz: 691646e7927e878c6341febc8c18406093654fda
+  metadata.gz: 1541fbb74cf785e0ff1c38ae076d570372fbf468
+  data.tar.gz: 33c1b4d431157a46e45c4fd30a92f97aa1cae272
 SHA512:
-  metadata.gz: 811abaa767db4514dc6ba1da8a5dd4420d1fbbef17ee2bfa6c0842c2152a13f9a7fa090d8189403a32585923ae800bad6d43985df1c6a55e1d7d120abcb9df6e
-  data.tar.gz: caa1b074ec6de75c8ad087808c830889e149a4e543398a2cedcf9d0c2f4d92d276291d86b503b774550db65f53335f43bdec1263298e49aaec724af54e74c3e6
+  metadata.gz: 8af15120d4030641f0ec8063fa4e0ebb6f43e1b08ea89075e938031100c1701718867376219fa94d76b443c1600ec9769ebe0f7435b985fb6e113e051fd510bd
+  data.tar.gz: bbee51bcc5625bfd0d9e97d6f5dc168d1cecf958a7d56839916044514ba0e56389017c84772fcd217f2f294f69652cb7c073c532e98626dab2a5b21cf42d126d

data/lib/rexleparser.rb

@@ -24,11 +24,11 @@ class RexleParser
     
 
   def scan_next(r, tagname)
-    
+
     j = tagname
 
     if (r =~ /^>/) == 0 then
-      
+
       # end tag match
       tag = r[/^>[^<]+</]
 
@@ -49,17 +49,24 @@ class RexleParser
           broken_tag = tag
           return [:child, [nil, [], broken_tag]] if broken_tag
           
-        elsif tag[/^>--(.*)--!</] then
-          
+        elsif tag[/^>--.*--!</] then
+
           # it's a comment tag
-          return [:child, $1]
+          return [:child, create_comment(tag)]
         else
 
           text, tag =  tag.sub('>',';tg&').split(/>/,2)
           r.prepend '>' + tag
           return [:child, text]
-        end            
+        end
+        
+      elsif tag[/^>--.*--!</m] then
+        
+        i = r =~ /--!</
+        tag = r.slice!(0,i+4)
 
+        # it's a comment tag
+        return [:child, create_comment(tag)]
       else
 
         # it's a start tag?
@@ -75,6 +82,11 @@ class RexleParser
     end
   end
 
+  def create_comment(tag)
+    tagname = '-!'
+    return [">#{tagname}<", [tag[/>--(.*)--!</m,1]], ">#{tagname}/<"] 
+  end
+  
   def parse_node(r, j=nil)
     
     return unless r.length > 0
@@ -87,8 +99,7 @@ class RexleParser
       tag += r.slice!(0,i+5)
       
       # it's a comment tag
-      tagname = '-!'
-      return [">#{tagname}<", [tag[/>--(.*)--!</,1]], ">#{tagname}/<"] 
+      return create_comment tag
     end
     
     tagname = tag[/([\w!]+)\/?<$/,1] 
@@ -159,4 +170,4 @@ class RexleParser
     
     return [tag[/[!\-\w\[]+/], ltext, get_attributes(tag), *r]
   end  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexleparser
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson