damerau-levenshtein 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c6faa0317240defb0210ab642c514942855fdb
-  data.tar.gz: 4ad7bd77b1eb7fec82c489e78d572fa75f25c2c9
+  metadata.gz: c8156a6bf2a0032eb58ce73f65532b8166592b0c
+  data.tar.gz: a3014e1f2cdd6aaa14438cee6fcf83a51edcdc05
 SHA512:
-  metadata.gz: fd15b89736839baa55d4023c15a5ff8511364b55b4e585c3bf68dcd4bb75e62e9e5dfdff1505691694c502c875f19b74c996691dec7261d184be97e0b0636ede
-  data.tar.gz: ae7e131dcd30ed4f3d98c78bfbe4359a63392c34f301c76aef975fbf94ec9f60abd9e61f500f71c0a1bfe9e493080eb6291c50a736d2c68802681524ad580f47
+  metadata.gz: a359dd70503719ae7d213059db6b255e113cd9795fb02b79d4d43d71244f47e874f86fb206ed00916c91d07ef44594ce117d801104fa2b7593b2ed207c270957
+  data.tar.gz: e91104f2e39d2a3f536c5b6819ad10d65b9cc6839481b8522ab4025bffe87310568f818a5bac0c2c7c81f66b2bddd1f6302411460e00f844a3e74da74cf157b3

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.3.4

data/.travis.yml

@@ -1,6 +1,4 @@
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
   - 2.3
   - 2.4

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 damerau-levenshtein CHANGELOG
 =============================
 
+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)

data/README.md

@@ -65,7 +65,7 @@ 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
@@ -175,6 +175,31 @@ differ.run("Something", "smthng")
 
 ```
 
+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 ##
 

data/damerau-levenshtein.gemspec

@@ -7,6 +7,7 @@ require "damerau-levenshtein/version"
 # rubocop:disable Metrics/BlockLength
 
 Gem::Specification.new do |s|
+  s.required_ruby_version = "~> 2.3"
   s.name = "damerau-levenshtein"
   s.version = DamerauLevenshtein::VERSION
   s.homepage = "https://github.com/GlobalNamesArchitecture/damerau-levenshtein"
@@ -26,18 +27,18 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/damerau_levenshtein/extconf.rb"]
   s.require_paths = ["lib", "lib/damerau-levenshtein"]
 
-  s.add_development_dependency "rspec", "~> 3.5"
+  s.add_development_dependency "rspec", "~> 3.7"
   # activesupport >= 5.0 does not support Ruby < 2.2
-  s.add_development_dependency "activesupport", "~> 4.2"
+  s.add_development_dependency "activesupport", "~> 5.1"
+  s.add_development_dependency "bundler", "~> 1.16"
   s.add_development_dependency "byebug", "~> 9.0"
-  s.add_development_dependency "cucumber", "~> 2.4"
-  s.add_development_dependency "ruby-prof", "~> 0.15"
-  s.add_development_dependency "shoulda", "~> 3.5"
-  s.add_development_dependency "rubocop", "~> 0.41"
   s.add_development_dependency "coveralls", "~> 0.8"
-  s.add_development_dependency "bundler", "~> 1.11"
-  s.add_development_dependency "rake", "~> 11.2"
+  s.add_development_dependency "cucumber", "~> 3.1"
+  s.add_development_dependency "rake", "~> 12.3"
   s.add_development_dependency "rake-compiler", "~> 1.0"
+  s.add_development_dependency "rubocop", "~> 0.52"
+  s.add_development_dependency "ruby-prof", "~> 0.17"
+  s.add_development_dependency "shoulda", "~> 3.5"
 end
 
 # rubocop:enable all

data/lib/damerau-levenshtein.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require_relative "damerau-levenshtein/version"

data/lib/damerau-levenshtein/differ.rb

@@ -5,7 +5,7 @@ module DamerauLevenshtein
   # resolution
   class Differ
     FORMATS = %i[raw tag].freeze
-    attr_accessor :format
+    attr_reader :format
 
     def initialize
       @format = :tag

data/lib/damerau-levenshtein/formatter.rb

@@ -50,7 +50,7 @@ module DamerauLevenshtein
         raw.each_with_index do |e, i|
           process_entry(e, i, data)
         end
-        data[:res] << format("</%s>", data[:type]) if data[:type] != :same
+        data[:res] << format("</%<type>s>", data) if data[:type] != :same
         data[:res].join("")
       end
 
@@ -58,14 +58,14 @@ module DamerauLevenshtein
         if data[:type] && e[:type] != data[:type]
           insert_tags(e, data)
         elsif data[:type].nil?
-          data[:res] << format("<%s>", e[:type]) if e[:type] != :same
+          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("</%s>", data[:type]) if data[:type] != :same
-        data[:res] << format("<%s>", entry[:type]) if entry[:type] != :same
+        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)

data/lib/damerau-levenshtein/version.rb

@@ -2,5 +2,5 @@
 
 # Damerau Levenshtein algorithm
 module DamerauLevenshtein
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: damerau-levenshtein
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,154 +16,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.5'
 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 blocks with more than 2 characters
@@ -204,9 +204,9 @@ require_paths:
 - lib/damerau-levenshtein
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Calculation of editing distance for 2 strings using Levenshtein or Damerau-Levenshtein