damerau-levenshtein 1.1.3 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f1db3c601f8dd29e5470deedecee3e99ee84f71
-  data.tar.gz: dc320d3f50452e226beba347b0711f78c85e1595
+SHA256:
+  metadata.gz: 1df0e124b37dd40f7d57bd0d96abcb1e0bdfef4d7dc38439ecdcddb8d292aa9b
+  data.tar.gz: '082576cec439a97f6c3bf262c52ec0e6f9dd26805971d9bc3791cdf9f5e2f1dc'
 SHA512:
-  metadata.gz: 5231e78a77dbc0f91fd790dab046099d5952649f895d2d418ae83fc8f4d610ffe55aa025f493bba494719c5886e76b67a954b7d22beb6a11bd9aa9c004526a53
-  data.tar.gz: 7e885987bd0b063145fbb04e31bc6a8474e2957d65abf7d877a08f2335e4527b396696f24e2a6d495a51d0d24ceac841971ba91381f2ceb11460f2ece41e660b
+  metadata.gz: c705b20404d0f2a344cd55693fb207666b16505da67390a82f31ebb1df37fa8c260f121da6fe70447179ae14df34281b9cbfa2332ddcced34afb42acfc861817
+  data.tar.gz: 846aaab0f6c38fdc4bd4ab626de6aec11ddf213b845b75867cad3ee4bd728bf121efb12b0886ead512cfad24798f052bb2c81dd2b36ba43b8f1633d569768feb

data/.gitignore

@@ -5,6 +5,10 @@ tmp
 *.o
 *.bundle
 *.gem
+.nvimlog
+.vim.custom
+.byebug_history
+
 # rcov generated
 coverage
 

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  NewCops: disable
   Exclude:
     - features/**/*
     - db/**/*
@@ -9,7 +10,7 @@ Metrics/ModuleLength:
   Max: 1000
 Style/StringLiterals:
   EnforcedStyle: double_quotes
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
-Style/FileName:
+Naming/FileName:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.5.8

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.1
+  - 2.5
+  - 2.6
+  - 2.7
 before_install: "gem update bundler"
 script:
   - "bundle exec rake"

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 damerau-levenshtein CHANGELOG
 =============================
 
-1.2.3 -- add ruby 2.3.1 to travis tests by request from @greysteil
+1.3.1 -- gems update
+
+1.3.0 -- (issue #10) shows difference between two strings
+
+1.2.0 -- add edit distance for array of integers (by @azhi)
+
+1.1.3 -- add ruby 2.3.1 to travis tests by request from @greysteil
 
 1.1.2 -- remove unnecessary production dependencies (by @ixti)
 

data/Gemfile

@@ -1,3 +1,5 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 gemspec

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Dmitry Mozzherin
+Copyright (c) 2011-2019 Dmitry Mozzherin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,40 +1,44 @@
-damerau-levenshtein
-===================
+# damerau-levenshtein #
 
 [![Gem Version][gem_svg]][gem]
 [![Continuous Integration Status][ci_svg]][ci]
 [![Dependency Status][dep_svg]][dep]
 [![Coverage Status][cov_svg]][cov]
 
-The damerau-levenshtein gem allows to find edit distance between two UTF-8
-or ASCII encoded strings with O(N\*M) efficiency.
+The damerau-levenshtein gem allows to find [edit distance][ed] between two
+UTF-8 or ASCII encoded strings with O(N\*M) efficiency.
 
 This gem implements pure Levenshtein algorithm, Damerau modification of it
 (where 2 character transposition counts as 1 edit distance). It also includes
 Boehmer & Rees 2008 modification of Damerau algorithm, where transposition
 of bigger than 1 character blocks is taken in account as well
-(Boehmer & Rees 2008).
+[(Rees 2014)][rees2014].
 
 ```ruby
 require "damerau-levenshtein"
 DamerauLevenshtein.distance("Something", "Smoething") #returns 1
 ```
 
-Gem damerau-levenshtein is compatible with ruby versions 1.8.7
-and 1.9.2 and higher, as well as 2.0.0 and higher
+It also returns a diff between two strings according to Levenshtein alrorithm.
+The diff is expressed by tags `<ins>`, `<del>`, and `<subst>`. Such tags make
+it possible to highlight differnce between strings in a flexible way.
 
-Dependencies
--------------
+```ruby
+require "damerau-levenshtein"
+differ = DamerauLevenshtein::Differ.new
+differ.run("corn", "cron")
+# output: ["c<subst>or</subst>n", "c<subst>ro</subst>n"]
+```
+
+## Dependencies ##
 
     sudo apt-get install build-essential libgmp3-dev
 
-Installation
-------------
+## Installation ##
 
     gem install damerau-levenshtein
 
-Examples
---------
+## Examples ##
 
 ```ruby
 require "damerau-levenshtein"
@@ -59,33 +63,63 @@ dl.distance("Something", "Smoething", 0) #returns 2
 dl.distance("Something", "meSothing", 2) #returns 2 instead of 4
 ```
 
-* comparison of words with utf-8 characters should work fine:
+* comparison of words with UTF-8 characters should work fine:
 
 ```ruby
 dl.distance("Sjöstedt", "Sjostedt") #returns 1
 ```
 
-API Description
------------
+* compare two arrays
+
+```ruby
+dl.array_distance([1,2,3,5], [1,2,3,4]) #returns 1
+```
+
+* return diff between two strings
+
+```ruby
+differ = DamerauLevenshtein::Differ.new
+differ.run("Something", "smthg")
+```
+
+* return diff between two strings in raw format
+
+```ruby
+differ = DamerauLevenshtein::Differ.new
+differ.format = :raw
+differ.run("Something", "smthg")
+```
+
+## API Description ##
+
+### Methods ###
 
-Gem defines two methods
+#### DamerauLevenshtein.version
 
 ```ruby
 DamerauLevenshtein.version
 #returns version number of the gem
+```
 
+#### DamerauLevenshtein.distance
+
+```ruby
 DamerauLevenshtein.distance(string1, string2, block_size, max_distance)
-#returns [edit distance][ed] between 2 strings
-```
+#returns edit distance between 2 strings
 
+DamerauLevenshtein.string_distance(string1, string2, block_size, max_distance)
+# an alias for .distance
 
+DamerauLevenshtein.array_distance(array1, array2, block_size, max_distance)
+# returns edit distance between 2 arrays of integers
+```
 
-DamerauLevenshtein.distance takes 4 arguments:
+`DamerauLevenshtein.distance` and `.array_distance` take 4 arguments:
 
-* string1
-* string2
-* block_size (default is 1)
-* max_distance (default is 10)
+* `string1` (`array1` for `.array_distance`)
+* `string2` (`array2` for `.array_distance`)
+* `block_size` (default is 1)
+* `max_distance` (default is 10)
 
 `block_size` determines maximum number of characters in a transposition block:
 
@@ -113,45 +147,93 @@ Levenshtein algorithm is expensive, so it makes sense to give up when edit
 distance is becoming too big. The argument max_distance does just that.
 
 ```ruby
+
 DamerauLevenshtein.distance("abcdefg", "1234567", 0, 3)
 # output: 4 -- it gave up when edit distance exceeded 3
+
+```
+
+#### DamerauLevenshtein::Differ
+
+`differ = DamerauLevenshtein::Differ.new` creates an instance of new differ class to return difference between two strings
+
+`differ.format` shows current format for diff. Default is `:tag` format
+
+`differ.format = :raw` changes current format for diffs. Possible values are `:tag` and `:raw`
+
+`differ.run("String1", "String2")` returns difference between two strings.
+
+For example:
+
+```ruby
+differ = DamerauLevenshtein::Differ.new
+differ.run("Something", "smthng")
+# output: ["<ins>S</ins><subst>o</subst>m<ins>e</ins>th<ins>i</ins>ng",
+#          "<del>S</del><subst>s</subst>m<del>e</del>th<del>i</del>ng"]
+
+```
+
+Or with parsing:
+
+```ruby
+require "damerau-levenshtein"
+require "nokogiri"
+
+differ = DamerauLevenshtein::Differ.new
+res = differ.run("Something", "Smothing!")
+nodes = Nokogiri::XML("<root>#{res.first}</root>")
+
+markup = nodes.root.children.map do |n|
+  case n.name
+  when "text"
+    n.text
+  when "del"
+    "~~#{n.children.first.text}~~"
+  when "ins"
+    "*#{n.children.first.text}*"
+  when "subst"
+    "**#{n.children.first.text}**"
+  end
+end.join("")
+
+puts markup
 ```
 
-Contributing to damerau-levenshtein
------------------------------------
+## Contributing to damerau-levenshtein ##
 
 * Check out the latest master to make sure the feature hasn't been
-implemented or the bug hasn't been fixed yet
+  implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested
-it and/or contributed it
+  it and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it
-in a future version unintentionally.
+  in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want
-to have your own version, or is otherwise necessary, that is fine, but please
-isolate to its own commit so I can cherry-pick around it.
+  to have your own version, or is otherwise necessary, that is fine, but please
+  isolate to its own commit so I can cherry-pick around it.
 
-Versioning
-----------
+## Versioning ##
 
 This gem is following practices of [Semantic Versioning][semver]
 
-Authors
--------
+## Authors ##
 
 [Dmitry Mozzherin][dimus]
 
-Contributors
-------------
+## Contributors ##
 
-[lazylester][lazylester], [Ran Xie][skarlit], [Alexey Zapparov][ixti]
+[Alexey Zapparov][ixti],
+[azhi][azhi],
+[Fabian Winkler][wynksaiddestroy]
+[Josephine Wright][jozr],
+[lazylester][lazylester],
+[Ran Xie][skarlit],
 
-Copyright
----------
+## Copyright ##
 
-Copyright (c) 2011-2016 Dmitry Mozzherin. See LICENSE.txt for
+Copyright (c) 2011-2019 Dmitry Mozzherin. See LICENSE.txt for
 further details.
 
 [gem_svg]: https://badge.fury.io/rb/damerau-levenshtein.svg
@@ -168,3 +250,7 @@ further details.
 [lazylester]: https://github.com/lazylester
 [skarlit]: https://github.com/Skarlit
 [ixti]: https://github.com/ixti
+[azhi]: https://github.com/azhi
+[jozr]: https://github.com/jozr
+[rees2014]: https://dx.doi.org/10.1371/journal.pone.0107510
+[wynksaiddestroy]: https://github.com/wynksaiddestroy

data/Rakefile

@@ -1,25 +1,32 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'cucumber/rake/task'
+require "cucumber/rake/task"
 require "rubocop/rake_task"
-require 'rake/dsl_definition'
-require 'rake'
-require 'rake/extensiontask'
-require 'rspec'
+require "rake/dsl_definition"
+require "rake"
+require "rake/extensiontask"
+require "rspec"
 
 RSpec::Core::RakeTask.new(:spec) do |rspec|
-  rspec.pattern = FileList['spec/**/*_spec.rb']
+  rspec.pattern = FileList["spec/**/*_spec.rb"]
 end
 
 Cucumber::Rake::Task.new(:features)
 
-Rake::ExtensionTask.new('damerau_levenshtein') do |extension|
-    extension.ext_dir = 'ext/damerau_levenshtein'
-    extension.lib_dir = 'lib/damerau-levenshtein'
+Rake::ExtensionTask.new("damerau_levenshtein") do |extension|
+  extension.ext_dir = "ext/damerau_levenshtein"
+  extension.lib_dir = "lib/damerau-levenshtein"
 end
 
 Rake::Task[:spec].prerequisites << :compile
 Rake::Task[:features].prerequisites << :compile
 
 RuboCop::RakeTask.new
-task :default => [:rubocop, :spec]
+task default: %i[rubocop spec]
+
+desc "open an irb session preloaded with this gem"
+task :console do
+  sh "irb -r pp -r ./lib/damerau-levenshtein.rb"
+end

data/damerau-levenshtein.gemspec

@@ -1,8 +1,11 @@
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 require "damerau-levenshtein/version"
 
 Gem::Specification.new do |s|
+  s.required_ruby_version = ">= 2.5"
   s.name = "damerau-levenshtein"
   s.version = DamerauLevenshtein::VERSION
   s.homepage = "https://github.com/GlobalNamesArchitecture/damerau-levenshtein"
@@ -15,21 +18,23 @@ Gem::Specification.new do |s|
                   "Damerau modification (where 2 character " \
                   "transposition counts as 1 edit distance). It also " \
                   "includes Boehmer & Rees 2008 modification, " \
-                  "to handle transposition in bloks with more than " \
+                  "to handle transposition in blocks with more than " \
                   "2 characters (Boehmer & Rees 2008)."
   s.files = `git ls-files -z`.split("\x0").
             reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.extensions = ["ext/damerau_levenshtein/extconf.rb"]
   s.require_paths = ["lib", "lib/damerau-levenshtein"]
 
-  s.add_development_dependency "rspec", "~> 3.4"
-  s.add_development_dependency "activesupport", "~> 4.2"
-  s.add_development_dependency "cucumber", "~> 2.3"
-  s.add_development_dependency "ruby-prof", "~> 0.15"
-  s.add_development_dependency "shoulda", "~> 3.5"
-  s.add_development_dependency "rubocop", "~> 0.38"
+  s.add_development_dependency "activesupport", "~> 6.0"
+  s.add_development_dependency "bundler", "~> 2.1"
+  s.add_development_dependency "byebug", "~> 11.0"
   s.add_development_dependency "coveralls", "~> 0.8"
-  s.add_development_dependency "bundler", "~> 1.11"
-  s.add_development_dependency "rake", "~> 11.1"
-  s.add_development_dependency "rake-compiler", "~> 0.9"
+  s.add_development_dependency "cucumber", "~> 4.1"
+  s.add_development_dependency "rake", "~> 13.0"
+  s.add_development_dependency "rake-compiler", "~> 1.1"
+  s.add_development_dependency "rspec", "~> 3.9"
+  s.add_development_dependency "rubocop", "~> 0.88"
+  s.add_development_dependency "ruby-prof", "~> 1.4"
+  s.add_development_dependency "shoulda", "~> 4.0"
+  s.add_development_dependency "solargraph", "~> 0.39"
 end

data/ext/damerau_levenshtein/damerau_levenshtein.c

@@ -4,14 +4,14 @@ VALUE DamerauLevenshteinBinding = Qnil;
 
 void Init_damerau_levenshtein();
 
-VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance);
+VALUE method_internal_distance(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance);
 
 void Init_damerau_levenshtein() {
 	DamerauLevenshteinBinding = rb_define_module("DamerauLevenshteinBinding");
-	rb_define_method(DamerauLevenshteinBinding, "distance_utf", method_distance_utf, 4);
+	rb_define_method(DamerauLevenshteinBinding, "internal_distance", method_internal_distance, 4);
 }
 
-VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance){
+VALUE method_internal_distance(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance){
   VALUE *sv = RARRAY_PTR(_s);
   VALUE *tv = RARRAY_PTR(_t);
   int i, i1, j, j1, k, half_tl, cost, *d, distance, del, ins, subs, transp, block;
@@ -24,8 +24,8 @@ VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VAL
   int max_distance = NUM2INT(_max_distance);
   int sl = (int) RARRAY_LEN(_s);
   int tl = (int) RARRAY_LEN(_t);
-  int s[sl];
-  int t[tl];
+  long long s[sl];
+  long long t[tl];
   
   if (block_size == 0) {
     pure_levenshtein = 1;
@@ -39,8 +39,8 @@ VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VAL
   if (sl == 1 && tl == 1 && sv[0] != tv[0]) return INT2NUM(1);
 
 
-  for (i=0; i < sl; i++) s[i] = NUM2INT(sv[i]);
-  for (i=0; i < tl; i++) t[i] = NUM2INT(tv[i]);
+  for (i=0; i < sl; i++) s[i] = NUM2LL(sv[i]);
+  for (i=0; i < tl; i++) t[i] = NUM2LL(tv[i]);
 
   sl++;
   tl++;

data/ext/damerau_levenshtein/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Loads mkmf which is used to make makefiles for Ruby extensions
 require "mkmf"
 

data/lib/damerau-levenshtein.rb

@@ -1,7 +1,9 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
-require "damerau-levenshtein/version"
-require "damerau-levenshtein/damerau_levenshtein"
+require_relative "damerau-levenshtein/version"
+require_relative "damerau-levenshtein/damerau_levenshtein"
+require_relative "damerau-levenshtein/formatter"
+require_relative "damerau-levenshtein/differ"
 
 # Damerau-Levenshtein algorithm
 module DamerauLevenshtein
@@ -12,6 +14,23 @@ module DamerauLevenshtein
   end
 
   def self.distance(str1, str2, block_size = 1, max_distance = 10)
-    distance_utf(str1.unpack("U*"), str2.unpack("U*"), block_size, max_distance)
+    internal_distance(
+      str1.unpack("U*"), str2.unpack("U*"),
+      block_size, max_distance
+    )
+  end
+
+  def self.string_distance(*args)
+    distance(*args)
+  end
+
+  def self.array_distance(array1, array2, block_size = 1, max_distance = 10)
+    internal_distance(array1, array2, block_size, max_distance)
+  end
+
+  # keep backward compatibility - internal_distance was called distance_utf
+  # before
+  def self.distance_utf(*args)
+    internal_distance(*args)
   end
 end

data/lib/damerau-levenshtein/differ.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module DamerauLevenshtein
+  # Shows the difference between two strings in character by character
+  # resolution
+  class Differ
+    FORMATS = %i[raw tag].freeze
+    attr_reader :format
+
+    def initialize
+      @format = :tag
+      @matrix = []
+    end
+
+    def format=(new_format)
+      new_format = new_format.to_sym
+      @format = new_format if FORMATS.include?(new_format)
+    end
+
+    def run(str1, str2)
+      @len1 = str1.size.freeze
+      @len2 = str2.size.freeze
+      prepare_matrix
+      edit_distance(str1, str2)
+      raw = trace_back
+      formatter_factory.show(raw, str1, str2)
+    end
+
+    private
+
+    def formatter_factory
+      formatter =
+        case @format
+        when :tag
+          DamerauLevenshtein::FormatterTag
+        when :raw
+          DamerauLevenshtein::FormatterRaw
+        end
+      Formatter.new(formatter)
+    end
+
+    def edit_distance(str1, str2)
+      (1..@len2).each do |i|
+        (1..@len1).each do |j|
+          no_change(i, j) && next if str2[i - 1] == str1[j - 1]
+          @matrix[i][j] = [del(i, j), ins(i, j), subst(i, j)].min + 1
+        end
+      end
+    end
+
+    def trace_back
+      res = []
+      cell = [@len2, @len1]
+      while cell != [0, 0]
+        cell, char = char_data(cell)
+        res.unshift char
+      end
+      res
+    end
+
+    def char_data(cell)
+      char = { distance: @matrix[cell[0]][cell[1]] }
+      val = find_previous(cell)
+      previous_value = val[0][0]
+      char[:type] = previous_value == char[:distance] ? :same : val[1]
+      cell = val.pop
+      [cell, char]
+    end
+
+    def find_previous(cell)
+      candidates = [[[ins(*cell), 1], :ins, [cell[0], cell[1] - 1]],
+                    [[del(*cell), 2], :del, [cell[0] - 1, cell[1]]],
+                    [[subst(*cell), 0], :subst, [cell[0] - 1, cell[1] - 1]]]
+      select_cell(candidates)
+    end
+
+    def select_cell(candidates)
+      candidates.select { |e| e[-1][0] >= 0 && e[-1][1] >= 0 }.
+        sort_by(&:first).first
+    end
+
+    def del(i, j)
+      @matrix[i - 1][j]
+    end
+
+    def ins(i, j)
+      @matrix[i][j - 1]
+    end
+
+    def subst(i, j)
+      @matrix[i - 1][j - 1]
+    end
+
+    def no_change(i, j)
+      @matrix[i][j] = @matrix[i - 1][j - 1]
+    end
+
+    def prepare_matrix
+      @matrix = []
+      @matrix << (0..@len1).to_a
+      @len2.times do |i|
+        ary = [i + 1] + (1..@len1).map { nil }
+        @matrix << ary
+      end
+    end
+  end
+end

data/lib/damerau-levenshtein/formatter.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module DamerauLevenshtein
+  # Formats supplied strings according to their differences
+  class Formatter
+    def initialize(formatter)
+      @formatter = formatter
+    end
+
+    def show(raw_format, str1, str2)
+      @formatter.show(raw_format, str1, str2)
+    end
+  end
+
+  # Outputs raw format for two strings
+  module FormatterRaw
+    def self.show(raw_format, _, _)
+      raw_format
+    end
+  end
+
+  # Outputs strings marked with tags
+  module FormatterTag
+    class << self
+      def show(raw_format, str1, str2)
+        inverted_raw_format = raw_format.map do |e|
+          type = invert_type(e[:type])
+          { distance: e[:distance], type: type }
+        end
+        [show_string(raw_format, str1, str2),
+         show_string(inverted_raw_format, str2, str1)]
+      end
+
+      private
+
+      def invert_type(type)
+        case type
+        when :del
+          :ins
+        when :ins
+          :del
+        else
+          type
+        end
+      end
+
+      def show_string(raw, str1, str2)
+        data = { res: [], type: nil, deletes: 0, inserts: 0,
+                 str1: str1, str2: str2 }
+        raw.each_with_index do |e, i|
+          process_entry(e, i, data)
+        end
+        data[:res] << format("</%<type>s>", data) if data[:type] != :same
+        data[:res].join("")
+      end
+
+      def process_entry(e, i, data)
+        if data[:type] && e[:type] != data[:type]
+          insert_tags(e, data)
+        elsif data[:type].nil?
+          data[:res] << format("<%<type>s>", e) if e[:type] != :same
+        end
+        insert_letter(e, i, data)
+      end
+
+      def insert_tags(entry, data)
+        data[:res] << format("</%<type>s>", data) if data[:type] != :same
+        data[:res] << format("<%<type>s>", entry) if entry[:type] != :same
+      end
+
+      def insert_letter(entry, index, data)
+        if entry[:type] == :del
+          insert_del(index, data)
+        else
+          insert_others(index, data)
+        end
+        data[:inserts] += 1 if entry[:type] == :ins
+        data[:type] = entry[:type]
+      end
+
+      def insert_del(i, data)
+        data[:res] << data[:str2][i - data[:inserts]]
+        data[:deletes] += 1
+      end
+
+      def insert_others(i, data)
+        data[:res] << data[:str1][i - data[:deletes]]
+      end
+    end
+  end
+end

data/lib/damerau-levenshtein/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Damerau Levenshtein algorithm
 module DamerauLevenshtein
-  VERSION = "1.1.3".freeze
+  VERSION = "1.3.3"
 end

metadata

@@ -1,158 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: damerau-levenshtein
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.3
 platform: ruby
 authors:
 - Dmitry Mozzherin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.88'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.88'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.39'
 description: This gem implements pure Levenshtein algorithm, Damerau modification
   (where 2 character transposition counts as 1 edit distance). It also includes Boehmer
-  & Rees 2008 modification, to handle transposition in bloks with more than 2 characters
+  & Rees 2008 modification, to handle transposition in blocks with more than 2 characters
   (Boehmer & Rees 2008).
 email: dmozzherin@gmail.com
 executables: []
@@ -176,12 +204,14 @@ files:
 - ext/damerau_levenshtein/extconf.rb
 - lib/damerau-levenshtein.rb
 - lib/damerau-levenshtein/damerau_levenshtein.so
+- lib/damerau-levenshtein/differ.rb
+- lib/damerau-levenshtein/formatter.rb
 - lib/damerau-levenshtein/version.rb
 homepage: https://github.com/GlobalNamesArchitecture/damerau-levenshtein
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,16 +220,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Calculation of editing distance for 2 strings using Levenshtein or Damerau-Levenshtein
   algorithms