levenshtein-ffi 1.0.2 → 1.0.3

data/Gemfile

@@ -1,8 +1,8 @@
 source :rubygems
 
-gem 'ffi'
+gem 'ffi', '~> 1.1.5'
 
 group :test do
-  gem 'rspec', '1.3.1'
+  gem 'rspec', '2.7.0'
   gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,19 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ffi (1.0.9)
+    diff-lcs (1.1.3)
+    ffi (1.1.5)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     rake (0.9.2)
-    rspec (1.3.1)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ffi
+  ffi (~> 1.1.5)
   jeweler
-  rspec (= 1.3.1)
+  rspec (= 2.7.0)

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/levenshtein-ffi.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{levenshtein-ffi}
-  s.version = "1.0.2"
+  s.name = "levenshtein-ffi"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Balatero"]
-  s.date = %q{2011-09-05}
-  s.description = %q{Provides a fast, cross-Ruby implementation of the levenshtein distance algorithm.}
-  s.email = %q{dbalatero@gmail.com}
+  s.date = "2012-08-09"
+  s.description = "Provides a fast, cross-Ruby implementation of the levenshtein distance algorithm."
+  s.email = "dbalatero@gmail.com"
   s.extensions = ["ext/levenshtein/extconf.rb"]
   s.extra_rdoc_files = [
     "README.markdown",
@@ -34,27 +34,27 @@ Gem::Specification.new do |s|
     "spec/levenshtein_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/dbalatero/levenshtein-ffi}
+  s.homepage = "http://github.com/dbalatero/levenshtein-ffi"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{An FFI version of the levenshtein gem.}
+  s.rubygems_version = "1.8.17"
+  s.summary = "An FFI version of the levenshtein gem."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.1.5"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<ffi>, ["~> 1.1.5"])
       s.add_dependency(%q<ffi>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<ffi>, ["~> 1.1.5"])
     s.add_dependency(%q<ffi>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/levenshtein.rb

@@ -1,12 +1,29 @@
 require 'ffi'
 
 module Levenshtein
-  extend FFI::Library
-
-  # Try loading in order.
-  library = File.dirname(__FILE__) + "/../ext/levenshtein/levenshtein"
-  candidates = ['.bundle', '.so', '.dylib', ''].map { |ext| library + ext }
-  ffi_lib(candidates)
-  
-  attach_function :distance, :levenshtein, [:string, :string], :int
+  class << self
+    extend FFI::Library
+
+    # Try loading in order.
+    library = File.dirname(__FILE__) + "/../ext/levenshtein/levenshtein"
+    candidates = ['.bundle', '.so', '.dylib', ''].map { |ext| library + ext }
+    ffi_lib(candidates)
+
+    # Safe version of distance, checks that arguments are really strings.
+    def distance(str1, str2)
+      validate(str1)
+      validate(str2)
+      ffi_distance(str1, str2)
+    end
+
+    # Unsafe version. Results in a segmentation fault if passed nils!
+    attach_function :ffi_distance, :levenshtein, [:string, :string], :int
+
+    private
+    def validate(arg)
+      unless arg.kind_of?(String)
+        raise TypeError, "wrong argument type #{arg.class} (expected String)"
+      end
+    end
+  end
 end

data/spec/levenshtein_spec.rb

@@ -19,4 +19,15 @@ describe Levenshtein do
       Levenshtein.distance(w2, w1).should == d
     end
   end
+
+  it "should raise an error if either argument is nil" do
+    expect { Levenshtein.distance("", nil) }.to raise_error TypeError
+    expect { Levenshtein.distance(nil, "") }.to raise_error TypeError
+  end
+
+  it "should raise an error if either argument is something else than a string" do
+    expect { Levenshtein.distance("woah", /woah/) }.to raise_error TypeError
+    expect { Levenshtein.distance(5.3, "5.3") }.to raise_error TypeError
+    expect { Levenshtein.distance(Object.new, "Hello") }.to raise_error TypeError
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1 @@
-require 'spec'
-
 require File.dirname(__FILE__) + "/../lib/levenshtein"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: levenshtein-ffi
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2164470340 !ruby/object:Gem::Requirement
+  requirement: &70329943057740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2164470340
+  version_requirements: *70329943057740
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2164472060 !ruby/object:Gem::Requirement
+  requirement: &70329943056940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164472060
+  version_requirements: *70329943056940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164550620 !ruby/object:Gem::Requirement
+  requirement: &70329943056140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164550620
+  version_requirements: *70329943056140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164718380 !ruby/object:Gem::Requirement
+  requirement: &70329943055340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164718380
+  version_requirements: *70329943055340
 description: Provides a fast, cross-Ruby implementation of the levenshtein distance
   algorithm.
 email: dbalatero@gmail.com
@@ -82,7 +81,6 @@ files:
 - spec/levenshtein_spec.rb
 - spec/spec_helper.rb
 - README.markdown.html
-has_rdoc: true
 homepage: http://github.com/dbalatero/levenshtein-ffi
 licenses: []
 post_install_message: 
@@ -95,9 +93,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3210361372130881473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: An FFI version of the levenshtein gem.