rbname 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY3MWE4ZTMxYWE2ZmE0OTVhMWMyOTFlOTI1OTMzNzQ0ZWFmNGM2MQ==
+    NzdhNGQ0M2MwZTBlOTJkYTk3NzAwMjc4MmM1NDhiMGIzZDE1ZmE2OQ==
   data.tar.gz: !binary |-
-    NDg5MDE3YzllNWJlNDY1MTk4YjkxYzU2ZjJkZDhlMTRmY2YyM2VkMw==
+    YjA0MGIzOTU0MDc0YTg0M2RjZTU0NWY5ZWEwYzIyM2ZhYzE5MmZiNw==
 SHA512:
   metadata.gz: !binary |-
-    ODFiYzZjNGRjNWEyZWYxNDdiZWI3OWJjYmQ5MzRmY2I0MGE0ODdhYTRlYmEw
-    NjExOGJlYWZmMjNjN2E2NDI3NTYwZTM3YmQ2MjQ3ZTAyZTAyZDMyZGU1MDkw
-    MjM3MjJmNzE4NzdiNmQxNTAzNzYwOTk5ZTU3NzVmMzU3MzJlOTE=
+    OWYxMzc2NWU1MGE4OTA0NWZmMmY1NDY4ZTJlNWMxNWJiMGRkNzYzYTc2MDNm
+    ZDFjZWU2NGY0OTIxMGEwNTQwYWJlM2UyYjcxMGVmYmJjZWRkYzM5ZGY5ZjUw
+    NmM4ZTU1NThkMGY4OTYyNDJkNjhlZTM4NGI3OWQxNzcyYjU2MzA=
   data.tar.gz: !binary |-
-    NjlkNzEyYWJjNzg5MWRmMWVkYWM4MjlhNGRmOWM5ODM4M2FmMDJkOGExOTkw
-    M2Q0NTFjZjk1MjM1NTg3N2VmMjdiMmMzNzA1MDAzMTgxY2Q4ZmJmMzdjMjc5
-    M2M3M2UwMzY3MWRiYTdmMDIxZWU2NGY4NTgxZTMyMDNhODVmZmQ=
+    MGJiZjg3MDllYzUyYTY5NjhkNjkyY2U5NjdkYzhlMzRiOTExOTI5NzNhYTcy
+    ZWVmMTdhNzExMTAyOGFlZmUzMWVkM2ExYWE5ZjI4OTVhY2MyZDkyMGE5M2Qz
+    MDdkMzIwMWYyNDM3YmFiNGViOTQ5YzFmYjMyYTc4OWQ1ZDVlYjI=

data/bin/rbname

@@ -6,4 +6,4 @@ end
 
 require 'main'
 
-Main.replace_all
+Main.new.replace_all

data/lib/change_prompt.rb

@@ -14,32 +14,68 @@ class ChangePrompt
     puts HORIZONTAL_LINE
     puts("#{USE_EDITOR}:  Edit in Vi")
     replacements.each_with_index do |replacement, index|
-      puts "#{index}:  #{replacement.suggest(file_line.raw_contents)}"
+      puts "#{one_indexed(index)}:  #{replacement.highlighted_suggest(file_line.raw_contents)}"
     end
     puts HORIZONTAL_LINE
+    get_the_input(replacements)
+  end
+
+  def self.get_the_input(replacements)
     user_input = gets
     puts("")
-    ChangePrompt.new(user_input)
+    prompt = ChangePrompt.new(user_input, replacements)
+
+    until(prompt.valid?)
+      puts "Yo, #{prompt.instance_variable_get(:@user_input)} is not a good answer.  Try again"
+      user_input = gets
+      puts("")
+      prompt = ChangePrompt.new(user_input, replacements)
+    end
+    prompt
   end
 
 
-  def initialize(user_input)
+  def initialize(user_input, replacements)
     @user_input = user_input
+    @replacements = replacements
   end
 
   def chose_editor?
     user_input.downcase.match(USE_EDITOR.downcase)
   end
 
+  def selected_replacement
+    replacements[zero_indexed(integer_input)] if integer_input
+  end
+
+  def valid?
+    chose_editor? || valid_integer_input || user_input.chomp.empty?
+  end
+
+  private
+
+  attr_reader :replacements
+
   def integer_input
     Integer(user_input)
   rescue => e
     nil
   end
 
-  private
+  def zero_indexed(index)
+    index - 1
+  end
+
+  def valid_integer_input
+    (1..replacements.count).include?(integer_input)
+  end
+
+  def self.one_indexed(index)
+    index + 1
+  end
 
   def self.present_line(file_line, pattern)
+    puts "\n" * 50
     puts HORIZONTAL_LINE
     puts("FILENAME: #{file_line.path}")
     puts HORIZONTAL_LINE

data/lib/extensions/array.rb

@@ -0,0 +1,9 @@
+class Array
+  def max_key
+    values = map do |element|
+      yield(element)
+    end
+
+    values.index(values.max)
+  end
+end

data/lib/extensions/object.rb

@@ -0,0 +1,5 @@
+class Object
+  def identity
+    self
+  end
+end

data/lib/extensions/string.rb

@@ -0,0 +1,11 @@
+class String
+  def indices_of_pattern(pattern)
+    indices = []
+    split("").each_with_index do |_, idx|
+      if self[idx..-1].start_with?(pattern)
+        indices  << idx
+      end
+    end
+    indices
+  end
+end

data/lib/main.rb

@@ -1,10 +1,17 @@
 require 'replacement'
 require 'change_prompt'
 require 'replacement_collection'
+require 'vim_edit'
 
 class Main
-  def self.replace_all
 
+  attr_accessor :manual_edit
+
+  def initialize
+    @manual_edit = VimEdit.new
+  end
+
+  def replace_all
     pattern, root_path = prompt_search_details
 
     file_lines = FileLine.find_all(pattern, root_path)
@@ -16,10 +23,10 @@ class Main
         applicable_replacements = replacement_collection.applicable_replacements(old_contents)
         user_input = ChangePrompt.prompt(pattern, file_line, applicable_replacements)
         if user_input.chose_editor?
-          edit_with_vim!(file_line, pattern)
+          manual_edit.execute!(file_line, pattern)
           record_manual_replacement!(replacement_collection, old_contents, file_line)
-        elsif user_input.integer_input
-          take_user_suggestion!(user_input.integer_input, applicable_replacements, file_line)
+        elsif user_input.selected_replacement
+          take_user_suggestion!(user_input.selected_replacement, file_line)
         end
       end
     end
@@ -27,30 +34,36 @@ class Main
 
   private
 
-  def self.prompt_search_details
+  def prompt_search_details
     puts "We will be replacing some text today."
     puts "What is a pattern describing the text you want to replace?"
     pattern = gets.chomp
     puts ""
     puts "What is root of your search? ('.' would probably work fine)"
-    root_path = gets.chomp
+    root_path = get_root_path
     puts ""
     [pattern, root_path]
   end
 
-  def self.record_manual_replacement!(replacement_collection, old_contents, file_line)
+  def get_root_path
+    chomped = gets.chomp
+    if chomped.empty?
+      puts "Defaulting to current directory.  Hit return to begin"
+      gets
+      return "."
+    end
+    return chomped
+  end
+
+  def record_manual_replacement!(replacement_collection, old_contents, file_line)
     new_contents = file_line.raw_contents
     replacement_collection << Replacement.generate(old_contents, new_contents) unless old_contents == new_contents
+    replacement_collection
   end
 
-  def self.take_user_suggestion!(integer_input, applicable_replacements, file_line)
-    replacement = applicable_replacements[integer_input]
+  def take_user_suggestion!(replacement, file_line)
     new_contents = replacement.suggest(file_line.raw_contents)
     file_line.update_filesystem!(new_contents)
   end
 
-  def self.edit_with_vim!(file_line, pattern)
-    system "vim +#{file_line.number} #{file_line.path} -c '#{"/"+pattern}' -c 'normal n' -c 'normal N' -c 'normal zz'"
-  end
-
 end

data/lib/replacement.rb

@@ -1,13 +1,16 @@
-class Replacement
-  attr_reader :to_replace, :new_text
+require 'extensions/array'
+require 'extensions/string'
+require 'extensions/object'
+require 'replacement/score'
 
-  def initialize(to_replace, new_text)
-    @to_replace = to_replace
-    @new_text = new_text
-  end
+class Replacement
+  attr_reader :removed_by_user, :added_by_user
 
