clausewitz-spelling 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d640bb21f1cb3259c2ef8066078959d11f55f644f4730d74479e001e879a70ec
-  data.tar.gz: d2c5fc3e3182f81083f3c91a48efc573ccc32f8255263a515fb4f90d0a36f7b9
+  metadata.gz: df7a1d4a0691bd8d0c5206439a475ffb7271b2114517ed0a1466272398db7f30
+  data.tar.gz: b2224cbea6f9e78ab1b57dc8c1b9e1e2cd0e76e8dacb192481977afff4baa7f6
 SHA512:
-  metadata.gz: 2a517c6090c8f74ccbb70e53a80bddf373e1d66db71c3b282c3795fb28493eb13681b5ba34c42766387341a56e60f7ca12e16299d67a9ba68cc7b5b3d2b18a04
-  data.tar.gz: 6f033f5381672af8dcf23c1212b896706726a5da30838f6bf85e64e02c0c04f4e1c7a19c64472729c5bfc173fe68d04d7d8be84614d48e3c45a55b63f60c46ca
+  metadata.gz: b26315488f9b5018c2b5289acee1c6517eb36ef362904abf8b83e15198af957c392a7144cd456a6d34103515aa7dafc8a04c129f391f9c10a65d65d19cd0cb14
+  data.tar.gz: 58454d39937ffbbabe81725488f304a4eefe4d7f42875bc2a7a0bda0d19e8c31ece293bee177c5c367878b3bc94afbead92bc9dc15ed969772c1a83b94bbd75b

data/Gemfile.lock

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

data/lib/clausewitz/localisation.rb

@@ -2,6 +2,17 @@ require 'yaml'
 
 module Clausewitz
   module Localisation
+    class UnparseableFileError < StandardError
+      attr_reader :errors
+      def initialize(errors)
+        @errors = errors
+      end
+
+      def message
+        @errors.join("\n")
+      end
+    end
+
     class LangConfig
       attr_reader :name, :base, :dialects, :default_dialect
       def initialize(name, base, dialects, default_dialect = nil)
@@ -57,6 +68,7 @@ module Clausewitz
     }
 
     def self.parse(text)
+      self.pre_validate(text)
       smudged_text = text.lines.map do |line|
         self.smudge_key(line)
       end
@@ -71,6 +83,29 @@ module Clausewitz
       contents
     end
 
+    def self.pre_validate(text)
+      errors = []
+      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.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|
@@ -80,7 +115,7 @@ module Clausewitz
     end
 
     def self.smudge_key(line)
-      if line =~ /  (\w|\.)+\:([0-9]+) \"/
+      if line =~ /  ([\w\d.'-])+\:([0-9]+) \"/
         line.sub(/\:([0-9]+) /, '!!!\1: ')
       else
         line

data/lib/clausewitz/spelling/checker.rb

@@ -63,6 +63,8 @@ module Clausewitz; module Spelling
 
       begin
         contents = Clausewitz::Localisation.parse_file(filepath)
+      rescue Clausewitz::Localisation::UnparseableFileError => e
+        return UnparseableFileResult.new(filepath, e.errors)
       rescue => e
         return UnparseableFileResult.new(filepath, e)
       end

data/lib/clausewitz/spelling/results.rb

@@ -225,10 +225,10 @@ module Clausewitz; module Spelling
 
   # Result capturing problems parsing a readable file.
   class UnparseableFileResult
-    attr_reader :filepath, :error
-    def initialize(filepath, error)
+    attr_reader :filepath, :errors
+    def initialize(filepath, errors)
       @filepath = filepath
-      @error    = error
+      @errors   = Array(errors)
     end
 
     def failed?
@@ -236,7 +236,7 @@ module Clausewitz; module Spelling
     end
 
     def failure_total
-      1
+      errors.size
     end
 
     def to_s
@@ -247,8 +247,7 @@ module Clausewitz; module Spelling
       spacer = ' ' * indent
       secondspacer = ' ' * (indent + 2)
       "#{spacer}#{@filepath} could not be parsed\n".red +
-        "#{secondspacer}#{@error.message}\n".red +
-        "#{secondspacer}Make sure every entry has exactly two spaces in front of it.".red
+        @errors.map { |e| "#{secondspacer}#{e}".red }.join("\n")
     end
   end
 end; end # Clausewitz::Spelling

data/lib/clausewitz/spelling/version.rb

@@ -1,5 +1,5 @@
 module Clausewitz
   module Spelling
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clausewitz-spelling
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Will Chappell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler