oga 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ef8ce9859d513dc0b7aa68284d825e3f50d548
-  data.tar.gz: f463aba9ea8634735834f8c31323893b5dd48f00
+  metadata.gz: 0884bc981b96ff1504e09e5c100c5b63dbf5f912
+  data.tar.gz: e0bcfded6267dc24bd995a32541537f8f6766566
 SHA512:
-  metadata.gz: 81e745c8341fa7b6cae1f7a9ddbd5d066cacb2ce547ee48680be8d2e2b4898fcaba7e2aa6c4ee16dc7169785f7fd24ca31bed725e913f6fe1abd1e50bffc2caf
-  data.tar.gz: 994e333deff715e9172cdddcd876c99d212750cb4b59f41e93765cccef9dc3df6e0e851520c098e3308f8fdcaee0317cd17099e1e2324e6cdccecd5c7c6054be
+  metadata.gz: 61ea4f71bc78a2162671b255091dd6568c36485925e334db8a23a88a45ba43437c78c718ab23c95b659251dd7adf5ffbc1dacf37c03cb07af075f4a64f676196
+  data.tar.gz: 97c97b8d8ab767236547d9ca4998ea3ad62d4d06ee22ca34d4248791d28e0ca51ee5dabfd76c188de1ad8d9647af8d24b60b364d05b0cac53bf74d8bda5efd62

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: ruby
 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
   name: ast
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.