tty 0.0.8 → 0.0.9

data/lib/tty.rb

@@ -37,13 +37,13 @@ require 'tty/terminal/home'
 
 require 'tty/system/which'
 
-require 'tty/text/wrapping'
+require 'tty/text/distance'
 require 'tty/text/truncation'
+require 'tty/text/wrapping'
 
-require 'tty/table/field'
 require 'tty/table/header'
 require 'tty/table/row'
-require 'tty/table/options'
+require 'tty/table/field'
 
 require 'tty/table/border'
 require 'tty/table/border_dsl'

data/lib/tty/shell.rb

@@ -135,6 +135,19 @@ module TTY
       args.each { |message| say message, options.merge(:color => :red) }
     end
 
+    def suggest(message, possibilities)
+      distances = Hash.new { |hash, key| hash[key] = [] }
+
+      possibilities.each do |possibility|
+        distances[Text.distance(message, possibility)] << possibility
+      end
+
+      minimum_distance = distances.keys.min
+      if minimum_distance < 4
+      else
+      end
+    end
+
     # Print a table to shell.
     #
     # @return [undefined]

data/lib/tty/support/equatable.rb

@@ -130,7 +130,7 @@ module TTY
       #
       # @api public
       def eql?(other)
-        instance_of?(other.class) and compare?(__method__, other)
+        instance_of?(other.class) && compare?(__method__, other)
       end
 
       # Compare two objects for equality based on their value
@@ -143,11 +143,7 @@ module TTY
       #
       # @api public
       def ==(other)
-        print '== '
-        p self
-        p other
-        return false unless self.class <=> other.class
-        compare?(__method__, other)
+        kind_of?(other.class) && compare?(__method__, other)
       end
 
     end # Methods

data/lib/tty/text.rb

@@ -15,6 +15,22 @@ module TTY
     def split_mode
     end
 
+    # Calculate the distance between strings
+    #
+    # @param [String] first
+    #   the first string for comparison
+    #
+    # @param [String] second
+    #   the second string for comparison
+    #
+    # @example
+    #   distance("which", "witch")
+    #   # => 2
+    #
+    def self.distance(first, second, *args)
+      Distance.new(first, second, *args).distance
+    end
+
     # Wrap a text into lines no longer than provided length
     #
     # @param [String] text

data/lib/tty/text/distance.rb

@@ -0,0 +1,73 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Text
+
+    # A class responsible for string comparison
+    class Distance
+      include Unicode
+
+      attr_reader :first
+
+      attr_reader :second
+
+      # Initalize a Distance
+      #
+      # @param [String] first
+      #   the first string for comparision
+      #
+      # @param [String] second
+      #  the second string for comparison
+      #
+      # @api private
+      def initialize(first, second, *args)
+        options = Utils.extract_options!(args)
+        @first = first.to_s
+        @second = second.to_s
+        # TODO: add option to ignore case
+      end
+
+      # Calculate the optimal string alignment distance
+      #
+      # @api private
+      def distance
+        distances = []
+        rows      = first.length
+        cols      = second.length
+
+        0.upto(rows) do |index|
+          distances << [index] + [0] * cols
+        end
+        distances[0] = 0.upto(cols).to_a
+
+        1.upto(rows) do |first_index|
+          1.upto(cols) do |second_index|
+            first_char  = first[first_index - 1]
+            second_char = second[second_index - 1]
+            cost        = first_char == second_char ? 0 : 1
+
+            distances[first_index][second_index] = [
+              distances[first_index - 1][second_index], # deletion
+              distances[first_index][second_index - 1],     # insertion
+              distances[first_index - 1][second_index - 1]  # substitution
+            ].min + cost
+
+            if first_index > 1 && second_index > 1
+              first_previous_char = first[first_index - 2]
+              second_previous_char = second[second_index - 2]
+              if first_char == second_previous_char && second_char == first_previous_char
+                distances[first_index][second_index] = [
+                  distances[first_index][second_index],
+                  distances[first_index - 2][second_index - 2] + 1 # transposition
+                ].min
+              end
+            end
+
+          end
+        end
+        distances[rows][cols]
+      end
+
+    end # Distance
+  end # Text
+end # TTY

data/lib/tty/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module TTY
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/tty/table/field/equality_spec.rb

@@ -31,10 +31,10 @@ describe TTY::Table::Field, '#==' do
   context 'with an equivalent object of subclass' do
     let(:other) { Class.new(described_class).new(value) }
 
-    it { should be_true }
+    it { should be_false }
 
     it 'is symmetric' do
-      should eql(other == object)
+      should_not eql(other == object)
     end
   end
 

data/spec/tty/table/renderer/basic/separator_spec.rb

@@ -55,28 +55,6 @@ describe TTY::Table, 'with separator' do
         +--+--+--+
       EOS
     end
