opener-opinion-detector-basic 3.1.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7754e1b84f37755bfeadff1c70fe7aeb8386a37
-  data.tar.gz: fae3879266340ea656422fb16b9e3f4c17d1bb7d
+SHA256:
+  metadata.gz: 37bab9088bfcdff7ddd21a5452bd9226edb14a0d11fb35b2f7bd8a183cd5b1af
+  data.tar.gz: 3605f40a5b4c1f22d343a308d6b7e4e28184bd8f0e7de000ca334842ccc3b4f7
 SHA512:
-  metadata.gz: bea2552b5e25787f09050c9d1e299f63f29c1f885103dca65a3925d8f6169d40f658da46a5d69c4e1d3d8cb95dd88b7e41f5c2958c86a54fde3b55d5f1106c74
-  data.tar.gz: e40877a4669a4b76db70548cc7c023b67ea61426ea593aa3a4311e5cb96186229a96fe444851cd008d8954644302f56b4ddd5046ea338bccfdcd7f7f6660b06a
+  metadata.gz: ccc07cced6aee88b530fa52bfa7185855a840cced15f7008574e9493e85e9249c2af14c6b0645b0e991edfe876e51d69ef26a10ff9ab56ded4ffe59a47873cf4
+  data.tar.gz: 025e2637189339a502fefa73f4e6c44d1317e3199ea474a790d1a4421a0b50293adac691da913800f70a023c1ae190ba2473397021b0d45f7952d6470f33da09

data/exec/opinion-detector-basic.rb

@@ -41,6 +41,22 @@ Opener::OpinionDetectorBasic::Processor.class_eval do
   add_method_tracer(:apply_conjunctions)
 end
 
+Opener::OpinionDetectorBasic::Term.class_eval do
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+  include NewRelic::Agent::MethodTracer
+
+  add_method_tracer(:initialize)
+  add_method_tracer(:sentiment_modifier)
+  add_method_tracer(:polarity)
+  add_method_tracer(:target_ids)
+  add_method_tracer(:strength)
+  add_method_tracer(:get_sentence)
+  add_method_tracer(:is_intensifier?)
+  add_method_tracer(:is_shifter?)
+  add_method_tracer(:is_expression?)
+  add_method_tracer(:is_conjunction?)
+end
+
 daemon = Opener::Daemons::Daemon.new(Opener::OpinionDetectorBasic)
 
 daemon.start

data/lib/opener/opinion_detector_basic.rb

@@ -1,7 +1,7 @@
 gem 'slop', '~> 3.0'
 
 require 'slop'
-require 'oga'
+require 'nokogiri'
 
 require 'rexml/document'
 require 'rexml/formatters/pretty'
@@ -40,10 +40,11 @@ module Opener
     # @param [String] input
     # @return [String]
     #
-    def run(input)
+    def run input, params = {}
       return Processor.new(input, options).process
     end
-  end # OpinionDetectorBasic
-end # Opener
+
+  end
+end
 
 

data/lib/opener/opinion_detector_basic/opinion.rb

@@ -76,7 +76,7 @@ module Opener
       def obtain_holders(sentences, language)
         sentence_terms = sentences[sentence]
         sentence_terms.each do |term|
-          if OPINION_HOLDERS[language].include?(term.lemma)
+          if OPINION_HOLDERS[language]&.include?(term.lemma)
             @holders << term.id
             break
           end

data/lib/opener/opinion_detector_basic/processor.rb

@@ -17,7 +17,7 @@ module Opener
       #  by default due to the performance overhead.
       #
       def initialize(file, options = {})
-        @document = Oga.parse_xml(file)
+        @document = Nokogiri.XML file
 
         @timestamp        = options[:timestamp]
         @opinion_strength = options[:opinion_strength]
@@ -44,30 +44,16 @@ module Opener
         pretty ? pretty_print(document) : document.to_xml
       end
 
-      ##
-      # Get the language of the input file.
-      #
-      # @return [String]
-      #
       def language
-        @language ||= document.at_xpath('KAF').get('xml:lang')
+        @language ||= document.at_xpath('KAF').attr('xml:lang')
       end
 
-      ##
-      # Get the terms from the input file
-      # @return [Hash]
-      #
       def terms
         @terms ||= document.xpath('KAF/terms/term').map do |term|
           Term.new(term, document, language)
         end
       end
 
-      ##
-      # Get the opinions.
-      #
-      # @return [Hash]
-      #
       def opinions
         unless @opinions
           set_accumulated_strength
@@ -79,7 +65,7 @@ module Opener
           #
           @opinions = terms.map do |term|
             if term.is_expression? && term.accumulated_strength != 0
-              o = Opinion.new(term)
+              Opinion.new(term)
             end
           end.compact
 
@@ -117,7 +103,7 @@ module Opener
       #
       def add_opinion(opinion, index)
         opinion_node = new_node("opinion", "KAF/opinions")
-        opinion_node.set('oid', "o#{index.to_s}")
+        opinion_node['oid'] = "o#{index.to_s}"
 
         unless opinion.holders.empty?
           opinion_holder_node = new_node("opinion_holder", opinion_node)
@@ -131,8 +117,8 @@ module Opener
         end
 
         expression_node = new_node("opinion_expression", opinion_node)
-        expression_node.set('polarity', opinion.polarity)
-        expression_node.set('strength', opinion.strength.to_s)
+        expression_node['polarity'] = opinion.polarity
+        expression_node['strength'] = opinion.strength.to_s
 
         add_opinion_element(expression_node, opinion.ids)
       end
@@ -141,14 +127,15 @@ module Opener
       # Method for adding opinion holders, targets and expressions.
       #
       def add_opinion_element(node, ids)
