opener-polarity-tagger 3.1.3 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4362832bbbb35ee32747d662b0ed336a4999281474b7866c748f392cd7e4850
-  data.tar.gz: 6882049bcdf93c02dec34023f472691d760f6f200370ba551d59036bf3f3e26b
+  metadata.gz: 4f5521ee603c20f1efe4008895c88409afbe7994fe5eab72a1de08766ac36da1
+  data.tar.gz: 0345c08ea80a4b55c0003a02763fa31837d72e6e38f7fcbb2b7c63a720e00712
 SHA512:
-  metadata.gz: af13174d0deb82c077403daadb9ad046e945eae79e24f7cf2a1e50961b1e901ec94553da428057a9eeccaa2c0e5a8e007b28f685874ea21253a8e36701bb7599
-  data.tar.gz: 3cd67f602a84d8674203579dc8e4bbba271ee49a57c5a34969e0cbef4bc29f32b25393ea0a45c77cff0d518e4355196734055d3f7774140d713bf675d0486fc0
+  metadata.gz: '02932a66b68aeb50c5c7f77f597ca8f6f6dd55d839796c6609a42eed2afd066ef531316abf1b600e48d7f3f4619a8f1de84d28b7c6858b47fbce4223ec08013f'
+  data.tar.gz: 41a68399fb4631e5aee6f6c2110d2e6da96ee1d96101b4a95548fc9def1f3e0e5e861cdad453dfb78cebf5de2a7d85dea76af7f9462ae86c55619bff7314a5a6

data/lib/opener/polarity_tagger.rb

@@ -2,6 +2,7 @@ require 'open3'
 require 'opener/core'
 require 'nokogiri'
 require 'hashie'
+require 'active_support/all'
 
 require_relative 'polarity_tagger/version'
 require_relative 'polarity_tagger/cli'
@@ -19,8 +20,12 @@ module Opener
       @proc    = @klass.new args: @args
     end
 
-    def run input
-      @proc.run input
+    def clear_cache params = {}
+      @proc.clear_cache(**params)
+    end
+
+    def run input, params = {}
+      @proc.run input, params
     end
 
   end

data/lib/opener/polarity_tagger/external.rb

@@ -52,7 +52,7 @@ module Opener
       # @param [String] input The text of which to detect the language.
       # @return [Array]
       #
-      def run(input)
+      def run input, params
         stdout, stderr, process = capture(input)
 
         raise stderr unless process.success?

data/lib/opener/polarity_tagger/internal.rb

@@ -16,11 +16,16 @@ module Opener
         @ignore_pos = ignore_pos
       end
 
-      def run input
+      def clear_cache lang: nil, environment:
+      end
+
+      def run input, params = {}
         @kaf = KAF::Document.from_xml input
-        @map = @kaf.map = CACHE[@kaf.language]
 
-        negators = 0
+        @cache_keys = params[:cache_keys] ||= {}
+        @cache_keys.merge! lang: @kaf.language
+        @map = @kaf.map = CACHE[**@cache_keys].lexicons
+
         @kaf.terms.each do |t|
           lemma = t.lemma&.downcase
           pos   = if @ignore_pos then nil else t.pos end
@@ -32,7 +37,6 @@ module Opener
             attrs.polarity = lexicon.polarity
           end
           if l = @map.by_negator(lemma)
-            negators += 1
             lexicon, polarity_pos = l, nil
             attrs.sentiment_modifier = 'shifter'
           end

data/lib/opener/polarity_tagger/lexicon_map.rb

@@ -7,21 +7,10 @@ module Opener
       attr_reader :intensifiers
       attr_reader :with_polarity
 
-      POS_ORDER = 'NRVGAO'
-      UNKNOWN   = Hashie::Mash.new polarity: 'unknown'
-
-      def initialize lang:, lexicons:
-        @lang          = lang
-        @lexicons      = lexicons
-
-        @negators      = {}
-        @intensifiers  = {}
-        @with_polarity = {}
-        map lexicons
-      end
-
-      DEFAULT_POS = 'O'
+      UNKNOWN = Hashie::Mash.new polarity: 'unknown'
 
+      POS_ORDER     = 'NRVGAO'
+      DEFAULT_POS   = 'O'
       POS_SHORT_MAP = {
         adj:         'G',
         adv:         'A',
@@ -34,6 +23,20 @@ module Opener
         multi_word_expression: 'O',
       }
 
+      def initialize lang:, lexicons:
+        @lang          = lang
+        @lexicons      = lexicons
+
+        @negators      = {}
+        @intensifiers  = {}
+        @with_polarity = {}
+        map lexicons
+      end
+
+      def blank?
+        @lexicons.blank?
+      end
+
       def by_negator lemma
         @negators[lemma]
       end
@@ -58,6 +61,8 @@ module Opener
       protected
 
       def map lexicons
+        return if blank?
+
         lexicons.each do |l|
           next if l.lemma.nil?
 

data/lib/opener/polarity_tagger/lexicons_cache.rb

@@ -12,28 +12,47 @@ module Opener
         @cache = {}
       end
 
-      def [] lang
+      def [] **params
         synchronize do
-          @cache[lang] ||= load_lexicons 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_lexicons lang
-        lexicons = if @url then load_from_url lang else load_from_path lang end
+      def cache_update existing = nil, **params
+        from     = Time.now
+        lexicons = load_lexicons cache: existing, **params
+
+        return existing if existing and lexicons.blank?
+        Hashie::Mash.new(
+          lexicons: lexicons,
+          from:     from,
+        )
+      end
+
+      def load_lexicons lang:, **params
+        lexicons = if @url then load_from_url lang: lang, **params else load_from_path lang: lang, **params end
 
         LexiconMap.new lang: lang, lexicons: lexicons
       end
 
-      def load_from_url lang
-        url      = "#{@url}&language_code=#{lang}"
+      def load_from_url lang:, cache:, **params
+        url  = "#{@url}&language_code=#{lang}&#{params.to_query}"
+        url += "&if_updated_since=#{cache.from.iso8601}" if cache
         puts "#{lang}: loading lexicons from url #{url}"
+
         lexicons = JSON.parse HTTPClient.new.get(url).body
         lexicons = lexicons['data'].map{ |l| Hashie::Mash.new l }
         lexicons
       end
 
-      def load_from_path lang
+      def load_from_path lang:, **params
         @path  ||= 'core/general-lexicons'
         dir      = "#{@path}/#{lang.upcase}-lexicon"
         config   = Nokogiri::XML File.read "#{dir}/config.xml"

data/lib/opener/polarity_tagger/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class PolarityTagger
 
-    VERSION = '3.1.3'
+    VERSION = '3.2.1'
 
   end
 end

data/opener-polarity-tagger.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-webservice', '~> 2.1'
   gem.add_dependency 'opener-core', '~> 2.2'
 
+  gem.add_dependency 'activesupport'
   gem.add_dependency 'hashie'
   gem.add_dependency 'rake'
   gem.add_dependency 'nokogiri'

metadata

@@ -1,164 +1,178 @@
 --- !ruby/object:Gem::Specification
 name: opener-polarity-tagger
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.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: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: activesupport
   prerelease: false
+  type: :runtime
   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: :runtime
+  name: hashie
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: rake
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cliver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: nokogiri
+  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: cliver
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-  type: :runtime
+  name: slop
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   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:
     - - ">="
@@ -237,7 +251,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: Polarity tagger for various languages.