rexle 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a4aceb6bd947cae15225eb68bd34057a7d3beac
-  data.tar.gz: 95b54c1d9c10f42a6c605b4868b0793dc34f39c9
+  metadata.gz: 3d38c81c7a23e32c83a2cc36e7e098e8934b9dff
+  data.tar.gz: 04554571f03400bdf7e2bcc5b01ce90bb58c6b17
 SHA512:
-  metadata.gz: 49d16ed9730f79d7cc2e5f8e6bf740759d9fe713418a2e998393bc509e744559e760fc9199bd0854c966447880e06f3f2bc50a506fd32a679ab1fce483a29cb4
-  data.tar.gz: ed08f4f6c9e30958d0637da8131c40e07ff1a765b0dc5ff72807f3fc998eef565e703f3608af0f81472325e3d45eadc690af87b1c7c9e106071005a245f943a0
+  metadata.gz: f2f01c1d8f316f2f961213f7dc37b2e17c15441a8ee500c965fc166df12229494ace0d520c3aa8a2bb326a9ad7dadd62cfb5f360f17dd7d32d7a95596f8a1c54
+  data.tar.gz: ae6017e0c05458d512da3e1127d47bc5526497ef5efa6fa310abdda1d4bead09f3cbfbd28f9cb96bca5960b61772872cf8be7db1273ec85b893d5f3fa58ddc82

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'cgi'
 
 # modifications:
 
+# 11-Feb-2015: bug fix: add_text now adds a String to @child_elements. 
+#                       All references to @child_lookup have now been removed.
 # 08-Feb-2015: bug fix: Within method filter_xpath(), a new String is created 
 #            from raw_path to workaround a frozen string when slice! is called.
 #              bug fix: A Rexle::Element#value will now only return an 
@@ -185,7 +187,6 @@ module XMLhelper
             and not x.children.is_an_empty_string?) or x.name == 'script' then
 
           out = ["<%s>" % tag]
-          #out << x.value unless x.value.nil? || x.value.empty?
           out << scan_print(x.children)
           out << "</%s>" % x.name
         else
@@ -232,7 +233,6 @@ module XMLhelper
 
       if x.is_a? Rexle::Element then
         
-        #return ["<%s/>" % x.name] if x.value = ''
         a = x.attributes.to_a.map do |k,v| 
           "%s='%s'" % [k,(v.is_a?(Array) ? v.join(' ') : v)]
         end
@@ -432,7 +432,7 @@ class Rexle
       elsif (fn_match and fn_match.captures.first[/^(attribute|@)/]) or fn_match.nil? then 
 
         procs = {
-          #jr061012 Array: proc {|x| block_given? ? x : x.flatten.uniq },
+
           Array: proc { |x| 
             if block_given? then 
               x.flatten(1) 
@@ -633,7 +633,6 @@ class Rexle
               r = e.xpath(a_path.join('/') + raw_condition.to_s \
                     + remaining_path, &blk)
               r
-              #(r || e) 
             end
 
             next if rtn_element.nil? or (rtn_element.is_a? Array and rtn_element.empty?)
@@ -721,8 +720,6 @@ class Rexle
         self.xml
       end  
     end
-    
-    #alias add add_element
 
     def add_attribute(*x)
 
@@ -738,7 +735,8 @@ class Rexle
     end
 
     def add_text(s)
-      self.value = (self.value || '') + s.to_s
+
+      self.child_elements << s
       self 
     end
     
@@ -761,9 +759,8 @@ class Rexle
       
     def children()
 
-      #return unless @value
-      #r = (@value.to_s.empty? ? [] : [@value])  + @child_elements
       r =  @child_elements
+      
       def r.is_an_empty_string?()
         self.length == 1 and self.first == ''
       end      
@@ -771,8 +768,6 @@ class Rexle
       return r
     end 
 
-    #alias child_elements children
-
     def children=(a)   @child_elements = a if a.is_a? Array  end
     
     def deep_clone() Rexle.new(self.xml).root end
@@ -790,7 +785,6 @@ class Rexle
           e.delete if e
         else
 
-          #jr010215 [@child_elements, @child_lookup].each{|x| x.delete_at i} if i
           i = @child_elements.index(obj)
           [@child_elements].each{|x| x.delete_at i} if i          
         end
@@ -837,7 +831,7 @@ class Rexle
     def texts()
 
      r = @child_elements.select do |x|
-        x.respond_to? :to_s
+        x.is_a? String or x.is_a? Rexle::CData
       end
       
       r.map do |x|
@@ -867,20 +861,11 @@ class Rexle
         
     def value=(raw_s)
 
-      #@value = String.new(raw_s.to_s.clone)
       val = String.new(raw_s.to_s.clone)
       
       escape_chars = %w(& &amp; < &lt; > &gt;).each_slice(2).to_a
       escape_chars.each{|x| val.gsub!(*x)}
-=begin
-      a = self.parent.instance_variable_get(:@child_lookup)
-      
-      if a then
-        i = a.index(a.assoc(@name))      
-        a[i][-1] = val
-        self.parent.instance_variable_set(:@child_lookup, a)
-      end
-=end      
+
       t = val
 
       @child_elements.any? ? @child_elements[0] = t : @child_elements << t
@@ -921,7 +906,6 @@ class Rexle
       return unless i
 
       parent.child_elements.insert(i+offset, node)
-      parent.child_lookup.insert(i+offset, [node.name, node.attributes, node.value])          
 
       @doc_id = self.doc_root.object_id
       node.instance_variable_set(:@doc_id, self.doc_root.object_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser