movie_searcher 0.0.4 → 0.0.6

data/Gemfile.lock

@@ -1,18 +1,25 @@
 PATH
   remote: .
   specs:
-    movie_searcher (0.0.2)
+    movie_searcher (0.0.6)
+      hintable_levenshtein
       httparty
-      levenshtein
 
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.4.2)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    autotest-fsevent (0.2.4)
+      sys-uname
+    autotest-growl (0.2.9)
+    autotest-standalone (4.5.4)
     crack (0.1.8)
     diff-lcs (1.1.2)
+    hintable_levenshtein (0.0.3)
     httparty (0.7.3)
       crack (= 0.1.8)
-    levenshtein (0.2.0)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -21,10 +28,15 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    sys-uname (0.8.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest
+  autotest-fsevent
+  autotest-growl
+  autotest-standalone
   movie_searcher!
   rspec

data/README.md

@@ -98,4 +98,4 @@ The `actors`, `writers` and `directors` accessors returns an `ImdbParty::Person`
 
 ## Requirements
 
-The gem is tested in OS X 10.6.6 using Ruby 1.8.7.
+The gem is tested in OS X 10.6.6 using Ruby 1.8.7 and 1.9.2

data/lib/imdb_party/levenshtein.rb

@@ -0,0 +1,27 @@
+# Some code borrowed from http://www.erikveen.dds.nl/levenshtein/doc/index.html
+require 'hintable_levenshtein'
+
+class Levenshtein
+  def self.distance(s1, s2, threshold = nil)
+    
+    # If the arguments is nil
+    s1 = s1.to_s unless s1
+    s2 = s2.to_s unless s2
+    
+    s1, s2  = s2, s1  if s1.length > s2.length  # s1 is the short one; s2 is the long one.
+
+    if s2.length == 0
+      0.0 # Since s1.length < s2.length, s1 must be empty as well.
+    else
+      if threshold
+        if (d = HintableLevenshtein.new.distance(s1, s2).to_f/s2.length) <= threshold
+          d
+        else
+          nil
+        end
+      else
+        HintableLevenshtein.new.distance(s1, s2).to_f/s2.length
+      end
+    end
+  end
+end

data/lib/movie_searcher.rb

@@ -1,5 +1,5 @@
 require "imdb_party"
-require 'levenshtein'
+require 'imdb_party/levenshtein'
 
 class MovieSearcher
   attr_accessor :options
@@ -49,7 +49,7 @@ class MovieSearcher
     title = title.gsub(/[^a-z0-9]/i, '').gsub(/(19|20)\d{2}/, '')
     
     movie = movies.map do |movie| 
-      [movie, Levenshtein.normalized_distance(movie[:title].gsub(/[^a-z0-9]/i, ''), title, @options[:limit])]
+      [movie, Levenshtein.distance(movie[:title].gsub(/[^a-z0-9]/i, ''), title, @options[:limit])]
     end.reject do |value|
       value.last.nil?
     end.sort_by do |_,value|

data/movie_searcher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "movie_searcher"
-  s.version     = "0.0.4"
+  s.version     = "0.0.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander", "Jon Maddox"]
   s.email       = ["linus@oleander.nu", "jon@mustacheinc.com"]
@@ -17,6 +17,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency('httparty')
-  s.add_dependency('levenshtein')
+  s.add_dependency('hintable_levenshtein')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('autotest-standalone')
+  s.add_development_dependency('autotest')
+  s.add_development_dependency('autotest-growl')
+  s.add_development_dependency('autotest-fsevent')
 end

data/spec/levenshtein_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Levenshtein do
+  it "should return the right value when no threshold is being defined" do
+    Levenshtein.distance("first", "last").should eq(0.6)
+  end
+  
+  it "should return nil value when a threshold is being passed" do
+    Levenshtein.distance("first", "last", 0.1).should be_nil
+  end
+  
+  it "should not return nil value when a threshold is being passed" do
+    Levenshtein.distance("first", "last", 0.8).should_not be_nil
+  end
+  
+  it "should not change when a threshold is being passed" do
+    Levenshtein.distance("first", "last", 0.8).should eq(0.6)
+  end
+  
+  it "should be tested?" do
+    Levenshtein.distance("first", "").should eq(1)
+  end
+  
+  it "should return zero when to strings are equal" do
+    Levenshtein.distance("abc123", "abc123").should eq(0)
+  end
+  
+  it "should never return a value larger then 1" do
+    Levenshtein.distance("asdasdasdasdasdasdasdasdasdasdasdasd", "a").should <= 1
+  end
+  
+  it "should not crash if one if the arguments is nil" do
+    lambda do
+      Levenshtein.distance(nil, "")
+      Levenshtein.distance(nil, nil)
+      Levenshtein.distance("", nil)
+    end.should_not raise_error
+  end
+  
+  it "should return the same value using nil as an empty string" do
+    Levenshtein.distance(nil, nil).should eq(Levenshtein.distance("", ""))
+    Levenshtein.distance(nil, "Hello").should eq(Levenshtein.distance("", "Hell0"))
+  end
+end

data/spec/movie_searcher_spec.rb

@@ -101,21 +101,25 @@ describe MovieSearcher, "should work as before" do
 
   it "have genres" do
     @movie.genres.should be_instance_of(Array)
+    @movie.genres.each{|genre| genre.should be_instance_of(String)}
     @movie.should have(4).genres
   end
 
   it "have actors" do
     @movie.actors.should be_instance_of(Array)
+    @movie.actors.each{|actor| actor.should be_instance_of(ImdbParty::Person)}
     @movie.should have(4).actors
   end
 
   it "have directors" do
     @movie.directors.should be_instance_of(Array)
+    @movie.directors.each{|director| director.should be_instance_of(ImdbParty::Person)}
     @movie.should have(2).directors
   end
 
   it "have writers" do
     @movie.writers.should be_instance_of(Array)
+    @movie.writers.each{|writer| writer.should be_instance_of(ImdbParty::Person)}
     @movie.should have(2).writers
   end
   
@@ -161,27 +165,27 @@ describe MovieSearcher, "should still have the same people" do
     @movie = MovieSearcher.find_movie_by_id("tt0382932")
   end
 
-  it "have a name" do
+  it "should have a name" do
     @movie.actors.map(&:name).should include('Patton Oswalt')
   end
 
-  it "have a role" do
+  it "should have a role" do
     @movie.actors.map(&:role).should include('Remy')
   end
 
-  it "have a name" do
+  it "should have a name" do
     @movie.directors.map(&:name).should include('Brad Bird')
   end
 
-  it "not have a role" do
+  it "should not have a role" do
     @movie.directors.first.role.should be_nil
   end
 
-  it "have a name" do
+  it "should have a name" do
     @movie.writers.map(&:name).should include('Brad Bird')
   end
 
-  it "not have a role" do
+  it "should not have a role" do
     @movie.writers.first.role.should be_nil
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require "#{File.dirname(__FILE__)}/../lib/movie_searcher.rb"
+require "#{File.dirname(__FILE__)}/../lib/imdb_party/levenshtein.rb"
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: movie_searcher
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Linus Oleander
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: levenshtein
+  name: hintable_levenshtein
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -61,6 +61,62 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: autotest-standalone
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: autotest-fsevent
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: IMDB client using the IMDB API that their iPhone app uses. It can also figure out what movie you are looking for just by looking at the release name of the movie
 email: 
 - linus@oleander.nu
@@ -84,10 +140,12 @@ files:
 - lib/imdb_party.rb
 - lib/imdb_party/httparty_icebox.rb
 - lib/imdb_party/imdb.rb
+- lib/imdb_party/levenshtein.rb
 - lib/imdb_party/movie.rb
 - lib/imdb_party/person.rb
 - lib/movie_searcher.rb
 - movie_searcher.gemspec
+- spec/levenshtein_spec.rb
 - spec/movie_searcher_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -125,5 +183,6 @@ signing_key:
 specification_version: 3
 summary: IMDB client using the IMDB API that their iPhone app uses
 test_files: 
+- spec/levenshtein_spec.rb
 - spec/movie_searcher_spec.rb
 - spec/spec_helper.rb