-        lemmas = terms.select{|t| ids.include?(t.id)}.map(&:lemma).join(" ")
-        comment = Oga::XML::Comment.new(:text => "#{lemmas}")
-        node.children << comment
+        lemmas    = terms.select{|t| ids.include?(t.id)}.map(&:lemma).join(" ")
+        comment   = Nokogiri::XML::Comment.new(document, "#{lemmas}")
+        node.add_child comment
+
         span_node = new_node("span", node)
 
         ids.each do |id|
-          target_node = new_node("target", span_node)
-          target_node.set('id', id.to_s)
+          target_node       = new_node("target", span_node)
+          target_node['id'] = id.to_s
         end
       end
 
@@ -162,19 +149,19 @@ module Opener
         version     = '2.0'
 
         node = new_node('linguisticProcessors', 'KAF/kafHeader')
-        node.set('layer', 'opinions')
+        node['layer'] = 'opinions'
 
         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
 
@@ -307,9 +294,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
 
         node
       end
@@ -321,6 +308,6 @@ module Opener
       def is_kaf?
         !!document.at_xpath('KAF')
       end
-    end # Processor
-  end # OpinionDetectorBasic
-end # Opener
+    end
+  end
+end

data/lib/opener/opinion_detector_basic/term.rb

@@ -29,7 +29,7 @@ module Opener
       # @return [String]
       #
       def id
-        @id ||= node.get('tid')
+        @id ||= node.attr('tid')
       end
 
       ##
@@ -38,7 +38,7 @@ module Opener
       # @return [String]
       #
       def lemma
-        @lemma ||= node.get('lemma')
+        @lemma ||= node.attr('lemma')
       end
 
       ##
@@ -47,7 +47,7 @@ module Opener
       # @return [String]
       #
       def pos
-        @pos ||= node.get('pos')
+        @pos ||= node.attr('pos')
       end
 
       ##
@@ -57,7 +57,7 @@ module Opener
       #
       def sentiment_modifier
         @sentiment_modifier ||=
-          first_sentiment ? first_sentiment.get('sentiment_modifier') : nil
+          first_sentiment ? first_sentiment.attr('sentiment_modifier') : nil
       end
 
       ##
@@ -66,7 +66,7 @@ module Opener
       # @return [String|NilClass]
       #
       def polarity
-        @polarity ||= first_sentiment ? first_sentiment.get('polarity') : nil
+        @polarity ||= first_sentiment ? first_sentiment.attr('polarity') : nil
       end
 
       ##
@@ -76,7 +76,7 @@ module Opener
       #
       def target_ids
         @target_ids ||= node.xpath('span/target')
-          .map { |target| target.get('id') }
+          .map { |target| target.attr('id') }
       end
 
       ##
@@ -109,7 +109,7 @@ module Opener
         document
         .xpath("KAF/text/wf[@wid='#{target_ids.first}']")
         .first
-        .get('sent')
+        .attr('sent')
       end
 
       ##
@@ -145,7 +145,7 @@ module Opener
       # @return [TrueClass|FalseClass]
       #
       def is_conjunction?(language)
-        CONJUNCTIONS[language].include?(lemma)
+        pos == 'J' || CONJUNCTIONS[language]&.include?(lemma)
       end
 
       private

data/lib/opener/opinion_detector_basic/version.rb

@@ -1,5 +1,7 @@
 module Opener
   class OpinionDetectorBasic
-    VERSION = '3.1.1'
+
+    VERSION = '3.2.3'
+
   end
 end

data/opener-opinion-detector-basic.gemspec

@@ -27,7 +27,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_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'cucumber'

metadata

@@ -1,160 +1,154 @@
 --- !ruby/object:Gem::Specification
 name: opener-opinion-detector-basic
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.3
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2020-11-09 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'
-  name: opener-daemons
-  prerelease: false
   type: :runtime
+  prerelease: false
   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'
-  name: opener-webservice
-  prerelease: false
   type: :runtime
+  prerelease: false
   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'
-  name: opener-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  name: oga
-  prerelease: false
+        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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: cucumber
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: benchmark-ips
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Basic Opinion Detector.
 email:
 executables:
-- opinion-detector-basic-server
 - opinion-detector-basic
 - opinion-detector-basic-daemon
+- opinion-detector-basic-server
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
+- bin/opinion-detector-basic
+- bin/opinion-detector-basic-daemon
+- bin/opinion-detector-basic-server
+- config.ru
+- exec/opinion-detector-basic.rb
 - lib/opener/opinion_detector_basic.rb
-- lib/opener/opinion_detector_basic/version.rb
-- lib/opener/opinion_detector_basic/term.rb
-- lib/opener/opinion_detector_basic/processor.rb
-- lib/opener/opinion_detector_basic/server.rb
 - lib/opener/opinion_detector_basic/cli.rb
 - lib/opener/opinion_detector_basic/opinion.rb
+- lib/opener/opinion_detector_basic/processor.rb
 - lib/opener/opinion_detector_basic/public/markdown.css
+- lib/opener/opinion_detector_basic/server.rb
+- lib/opener/opinion_detector_basic/term.rb
+- lib/opener/opinion_detector_basic/version.rb
 - lib/opener/opinion_detector_basic/views/index.erb
-- config.ru
 - opener-opinion-detector-basic.gemspec
-- README.md
-- LICENSE.txt
-- exec/opinion-detector-basic.rb
 - task/test.rake
-- bin/opinion-detector-basic-server
-- bin/opinion-detector-basic
-- bin/opinion-detector-basic-daemon
 homepage: http://opener-project.github.com/
 licenses:
 - Apache 2.0
@@ -165,19 +159,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Basic Opinion Detector.
 test_files: []
-has_rdoc: