oga 2.15-java → 3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23b316d99884b02f345750c4f2f68bd245891c67
-  data.tar.gz: 62b7a2f7a2d73b548047dc79865f72b58ae5d806
+SHA256:
+  metadata.gz: bfae6d81e50c59fe3b0cbf4a5f6028c749820b6d93bf30c7f5efb08419d0cbb3
+  data.tar.gz: 8f9ad335e6b387f247ddcde93d74c4c2c75a00ad09148b902628728a8ecdce97
 SHA512:
-  metadata.gz: 954fe9a4397b7d6b274a12963df19c9206ae377b51879c83ae63e7e9ac51e0e00599686e2e63dfc919d3c75f4a8cfe11c81e12d3c84320196ec38f1c4d954975
-  data.tar.gz: 27bb50ab795cde9b92fa2e84293379e0b68fc0df86a407f76c7765a4294f10274c1a1426fd86fbbddca5988b4743b27944b1bcba60e66787495b7755ad6e6275
+  metadata.gz: 298c8bd91c7fd954956e2757cde6fa1b832dc16d0896553dd4684b4bdcfa72c39b6128dc56b1a9dd2864057b0c964c82d810d49e32d276ebb19e68a27c110aeb
+  data.tar.gz: 2c46594d335c3b31260bce5125463caf7a83249034d438ee96daa001e441c8bf773fc99c529547d114d0734ea190083110809ece7260c06b684f1118500b49c9

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,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: '2.15'
+  version: '3.0'
 platform: java
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: ast
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: ruby-ll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+  name: ruby-ll
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+  name: rspec
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: yard
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: simplecov
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: kramdown
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: benchmark-ips
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake-compiler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 description: Oga is an XML/HTML parser written in Ruby.
 email: yorickpeterse@gmail.com
 executables: []
@@ -218,7 +218,7 @@ 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:
   - - ">="
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.