spellr 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09ecd923199d9533b1aa92210b6c4f8b02c03f3c4f420a46fd1519248556bff
-  data.tar.gz: ad58ff25a6c0e96598da4dc0bf86f6f380132be18866ff3c861237190aea4e71
+  metadata.gz: 60659d04d7461c60fc7880fe44fa4af1d6b852511affaef3722d8bca7902bebe
+  data.tar.gz: 6327cb52ae02517918e886b774311f09270dc1e96166361962c49f9f01f28506
 SHA512:
-  metadata.gz: a47ec69ccdb59b1de84f509ec25457331b8b9306bb566e7f34a13872d36bd7a7d288e61eb73e96674da2fc1730f7cc41f250f8894457a97f02d656fbd3bfb9ca
-  data.tar.gz: a792a72098ec9601a06c2eacb279db00fc87a3b6e232d5466a896070420103115ae63f0699ce1de79a185839270c8b6b3d6bc0ca2b2ca100394079da4a6721ba
+  metadata.gz: 1aadb5c07c9ce3fa8899be299810480034d1bfed1e93aa9fe0e07192edb9cac21e8c505908da7757badb0190da5d0251c47cf135306aa60cde8abbee2a4e3db8
+  data.tar.gz: 7fc321f6665f93c4093a46748781eb59ce56930c334298670e5592d63887e97092bc2ab49394ab08f143d8a84a213e4df76a149b6f97065b51f78feebc56e91c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.9.0
+- Recognize url with _ in query string and zero length path
+- Assume all files are utf8
+
 # v0.8.8
 - output a suggested `spellr --interactive` command with filenames, when running this without --interactive
 

data/README.md

@@ -27,7 +27,7 @@ However, in a programming context spelling things _consistently_ is useful, wher
 
 ## Installation
 
-This is tested against ruby 2.4.0-3.0.0.preview1.
+This is tested against ruby 2.4-3.0.
 
 ### With Bundler
 

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), symbolize_names: true)
+      YAML.safe_load(::File.read(path, encoding: ::Encoding::UTF_8), 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)
+      write(yield(read(encoding: ::Encoding::UTF_8)), encoding: ::Encoding::UTF_8)
     end
   end
 end

data/lib/spellr/stringio_with_encoding.rb

@@ -0,0 +1,11 @@
+# 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

data/lib/spellr/token_regexps.rb

@@ -39,8 +39,9 @@ module Spellr
     # literal \ so that i can match on domains in regexps. no-one cares but me.
     URL_HOSTNAME = /(?:[[:alnum:]\-\\]+(?:\.[[:alnum:]\-\\]+)+|localhost|#{URL_IP_ADDRESS})/.freeze
     URL_PORT = /:\d+/.freeze
-    URL_PATH = %r{/(?:[[:alnum:]=@!$&~\-/._\\]|%\h{2})+}.freeze
-    URL_QUERY = %r{\?(?:[[:alnum:]=!$\-/.\\]|%\h{2})+(?:&(?:[[:alnum:]=!$\-/.\\]|%\h{2})+)*}.freeze
+    URL_PATH = %r{/(?:[[:alnum:]=@!$&~\-/._\\]|%\h{2})*}.freeze
+    URL_QUERY_PART = %r{(?:[[:alnum:]=!$\-/._\\]|%\h{2})+}.freeze
+    URL_QUERY = /\?#{URL_QUERY_PART}(?:&#{URL_QUERY_PART})*/.freeze
     URL_FRAGMENT = %r{#(?:[[:alnum:]=!$&\-/.\\]|%\h{2})+}.freeze
 
     # URL can be any valid hostname, it must have either a scheme, userinfo, or path

data/lib/spellr/tokenizer.rb

@@ -27,7 +27,7 @@ module Spellr
     end
 
     def each_term(&block)
-      file.each_line do |line|
+      file.each_line(encoding: ::Encoding::UTF_8) do |line|
         prepare_tokenizer_for_line(line)&.each_term(&block)
       end
     ensure
@@ -56,12 +56,14 @@ module Spellr
       char_offset = @start_at.line_location.char_offset
       byte_offset = @start_at.line_location.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
+      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
 
-        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.8.8'
+  VERSION = '0.9.0'
 end

data/lib/spellr/wordlist.rb

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

data/spellr.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec', '~> 1.44.1'
   spec.add_development_dependency 'simplecov', '~> 0.18.5'
   spec.add_development_dependency 'simplecov-console'
-  spec.add_development_dependency 'tty_string', '>= 0.2.1'
+  spec.add_development_dependency 'tty_string', '>= 1.1.0'
   spec.add_development_dependency 'webmock', '~> 3.8'
 
   spec.add_dependency 'fast_ignore', '>= 0.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spellr
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Dana Sherson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 
+description:
 email:
 - robot@dana.sh
 executables:
@@ -266,6 +266,7 @@ 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
@@ -303,7 +304,7 @@ metadata:
   homepage_uri: http://github.com/robotdana/spellr
   source_code_uri: http://github.com/robotdana/spellr
   changelog_uri: http://github.com/robotdana/spellr/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -318,8 +319,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Spell check your source code
 test_files: []