rexle 0.9.78 → 0.9.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b477ad4e3530a3d3499d511b31b264692cb8df8d
-  data.tar.gz: aa200456d9efb9a7193b40732ca247728f196b25
+  metadata.gz: a1aece67407d9a24d7b601a7a4d2d1a88c791e0e
+  data.tar.gz: c85716dd099bdeddb1e885f8966882fc73e709bd
 SHA512:
-  metadata.gz: 19492bee2c952f197cf8b16c6add250a76a7bf168c09292d36ed68bded6c4c1c76fa20991aa4e11e11e3ce4559f770ce515e509ed27a7114a97356fc0a687ef0
-  data.tar.gz: 791f20b060e23d55d451e8a4a14b4dd27aa64c7dfee9bde3f0af5c14060fbfd5019102255504f6be4118242c33cca77d4906dab0fae92974a5fd7962b9bf4005
+  metadata.gz: eaf56e4473638d05101f0c48ddd92fb73d8b3d8f6ef75dc2ef558e7bc0e55b1db431a903fccd08062744c2aca8de3127348018f7c0fe2d52aac0b1292f615667
+  data.tar.gz: ce88784039d418f4e83f0cad51f9f00425b2988f36ba566781c4b4d49f22e97c39ac9c8b58dc5c1931a755785feecd4a5d9e75c07cabecbac9a0cb5cd35eed03

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-��<?��x�V��ld�gE�
-Qe�b��U���B~^�(� �h6����O���<4oH����@��.�2�cR0����y�#�jMr�O���V�����׼�^EO�A��{e�T���ా���K�:�
�D��8>=븝p�3
+��<; ����G{�=�3��hf
+�6�+��#�z�	�u����ݳ��K�t2�E��]��"$mW��i�H_Q2l��jF,�L��V@�4`o�
+Cw�a�����/{3�#k����A��=��ȕL�W�\r膸�E|Ȗ�@Ǚj�K���l�o�i	M�,j;"d�c2�L䭃���g��+��z�����O�����q-O�X�k8��+W3J�)Rn"0|����3_cX\�r5�� �h�a�k0�<ǂw�xK�-]�

data/lib/rexle.rb

@@ -11,9 +11,8 @@ include REXML
 
 # modifications:
 
-# 05-Nov-2013: Insert_before bug fix: The original position of the node is
-#                deleted if the current node is inserted elsewhere 
-#                within the doc                 
+# 05-Nov-2013: If a node is added to the document which already exists in the
+#                 node, it will be moved accordingly.
 # 05-Nov02013: XPath bug fix: recursive selector with conditional parent now 
 #                returns the correct child e.g. //b[2]/c
 # 10-Oct-2013: bug fix: child elements which have the same name as their parent 
@@ -199,11 +198,12 @@ class Rexle
     include XMLhelper
     
     attr_accessor :name, :value, :parent
-    attr_reader :child_lookup, :child_elements
+    attr_reader :child_lookup, :child_elements, :doc_id
     
     alias original_clone clone
 
     def initialize(name=nil, value='', attributes={}, rexle=nil)
+
       @rexle = rexle      
       super()
       @name, @value, @attributes = name.to_s, value, attributes
@@ -441,6 +441,7 @@ class Rexle
     end
 
     def add_element(item)
+      
       if item.is_a? Rexle::Element then
 
         @child_lookup << [item.name, item.attributes, item.value]
@@ -454,7 +455,27 @@ class Rexle
       elsif item.is_a? Rexle then
         self.add_element(item.root)
       end
-    end    
+    end 
+
+    def add(item)   
+
+      if item.is_a? Rexle::Element then
+
+        if self.doc_id == item.doc_id then
+
+          new_item = item.deep_clone
+          add_element new_item
+          item.delete
+          item = new_item
+          new_item
+        else
+          add_element item
+        end
+      else
+        add_element item
+      end
+
+    end
 
     def inspect()
       if self.xml.length > 30 then
@@ -464,7 +485,7 @@ class Rexle
       end  
     end
     
-    alias add add_element
+    #alias add add_element
 
     def add_attribute(*x)
 
@@ -620,13 +641,13 @@ class Rexle
 
       i = parent.child_elements.index(self)
       return unless i
-      new_node = node.deep_clone
 
-      self.delete node
-      node = new_node
-      parent.child_elements.insert(i+offset,new_node)
+      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)
 
-      parent.child_lookup.insert(i+offset, [new_node.name, new_node.attributes, new_node.value])          
       self
     end      
 
@@ -810,10 +831,12 @@ class Rexle
   def attributes() @doc.attributes end
     
   def add_element(element)  
+
     if @doc then     
       raise 'attempted adding second root element to document' if @doc.root
       @doc.root.add_element(element) 
     else
+
       doc_node = ['doc', '', {}, element.to_a]  
       @doc = scan_element(*doc_node)      
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 0.9.78
+  version: 0.9.79
 platform: ruby
 authors:
 - James Robertson