spellr 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60659d04d7461c60fc7880fe44fa4af1d6b852511affaef3722d8bca7902bebe
-  data.tar.gz: 6327cb52ae02517918e886b774311f09270dc1e96166361962c49f9f01f28506
+  metadata.gz: 901a89f14415b3993f210ac2f0f94cb82efdbfc55565f8e1c9fd51347790b3d6
+  data.tar.gz: 113d25fcdfc5d70c9e50f4a061092728c1349452e88e0dd0d6268d10851c47b9
 SHA512:
-  metadata.gz: 1aadb5c07c9ce3fa8899be299810480034d1bfed1e93aa9fe0e07192edb9cac21e8c505908da7757badb0190da5d0251c47cf135306aa60cde8abbee2a4e3db8
-  data.tar.gz: 7fc321f6665f93c4093a46748781eb59ce56930c334298670e5592d63887e97092bc2ab49394ab08f143d8a84a213e4df76a149b6f97065b51f78feebc56e91c
+  metadata.gz: adcfec5ea17125517f445fb7e895b5ee049d1540f7626ab5c55d835d600b149d844b9a052f2324784038f5098a392a8f51b16d01c56ace9cffa773b34e27bbca
+  data.tar.gz: 922c16526b3e0dd8600ca5ef836de2419dda0237e3b3c2d8a2674d1ca7b0f0dcebf1fe0d0deded671522ee526c7e185a338ef98e762c4385e00b25f8e3ae94e8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.9.1
+- Assume all files are utf8, more comprehensively. (Sets ::Encoding.default_external and default_internal while running)
+
 # v0.9.0
 - Recognize url with _ in query string and zero length path
 - Assume all files are utf8

data/exe/spellr

@@ -3,4 +3,7 @@
 
 require_relative '../lib/spellr/cli'
 
+::Encoding.default_external = ::Encoding::UTF_8
+::Encoding.default_internal = ::Encoding::UTF_8
+
 exit Spellr::CLI.new(ARGV).run

data/lib/spellr/config_loader.rb

@@ -32,7 +32,7 @@ module Spellr
     def load_yaml(path)
       return {} unless ::File.exist?(path)
 
-      YAML.safe_load(::File.read(path, encoding: ::Encoding::UTF_8), symbolize_names: true)
+      YAML.safe_load(::File.read(path), symbolize_names: true)
     end
 
     def merge_config(default, project) # rubocop:disable Metrics/MethodLength

data/lib/spellr/file.rb

@@ -34,7 +34,7 @@ module Spellr
     end
 
     def read_write
-      write(yield(read(encoding: ::Encoding::UTF_8)), encoding: ::Encoding::UTF_8)
+      write(yield read)
     end
   end
 end

data/lib/spellr/rake_task.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rake'
-require 'spellr/cli'
 require 'shellwords'
 
 module Spellr
@@ -36,11 +35,13 @@ module Spellr
       desc("Run spellr (default args: #{escaped_argv})")
     end
 
-    def define_task
+    def define_task # rubocop:disable Metrics/MethodLength
       task(@name, :'*args') do |_, task_argv|
-        argv = argv_or_default(task_argv)
-        write_cli_cmd(argv)
-        run(argv)
+        with_utf_8 do
+          argv = argv_or_default(task_argv)
+          write_cli_cmd(argv)
+          run(argv)
+        end
       end
     end
 
@@ -49,6 +50,7 @@ module Spellr
     end
 
     def run(argv)
+      require 'spellr/cli'
       status = Spellr::CLI.new(argv).run
       exit 1 unless status == 0
     end
@@ -57,5 +59,15 @@ module Spellr
       task_argv = task_argv.to_a.compact
       task_argv.empty? ? @default_argv : task_argv
     end
+
+    def with_utf_8 # rubocop:disable Metrics/MethodLength
+      old_default_external = ::Encoding.default_external
+      old_default_internal = ::Encoding.default_internal
+      ::Encoding.default_external = ::Encoding::UTF_8
+      ::Encoding.default_internal = ::Encoding::UTF_8
+      yield
+      ::Encoding.default_external = old_default_external
+      ::Encoding.default_internal = old_default_internal
+    end
   end
 end

data/lib/spellr/tokenizer.rb

@@ -27,7 +27,7 @@ module Spellr
     end
 
     def each_term(&block)
-      file.each_line(encoding: ::Encoding::UTF_8) do |line|
+      file.each_line do |line|
         prepare_tokenizer_for_line(line)&.each_term(&block)
       end
     ensure
@@ -56,14 +56,12 @@ module Spellr
       char_offset = @start_at.line_location.char_offset
       byte_offset = @start_at.line_location.byte_offset
 
-      file
-        .each_line(encoding: ::Encoding::UTF_8)
-        .with_index(@start_at.line_location.line_number) do |line, line_number|
-          yield line, line_number, char_offset, byte_offset
+      file.each_line.with_index(@start_at.line_location.line_number) do |line, line_number|
+        yield line, line_number, char_offset, byte_offset
 
-          char_offset += line.length
-          byte_offset += line.bytesize
-        end
+        char_offset += line.length
+        byte_offset += line.bytesize
+      end
     ensure
       file.close
     end

data/lib/spellr/version.rb

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

data/lib/spellr/wordlist.rb

@@ -41,7 +41,7 @@ module Spellr
       touch
       @include[term] = true
       insert_sorted(term)
-      @path.write(words.join, encoding: ::Encoding::UTF_8) # we don't need to clear the cache
+      @path.write(words.join) # we don't need to clear the cache
     end
 
     def words
@@ -55,7 +55,7 @@ module Spellr
     end
 
     def write(content)
-      @path.write(content, encoding: ::Encoding::UTF_8)
+      @path.write(content)
 
       clear_cache
     end
@@ -70,7 +70,7 @@ module Spellr
       return if exist?
 
       @path.dirname.mkpath
-      @path.write('', encoding: ::Encoding::UTF_8)
+      @path.write('')
       clear_cache
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spellr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Dana Sherson
@@ -266,7 +266,6 @@ files:
 - lib/spellr/rake_task.rb
 - lib/spellr/reporter.rb
 - lib/spellr/string_format.rb
-- lib/spellr/stringio_with_encoding.rb
 - lib/spellr/token.rb
 - lib/spellr/token_regexps.rb
 - lib/spellr/tokenizer.rb

data/lib/spellr/stringio_with_encoding.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Spellr
-  class StringIOWithEncoding < ::StringIO
-    def each_line(*args, encoding: nil, **kwargs, &block)
-      string.force_encoding(encoding) if encoding && !string.frozen?
-
-      super(*args, **kwargs, &block)
-    end
-  end
-end