spellr 0.3.2 → 0.4.0

data/lib/spellr/token.rb

@@ -5,14 +5,21 @@
 require_relative 'column_location'
 require_relative 'string_format'
 
-module Spellr
-  class Token < String
-    attr_reader :location, :line
-    def self.normalize(value)
-      return value.normalize if value.is_a?(Spellr::Token)
+class String
+  def normalize
+    normalize_cache[to_s]
+  end
 
-      value.strip.downcase.unicode_normalize.tr('’', "'") + "\n"
+  def normalize_cache
+    @@normalize_cache ||= Hash.new do |cache, term| # rubocop:disable Style/ClassVars # i want this shared with subclasses
+      cache[term] = term.strip.downcase.unicode_normalize.tr('’', "'") + "\n"
     end
+  end
+end
+
+module Spellr
+  class Token < String
+    attr_reader :location, :line, :replacement
 
     def self.wrap(value)
       return value if value.is_a?(Spellr::Token)
@@ -42,10 +49,6 @@ module Spellr
       )
     end
 
-    def normalize
-      @normalize ||= self.class.normalize(to_s)
-    end
-
     def inspect
       "#<#{self.class.name} #{to_s.inspect} @#{location}>"
     end
@@ -67,6 +70,7 @@ module Spellr
     end
 
     def replace(replacement)
+      @replacement = replacement
       ::File.open(file_name, 'r+') do |f|
         body = f.read
         body[location.absolute_char_offset...(location.absolute_char_offset + length)] = replacement

data/lib/spellr/tokenizer.rb

@@ -51,7 +51,7 @@ module Spellr
     end
 
     def normalized_terms
-      enum_for(:each_term).map { |t| Token.normalize(t) }.uniq.sort
+      enum_for(:each_term).map(&:normalize).uniq.sort
     end
 
     private
@@ -65,7 +65,6 @@ module Spellr
     def prepare_tokenizer_for_line(line, _line_number)
       line_tokenizer.string = line
       line_tokenizer.pos = 0
-      # line_tokenizer.pos = @start_at.byte_offset if line_number == @start_at.line_number
       line_tokenizer
     end
   end

data/lib/spellr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spellr
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/spellr/wordlist.rb

@@ -6,8 +6,6 @@ require_relative 'token'
 
 module Spellr
   class Wordlist
-    class NotFound < Spellr::Error; end
-
     include Enumerable
 
     attr_reader :path, :name
@@ -31,7 +29,7 @@ module Spellr
     # significantly faster than default Enumerable#include?
     # requires terms to be sorted
     def include?(term)
-      include_cache[Spellr::Token.normalize(term)]
+      include_cache[term.normalize]
     end
 
     def include_cache
@@ -69,12 +67,14 @@ module Spellr
     end
 
     def exist?
-      @path.exist?
+      return @exist if defined?(@exist)
+
+      @exist = @path.exist?
     end
 
     def add(term)
       touch
-      term = Spellr::Token.normalize(term)
+      term = term.normalize
       include_cache[term] = true
       to_a << term
       to_a.sort!
@@ -89,6 +89,7 @@ module Spellr
 
       @path.dirname.mkpath
       @path.write('')
+      remove_instance_variable(:@exist)
     end
 
     def raise_unless_exists?

data/lib/spellr.rb

@@ -1,26 +1,17 @@
 # frozen_string_literal: true
 
+require_relative 'spellr/backports'
+require_relative 'spellr/config'
+
 module Spellr
   class Error < StandardError; end
-  class DidReplacement < Spellr::Error
-    attr_reader :token
-
-    def initialize(token = nil)
-      @token = token
-    end
-  end
-  class DidAdd < Spellr::Error
-    attr_reader :token
-
-    def initialize(token = nil)
-      @token = token
-    end
+  class Wordlist
+    class NotFound < Spellr::Error; end
   end
 
   module_function
 
   def config
-    require_relative 'spellr/config'
     @config ||= Spellr::Config.new
   end
 end

data/spellr.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://github.com/robotdana/spellr'
   spec.license = 'MIT'
 
-  spec.files = Dir.glob("{lib,exe,bin/fetch_wordlist,wordlists}/**/{*,.*}") + %w{
+  spec.files = Dir.glob('{lib,exe,bin/fetch_wordlist,wordlists}/**/{*,.*}') + %w{
     CHANGELOG.md
     Gemfile
     Gemfile.lock
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-eventually'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'terminal-table'
   spec.add_development_dependency 'tty_string'
-  spec.add_dependency 'fast_ignore'
+  spec.add_dependency 'fast_ignore', '~> 0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spellr
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty_string
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fast_ignore
+  name: tty_string
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fast_ignore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: 
 email:
 - robot@dana.sh
@@ -154,6 +168,7 @@ files:
 - exe/spellr
 - lib/.spellr.yml
 - lib/spellr.rb
+- lib/spellr/backports.rb
 - lib/spellr/check.rb
 - lib/spellr/cli.rb
 - lib/spellr/column_location.rb
@@ -162,6 +177,10 @@ files:
 - lib/spellr/file.rb
 - lib/spellr/file_list.rb
 - lib/spellr/interactive.rb
+- lib/spellr/key_tuner/data.yml
+- lib/spellr/key_tuner/naive_bayes.rb
+- lib/spellr/key_tuner/possible_key.rb
+- lib/spellr/key_tuner/stats.rb
 - lib/spellr/language.rb
 - lib/spellr/line_location.rb
 - lib/spellr/line_tokenizer.rb