clausewitz-spelling 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72934fe1a38a001b59b01610c918b4d1fc721b1bad7c93d88b98e29de27c5afa
-  data.tar.gz: 58a8843c180c16feb72ffa296063d0f102c91f453334783370fe0c179b8d24fc
+  metadata.gz: 14628de7ded50f9ae6e12b409973ec0e72e13edd5ea3178ae5f7298a0d11e17a
+  data.tar.gz: 0d97cea942b71db034204bfc07d9bc51d14f3ceb7db2ff57641e06a3ea5d08b4
 SHA512:
-  metadata.gz: e63d6154357dc6b659189f5b0af701933e5cffb7f80d18f57d66726d3bd5c939d808f186184cff799c129aaaa014b820af5fa6aecac1da8636b6a7e9b89dea48
-  data.tar.gz: e13bc6151cc4e6f7a025a36d6ed0c766b075ffd66f4bab4e4adc97f3ae73c352b5c6d7357dd0227dd249f8eb7f61d7dd41dfbf8770b561a517ff3822f26a145f
+  metadata.gz: 72ad7f946e863dbae77566f46db776db2db05da357ff268937ede5d044da423e87b6c0b426ee8d88ca742631074eda6797f605f7319ed1c17bb1b655dd47ba3b
+  data.tar.gz: 2c60faa04871eeae5c75a88003d16bb0cfa6509251d0b004f51067881bd88e22580a1bf432bf11e8789c68e3585f6d4b0973d0f2eb078a1acadeaa21082046e4

data/Gemfile.lock

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

data/lib/clausewitz/spelling/checker.rb

@@ -21,6 +21,8 @@ module Clausewitz; module Spelling
       @suggestion_count = opts[:suggestion_count] || DEFAULT_SUGGESTION_COUNT
       @verbose          = opts[:verbose]
 
+      @check_cache = {}
+
       load_dictionaries!
     end
 
@@ -48,7 +50,7 @@ module Clausewitz; module Spelling
     end
 
     def check_file(filepath)
-      puts "Checking file '#{filepath}'..." if @verbose
+      $stderr.puts "Checking file '#{filepath}'..." if @verbose
       results = []
       begin
         filepath = Pathname.new(filepath)
@@ -104,7 +106,7 @@ module Clausewitz; module Spelling
 
       # Remove other localisation bits we don't care about.
       entry.gsub!(/§(%|\*|=|\d|W|G|R|B|Y|b|M|g|T|l|H|\+|-|!)/, '')
-      entry.gsub!(/£\w+/, '')
+      entry.gsub!(/(£|\$)\w+(\|.+\$)?/, '')
 
       ## We should also remove punctuation that is never part of words, like
       ## exclamation points, commas, semi-colons, and question marks.
@@ -148,11 +150,19 @@ module Clausewitz; module Spelling
         end
       end
 
-      checks = words.map { |word| check_word(word, lc) }.compact
+      checks = words.map do |word|
+        check = check_word(word, lc)
+        unless @check_cache.key?([[word, lc]])
+          @check_cache[[word, lc]] = check
+        end
+        check
+      end.compact
       EntryResults.new(key, checks)
     end
 
     def check_word(word, lc)
+      return @check_cache[[word, lc]] if @check_cache.key?([word, lc])
+
       return if is_number?(word)
       return if is_plural_number?(word)
       return if is_ordinal?(word)

data/lib/clausewitz/spelling/results.rb

@@ -7,13 +7,30 @@ module Clausewitz; module Spelling
       @lang_results = lang_results
     end
 
+    def ignored?
+      @lang_results.all?(&:ignored?)
+    end
+
     def failed?
       @lang_results.any?(&:failed?)
     end
 
+    def failures
+      @lang_results.select(&:failed?)
+    end
+
+    def failure_total
+      failures.reduce(0) { |memo, obj| memo += obj.failures.size }
+    end
+
+    def size
+      @lang_results.reduce(0) { |memo, obj| memo += obj.size }
+    end
+
     def to_s
-      outfile = failed? ? @filepath.to_s.red : "#{@filepath} passed".green
-      failures = @lang_results.select(&:failed?)
+      outfile = failed? ? "#{@filepath} has #{failure_total} errors (#{size} total keys checked)".red : "#{@filepath} passed (#{size} total keys checked)".green
+      outfile = ignored? ? "#{@filepath} ignored".yellow : outfile
+      interesting = @lang_results.select { |l| l.failed? || l.ignored? }
       "#{outfile}\n" + failures.map { |l| "  #{l}" }.join("\n")
     end
   end
@@ -24,10 +41,22 @@ module Clausewitz; module Spelling
       @entry_results = entry_results
     end
 
+    def ignored?
+      false
+    end
+
     def failed?
       @entry_results.any?(&:failed?)
     end
 
+    def failures
+      @entry_results.select(&:failed?)
+    end
+
+    def size
+      @entry_results.size
+    end
+
     def to_s
       to_str
     end
@@ -38,7 +67,7 @@ module Clausewitz; module Spelling
       failures = @entry_results.select(&:failed?)
       outlines = failures.map { |e| "#{spacer}#{e.to_str(indent + 2)}" }
       outlines = outlines.join("\n")
-      outlang = failed? ? @lang.red : @lang.green
+      outlang = failed? ? "#{@lang} has #{failures.size} keys with errors".red : "#{@lang} passed (#{size} keys checked)".green
       out = "#{firstspacer}#{outlang}\n#{outlines}"
     end
   end
@@ -48,10 +77,22 @@ module Clausewitz; module Spelling
       @lang = lang
     end
 
+    def ignored?
+      true
+    end
+
     def failed?
       false
     end
 
+    def failures
+      []
+    end
+
+    def size
+      0
+    end
+
     def to_s
       to_str
     end
@@ -199,7 +240,7 @@ module Clausewitz; module Spelling
       secondspacer = ' ' * (indent + 2)
       "#{spacer}#{@filepath} could not be parsed\n".red +
         "#{secondspacer}#{@error.message}\n".red +
-        "Make sure every entry has exactly two spaces in front of it.".red
+        "#{secondspacer}Make sure every entry has exactly two spaces in front of it.".red
     end
   end
 end; end # Clausewitz::Spelling

data/lib/clausewitz/spelling/version.rb

@@ -1,5 +1,5 @@
 module Clausewitz
   module Spelling
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clausewitz-spelling
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Will Chappell