opener-property-tagger 3.2.0 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adec67a48fac849987e8347eeb0bc5a304e930ab6fdc604ae7029012c6505868
-  data.tar.gz: 9e1dda3b0fecc300a8ef8d4574563cf51e1eb3590601637a0a4d8160bbdccc40
+  metadata.gz: 436af27476deb0372f325ed255151bf5128608405c740289931ecb630b111ab4
+  data.tar.gz: 5ff2d6bf101e606a786f0b4a9da8021a231ea07fac29fb51c452a1aefa737954
 SHA512:
-  metadata.gz: e15b757610a466b6bc1b15e7afcb2c207874c9f696a375a2f56630c88a686f9990a362422a76835685b06a6a6fce32130565fe37e27ca1f1c818ae8a263fe86e
-  data.tar.gz: a4ce0b27abba305fe0b440a6cb26fce829ceea37e775325be22aad5cc6efb6b45fe161ceb38e407040fb014881683ce0981f56b4defab07862fb81e539102588
+  metadata.gz: 4918a0be797e2776329863a1f9f43609b9b30390e6165e73c4e089f533ce769a077e82fa928091285dbf866039dad589b7a650b7c6ffd9cc403c355862a9bd5b
+  data.tar.gz: bcac64dc7d1f229b264976070c05f64e5ff42c54ba2f809f905beb4d7597acea6c71923c271c4bc5dd77c979aa78ffdcb74757c5d27f6819bb6e62186d41fed8

data/lib/opener/property_tagger.rb

@@ -1,18 +1,19 @@
 require 'open3'
 require 'slop'
-require 'oga'
+require 'nokogiri'
 require 'monitor'
 require 'httpclient'
 require 'hashie'
 require 'json'
+require 'active_support/all'
 
 require 'rexml/document'
 require 'rexml/formatters/pretty'
 
 require_relative 'property_tagger/version'
 require_relative 'property_tagger/cli'
-require_relative 'property_tagger/aspects_cache'
 require_relative 'property_tagger/remote_aspects_cache'
+require_relative 'property_tagger/file_aspects_cache'
 require_relative 'property_tagger/processor'
 
 module Opener
@@ -51,10 +52,7 @@ module Opener
 
       @path = options[:resource_path] || ENV['RESOURCE_PATH'] ||
         ENV['PROPERTY_TAGGER_LEXICONS_PATH']
-
-      unless @path
-        raise ArgumentError, 'No lexicon path provided'
-      end
+      return unless @path
 
       @path = File.expand_path @path
     end
@@ -69,10 +67,11 @@ module Opener
     # @param [String] input
     # @return [String]
     #
-    def run input
+    def run input, params = {}
       timestamp = !options[:no_time]
 
       Processor.new(input,
+        params:    params,
         url:       remote_url,
         path:      path,
         timestamp: timestamp,

data/lib/opener/property_tagger/{aspects_cache.rb → file_aspects_cache.rb}

@@ -3,7 +3,8 @@ module Opener
     ##
     # Thread-safe cache for storing the contents of aspect files.
     #
-    class AspectsCache
+    class FileAspectsCache
+
       include MonitorMixin
 
       def initialize
@@ -42,6 +43,7 @@ module Opener
 
         return mapping
       end
-    end # AspectsCache
-  end # PropertyTagger
-end # Opener
+
+    end
+  end
+end

data/lib/opener/property_tagger/processor.rb

@@ -12,9 +12,9 @@ module Opener
       ##
       # Global cache used for storing loaded aspects.
       #
-      # @return [Opener::PropertyTagger::AspectsCache.new]
+      # @return [Opener::PropertyTagger::FileAspectsCache.new]
       #
-      ASPECTS_CACHE        = AspectsCache.new
+      FILE_ASPECTS_CACHE   = FileAspectsCache.new
       REMOTE_ASPECTS_CACHE = RemoteAspectsCache.new
 
       ##
@@ -24,17 +24,19 @@ module Opener
       # @param [TrueClass|FalseClass] pretty Enable pretty formatting, disabled
       #  by default due to the performance overhead.
       #
-      def initialize file, url: nil, path: nil, timestamp: true, pretty: false
-        @document     = Oga.parse_xml file
+      def initialize file, params: {}, url: nil, path: nil, timestamp: true, pretty: false
+        @document     = Nokogiri.XML file
         raise 'Error parsing input. Input is required to be KAF' unless is_kaf?
         @timestamp    = timestamp
         @pretty       = pretty
 
+        @params       = params
+        @cache_keys   = params[:cache_keys] || {lang: language}
         @remote       = !url.nil?
         @aspects_path = path
         @aspects_url  = url
 
-        @aspects = if @remote then REMOTE_ASPECTS_CACHE[language] else ASPECTS_CACHE[aspects_file] end
+        @aspects = if @remote then REMOTE_ASPECTS_CACHE[**@cache_keys].aspects else FILE_ASPECTS_CACHE[aspects_file] end
       end
 
       ##
@@ -58,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
 
@@ -141,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
@@ -167,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
 
@@ -210,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/remote_aspects_cache.rb

@@ -7,6 +7,8 @@ module Opener
 
       include MonitorMixin
 
+      UPDATE_INTERVAL = (ENV['CACHE_EXPIRE_MINS']&.to_i || 5).minutes
+
       def initialize
         super
 
@@ -14,24 +16,43 @@ module Opener
         @cache = {}
       end
 
-      def [] lang
+      def [] **params
         synchronize do
-          @cache[lang] ||= load_aspects lang
+          existing = @cache[params]
+          break existing if existing and existing.from > UPDATE_INTERVAL.ago
+          @cache[params] = cache_update existing, **params
         end
       end
       alias_method :get, :[]
 
-      def load_aspects lang
-        mapping  = Hash.new{ |hash, key| hash[key] = [] }
-        url      = "#{@url}&language_code=#{lang}"
+      def cache_update existing = nil, **params
+        from     = Time.now
+        lexicons = load_aspects cache: existing, **params
+
+        if existing and lexicons.blank?
+          existing.from = from
+          return existing
+        end
+
+        Hashie::Mash.new(
+          aspects: lexicons,
+          from:    from,
+        )
+      end
+
+      def load_aspects lang:, cache:, **params
+        url  = "#{@url}&language_code=#{lang}&#{params.to_query}"
+        url += "&if_updated_since=#{cache.from.utc.iso8601}" if cache
+        puts "#{lang}: loading aspects from #{url}"
+
         lexicons = JSON.parse HTTPClient.new.get(url).body
         lexicons = lexicons['data'].map{ |l| Hashie::Mash.new l }
-
+        mapping  = Hash.new{ |hash, key| hash[key] = [] }
         lexicons.each do |l|
           mapping[l.lemma.to_sym] << l.aspect
         end
 
-        return mapping
+        mapping
       end
 
     end

data/lib/opener/property_tagger/version.rb

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

data/opener-property-tagger.gemspec

@@ -28,9 +28,10 @@ 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'
 
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'cucumber'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-property-tagger
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.4
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 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
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -173,8 +181,8 @@ files:
 - config.ru
 - exec/property-tagger.rb
 - lib/opener/property_tagger.rb
-- lib/opener/property_tagger/aspects_cache.rb
 - lib/opener/property_tagger/cli.rb
+- lib/opener/property_tagger/file_aspects_cache.rb
 - lib/opener/property_tagger/processor.rb
 - lib/opener/property_tagger/public/markdown.css
 - lib/opener/property_tagger/remote_aspects_cache.rb