comma_splice 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd12b113b4440991523636f0cb9e7cf193394704cf12234f640632001bee96fa
-  data.tar.gz: 9ad043ca537cef2ab6e3ada54e56e07c04e762c58d3ecca314b894222e86ca42
+  metadata.gz: 7f6b56980107ae3e81c5d61f6331f4eedcd21d6120f145f6a3b4e18c79a4d63b
+  data.tar.gz: cf3bac98bb36e2a94f6d939b54496d803cbc7078ee044b1972f66450b667628e
 SHA512:
-  metadata.gz: d1efb0c81ae6927969ac5e142d94553f845a454620774c333b23a97d4afffca93a8929156f8b2216d2360446fcf97f986d09ba4e1a4983b25f59822f07cef406
-  data.tar.gz: 5cabfeb12c2329e1d8ed3be5c0518435863a0d63dd7c226c11dd3339cca1c38990b0527b20ceb000e1c3ad4cdaed53235041d5741a63ccae56eb393909e5e2ba
+  metadata.gz: 17025c468ae170c2e7a3a3b8555072208181e1a020dbd835d8ee4ced13d7dd91c8eca4f99b6c27ce25b279e2f6a2354c0af734c42446a2cf31375d572d8c283d
+  data.tar.gz: dd0bf6268d3ee42443a143e6d99df65c56bb65703eddf0e67f10d86651af9c7a56f2ae3199bb31d39a03ae1d7cc673a4de9278abb6922e0fd5ce8dd68e082bf1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.2.2 (January 27, 2020)
+- [BUGFIX] Fix another scoring issue
+
 ### 0.2.1 (January 26, 2020)
 - [BUGFIX] Remove debug information from option output
 - [IMPROVEMENT] Add debug option to display scoring info

data/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 # Specify your gem's dependencies in comma_splice.gemspec
+gem 'simplecov', require: false, group: :test
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comma_splice (0.2.1)
+    comma_splice (0.2.2)
 
 GEM
   remote: https://rubygems.org/
@@ -14,8 +14,10 @@ GEM
     byebug (11.0.1)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
+    docile (1.3.2)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    json (2.3.0)
     minitest (5.11.3)
     rake (10.5.0)
     rspec (3.8.0)
@@ -31,6 +33,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -46,6 +53,7 @@ DEPENDENCIES
   comma_splice!
   rake (~> 10.0)
   rspec
+  simplecov
   thor
 
 BUNDLED WITH

data/lib/comma_splice/helpers/comma_calculator.rb

@@ -8,8 +8,9 @@ module CommaSplice
     def initialize(headers, values)
       raise StandardError, "Determining all the possibilities to fit #{values.size} values into the #{headers.size} headers #{headers.inspect} is computationally expensive. Please specify the columns where commas might be." if headers.size > 10 && values.size > 10
 
-      @headers = headers
-      @values  = values
+      @headers        = headers
+      @values         = values
+      @longest_header = @headers.max_by(&:length)
     end
 
     def correction
@@ -20,11 +21,11 @@ module CommaSplice
       elsif best_options.size > 1
         prompt_for_options(best_options)
       else
-        prompt_for_options(all_options)
+        prompt_for_options(ranked_options)
       end
     end
 
-    def all_options
+    def ranked_options
       @all_options ||= join_possibilities.collect do |joins|
         values = @values.dup
         joins.collect do |join_num|
@@ -38,10 +39,8 @@ module CommaSplice
           end
         end
       end
-    end
 
-    def ranked_options
-      @ranked_options ||= all_options.collect do |option|
+      @ranked_options ||= @all_options.collect do |option|
         OptionScorer.new(option)
       end
     end
@@ -70,32 +69,11 @@ module CommaSplice
     end
 
     def prompt_for_options(options)
-      longest_header = @headers.max_by(&:length)
-
       options.each_with_index do |option, index|
-        score_breakdown = option.breakdown
-
-        @headers.each_with_index do |header, i|
-          marker = if i.zero?
-                     "(#{index + 1})"
-                   else
-                     ''
-                   end
-
-          line = marker.ljust(7) +
-                 header.ljust(longest_header.size) + ': ' +
-                 option.option[i].to_s.ljust(75)
-
-          if CommaSplice.debug
-            line = line + "| " + (score_breakdown.shift || "")
-          end
-          puts line
-        end
-
-        puts "\n"
+        print_option(option, index)
       end
 
-      puts "press 0 to see all options" if all_options.size != options.size
+      puts "press 0 to see all options" if ranked_options.size != options.size
 
       selected_option = nil
       until selected_option && selected_option.to_i > -1
@@ -109,5 +87,30 @@ module CommaSplice
         options[selected_option.to_i - 1].option
       end
     end
+
+    def print_option(option, index = nil)
+      score_breakdown = option.breakdown
+
+      lines = []
+      @headers.each_with_index do |header, i|
+        marker = if i.zero? && index
+                   "(#{index + 1})"
+                 else
+                   ''
+                 end
+
+        line = marker.ljust(7) +
+               header.ljust(@longest_header.size) + ': ' +
+               option.option[i].to_s.ljust(75)
+
+        if CommaSplice.debug
+          line = line + "| " + (score_breakdown.shift || "")
+        end
+
+        lines << line
+      end
+      lines << "\n"
+      puts lines.join("\n")
+    end
   end
 end

data/lib/comma_splice/helpers/option_scorer.rb

@@ -1,6 +1,5 @@
 module CommaSplice
   # scores options based on how likely they are to be correct
-
   class OptionScorer
     attr_reader :option
 
@@ -58,7 +57,7 @@ module CommaSplice
 
     def options_that_have_words_joined_by_commas
       option.select do |o|
-        o.to_s.match(/[A-Za-z],[A-Za-z]/)
+        o.to_s.match(/[^0-9],[\w]/) || o.to_s.match(/[^\w],[0-9]/)
       end.compact.size * -5
     end
 
@@ -109,6 +108,5 @@ module CommaSplice
     def rules
       methods.grep(/options_that/)
     end
-
   end
 end

data/lib/comma_splice/line_corrector.rb

@@ -18,13 +18,17 @@ module CommaSplice
     end
 
     def needs_correcting?
-      @values && @values.size > 0 && @headers.size != @values.size
+      @values && @values.size.positive? && @headers.size != @values.size
     end
 
     def needs_manual_input?
       corrector.needs_manual_input?
     end
 
+    def option_count
+      corrector.best_options.size
+    end
+
     def original
       generate_csv_line(@values)
     end

data/lib/comma_splice/version.rb

@@ -1,3 +1,3 @@
 module CommaSplice
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comma_splice
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeff Keen