rexleparser 0.2.2 → 0.2.3

data/lib/rexleparser.rb

@@ -5,8 +5,7 @@
 
 class RexleParser
 
-  def initialize(s)
-    super()
+  def initialize(s)    
     @a = scan_element(s.sub(/<\?[^>]+>/,'').split(//))    
   end
 
@@ -23,55 +22,69 @@ class RexleParser
     if a.length > 1 then
       a.shift
 
-      name = ''
-      name << a.shift
-      name << a.shift while a[0] != ' ' and a[0] != '>' and a[0] != '/'
+      # CDATA ?
+      if a[0..1].join == '![' then
 
-      if name then
+        name = '!['
+        8.times{ a.shift }
+        value = ''
 
-        # find the closing tag
-        i = a.index('>')
-        raw_values = ''
+        value << a.shift until a[0..2].join == ']]>' or a.length <= 1
+        a.slice!(0,3)
+        element = [name, value, {}]        
+      else
 
-        # is it a self closing tag?
-        if a[i-1] == '/' then          
-          raw_values << a.shift until a[0] == '/'
-          a.shift until a[0] == '<' or a.length < 1
-          raw_values.strip!
+        name = ''
+        name << a.shift
+        name << a.shift while a[0] != ' ' and a[0] != '>' and a[0] != '/'
 
-          attributes = get_attributes(raw_values) if raw_values.length > 0
-          element = [name, '', attributes]
-        else
+        if name then
 
-          raw_values << a.shift until a[0] == '<'
-          value, attributes = get_value_and_attributes(raw_values) if raw_values.length > 0
+          # find the closing tag
+          i = a.index('>')
+          raw_values = ''
 
-          element = [name, value, attributes]
-          
-          tag = a[0, name.length + 3].join
+          # is it a self closing tag?
+          if a[i-1] == '/' then          
+            raw_values << a.shift until a[0] == '/'
+            a.shift until a[0] == '<' or a.length < 1
+            raw_values.strip!
 
-          if a.length > 0 then
+            attributes = get_attributes(raw_values) if raw_values.length > 0
+            element = [name, '', attributes]
+          else
 
-            children = true
-            children = false if tag == "</%s>" % name
+            raw_values << a.shift until a[0] == '<'
+            value, attributes = get_value_and_attributes(raw_values) if raw_values.length > 0
 
-            if children == true then
+            element = [name, value, attributes]
+            
+            tag = a[0, name.length + 3].join
 
-              (r = scan_element(a); element << r if r) until (a[0, name.length + 3].join == "</%s>" % [name]) or a.length < 2
-              a.slice!(0, name.length + 3) if a[0, name.length + 3].join == "</%s>" % name
-              a.shift until a[0] == '<' or a.length <= 1   
-            else
-              #check for its end tag
-              a.slice!(0, name.length + 3) if a[0, name.length + 3].join == "</%s>" % name
-              a.shift until a[0] == '<' or a.length <= 1   
+            if a.length > 0 then
+
+              children = true
+              children = false if tag == "</%s>" % name
+
+              if children == true then
+
+                (r = scan_element(a); element << r if r) until (a[0, name.length + 3].join == "</%s>" % [name]) or a.length < 2
+                a.slice!(0, name.length + 3) if a[0, name.length + 3].join == "</%s>" % name
+                a.shift until a[0] == '<' or a.length <= 1   
+              else
+                #check for its end tag
+                a.slice!(0, name.length + 3) if a[0, name.length + 3].join == "</%s>" % name
+                a.shift until a[0] == '<' or a.length <= 1   
+              end
             end
+            
           end
-          
-        end
 
-        element
+          return element
 
+        end
       end
+
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexleparser
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +00:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: []