opener-chained-daemon 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a3d261875bffe0427ec49e37eb23a13dc8ddddb6a0677681f7a21a550961da5
-  data.tar.gz: eaf306aa0f178899dde39b6995efa08985cb00020636a3bcaa81061b2d5bc1c2
+  metadata.gz: ccbd3019511ea9dd574ac013aeadb58f5c480e5a71a641320b047f6220c5288a
+  data.tar.gz: 5dfa19e0fc0d176bd9bfe5cdbc04740ebf1ee2c15165f99454552d6686f751fe
 SHA512:
-  metadata.gz: 98a9a18b0130a61f41697c38deb88fe48769be4c5263a05aad4bd91b472db3d47b3e1cd36e69a6f6c6a5860a7413a4322cf8853837e7155d0e0adf0087c492cf
-  data.tar.gz: 2783a9005454540407af1a2fd07f748db06ee02716720abc9695f532448e367322fe09e6c28df59e8b690435aa1958c7ae10cc773a23418a1ff6993480984fc2
+  metadata.gz: 3d2b23910cdb755ac043ea9143716a18fa305f7dfcb381914dc8387fd94ce72de7bf4a6bca163280c5b2ef14298191aa21604ae0fca01a7e5f77153c0cf63fa6
+  data.tar.gz: 8c56eb7b23ad95e7d6a50f059154f870fd3b6cd16a3f4ffa2532ea5898e2ff52f903b71138eba3e06e679ce77a03c03972bb1df1cb5238305ddff764d4918274

data/lib/opener/chained_daemon.rb

@@ -8,6 +8,8 @@ require 'rexml/formatters/pretty'
 
 require 'opener/daemons'
 
+require_relative 'sym_mash'
+
 require_relative 'chained_daemon/languages_cache'
 require 'opener/language_identifier'
 require 'opener/tokenizer'

data/lib/opener/chained_daemon/chained_daemon.rb

@@ -17,11 +17,13 @@ module Opener
       }
     end
 
-    def run input, params = {}
-      params ||= {}
-      params.deep_symbolize_keys!
-      params[:translate_languages] ||= []
-      params[:cache_keys] = params[:cache_keys]&.sort&.to_h || {}
+    def run input, _params = {}
+      params = SymMash.new _params
+      params.translate_languages ||= []
+      params.cache_keys = SymMash.new params.cache_keys&.to_h&.sort&.to_h || {}
+      if params.filter_vertical and params.property_type.present?
+        params.cache_keys.property_type = params.property_type
+      end
 
       lang     = nil
       output   = nil
@@ -34,7 +36,7 @@ module Opener
       rescue Core::UnsupportedLanguageError
         xml  = Nokogiri.parse input
         lang = xml.root.attr('xml:lang')
-        raise unless lang.in? params[:translate_languages]
+        raise unless lang.in? params.translate_languages
 
         input = translate xml, params
         retry
@@ -47,7 +49,7 @@ module Opener
         output = xml.to_s
       end
 
-      output = pretty_print output if params[:cache_keys][:environment] == 'staging'
+      output = pretty_print output if params.cache_keys&.environment == 'staging'
       output
 
     rescue Core::UnsupportedLanguageError
@@ -84,7 +86,7 @@ module Opener
     protected
 
     def translate_service params
-      params[:translate_service]&.to_sym || :google
+      params.translate_service&.to_sym || :google
     end
 
     def google_translator

data/lib/opener/chained_daemon/cli.rb

@@ -47,12 +47,7 @@ Example:
           run do |opts, args|
             daemon = ChainedDaemon.new args: args
             input  = STDIN.tty? ? nil : STDIN.read
-
-            params = if ENV['PARAMS']
-                       JSON.parse ENV['PARAMS']
-                     else
-                       {}
-                     end
+            params = if ENV['PARAMS'] then JSON.parse ENV['PARAMS'] else {} end
             # Set environment as staging from console for testing purposes
             params[:cache_keys] = { environment: 'staging', merged: true }
 

data/lib/opener/chained_daemon/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class ChainedDaemon
 
-    VERSION = '3.1.5'
+    VERSION = '3.2.0'
 
   end
 end

data/lib/opener/stanza/tokenizer_pos.rb

@@ -54,12 +54,9 @@ module Opener
 
         miscs = {}
         tokens.each_with_index do |t, i|
-          miscs[i] ||= {}
+          miscs[i] = {}
           t.each do |word|
-            word['id'].is_a?(Array) && word['id'].each do |id|
-              puts id
-              miscs[i][id] = word['misc']
-            end
+            word['id'].is_a?(Array) && word['id'].each { |id| miscs[i][id] = word['misc'] }
           end
         end
 

data/lib/opener/sym_mash.rb

@@ -0,0 +1,14 @@
+class SymMash < ::Hashie::Mash
+
+  disable_warnings
+
+  include Hashie::Extensions::Mash::SymbolizeKeys
+
+  def inspect
+    map do |k,v|
+      v = "{#{v.inspect}}" if v.is_a? SymMash
+      "#{k}=#{v}"
+    end.join ' '
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-chained-daemon
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -308,9 +308,9 @@ description: OpeNER daemon for processing multiple queues at once
 email:
 executables:
 - chained-daemon
-- chained-daemon-daemon
 - chained-daemon-csv
 - console
+- chained-daemon-daemon
 extensions: []
 extra_rdoc_files: []
 files:
@@ -331,6 +331,7 @@ files:
 - lib/opener/kaf/term.rb
 - lib/opener/kaf/text.rb
 - lib/opener/stanza/tokenizer_pos.rb
+- lib/opener/sym_mash.rb
 - opener-chained-daemon.gemspec
 homepage:
 licenses:
@@ -352,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.8
 signing_key:
 specification_version: 4
 summary: OpeNER daemon for processing multiple queues at once