-  def self.suggestions(replacements, to_change)
-    replacements.map { |replacement| replacement.suggest(to_change) }.uniq.compact
+  def initialize(removed_by_user, added_by_user, left_context, right_context)
+    @removed_by_user = removed_by_user
+    @added_by_user = added_by_user
+    @left_context = left_context
+    @right_context = right_context
   end
 
   def self.generate(before, after)
@@ -19,21 +22,41 @@ class Replacement
       before[before.length - index - 1] != after[after.length - index - 1]
     end
 
-    to_replace = drop_characters(before, leading_same_characters_count, trailing_same_characters_count)
-    new_text = drop_characters(after, leading_same_characters_count, trailing_same_characters_count)
+    removed_by_user = drop_characters(before, leading_same_characters_count, trailing_same_characters_count)
+    added_by_user = drop_characters(after, leading_same_characters_count, trailing_same_characters_count)
+
+    left_context = before[0...leading_same_characters_count]
 
-    Replacement.new(to_replace, new_text)
+    right_context = before[-trailing_same_characters_count..-1]
+
+    Replacement.new(removed_by_user, added_by_user, left_context, right_context)
   end
 
-  def suggest(to_change)
-    if to_change.match(to_replace)
-      to_change.sub(to_replace, new_text)
-    end
+  def suggest(requiring_suggestions)
+    formattable_suggest(requiring_suggestions, &:identity)
+  end
+
+  def highlighted_suggest(requiring_suggestions)
+    formattable_suggest(requiring_suggestions, &:red)
   end
 
   private
 
+  def formattable_suggest(requiring_suggestions)
+    indices = requiring_suggestions.indices_of_pattern(removed_by_user)
+
+    best_replacement_index = indices.max_key do |index|
+      Score.best_score(removed_by_user, requiring_suggestions, @left_context, @right_context, index)
+    end
+
+    return unless best_replacement_index
+
+    subbed = requiring_suggestions[best_replacement_index..-1].sub(removed_by_user, yield(added_by_user))
+    requiring_suggestions[0...best_replacement_index] + subbed
+  end
+
   def self.drop_characters(subject, leading, trailing)
     subject[leading...(subject.size - trailing)]
   end
 end
+

data/lib/replacement/score.rb

@@ -0,0 +1,25 @@
+class Replacement
+  class Score
+    def self.best_score(pattern, to_update, left_context, right_context, pattern_index)
+      [right_score(pattern, to_update, right_context, pattern_index),
+        left_score(to_update, left_context, pattern_index)].max
+    end
+
+    def self.right_score(pattern, to_update, right_context, pattern_index)
+      pattern_length = pattern.length
+      start_index = pattern_index + pattern_length
+      string_dot_product(to_update[start_index..-1], right_context).count
+    end
+
+    def self.left_score(to_update, left_context, pattern_index)
+      string_dot_product(to_update[0...pattern_index].reverse, left_context.reverse).count
+    end
+
+
+    def self.string_dot_product(first, second)
+      first.split("").zip(second.split("")).take_while do |(a,b)|
+        a == b
+      end
+    end
+  end
+end

data/lib/replacement_collection.rb

@@ -1,7 +1,7 @@
 class ReplacementCollection < Array
   def applicable_replacements(line_contents)
     select do |replacement|
-      line_contents.match(Regexp.escape(replacement.to_replace))
+      line_contents.match(Regexp.escape(replacement.removed_by_user))
     end
   end
 end

data/lib/vim_edit.rb

@@ -0,0 +1,5 @@
+class VimEdit
+  def execute!(file_line, pattern)
+    system "vim +#{file_line.number} #{file_line.path} -c '#{"/"+pattern}' -c 'normal n' -c 'normal N' -c 'normal zz'"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbname
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Wai Lee Chin Feman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,11 +46,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/change_prompt.rb
+- lib/extensions/array.rb
+- lib/extensions/object.rb
+- lib/extensions/string.rb
 - lib/file_line.rb
 - lib/file_line_presenter.rb
 - lib/main.rb
 - lib/replacement.rb
+- lib/replacement/score.rb
 - lib/replacement_collection.rb
+- lib/vim_edit.rb
 - bin/rbname
 homepage: http://github.com/skatenerd
 licenses:
@@ -72,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: CLI Find/Replace