opener-property-tagger 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 200701c1c3f256b0fbfa6fb284e321a16d10f399ced1fa750f7f9d4b66ed5a6f
-  data.tar.gz: 6da856c2c5beb56d778f12e93db99c6e5109728c1c89a6a8f8cceec488a556d2
+  metadata.gz: 436af27476deb0372f325ed255151bf5128608405c740289931ecb630b111ab4
+  data.tar.gz: 5ff2d6bf101e606a786f0b4a9da8021a231ea07fac29fb51c452a1aefa737954
 SHA512:
-  metadata.gz: 5d7056c547b3c7b845b4d3ad7d9f43019629c57e447b7ba5d10ada342809e708f4b62a6ac468daef61617a62e60b35391b541e9f393722d26590b531f6292559
-  data.tar.gz: 7a79912c1317fb629c95244c8f0bb9cf73690bf3b194984c8a7c818a6cc3123f8eaa5957d6bbe32db01f000457472a9db91ba7f1c3b8b556fdfcd440ff033c1a
+  metadata.gz: 4918a0be797e2776329863a1f9f43609b9b30390e6165e73c4e089f533ce769a077e82fa928091285dbf866039dad589b7a650b7c6ffd9cc403c355862a9bd5b
+  data.tar.gz: bcac64dc7d1f229b264976070c05f64e5ff42c54ba2f809f905beb4d7597acea6c71923c271c4bc5dd77c979aa78ffdcb74757c5d27f6819bb6e62186d41fed8

data/lib/opener/property_tagger.rb

@@ -1,6 +1,6 @@
 require 'open3'
 require 'slop'
-require 'oga'
+require 'nokogiri'
 require 'monitor'
 require 'httpclient'
 require 'hashie'

data/lib/opener/property_tagger/processor.rb

@@ -25,7 +25,7 @@ module Opener
       #  by default due to the performance overhead.
       #
       def initialize file, params: {}, url: nil, path: nil, timestamp: true, pretty: false
-        @document     = Oga.parse_xml file
+        @document     = Nokogiri.XML file
         raise 'Error parsing input. Input is required to be KAF' unless is_kaf?
         @timestamp    = timestamp
         @pretty       = pretty
@@ -60,25 +60,16 @@ module Opener
         return pretty ? pretty_print(document) : document.to_xml
       end
 
-      ##
-      # Get the language of the input file.
-      #
-      # @return [String]
-      #
       def language
-        return @language ||= document.at_xpath('KAF').get('xml:lang')
+        return @language ||= document.at_xpath('KAF').attr('xml:lang')
       end
 
-      ##
-      # Get the terms from the input file
-      # @return [Hash]
-      #
       def terms
         unless @terms
           @terms = {}
 
           document.xpath('KAF/terms/term').each do |term|
-            @terms[term.get('tid').to_sym] = term.get('lemma')
+            @terms[term.attr('tid').to_sym] = term.attr('lemma')
           end
         end
 
@@ -143,22 +134,21 @@ module Opener
       def add_property(key, value, index)
         property_node = new_node("property", "KAF/features/properties")
 
-        property_node.set('lemma', key.to_s)
-        property_node.set('pid', "p#{index.to_s}")
+        property_node['lemma'] = key.to_s
+        property_node['pid']   = "p#{index.to_s}"
 
         references_node = new_node("references", property_node)
 
         value.uniq.each do |v|
-          comment = Oga::XML::Comment.new(:text => " #{v.last} ")
-
-          references_node.children << comment
+          comm_node = Nokogiri::XML::Comment.new(references_node, " #{v.last} ")
+          references_node.add_child comm_node
 
           span_node = new_node("span", references_node)
 
           v.first.each do |val|
-            target_node = new_node("target", span_node)
+            target_node       = new_node("target", span_node)
 
-            target_node.set('id', val.to_s)
+            target_node['id'] = val.to_s
           end
         end
       end
@@ -169,19 +159,19 @@ module Opener
         version     = '2.0'
 
         node = new_node('linguisticProcessors', 'KAF/kafHeader')
-        node.set('layer', 'features')
+        node['layer'] = 'features'
 
         lp_node = new_node('lp', node)
 
-        lp_node.set('version', "#{last_edited}-#{version}")
-        lp_node.set('name', description)
+        lp_node['version'] = "#{last_edited}-#{version}"
+        lp_node['name']    = description
 
         if timestamp
           format = '%Y-%m-%dT%H:%M:%S%Z'
 
-          lp_node.set('timestamp', Time.now.strftime(format))
+          lp_node['timestamp'] = Time.now.strftime(format)
         else
-          lp_node.set('timestamp', '*')
+          lp_node['timestamp'] = '*'
         end
       end
 
@@ -212,9 +202,9 @@ module Opener
           parent_node = parent
         end
 
-        node = Oga::XML::Element.new(:name => tag)
+        node = Nokogiri::XML::Element.new(tag, document)
 
-        parent_node.children << node
+        parent_node.add_child node
 
         return node
       end

data/lib/opener/property_tagger/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class PropertyTagger
 
-    VERSION = '3.3.3'
+    VERSION = '3.3.4'
 
   end
 end

data/opener-property-tagger.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-webservice', '~> 2.1'
   gem.add_dependency 'opener-core', '~> 2.2'
 
-  gem.add_dependency 'oga', ['~> 1.0', '>= 1.3.1']
+  gem.add_dependency 'nokogiri'
   gem.add_dependency 'httpclient'
   gem.add_dependency 'hashie'
   gem.add_dependency 'activesupport'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-property-tagger
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-daemons
@@ -53,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: oga
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -173,9 +167,9 @@ dependencies:
 description: Property tagger for hotels in Dutch and English.
 email:
 executables:
-- property-tagger-server
 - property-tagger
 - property-tagger-daemon
+- property-tagger-server
 extensions: []
 extra_rdoc_files: []
 files: