opener-property-tagger 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c33a6b3d4f58d431c9b6eca1c4a4a66239fa651
-  data.tar.gz: 40f3ca343fe303d8b5bbe69576bafec5e0f555cf
+SHA256:
+  metadata.gz: adec67a48fac849987e8347eeb0bc5a304e930ab6fdc604ae7029012c6505868
+  data.tar.gz: 9e1dda3b0fecc300a8ef8d4574563cf51e1eb3590601637a0a4d8160bbdccc40
 SHA512:
-  metadata.gz: 810e45722da0010b75c49add4d9f83cab411c06b72c458402a6e37997c607c49a107bc874b9dd6f06f5ea61f93c7c2e155e03e1c234ba6aa567bc86f9ca2a8c4
-  data.tar.gz: 01dd805a7355cd5109cc61085ca2a564bb5a81a5a1cdf8f90f2d8b199a18f1c4d69e9f263b8fc9872e918bd10e74e6a2ba9a18103e59287ccd52441cf5885488
+  metadata.gz: e15b757610a466b6bc1b15e7afcb2c207874c9f696a375a2f56630c88a686f9990a362422a76835685b06a6a6fce32130565fe37e27ca1f1c818ae8a263fe86e
+  data.tar.gz: a4ce0b27abba305fe0b440a6cb26fce829ceea37e775325be22aad5cc6efb6b45fe161ceb38e407040fb014881683ce0981f56b4defab07862fb81e539102588

data/lib/opener/property_tagger.rb

@@ -2,6 +2,9 @@ require 'open3'
 require 'slop'
 require 'oga'
 require 'monitor'
+require 'httpclient'
+require 'hashie'
+require 'json'
 
 require 'rexml/document'
 require 'rexml/formatters/pretty'
@@ -9,6 +12,7 @@ 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/processor'
 
 module Opener
@@ -43,14 +47,20 @@ module Opener
     # @return [String]
     #
     def path
-      path = options[:resource_path] || ENV['RESOURCE_PATH'] ||
+      return @path if @path
+
+      @path = options[:resource_path] || ENV['RESOURCE_PATH'] ||
         ENV['PROPERTY_TAGGER_LEXICONS_PATH']
 
-      unless path
+      unless @path
         raise ArgumentError, 'No lexicon path provided'
       end
 
-      return File.expand_path(path)
+      @path = File.expand_path @path
+    end
+
+    def remote_url
+      @remote_url ||= ENV['PROPERTY_TAGGER_LEXICONS_URL']
     end
 
     ##
@@ -59,11 +69,17 @@ module Opener
     # @param [String] input
     # @return [String]
     #
-    def run(input)
+    def run input
       timestamp = !options[:no_time]
 
-      return Processor.new(input, path, timestamp, options[:pretty]).process
+      Processor.new(input,
+        url:       remote_url,
+        path:      path,
+        timestamp: timestamp,
+        pretty:    options[:pretty],
+      ).process
     end
-  end # PolarityTagger
-end # Opener
+
+  end
+end
 

data/lib/opener/property_tagger/aspects_cache.rb

@@ -22,8 +22,6 @@ module Opener
         synchronize do
           @cache[path] = load_aspects(path) unless @cache.key?(path)
         end
-
-        return @cache[path]
       end
 
       alias_method :get, :[]

data/lib/opener/property_tagger/processor.rb

@@ -4,14 +4,18 @@ module Opener
     # Class that applies property tagging to a given input KAF file.
     #
     class Processor
-      attr_accessor :document, :aspects_path, :timestamp, :pretty
+
+      attr_accessor :document
+      attr_accessor :aspects, :aspects_path, :aspects_url
+      attr_accessor :timestamp, :pretty
 
       ##
       # Global cache used for storing loaded aspects.
       #
       # @return [Opener::PropertyTagger::AspectsCache.new]
       #
-      ASPECTS_CACHE = AspectsCache.new
+      ASPECTS_CACHE        = AspectsCache.new
+      REMOTE_ASPECTS_CACHE = RemoteAspectsCache.new
 
       ##
       # @param [String|IO] file The KAF file/input to process.
@@ -20,13 +24,17 @@ module Opener
       # @param [TrueClass|FalseClass] pretty Enable pretty formatting, disabled
       #  by default due to the performance overhead.
       #
-      def initialize(file, aspects_path, timestamp = true, pretty = false)
-        @document     = Oga.parse_xml(file)
-        @aspects_path = aspects_path
+      def initialize file, 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
 
-        raise 'Error parsing input. Input is required to be KAF' unless is_kaf?
+        @remote       = !url.nil?
+        @aspects_path = path
+        @aspects_url  = url
+
+        @aspects = if @remote then REMOTE_ASPECTS_CACHE[language] else ASPECTS_CACHE[aspects_file] end
       end
 
       ##
@@ -50,13 +58,6 @@ module Opener
         return pretty ? pretty_print(document) : document.to_xml
       end
 
-      ##
-      # @return [Hash]
-      #
-      def aspects
-        return ASPECTS_CACHE[aspects_file]
-      end
-
       ##
       # Get the language of the input file.
       #
@@ -228,9 +229,9 @@ module Opener
       # @return [String]
       #
       def aspects_file
-        return @aspects_file ||=
-          File.expand_path("#{aspects_path}/#{language}.txt", __FILE__)
+        @aspects_file ||= File.expand_path "#{aspects_path}/#{language}.txt", __FILE__
       end
-    end # Processor
-  end # PropertyTagger
-end # Opener
+
+    end
+  end
+end

data/lib/opener/property_tagger/remote_aspects_cache.rb

@@ -0,0 +1,39 @@
+module Opener
+  class PropertyTagger
+    ##
+    # Thread-safe cache for storing the contents of remote aspects.
+    #
+    class RemoteAspectsCache
+
+      include MonitorMixin
+
+      def initialize
+        super
+
+        @url   = ENV['PROPERTY_TAGGER_LEXICONS_URL']
+        @cache = {}
+      end
+
+      def [] lang
+        synchronize do
+          @cache[lang] ||= load_aspects lang
+        end
+      end
+      alias_method :get, :[]
+
+      def load_aspects lang
+        mapping  = Hash.new{ |hash, key| hash[key] = [] }
+        url      = "#{@url}&language_code=#{lang}"
+        lexicons = JSON.parse HTTPClient.new.get(url).body
+        lexicons = lexicons['data'].map{ |l| Hashie::Mash.new l }
+
+        lexicons.each do |l|
+          mapping[l.lemma.to_sym] << l.aspect
+        end
+
+        return mapping
+      end
+
+    end
+  end
+end

data/lib/opener/property_tagger/version.rb

@@ -1,5 +1,7 @@
 module Opener
   class PropertyTagger
-    VERSION = '3.1.1'
-  end # PropertyTagger
-end # Opener
+
+    VERSION = '3.2.0'
+
+  end
+end

data/opener-property-tagger.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-core', '~> 2.2'
 
   gem.add_dependency 'oga', ['~> 1.0', '>= 1.3.1']
+  gem.add_dependency 'httpclient'
+  gem.add_dependency 'hashie'
 
   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.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - development@olery.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-daemons
@@ -72,6 +72,34 @@ 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
+  prerelease: false
+  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'
+  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
@@ -129,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Property tagger for hotels in Dutch and English.
-email: 
+email:
 executables:
 - property-tagger
 - property-tagger-daemon
@@ -149,6 +177,7 @@ files:
 - lib/opener/property_tagger/cli.rb
 - lib/opener/property_tagger/processor.rb
 - lib/opener/property_tagger/public/markdown.css
+- lib/opener/property_tagger/remote_aspects_cache.rb
 - lib/opener/property_tagger/server.rb
 - lib/opener/property_tagger/version.rb
 - lib/opener/property_tagger/views/index.erb
@@ -160,7 +189,7 @@ homepage: http://opener-project.github.com/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,10 +204,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.8
+signing_key:
 specification_version: 4
 summary: Property tagger for hotels in Dutch and English.
 test_files: []
-has_rdoc: