fuzzy-string-match 0.9.5 → 0.9.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTMxMjIwZDNmNTg3MzVkNjIxNDEwMTQzOWQ4NzI5MTkyYWQzMWE4MQ==
-  data.tar.gz: !binary |-
-    NmE1NWJlYmI0ZTVlNTUzNjY4MzhhYTQ5Yzk5MDU1ZGJjODJmZTUwNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzVlODllOTIzYzU0NWU5MjIxNTVhOGFjMWViNjZlN2NmMjM5MmU1MjM4ODli
-    ZTRmZDY4NDkyYzc3ZjJiZTlmNzQ2MWFkZGE1ZDMyZTIxMTNlNzg1NDc1ZWI3
-    ZDM5OGNhZmYyYjc2YmRlZTU0NDEzNWZlZWMyYmQ4M2E0MjcxZGQ=
-  data.tar.gz: !binary |-
-    ZTA4MzVmZWJjMGM3YjZkOGY2OGFjNmI1YjFkM2Y5MmYwZGFhOTIyOWVlMGNi
-    NWJkYzhmZjc5YTZlNmYyMGJjNGVmZjBiNDc3ZGQwMGFiM2JkNDZmNWJlNGRk
-    YzE1NmI3MGEzODBlNWQyZWIxYmJiZTA3YzUxOTJjNTNmNDRiY2I=
+SHA1:
+  metadata.gz: b354a1f27f7029336168498837d8437b0affd8bc
+  data.tar.gz: b925921e5ef9e99fc21e72d256411769406de2ec
+SHA512:
+  metadata.gz: 4d926213cf459a40ce0f0c2eeaab879f6f962816486719e1a29f6b06ef03c32a5f47e788a4fc0f1f0e2ff6a13e45b090ed1ddface8aa988d04dce7e1a92380cb
+  data.tar.gz: 593964ef2f4c325214ebc49c1f3db29667dbce5ec50d05dad2071f24e45f65a83cc753720372f3c0c495839bd7c90816daec803cdd2ace062866154f514b8d62

data/README.md

@@ -17,10 +17,6 @@
 
     gem install fuzzy-string-match
 
-## Installing (pure ruby version)
-
-    gem install fuzzy-string-match_pure
-
 ## Features
 * Calculate Jaro-Winkler distance of two strings.
   * Pure ruby version can handle both ASCII and UTF8 strings. (and slow)
@@ -80,7 +76,7 @@
 
 ### for CRuby
  - RubyInline
- - Ruby 1.9.1 or higher
+ - Ruby 1.9.2 or higher ( includes RubyInstaller.org's CRuby on Windows )
 
 ### for JRuby
  - JRuby 1.6.6 or higher
@@ -95,4 +91,48 @@
  - <http://github.com/naoya/perl-text-jarowinkler>
 
 ## License
+
  - Apache 2.0 LICENSE
+
+## ChangeLog
+
+### 0.9.6 / Dec  21, 2013
+
+* New feature: fuzzy-string-match falls back into pure ruby mode when c-compile fails.
+* fuzzy-string-match_pure is obsolute gem 
+
+### 0.9.5 / Mar  26, 2013
+
+* Fixed: 'jarowinkler.rb:42: warning: implicit conversion shortens 64-bit value into a 32-bit value' on MacOS X 64bit env.
+
+### 0.9.4 / July 10, 2012
+
+* Fixed: undefined method getDistance' error.
+
+### 0.9.3 / Feb 27, 2012
+
+* Changed gem dependency of `rspec'.
+   gemspec.dependency( "rspec" )  to  gemspec.development_dependency( "rspec" )
+
+### 0.9.2 / Feb 17, 2012
+
+* Supported JRuby platform
+* Divided into two gems.
+
+  1. fuzzy-string-match      ... native (RubyInline) version.
+  2. fuzzy-string-match_pure ... pure ruby version
+
+* Divided rspec files into several files.
+
+* Supported testable gem
+   Please install rubygems-test and "gem test".
+
+### 0.9.1 / Jul 30, 2011
+
+* Changed gcc compiler's option for RubyInline.
+
+* Stoped to use obsolute method of RSpec.
+
+### 0.9.0 / Oct 12, 2010
+
+* First release.

data/Rakefile

@@ -3,7 +3,7 @@
 # Release Engineering
 #   1. edit the VERSION.yml file
 #   2. rake test
-#   3. rake gemspec  &&   rake build
+#   3. rake gemspec  &&   gem build fuzzy-string-match.gemspec
 #      to generate fuzzy-string-match-x.x.x.gem
 #   4. install fuzzy-string-match-x.x.x.gem to clean environment and test
 #   5. rake release
@@ -17,33 +17,12 @@ require 'rake'
 begin
   require 'jeweler2'
 
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "fuzzy-string-match_pure"
-    gemspec.summary = "fuzzy string matching library (Pure ruby version)"
-    gemspec.description = "calculate Jaro Winkler distance."
-    gemspec.email = "kiyoka@sumibi.org"
-    gemspec.homepage = "http://github.com/kiyoka/fuzzy-string-match"
-    gemspec.authors = ["Kiyoka Nishiyama"]
-    gemspec.files = FileList['.gemtest',
-                             'Rakefile',
-                             'VERSION.yml',
-                             'lib/fuzzystringmatch/pure/jarowinkler.rb',
-                             'lib/fuzzystringmatch/pure.rb',
-                             'lib/fuzzystringmatch.rb',
-                             'lib/*.rb',
-                             'test/basic_pure_spec.rb',
-                             'test/mutibyte_spec.rb',
-                             'LICENSE.txt',
-                             'README.md'].to_a
-    gemspec.add_development_dependency( "rspec" )
-    gemspec.required_ruby_version = '>= 1.9.1'
-  end
-
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "fuzzy-string-match"
     gemspec.summary = "fuzzy string matching library"
     gemspec.description = "calculate Jaro Winkler distance."
     gemspec.email = "kiyoka@sumibi.org"
+    gemspec.license = 'Apache-2.0'
     gemspec.homepage = "http://github.com/kiyoka/fuzzy-string-match"
     gemspec.authors = ["Kiyoka Nishiyama"]
     gemspec.files = FileList['.gemtest',
@@ -71,12 +50,18 @@ end
 task :default => [:test] do
 end
 
-task :test do
+task :test => [:fallback_test] do
   sh "ruby -I ./lib `which rspec` -b ./test/basic_native_spec.rb"   if File.exist?( "./test/basic_native_spec.rb" )
   sh "ruby -I ./lib `which rspec` -b ./test/basic_pure_spec.rb"
   sh "ruby -I ./lib `which rspec` -b ./test/mutibyte_spec.rb"
 end
 
+task :fallback_test => [:clean_dot_rubyinline] do
+  sh "/bin/mkdir -p /tmp/fake_gcc/"
+  sh "/bin/cp ./fake_gcc /tmp/fake_gcc/gcc"
+  sh "export PATH=\"/tmp/fake_gcc:${PATH}\" ; rspec -I ./lib ./test/fallback_pure_spec.rb"
+end
+
 task :test_dev do
   sh "ruby -I ./lib `which rspec` -b ./test/verify_with_amatch_spec.rb"
 end
@@ -85,3 +70,6 @@ task :bench do
   sh "ruby ./benchmark/vs_amatch.rb"
 end
 
+task :clean_dot_rubyinline do
+  sh "/bin/rm -rf ~/.ruby_inline"
+end

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 9
-:patch: 5
+:patch: 6
 

data/lib/fuzzystringmatch.rb

@@ -16,14 +16,6 @@
 #   limitations under the License.
 #
 require 'fuzzystringmatch/pure'
-begin
-  if RUBY_PLATFORM == "java"
-    STDERR.puts "fuzzy-string-match Warning: native version is disabled on java platform. falled back to pure ruby version..."
-  else
-    require 'fuzzystringmatch/inline'
-  end
-rescue LoadError
-end
 
 module FuzzyStringMatch
   class JaroWinkler
@@ -31,18 +23,27 @@ module FuzzyStringMatch
       case type
       when :pure
         FuzzyStringMatch::JaroWinklerPure.new
+
       when :native
-        begin
-          FuzzyStringMatch::JaroWinklerInline.new
-        rescue NameError
-          STDERR.puts "fuzzy-string-match Warning: native version is disabled. falled back to pure ruby version..."
+        if RUBY_PLATFORM == "java"
+          STDERR.puts "fuzzy-string-match Warning: native version is disabled on java platform. falled back to pure ruby version..."
           FuzzyStringMatch::JaroWinklerPure.new
+        else
+          begin
+            require 'fuzzystringmatch/inline'
+            begin
+              FuzzyStringMatch::JaroWinklerInline.new
+            rescue NameError
+              STDERR.puts "fuzzy-string-match Warning: native version is disabled. falled back to pure ruby version..."
+              FuzzyStringMatch::JaroWinklerPure.new
+            end
+          rescue CompilationError
+            STDERR.puts "fuzzy-string-match Warning: fallback into pure version, because compile failed."
+            FuzzyStringMatch::JaroWinklerPure.new
+          end
         end
       end
-    end
-    def create( type = :pure )         # this is obsolute
-      STDERR.puts "fuzzy-string-match Warning: FuzzyStringMatch.new.create() is obsolute, please use FuzzyStringMatch.create() ..."
-      FuzzyStringMatch::JaroWinkler.create( type )
+
     end
   end
 end

data/test/basic_native_spec.rb

@@ -51,12 +51,8 @@ describe FuzzyStringMatch, "when some string distances (Native) are" do
   end
 end
 
-describe FuzzyStringMatch, "when older factory method was called, (Pure) are" do
-  before do
-    @jarow = FuzzyStringMatch::JaroWinkler.new.create
-  end
+describe FuzzyStringMatch, "when older factory method was called, (Native) are" do
   it "should" do
-    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
-    @jarow.pure?( ).should be_true
+    lambda { FuzzyStringMatch::JaroWinkler.new.create( :native ) }.should    raise_error(NoMethodError)
   end
 end

data/test/basic_pure_spec.rb

@@ -51,12 +51,9 @@ describe FuzzyStringMatch, "when some string distances (Pure) are" do
   end
 end
 
-describe FuzzyStringMatch, "when older factory method was called, (Pure) are" do
-  before do
-    @jarow = FuzzyStringMatch::JaroWinkler.new.create
-  end
+describe FuzzyStringMatch, "when older factory method was called, (Native) are" do
   it "should" do
-    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
-    @jarow.pure?( ).should be_true
+    lambda { FuzzyStringMatch::JaroWinkler.new.create( :pure ) }.should    raise_error(NoMethodError)
   end
 end
+

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-string-match
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.6
 description: calculate Jaro Winkler distance.
@@ -74,7 +74,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .gemtest
+- ".gemtest"
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -88,7 +88,8 @@ files:
 - test/basic_pure_spec.rb
 - test/mutibyte_spec.rb
 homepage: http://github.com/kiyoka/fuzzy-string-match
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -96,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: fuzzy string matching library