dam_lev 1.0.0 → 1.0.1

data/.gitignore

@@ -19,3 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+*.gem
+.bundle

data/Gemfile

@@ -1,2 +1,3 @@
-gem 'rspec'
-gem 'yard'
+source :gemcutter
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    dam_lev (1.0.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  dam_lev!
+  rspec (~> 2.1.0)

data/README.md

@@ -16,7 +16,7 @@ DamLev implements the [Damerau–Levenshtein distance algorithm][1]. It is an al
     DamLev.distance("DamLev", "Damev")   # => 1 # deletion
     DamLev.distance("DamLev", "DamLiev") # => 1 # insertion
     DamLev.distance("DamLev", "Dam7ev")  # => 1 # substitution
-    DamLev.distance("DamLev", "DameLv")  # => 2 # transposition
+    DamLev.distance("DamLev", "DameLv")  # => 1 # transposition
 
 ## Note on Patches/Pull Requests
  

data/Rakefile

@@ -1,46 +1,5 @@
-# encoding: utf-8
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "dam_lev"
-    gem.summary = %Q{Measure the distance between two strings.}
-    gem.description = %Q{Measures the distance between two strings using the Damerau–Levenshtein distance algorithm. For more, see http://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance }
-    gem.email = "blatyo@gmail.com"
-    gem.homepage = "http://github.com/blatyo/DamLev"
-    gem.authors = ["Allen Madsen"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)

data/dam_lev.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/dam_lev/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "dam_lev"
+  s.version     = DamLev::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Allen Madsen"]
+  s.email       = ["blatyo@gmail.com"]
+  s.homepage    = "http://github.com/blatyo/DamLev"
+  s.summary     = %q{Measure the distance between two strings.}
+  s.description = %q{Measures the distance between two strings using the Damerau–Levenshtein distance algorithm. For more, see http://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance }
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.add_development_dependency "rspec",   "~> 2.1.0"
+  s.add_development_dependency "bundler", ">= 1.0.0"
+
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files`.split("\n").map{|f| f =~ /^(spec\/.*)/ ? $1 : nil}.compact
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^(bin\/.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/lib/dam_lev.rb

@@ -9,13 +9,17 @@ class DamLev
       (1..str2.length).each do |j|
         sub_cost = str1[i-1] == str2[j-1] ? 0 : 1
         
-        distance_matrix[i][j] = [distance_matrix[i-1][j] + 1,                 # deletion
-                                 distance_matrix[i][j-1] + 1,                 # insertion
-                                 distance_matrix[i-1][j-1] + sub_cost].min        # substitution
+        distance_matrix[i][j] = [
+          distance_matrix[i-1][j] + 1,            # deletion
+          distance_matrix[i][j-1] + 1,            # insertion
+          distance_matrix[i-1][j-1] + sub_cost    # substitution
+        ].min    
                                     
         if i > 1 && j > 1 && str1[i-1] == str2[j-2] && str1[i-2] == str2[j-1]
-          distance_matrix[i+1][j+1] = [distance_matrix[i][j], 
-                                       distance_matrix[i-2][j-2] + sub_cost].min  # transposition
+          distance_matrix[i][j] = [
+            distance_matrix[i][j], 
+            distance_matrix[i-2][j-2] + sub_cost  # transposition
+          ].min
         end
       end
     end

data/lib/dam_lev/version.rb

@@ -0,0 +1,3 @@
+class DamLev
+  VERSION = "1.0.1"
+end

data/spec/{DamLev_spec.rb → dam_lev_spec.rb}

@@ -18,8 +18,8 @@ describe DamLev do
       DamLev.distance("DamLev", "Dam7ev").should == 1
     end
     
-    it "should calculate a distance of two when two characters have been swapped between two strings" do
-      DamLev.distance("DamLev", "DameLv").should == 2
+    it "should calculate a distance of one when two characters have been swapped between two strings" do
+      DamLev.distance("DamLev", "DameLv").should == 1
     end
     
     it "should calculate a distance equal to the longest string if the other is empty" do

data/spec/spec_helper.rb

@@ -1,9 +1,2 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'dam_lev'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end
+require File.join(File.dirname(__FILE__), '..', 'lib', 'dam_lev')
+require 'rspec'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Allen Madsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -04:00
+date: 2010-11-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,17 +23,17 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 1
+        - 0
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: bundler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -41,39 +41,42 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :development
   version_requirements: *id002
 description: "Measures the distance between two strings using the Damerau\xE2\x80\x93Levenshtein distance algorithm. For more, see http://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance "
-email: blatyo@gmail.com
+email: 
+- blatyo@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
+- dam_lev.gemspec
 - lib/dam_lev.rb
-- spec/DamLev_spec.rb
-- spec/spec.opts
+- lib/dam_lev/version.rb
+- spec/dam_lev_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/blatyo/DamLev
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,8 +93,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
@@ -100,5 +105,5 @@ signing_key:
 specification_version: 3
 summary: Measure the distance between two strings.
 test_files: 
-- spec/DamLev_spec.rb
+- spec/dam_lev_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/spec/spec.opts

@@ -1 +0,0 @@
---color