oga 1.2.2-java → 1.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2b6fa7e733f0f4d9316f55c840a244f5979279
-  data.tar.gz: 9f3308d6bd9ed1cc449365ed39eada71d2cdb16b
+  metadata.gz: ecc2ee704871348245514551a7d0438c6b9df1a3
+  data.tar.gz: 13b7226f94f4a49f5dea21a5d65d7a22bf14ab7d
 SHA512:
-  metadata.gz: e3d282efad377ae5e59c0ec92e05cd2281efd80c2ad18b553398f5dd6ac70be74a94cd83c0e730fb14d466717bdaee09798e1defe16d1d67977114ebcd51a6f3
-  data.tar.gz: adf5e877c4e5f5316441c033da20d158f85dd2d871f1e6c1b95b90a7267ffefc7e69b63bc984060a34293c9e49bf1535862c96b2b9b3a7168cbfdb54710f8b9c
+  metadata.gz: 43c266a0b1fcac304f462e8cbe9f347badcd463a2024366cf2369573ce2807f633a1e9ca0494bf63bfd46092b682842568e7321c7a66802a9aed48b824626960
+  data.tar.gz: b67b963872f590d85bf1c3a1582b809d043bd318d304d771e436bd8fcc34553a7fef39a7b53d67a8128c61cd60c51295429bcd3e9248b43df98fd07df385b63c

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end # Oga

data/lib/oga/xml/node_set.rb

@@ -42,10 +42,15 @@ module Oga
       # @param [Oga::XML::NodeSet] owner The owner of the set.
       #
       def initialize(nodes = [], owner = nil)
-        @nodes = nodes
-        @owner = owner
+        @nodes    = nodes
+        @owner    = owner
+        @existing = {}
 
-        @nodes.each { |node| take_ownership(node) } if owner
+        @nodes.each do |node|
+          mark_existing(node)
+
+          take_ownership(node) if @owner
+        end
       end
 
       ##
@@ -103,11 +108,13 @@ module Oga
       # @param [Oga::XML::Node] node
       #
       def push(node)
-        return if @nodes.include?(node)
+        return if exists?(node)
 
         @nodes << node
 
-        take_ownership(node)
+        mark_existing(node)
+
+        take_ownership(node) if @owner
       end
 
       alias_method :<<, :push
@@ -118,11 +125,13 @@ module Oga
       # @param [Oga::XML::Node] node
       #
       def unshift(node)
-        return if @nodes.include?(node)
+        return if exists?(node)
 
         @nodes.unshift(node)
 
-        take_ownership(node)
+        mark_existing(node)
+
+        take_ownership(node) if @owner
       end
 
       ##
@@ -133,7 +142,11 @@ module Oga
       def shift
         node = @nodes.shift
 
-        remove_ownership(node)
+        if node
+          unmark_existing(node)
+
+          remove_ownership(node) if @owner
+        end
 
         node
       end
@@ -146,7 +159,11 @@ module Oga
       def pop
         node = @nodes.pop
 
-        remove_ownership(node)
+        if node
+          unmark_existing(node)
+
+          remove_ownership(node) if @owner
+        end
 
         node
       end
@@ -158,11 +175,13 @@ module Oga
       # @param [Oga::XML::Node] node
       #
       def insert(index, node)
-        return if @nodes.include?(node)
+        return if exists?(node)
 
         @nodes.insert(index, node)
 
-        take_ownership(node)
+        mark_existing(node)
+
+        take_ownership(node) if @owner
       end
 
       ##
@@ -257,7 +276,11 @@ module Oga
       def delete(node)
         removed = @nodes.delete(node)
 
-        remove_ownership(removed) if removed
+        if removed
+          unmark_existing(removed)
+
+          remove_ownership(removed) if @owner
+        end
 
         removed
       end
@@ -317,7 +340,7 @@ module Oga
       # @param [Oga::XML::Node] node
       #
       def take_ownership(node)
-        node.node_set = self if owner
+        node.node_set = self
       end
 
       ##
@@ -328,6 +351,22 @@ module Oga
       def remove_ownership(node)
         node.node_set = nil if node.node_set == self
       end
+
+      # @param [Oga::XML::Node|Oga::XML::Attribute] node
+      # @return [TrueClass|FalseClass]
+      def exists?(node)
+        @existing.key?(node)
+      end
+
+      # @param [Oga::XML::Node|Oga::XML::Attribute] node
+      def mark_existing(node)
+        @existing[node] = true
+      end
+
+      # @param [Oga::XML::Node|Oga::XML::Attribute] node
+      def unmark_existing(node)
+        @existing.delete(node)
+      end
     end # NodeSet
   end # XML
 end # Oga

data/lib/oga/xpath/evaluator.rb

@@ -1691,7 +1691,9 @@ module Oga
       def name_matches?(xml_node, name)
         return false unless xml_node.respond_to?(:name)
 
-        name == STAR ? true : xml_node.name == name
+        return true if name == STAR
+
+        xml_node.name == name || xml_node.name.casecmp(name) == 0
       end
 
       ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: java
 authors:
 - Yorick Peterse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement