rexleparser 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4330404254beb8ed5f07d36f58b25ab205e59fb5
-  data.tar.gz: 4666744fd9216a3d9d853b16ea9a62d30a3b8b56
+  metadata.gz: 0baa1d11b178d71f232e3604fdb936bd6f857ce2
+  data.tar.gz: ed963d731307869d74c86ab9d58b496e9a8bad2a
 SHA512:
-  metadata.gz: d83bad47aaca56fc76015abd65953666086ce1f21126c6e14406553592e6bcede69399f27700d2f26d39fee14d67d7f89f83330343d1281baba433553a3007a1
-  data.tar.gz: 9479388eb6bb5889411f404952f4c41ee05d5dbaa6c7306bfa6b515452ae74cdcdf91d5acdb9dc15c15c441dbb58f87a7de584dc6569771ffbf61a9b04fd7be2
+  metadata.gz: d5c6ff15f20a5452465c36e8b8abf31113d5ec76fc99f8f9edc5bd1898f83686abaea6b581f3d3b4a82097ebd85acf88f4a8c6f1a3e6a0c3528dda32c2a804ac
+  data.tar.gz: 246d8bde1130a8ef36e4c963f20a530ece5cb10c4f5efccdee76dec44d3c0aad89264c3dcc571655a63fe0da3ca1071cf2829abbe8937efe4dba67438a084049

data/lib/rexleparser.rb

@@ -56,16 +56,32 @@ class RexleParser
 
           return [:child, text]
         end
-      elsif tag[/>\/|\/<$/] or tag[/^>.*[\w!]+\/<$/] then
-        return [:newnode]
-      elsif r[/^(?:>--|>\]\]).*(?:--!|\[ATADC\[!<)/m] then
+      elsif r[0,3] == '>--' then   # comment tag found
+          
+        r.slice!(0,3)
+        i = r =~ /(\-\-!<)/
+        s = r.slice!(0,i)
+        r.slice!(0,3)
+
+        tagname, content = ['-!',s]
+      
+        return [:child, [">#{tagname}<", [content], ">#{tagname}/<"]]
+        
+      elsif r[0,3] == '>]]' then   # CDATA tag found
 
-        i = r =~ /(\-\-!<|\[ATADC\[!<)/
-        len = ($1).length
-        tag = r.slice!(0,i+len)
+        r.slice!(0,3)
+        i = r =~ /(\[ATADC\[!<)/
+        s = r.slice!(0,i)
+        r.slice!(0,9)
 
-        # it's a comment tag
-        return [:child, create_comment(tag)]
+        tagname, content = ['[!',s]
+
+        return [:child, [">#{tagname}<", [content], ">#{tagname}/<"]]        
+        
+      elsif tag[/>\/|\/<$/] or tag[/^>.*[\w!]+\/<$/] then
+                
+        return [:newnode]        
+        
       else
   
         r.sub!('>',';tg&')      
@@ -85,33 +101,12 @@ class RexleParser
       return [:child, text] if text
     end
   end
-
-  def create_comment(tag)
-    
-    tagname = tag[0,3] == '>--' ? '-!' : '[!'   
-    rt =  [">#{tagname}<", 
-           [tag[/(?:>--|>\]\])(.*)(?:--!|\[ATADC\[!<)/m,1]], ">#{tagname}/<"
-          ]
-
-    return rt
-  end
   
   def parse_node(r, j=nil)
-    
+        
     return unless r.length > 0
 
     tag = r.slice!(/^>[^<]+</) if (r =~ /^>[^<]+</) == 0
-
-    if tag and tag[0,3][/>--|>\]\]/] then
-
-      i = r =~ /(\-\-!<|\[ATADC\[!<)/
-      len = ($1).length
-      tag += r.slice!(0,i+len)
-  
-      # it's a comment tag
-      return create_comment tag
-    end
-    
     tagname = tag[/([\w!]+)\/?<$/,1] 
 
     # self closing tag?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexleparser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   CkjTMLaPwIQI6dsbG4bVJ7/XzL7c8niqJSF7M0yr1+2kUrWFUZMBMrUUxgZxSkjL
   Cgd76bp2zjiyCw==
   -----END CERTIFICATE-----
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk