clausewitz-spelling 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daaea52183455f6976867e87c55de6a3c3394d912d48e93a9a494655feddf81a
-  data.tar.gz: d090c2311b22670354bed6bdf1055bd610ef46b57f46ff02f7b99deb182f3a65
+  metadata.gz: c7068d2ed59ef6a208ee2f18e86e1ba32d824065b1cec88654ea59f3b689d998
+  data.tar.gz: 141d5a09103f95f44415d4d65c464485c6187fec964e448ca26c67322f77b5ca
 SHA512:
-  metadata.gz: ba7d277f9e4bfe7f173a730d4ae60249244afe8decdbfb2540bc9e79497444ba036f474545f65062f76ca4354882fb85499bf185e26db337b2fbf577d58e9daf
-  data.tar.gz: 11fa5ccd399dae5558a231620c2ca54f2aaa0b9957ccbafbcd021250d0c89f9a62e66c29fca70319589ad279aac6d6e8e979aeeb8a89d478b8415e2824b9288e
+  metadata.gz: 1201a42008e483b88ecd89e3dc826385f546a3000576a4121c520f9b8cea4286c90dfe3ca534d6f76e732c5eed0076940f14e033fc6e59dab635b21a622df5c2
+  data.tar.gz: 3355650f99636c77df5a84ecfaec6010d3ea049591f09310e67af4dbb44b4847013fcb03d27ec1d5b22540537529c77df58975433cd6450296d8876feb36ef24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clausewitz-spelling (0.2.16)
+    clausewitz-spelling (0.2.17)
       colorize
       damerau-levenshtein
       ffi-hunspell-wtchappell

data/lib/clausewitz/localisation.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'yaml'
 
 module Clausewitz
@@ -53,10 +55,18 @@ module Clausewitz
         'german',
         'de', %w[de], 'de'
       ),
-      'l_portuguese' => LangConfig.new(
-        'portuguese',
-        'pt', %w[pt br], 'pt'
+      'l_polish' => LangConfig.new(
+        'polish',
+        'pl', %w[pl], 'pl'
+      ),
+      'l_braz_por' => LangConfig.new(
+        'braz_por',
+        'pt', %w[br], 'br'
       ),
+      #'l_portuguese' => LangConfig.new(
+      #  'portuguese',
+      #  'pt', %w[br pt], 'pt'
+      #),
       'l_spanish' => LangConfig.new(
         'spanish',
         'es', %w[mx es], 'es'
@@ -69,18 +79,27 @@ module Clausewitz
 
     def self.parse(text)
       self.pre_validate(text)
-      smudged_text = text.lines.map do |line|
-        self.smudge_key(line)
-      end
-      contents = YAML.load(smudged_text.join("\n"))
-      self.validate_localisation!(contents)
-      contents.each do |lang, entries|
-        entry_keys = entries ? entries.keys : []
-        entry_keys.each do |key|
-          entries[unsmudge_key(key)] = entries.delete(key)
+      contents = {}
+      current_lang = nil
+      text.lines.each do |line|
+        line.strip!
+        next if line.empty? || line =~ /^#/
+        lang_match = LANG_MAP.keys.find { |lang| line == "#{lang}:" }
+        if lang_match
+          current_lang = lang_match
+          next
+        end
+        unless current_lang
+          errors = ["Cannot parse loc key without a langauge being set!"]
+          fail(UnparseableFileError, errors)
         end
+        key, value = line.split(/\s/, 2)
+        key.gsub!(/:(\d+)?$/, '')
+        value.gsub!(/(^"|"$)/, '')
+        contents[current_lang] ||= {}
+        contents[current_lang][key] = value
       end
-      contents
+      return contents
     end
 
     def self.pre_validate(text)
@@ -88,11 +107,6 @@ module Clausewitz
       text.lines[1..-1].each_with_index do |line, index|
         lineno = index + 2
 
-
-        if line =~ /^\s*([\w\d.'-])+\:([0-9]+)? \"/ && line !~ /^  ([\w\d.'-])+\:([0-9]+)? \"/
-          errors << "Line ##{lineno} does not start with two spaces."
-        end
-
         if line =~ /^\s*([\w\d.'-])+\:([0-9]+)?\"/
           errors << "Line ##{lineno} is missing a space between the key and value."
         end
@@ -100,32 +114,18 @@ module Clausewitz
         if line.count('"').odd?
           errors << "Unmatched double quote on line ##{lineno}."
         end
-
-        quote_pxs = (0 ... line.length).find_all { |i| line[i, 1] == '"' }
-        quote_pxs.shift; quote_pxs.pop;
-        if quote_pxs.any? { |px| line[px - 1] != '\\' }
-          errors << "Unescaped double quote on line ##{lineno}."
-        end
       end
       fail(UnparseableFileError, errors) unless errors.empty?
     end
 
     def self.parse_file(filepath)
       contents = nil
-      File.open(filepath, 'r:UTF-8') do |f|
+      File.open(filepath, 'r:bom|UTF-8') do |f|
         contents = f.read
       end
       self.parse(contents)
     end
 
-    def self.smudge_key(line)
-      if line =~ /  ([\w\d.'-])+\:([0-9]+) \"/
-        line.sub(/\:([0-9]+) /, '!!!\1: ')
-      else
-        line
-      end
-    end
-
     def self.validate_localisation!(contents)
       fail("Unknown language keys!") unless contents.keys.all? do |lang|
         self.valid_lang?(lang)
@@ -136,9 +136,5 @@ module Clausewitz
     def self.valid_lang?(lang)
       lang =~ VALID_LANG_REGEX
     end
-
-    def self.unsmudge_key(line)
-      line.sub(/!!!([0-9]+)$/, ':\1')
-    end
   end
 end

data/lib/clausewitz/spelling/checker.rb

@@ -9,6 +9,9 @@ require 'pragmatic_tokenizer'
 require 'clausewitz/localisation'
 require 'clausewitz/spelling/results'
 
+require 'pp'
+pp FFI::Hunspell.directories
+
 module Clausewitz; module Spelling
   class Checker
     DEFAULT_SUGGESTION_COUNT = 3
@@ -164,6 +167,8 @@ module Clausewitz; module Spelling
         punctuation: :none,
         downcase: false
       }
+      entry.gsub!('\n', ' ')
+      entry.gsub!('\"', '"')
       words = PragmaticTokenizer::Tokenizer.new(opts).tokenize(entry)
       words = words.map { |word| word.split('—') }.flatten(1)
       words.map! do |word|

data/lib/clausewitz/spelling/results.rb

@@ -142,7 +142,7 @@ module Clausewitz; module Spelling
       if failed?
         outlines = @word_results.map { |w| "#{spacer}#{w.to_str(indent + 2)}" }
         outlines = outlines.join("\n")
-        "#{spacer}#{@key.red}\n#{outlines}"
+        "#{spacer}#{@key.red}:\n#{outlines}"
       else
         "#{spacer}#{@key} passed".green
       end
@@ -214,7 +214,7 @@ module Clausewitz; module Spelling
       msg = "#{spacer}#{@word}".red
 
       if @suggestions && !@suggestions.empty?
-        msg += " (#{@suggestions.join(', ')})".yellow
+        msg += " (#{@suggestions.map { |sug| sug.encode('utf-8') }.join(', ')})".yellow
       else
         msg += " (-- no suggestions --)".yellow
       end

data/lib/clausewitz/spelling/version.rb

@@ -1,5 +1,5 @@
 module Clausewitz
   module Spelling
-    VERSION = "0.2.16"
+    VERSION = "0.2.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clausewitz-spelling
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Will Chappell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,6 @@ files:
 - bin/console
 - bin/setup
 - clausewitz-spelling.gemspec
-- en_GB_owb.dic
 - exe/clausewitz-spellcheck
 - lib/clausewitz/localisation.rb
 - lib/clausewitz/spelling.rb

data/en_GB_owb.dic

@@ -1,81 +0,0 @@
-35
-Adytum/1
-Almirante/1
-APC/2 1
-Allgood/1
-Aradesh/1
-Bearport/1
-Boneyard/1
-Chico/1
-Ciudad/1
-Colibrí/1
-Darkwater/1
-Dayglow/1
-Elijah/1
-Elijah's
-FEV/1
-GAI/1
-Gizmo/1
-Harbor/1
-Hardin/2 1
-Hardin's
-Harlon/1
-Héctor/1
-Henderton/1
-Hubology
-Hubologist/2 1
-Junktown/1
-Klamath/1
-Los
-Maxson/1
-Morbid/1
-Mossman/1
-NCR/1
-Paz/1
-Pesca/1
-Peterson/1
-Petro/1
-Rafael/1
-Rattletail/1
-Reynosa/1
-RobCo/1
-Santángel/1
-Seabear/1
-Shi/1
-Silus/1
-Tamaulipas/1
-Tampico/1
-Tandi/1
-Tech
-Tlaloc/1
-TODO/1
-West-Tek/1
-Valles/1
-Vandenberg/1
-Vault-Tec/1
-bandito/2 1
-brahmin/5 1
-caudillo/2 1
-commonfolk/5 1
-deathclaw/2 1
-doodad/2 1
-eyebot/2
-firefight/2 1
-firepower/5 1
-hardline/2 1
-lakebed/2 1
-malcontents
-military's
-playbook/2 1
-protectron/2 1
-radscorpion/2 1
-robobrain/2 1
-securitron/2 1
-shopfront/2 1
-superweapon/2 1
-tribals/5	1
-underway
-unpowered
-vertibird/2 1
-weaponsmith/2 1
-wildcard/2 1