rexleparser 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c6e0c98ab82d9ab25998d70a80ab85205e69fe
-  data.tar.gz: ca60e2d6f97490342287be767ca6507822880511
+  metadata.gz: 4330404254beb8ed5f07d36f58b25ab205e59fb5
+  data.tar.gz: 4666744fd9216a3d9d853b16ea9a62d30a3b8b56
 SHA512:
-  metadata.gz: eade36dcc002807e18bd07357b695f5b8bb8c95499a9f5ce91d58b34ff80793e0863a1fe4e4187baed922890f5526cc21221362ed5ea28c1d8b42de6628d8472
-  data.tar.gz: f62d6271b8d4c33cc0a65c090a66712ddcc03a32e34a8f77c28508399e5c24139a1a62ea737499152c82b6c25a64574cac93689d24b2736bafb4c1dba7795778
+  metadata.gz: d83bad47aaca56fc76015abd65953666086ce1f21126c6e14406553592e6bcede69399f27700d2f26d39fee14d67d7f89f83330343d1281baba433553a3007a1
+  data.tar.gz: 9479388eb6bb5889411f404952f4c41ee05d5dbaa6c7306bfa6b515452ae74cdcdf91d5acdb9dc15c15c441dbb58f87a7de584dc6569771ffbf61a9b04fd7be2

data/lib/rexleparser.rb

@@ -17,22 +17,18 @@ class RexleParser
     @to_a = reverse(parse_node(s.strip.gsub(/<\?[^>]+>/,'').reverse))
 
   end
-  
-  
-  private
     
+  private
 
+  
   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
 
@@ -71,9 +67,8 @@ class RexleParser
         # it's a comment tag
         return [:child, create_comment(tag)]
       else
-
-        r.sub!('>',';tg&')
-        
+  
+        r.sub!('>',';tg&')      
         i = r =~ />(?:[\-\/"'\w]|\]\])/ # collect until a tag is found or a CDATA element
         text = r.slice!(0,i)
 
@@ -103,7 +98,6 @@ class RexleParser
   
   def parse_node(r, j=nil)
     
-    #puts '+parse_node ' + r.inspect
     return unless r.length > 0
 
     tag = r.slice!(/^>[^<]+</) if (r =~ /^>[^<]+</) == 0
@@ -130,7 +124,6 @@ class RexleParser
     until end_tag do 
       
       key, res = scan_next r, tagname      
-      #puts "key: %s; res: %s" % [key, res]
       
       case key 
       when :end_tag
@@ -176,17 +169,8 @@ class RexleParser
     
     children = obj[-1]
 
-    if children.last.is_a?(String) then
-      ltext ||= ''
-      ltext << children.pop.reverse 
-    end
-    
-    ltext << children.pop.reverse if children.last.is_a?(String) 
-
-    r = children.reverse.map do |x|
-      reverse(x)
-    end
+    r = children.reverse.map {|x| reverse(x)}
     
-    return [tag[/[!\-\w\[]+/], ltext, get_attributes(tag), *r]
+    return [tag[/[!\-\w\[]+/], get_attributes(tag), *r]
   end  
 end

metadata

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