onlyoffice_language_helper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7dacc49bd982030e1bbeb32cef0c6cfbe05c638cde4d8e78610b000f1a8c7be
-  data.tar.gz: c9952a740dc42eedd48329498286e7b02777f2873b527ab782ca92c98443a531
+  metadata.gz: dd764ee21cd204cfb7d5a5043bc8dd77dd444a1155b061b121ba31c20d1070f6
+  data.tar.gz: 6740cc29afff12e6fcebbb3ec4e0ab22a715646c1f3a5ab79305d214f6d7bb5e
 SHA512:
-  metadata.gz: 3e572ad5b79647ad9b26a8b9102ec4de89d077f9dae5a71aeb4c08798fdbba483ffc121d7deee57929e07fed55749e9f94f3d5a96df761792691c468cc5c25f1
-  data.tar.gz: e7671a85fc20055c9bb782ef71bcb980ad8074543c9ef21a81ca8003a31dc273abb11c5fdc19e6707627b8d11be7e83c0a560297a6e52cd88320b46ffbef099d
+  metadata.gz: c658ea226f63814598546faf96c6e69bbcf75789b4e16140225eeeca581cd176bddf100e8023407d0224fc2d2c7a48603654ada5f649df53d2070cbe617760ab
+  data.tar.gz: 7125cacfd2ace60894d27cdf73562d59188eb6e206fafa7c314baf818d2d3ed78fba73bc6c271fe34dcacac8f333003d5b80a0db81fe61ad80ba6a6bb133f06e

data/lib/onlyoffice_language_helper/spell_checker.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'hunspell-ffi'
+require 'ffi/hunspell'
 require 'httparty'
 require 'json'
 require 'cgi'
 require 'whatlanguage'
 require_relative 'spell_checker/config'
-require_relative 'spell_checker/dictionaries_threads'
 
 # Spellchecker stuff
 module OnlyofficeLanguageHelper
@@ -27,8 +26,7 @@ module OnlyofficeLanguageHelper
       config
       yield(@config) if block_given?
       check_language
-      @dictionary = Hunspell.new(path_to_dic_aff(:aff),
-                                 path_to_dic_aff(:dic))
+      FFI::Hunspell.directories = all_languages_dictonaries
       OnlyofficeLoggerHelper.log('Configuring complete!')
     end
 
@@ -36,12 +34,41 @@ module OnlyofficeLanguageHelper
     # @param string [String] string to check
     # @return [Array<Hash>] result of check
     def self.check_in_all_dictionaries(string)
-      check_configuration
-      @dictionaries ||= DictionariesThreads.new
+      results = []
       split_text_by_words(string).map do |word|
-        parse_spellcheck_result(word,
-                                @dictionaries.check_word(word))
+        word_hash = {}
+        word_hash[word] = check_word_in_all(word)
+        results << word_hash
       end
+      results
+    end
+
+    # Check word in all dictionaries
+    # @param [String] word to check
+    # @return [Hash] word check result
+    def self.check_word_in_all(word)
+      word_results = {}
+
+      @threads = []
+      available_languages.each do |language|
+        @threads << Thread.new do
+          word_results[language] = check_single_word(word, language)
+        end
+      end
+      @threads.each(&:join)
+      word_results
+    end
+
+    # Check if word correct in single language
+    # @param [String] word to check
+    # @param [String] language to check
+    # @return [Boolean] result of check
+    def self.check_single_word(word, language)
+      dict = FFI::Hunspell.dict(language)
+      result = dict.check?(word)
+      dict.close
+      OnlyofficeLoggerHelper.log("Word `#{word}` in `#{language}` correct: #{result}")
+      result
     end
 
     # Get path to dic aff
@@ -50,7 +77,7 @@ module OnlyofficeLanguageHelper
     # @return [String] path
     def self.path_to_dic_aff(extension, language = config.expected_language)
       "#{config.dictionaries_path}/dictionaries/"\
-      "#{language}/#{language}.#{extension}"
+        "#{language}/#{language}.#{extension}"
     end
 
     # Split text by words
@@ -60,19 +87,6 @@ module OnlyofficeLanguageHelper
       string.to_s.scan(/\b[[:word:]['-]]+\b/u).uniq
     end
 
-    # Parse spellchecker result
-    # @param word [String] word to check
-    # @param spellcheck_result [Hash] param to set result
-    # @return [Hash] value of result
-    def self.parse_spellcheck_result(word, spellcheck_result)
-      unless spellcheck_result[config.expected_language]
-        warn("Word '#{word}' was not found in "\
-             "'#{config.expected_language}' dictionary!")
-        spellcheck_result['suggestions'] = @dictionary.suggest(word)
-      end
-      { word => spellcheck_result }
-    end
-
     # @return [Config] get current config
     def self.config
       @config ||= Config.new
@@ -83,13 +97,6 @@ module OnlyofficeLanguageHelper
       @config = Config.new
     end
 
-    # @return [nil] check if current config is right
-    def self.check_configuration
-      return if @dictionary
-
-      raise 'Call SpellChecker.configure method before using it!'
-    end
-
     # @return [nil] check if current language has dictonaries
     def self.check_language
       unless File.exist?(path_to_dic_aff(:dic)) ||
@@ -97,5 +104,17 @@ module OnlyofficeLanguageHelper
         raise 'Incorrect language'
       end
     end
+
+    # @return [Array<String>] list of available dictonaries
+    def self.available_languages
+      all_languages_dictonaries.map { |dir| File.basename(dir) }
+    end
+
+    # @return [Array<String>] list of all dictionaries dir
+    def self.all_languages_dictonaries
+      Dir.glob("#{Dir.pwd}/lib/onlyoffice_language_helper/dictionaries/*").select do |fn|
+        File.directory?(fn)
+      end
+    end
   end
 end

data/lib/onlyoffice_language_helper/version.rb

@@ -2,5 +2,5 @@
 
 module OnlyofficeLanguageHelper
   # @return [String] version of gem
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_language_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-21 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detect_language
@@ -26,33 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: ffi-hunspell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hunspell-ffi
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: onlyoffice_file_helper
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +335,6 @@ files:
 - lib/onlyoffice_language_helper/name.rb
 - lib/onlyoffice_language_helper/spell_checker.rb
 - lib/onlyoffice_language_helper/spell_checker/config.rb
-- lib/onlyoffice_language_helper/spell_checker/dictionaries_threads.rb
 - lib/onlyoffice_language_helper/version.rb
 homepage: https://github.com/ONLYOFFICE-QA/onlyoffice_language_helper
 licenses:
@@ -347,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: ONLYOFFICE Helper Gem for language operation

data/lib/onlyoffice_language_helper/spell_checker/dictionaries_threads.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module OnlyofficeLanguageHelper
-  module SpellChecker
-    # Threads for spellchecker
-    class DictionariesThreads
-      attr_accessor :word
-
-      Thread.abort_on_exception = true
-
-      def initialize
-        @dictionaries = {}
-        Dir.glob("#{SpellChecker.config.dictionaries_path}/dictionaries/*")
-           .select { |f| File.directory?(f) }.each do |lang|
-          @dictionaries[File.basename(lang)] =
-            Hunspell.new(SpellChecker.path_to_dic_aff(:aff,
-                                                      File.basename(lang)),
-                         SpellChecker.path_to_dic_aff(:dic,
-                                                      File.basename(lang)))
-        end
-        init_threads_data
-      end
-
-      # @return [Array<Thread>] list of checker threads
-      def threads
-        @threads ||= init_threads
-      end
-
-      # Check current word
-      # @param word [String] word to check
-      # @return [Hash] result of check
-      def check_word(word)
-        @result = {}
-        @word = word.to_s
-        start_threads
-      end
-
-      # @return [Hash] start threads and return results
-      def start_threads
-        threads.each(&:run)
-        until @result.length == @dictionaries.length
-        end
-        @result
-      end
-
-      private
-
-      def init_threads_data
-        @result = {}
-        threads
-      end
-
-      def init_threads
-        @threads = []
-        @dictionaries.each do |key, value|
-          @threads << Thread.new do
-            loop do
-              @result[key] = value.check(@word.to_s)
-              Thread.stop
-            end
-          end
-        end
-        @threads
-      end
-    end
-  end
-end