-
-    context 'with specific separator' do
-      let(:header) { ['h1', 'h2'] }
-      let(:rows) { [['a1', 'a2'], ['b1', 'b2'], ['c1', 'c2']] }
-
-      it 'custom separator' do
-        pending
-        table.border.separator= [2]
-        table.to_s.should == <<-EOS.normalize
-          +--+--+
-          |h1|h2|
-          +--+--+
-          |a1|a2|
-          |b1|b2|
-          +--+--+
-          |c1|c2|
-          +--+--+
-        EOS
-      end
-
-    end
-
   end
 
   context 'when unicode' do

data/spec/tty/text/distance/distance_spec.rb

@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Text::Distance, '#distance' do
+  let(:object) { described_class.new(*strings) }
+
+  subject { object.distance }
+
+  context 'when nil' do
+    let(:strings) { [nil, nil] }
+
+    it { should eql(0) }
+  end
+
+  context 'when empty' do
+    let(:strings) { ['', ''] }
+
+    it { should eql(0) }
+  end
+
+  context 'with one non empty' do
+    let(:strings) { ['abc', ''] }
+
+    it { should eql(3) }
+  end
+
+  context 'when similar' do
+    let(:strings) { ['abc', 'abc'] }
+
+    it { should eql(0) }
+  end
+
+  context 'when similar' do
+    let(:strings) { ['abc', 'acb'] }
+
+    it { should eql(1) }
+  end
+
+  context 'when end similar' do
+    let(:strings) { ['saturday', 'sunday'] }
+
+    it { should eql(3) }
+  end
+
+  context 'when contain similar' do
+    let(:strings) { ['which', 'witch'] }
+
+    it { should eql(2) }
+  end
+
+  context 'when similar' do
+    let(:strings) { ['smellyfish','jellyfish'] }
+
+    it { should eql(2) }
+  end
+
+  context 'when unicode' do
+    let(:strings) { ['マラソン五輪代表', 'ララソン五輪代表'] }
+
+    it { should eql(1) }
+  end
+end

data/spec/tty/text/distance/initialize_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Text::Distance, '#initialize' do
+  let(:strings) { ['abc', 'acb'] }
+
+  subject { described_class.new(*strings) }
+
+  its(:first) { should == strings.first }
+
+  its(:second) { should == strings.last }
+
+end # initialize

data/spec/tty/text/distance_spec.rb

@@ -0,0 +1,11 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Text, '#distance' do
+  let(:strings) { ['witch', 'which'] }
+
+  subject { described_class.distance(*strings) }
+
+  it { should == 2 }
+end # distance

data/spec/tty/text/truncation/truncate_spec.rb

@@ -3,12 +3,12 @@
 require 'spec_helper'
 
 describe TTY::Text::Truncation, '#truncate' do
-  let(:instance) { described_class.new }
+  let(:object) { described_class.new(text, options) }
   let(:separator) { nil }
   let(:trailing) { '…' }
   let(:options) { { :length => length, :separator => separator, :trailing => trailing }  }
 
-  subject { described_class.new(text, options).truncate }
+  subject { object.truncate }
 
   context 'unicode support' do
     let(:text) { 'ラドクリフ、マラソン五輪代表に1万m出場にも含み' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tty
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152273080 !ruby/object:Gem::Requirement
+  requirement: &2156006680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152273080
+  version_requirements: *2156006680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152272300 !ruby/object:Gem::Requirement
+  requirement: &2156005760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152272300
+  version_requirements: *2156005760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152271820 !ruby/object:Gem::Requirement
+  requirement: &2156004720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152271820
+  version_requirements: *2156004720
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &2152269160 !ruby/object:Gem::Requirement
+  requirement: &2156003760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152269160
+  version_requirements: *2156003760
 description: Toolbox for developing CLI clients
 email:
 - ''
@@ -127,6 +127,7 @@ files:
 - lib/tty/terminal/echo.rb
 - lib/tty/terminal/home.rb
 - lib/tty/text.rb
+- lib/tty/text/distance.rb
 - lib/tty/text/truncation.rb
 - lib/tty/text/wrapping.rb
 - lib/tty/vector.rb
@@ -238,6 +239,9 @@ files:
 - spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
 - spec/tty/terminal/size_spec.rb
+- spec/tty/text/distance/distance_spec.rb
+- spec/tty/text/distance/initialize_spec.rb
+- spec/tty/text/distance_spec.rb
 - spec/tty/text/truncate_spec.rb
 - spec/tty/text/truncation/initialize_spec.rb
 - spec/tty/text/truncation/truncate_spec.rb
@@ -381,6 +385,9 @@ test_files:
 - spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
 - spec/tty/terminal/size_spec.rb
+- spec/tty/text/distance/distance_spec.rb
+- spec/tty/text/distance/initialize_spec.rb
+- spec/tty/text/distance_spec.rb
 - spec/tty/text/truncate_spec.rb
 - spec/tty/text/truncation/initialize_spec.rb
 - spec/tty/text/truncation/truncate_spec.rb