rexleparser 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8258d5d421fa3d0fc502c413c7ed1c5c2be927d8
-  data.tar.gz: be193636ca0e679cab459437f36f04e20f59a5a1
+  metadata.gz: a8c6e0c98ab82d9ab25998d70a80ab85205e69fe
+  data.tar.gz: ca60e2d6f97490342287be767ca6507822880511
 SHA512:
-  metadata.gz: b85289de149d1a78ab742214a92a73b39b75ac50518e8da70c6e1e740b7abeb3239d928a9ce306351750e0aa6fbdb5b74b68b15a95626748b9cef73a0a27af21
-  data.tar.gz: a085d0aaa231a3c2b45c8aaa0f3fcfaaa6b6853571e192fd475e6fa622f5dd7992a2291cf2b19134cb7abd17b27745cb5cc739407728e87a179bc54b678a0b7f
+  metadata.gz: eade36dcc002807e18bd07357b695f5b8bb8c95499a9f5ce91d58b34ff80793e0863a1fe4e4187baed922890f5526cc21221362ed5ea28c1d8b42de6628d8472
+  data.tar.gz: f62d6271b8d4c33cc0a65c090a66712ddcc03a32e34a8f77c28508399e5c24139a1a62ea737499152c82b6c25a64574cac93689d24b2736bafb4c1dba7795778

data/lib/rexleparser.rb

@@ -24,13 +24,16 @@ class RexleParser
 
   def scan_next(r, tagname)
     
+    #puts '+scan_next : ' + r.inspect
+    
     j = tagname
 
     if r[0] == '>' then
 
       # end tag match
       tag = r[/^>[^<]+</]
-
+      #puts 'tag: '  + tag.inspect
+      
       if tag[1][/[ \w"']/] and  tag[-2] != '/'  then
 
         # is it the end tag to match the start tag?
@@ -57,7 +60,7 @@ class RexleParser
 
           return [:child, text]
         end
-      elsif tag[/>\/|\/<$/] then
+      elsif tag[/>\/|\/<$/] or tag[/^>.*[\w!]+\/<$/] then
         return [:newnode]
       elsif r[/^(?:>--|>\]\]).*(?:--!|\[ATADC\[!<)/m] then
 
@@ -69,8 +72,12 @@ class RexleParser
         return [:child, create_comment(tag)]
       else
 
-        # it's a start tag?
-        return [:newnode] if tag[/^>.*[\w!]+\/<$/]
+        r.sub!('>',';tg&')
+        
+        i = r =~ />(?:[\-\/"'\w]|\]\])/ # collect until a tag is found or a CDATA element
+        text = r.slice!(0,i)
+
+        return [:child, text] if text
 
       end # end of tag match
       
@@ -96,6 +103,7 @@ class RexleParser
   
   def parse_node(r, j=nil)
     
+    #puts '+parse_node ' + r.inspect
     return unless r.length > 0
 
     tag = r.slice!(/^>[^<]+</) if (r =~ /^>[^<]+</) == 0
@@ -122,6 +130,7 @@ class RexleParser
     until end_tag do 
       
       key, res = scan_next r, tagname      
+      #puts "key: %s; res: %s" % [key, res]
       
       case key 
       when :end_tag
@@ -163,7 +172,7 @@ class RexleParser
     obj = raw_obj.clone
     return obj.reverse! if obj.is_a? String
 
-    tag = obj.pop.reverse.sub('!cdata','!-')
+    tag = obj.pop.reverse
     
     children = obj[-1]
 

data.tar.gz.sig

@@ -1 +1,4 @@
-t�u�_&��A_b�>$�e��v[	pp+��c<4�i0w�L�VG�ʾ���Nm�Y�����`�ѵ��a�J���Ѧا�˚A�� Өu�k�_6���u(d��ݷMu�Is<ơj�]�?R(4�E����株-R9L�^n8�p@фJv_��ku�A�.�r�C�+�����������&Tߏ�pWx7�ǯ��Ӥ]�i�ls�c.h!�{JLZ4��>�օ4���>c*�=8G����>G�a�z�
+)X�fbVʰ����C�U���	�q���3�w�#�e�q>�H���1�����U�8�S��Z���+��n�9��^��L|�
+a4��2ci����"o��؀�dV��y��?U�*:j���{$�Dm
+��5�����ٕ׵��/��Q����l�,\@��3:4E�5J��!��Q.`��ov`Y�q����
+��6u�1�	�p9o9e죭�<�����QA 	4,�F�:�o���蠞����/��\Q

metadata

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