rexleparser 0.1.2 → 0.1.3

data/lib/rexleparser.rb

@@ -5,7 +5,7 @@
 
 class RexleParser
 
-  def initialize(s)
+  def initialize(s)    
     @a = scan_element(s.sub(/<\?[^>]+>/,'').split(//))    
   end
 
@@ -17,57 +17,55 @@ class RexleParser
  
   def scan_element(a)
 
-    a.shift until a[0] == '<' and a[1] != '/' or a.length < 1
+    a.shift until a[0] == '<' and a[1] != '/' or a.length < 1        
 
     if a.length > 1 then
       a.shift
 
       name = ''
       name << a.shift
-      name << a.shift while a[0] != ' ' and a[0] != '>'
+      name << a.shift while a[0] != ' ' and a[0] != '>' and a[0] != '/'
 
       if name then
 
-        a.shift until a[0] = '>'
+        # find the closing tag
+        i = a.index(a.detect{|x| x == '>'})
         raw_values = ''
-        a.shift 
-        raw_values << a.shift until a[0] == '<'
 
-        value = raw_values
+        # is it a self closing tag?
+        if a[i-1] == '/' then          
+          raw_values << a.shift until a[0] == '/'
+          2.times{a.shift}
+          raw_values.strip!
 
-        if raw_values.length > 0 then
+          attributes = get_attributes(raw_values) if raw_values.length > 0
+          element = [name, '', attributes]
+        else
 
-          match_found = raw_values.match(/(.*)>([^>]*$)/)
-          if match_found then
-            raw_attributes, value = match_found.captures
+          raw_values << a.shift until a[0] == '<'
+          value, attributes = get_attributes(raw_values) if raw_values.length > 0
 
-            attributes = raw_attributes.scan(/(\w+\='[^']+')|(\w+\="[^"]+")/).map(&:compact).flatten.inject({}) do |r, x|
-              attr_name, val = x.split(/=/) 
-              r.merge(attr_name => val[1..-2])
-            end
-          end
-        end
-
-        element = [name, value, attributes]
+          element = [name, value, attributes]
 
-        tag = a[0, name.length + 3].join
+          tag = a[0, name.length + 3].join
 
-        if a.length > 0 then
+          if a.length > 0 then
 
-          children = true
-          children = false if tag == "</%s>" % name
+            children = true
+            children = false if tag == "</%s>" % name
 
-          if children == true then
-            r = scan_element(a)
-            element << r if r
+            if children == true then
+              r = scan_element(a)
+              element << r if r
 
-            (r = scan_element(a); element << r if r) until (a[0, name.length + 3].join == "</%s>" % [name]) or a.length < 2
-          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   
+              (r = scan_element(a); element << r if r) until (a[0, name.length + 3].join == "</%s>" % [name]) or a.length < 2
+            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
 
         element
@@ -75,4 +73,24 @@ class RexleParser
       end
     end
   end
-end
+  
+  def get_value_and_attributes(raw_values)
+    attributes = {}
+
+    match_found = raw_values.match(/(.*)>([^>]*$)/)
+    if match_found then
+      raw_attributes, value = match_found.captures
+      attributes = get_attributes(raw_attributes)
+    end
+
+    [value, attributes]
+  end
+
+  def get_attributes(raw_attributes)
+    raw_attributes.scan(/(\w+\='[^']+')|(\w+\="[^"]+")/).map(&:compact).flatten.inject({}) do |r, x|
+      attr_name, val = x.split(/=/) 
+      r.merge(attr_name => val[1..-2])
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexleparser
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: []