oga 2.15 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09809a9591606c3dbed1284ec8fa5dc37f1c6b10ae079b48dd3a756029dada53'
-  data.tar.gz: 5ac65c917043c3e51b0cfcb3c8fe0d341a4aeb7e3c39a52c7e3c1d3b68c4c37d
+  metadata.gz: fe38fd196a394b8bbef5f09b4149bda6e1cb9f4350946508c1184aa5dee83a4a
+  data.tar.gz: e9d3920e6544029b1d0ca0a0319b5e5cae3fe37b198b0c0c0809cf3b1442e942
 SHA512:
-  metadata.gz: 541756a494f6a5de668a73dbb7d28999242689cfecbb475d6940edcc0a5428a99ab6f432d0d729d2fdc1bc9e68244f0f15557e70e46d0f4a0ed2aa02671d6b9d
-  data.tar.gz: 9375adf05e90a223fd4f0d00ca251f2b917552c58261ab2d3838fc5a339815657bc60344b322a4415a40d72cc8b410b89ff14a869a8ad5810652660c0c69f314
+  metadata.gz: bc397efa4eaa87451f2769e55634d9bd754e1c9788bb605f71e77dbe72b2f236f0af9d0cc942ab066036c817d1991ab44da03e213c9c0287c9d9199ed8689d0c
+  data.tar.gz: fdc4a670a61b755a0c0aafbb47bba2d10b253a3717794ac395f52a3e1d68fe522ee809b0513895296503d82fafef7d6132517b227610ea62db2f7e11eb38afb0

data/README.md

@@ -172,9 +172,9 @@ Querying a document using a namespace:
 
 | Ruby     | Required      | Recommended |
 |:---------|:--------------|:------------|
-| MRI      | >= 1.9.3      | >= 2.1.2    |
-| Rubinius | >= 2.2        | >= 2.2.10   |
+| MRI      | >= 2.3.0      | >= 2.6.0    |
 | JRuby    | >= 1.7        | >= 1.7.12   |
+| Rubinius | Not supported |             |
 | Maglev   | Not supported |             |
 | Topaz    | Not supported |             |
 | mruby    | Not supported |             |

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '2.15'
+  VERSION = '3.0'
 end # Oga

data/lib/oga/xml/querying.rb

@@ -10,6 +10,7 @@ module Oga
       #     document = Oga.parse_xml <<-EOF
       #     <people>
       #       <person age="25">Alice</person>
+      #       <ns:person xmlns:ns="http://example.net">Bob</ns:person>
       #     </people>
       #     EOF
       #
@@ -25,15 +26,23 @@ module Oga
       #
       #     document.xpath('people/person[@age = $age]', 'age' => 25)
       #
+      # Using namespace aliases:
+      #
+      #     namespaces = {'example' => 'http://example.net'}
+      #     document.xpath('people/example:person', namespaces: namespaces)
+      #
       # @param [String] expression The XPath expression to run.
       #
       # @param [Hash] variables Variables to bind. The keys of this Hash should
       #  be String values.
       #
+      # @param [Hash] namespaces Namespace aliases. The keys of this Hash should
+      #  be String values.
+      #
       # @return [Oga::XML::NodeSet]
-      def xpath(expression, variables = {})
+      def xpath(expression, variables = {}, namespaces: nil)
         ast   = XPath::Parser.parse_with_cache(expression)
-        block = XPath::Compiler.compile_with_cache(ast)
+        block = XPath::Compiler.compile_with_cache(ast, namespaces: namespaces)
 
         block.call(self, variables)
       end

data/lib/oga/xpath/compiler.rb

@@ -42,12 +42,16 @@ module Oga
       # Compiles and caches an AST.
       #
       # @see [#compile]
-      def self.compile_with_cache(ast)
-        CACHE.get_or_set(ast) { new.compile(ast) }
+      def self.compile_with_cache(ast, namespaces: nil)
+        cache_key = namespaces ? [ast, namespaces] : ast
+        CACHE.get_or_set(cache_key) { new(namespaces: namespaces).compile(ast) }
       end
 
-      def initialize
+      # @param [Hash] namespaces
+      def initialize(namespaces: nil)
         reset
+
+        @namespaces = namespaces
       end
 
       # Resets the internal state.
@@ -1385,7 +1389,23 @@ module Oga
         end
 
         if ns and ns != STAR
-          ns_match  = input.namespace_name.eq(string(ns))
+          if @namespaces
+            ns_uri = @namespaces[ns]
+            ns_match =
+              if ns_uri
+                input.namespace.and(input.namespace.uri.eq(string(ns_uri)))
+              else
+                self.false
+              end
+          else
+            ns_match =
+              if ns == XML::Element::XMLNS_PREFIX
+                input
+              else
+                input.namespace_name.eq(string(ns))
+              end
+          end
+
           condition = condition ? condition.and(ns_match) : ns_match
         end
 

data/oga.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |s|
     s.extensions = ['ext/c/extconf.rb']
   end
 
-  s.has_rdoc              = 'yard'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency 'ast'
   s.add_dependency 'ruby-ll', '~> 2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: '2.15'
+  version: '3.0'
 platform: ruby
 authors:
 - Yorick Peterse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -218,15 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.