opener-property-tagger 3.2.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168a0501dc6567285dd70b1a304fdc885b6d9493f9ca62863a428068b42d284e
-  data.tar.gz: 6e9dd2b446eca6e75d4644e5cb59ec8ad64ec6f7f88e79266142129ce5ee59eb
+  metadata.gz: d732e35937583e6fbad1452c2dc72f894df668979a9259c19f4a84a9557b8971
+  data.tar.gz: 6999b3814921c0ec9cefd59b096c89b18c4ac4e9c5a9529f0fa3141c463ea306
 SHA512:
-  metadata.gz: 7a209b8da679c06ea5fce64a11142b22b8b7a3c4da2775f832f4266af152c624f8ddb9e81bf7cbb96d668babc303fedb1243988b243faa2c72a5b7438c47c9b6
-  data.tar.gz: 621b9a11a6c2230aee345fc4d072b8636d1c63b6533960103de475355a54baac7924867eb59176850d7b0aaaccdbc1a4a6eccf9af62652bbaf6f26097163778d
+  metadata.gz: 0d1d7714bfeab24e5505ea3d442b423ab3fe6daa26dfe214b412add729e2544543d0ccadf078bec3d852bb3fa2b1ec541b131a064b9a2598e38bebbeb58a6061
+  data.tar.gz: 24a4b3b4dcd85edd9249b16e79673487a174c58e7c826820c4b1a67aed56a8f92ec4e228e0d773598b3ed6ce14b5196a2163b48c63646d3442014fcfc2af561c

data/lib/opener/property_tagger.rb

@@ -5,14 +5,15 @@ 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
@@ -66,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
+      def initialize file, params: {}, url: nil, path: nil, timestamp: true, pretty: false
         @document     = Oga.parse_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
 
       ##

data/lib/opener/property_tagger/remote_aspects_cache.rb

@@ -14,25 +14,43 @@ module Opener
         @cache = {}
       end
 
-      def [] lang
+      def [] **params
         synchronize do
-          @cache[lang] ||= load_aspects lang
+          if existing = @cache[params]
+            existing.tap do
+              Thread.new{ @cache[params] = cache_update existing, **params }
+            end
+          else
+            @cache[params] = cache_update **params
+          end
         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
+
+        return existing if existing and lexicons.blank?
+        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.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 }
-        puts "#{lang}: loaded aspects from #{url}"
-
+        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.1'
+    VERSION = '3.3.1'
 
   end
 end

data/opener-property-tagger.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'oga', ['~> 1.0', '>= 1.3.1']
   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,59 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: opener-property-tagger
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.1
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: opener-daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-  type: :runtime
+  name: opener-daemons
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: opener-webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  type: :runtime
+  name: opener-webservice
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: opener-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-  type: :runtime
+  name: opener-core
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -62,8 +61,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
-  type: :runtime
+  name: oga
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -73,84 +73,98 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: httpclient
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: hashie
+  prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: activesupport
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: cucumber
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  name: benchmark-ips
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -173,8 +187,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
@@ -205,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: Property tagger for hotels in Dutch and English.