musicbrainz_automatcher 0.1.1 → 0.2.0

data/lib/musicbrainz_automatcher.rb

@@ -1,6 +1,8 @@
 require 'active_support'
 require 'rbrainz'
+require 'logger'
 require 'iconv'
+require 'time'
 require 'text'
 
 # Monkey patch String class to add our escaping method
@@ -40,10 +42,9 @@ class MusicbrainzAutomatcher
   # Given an array of artists and a track title, return an rbrainz artist object.
   # If there is no match in MusicBrainz, then false is returned
   def match_artist(artists, title=nil)
-  
     # Only interested in first item of title array
     title = title.first if title.is_a?(Array)
-
+    
     # Remove excess whitespace from the title
     title.strip! unless title.nil?
     
@@ -52,7 +53,7 @@ class MusicbrainzAutomatcher
     
     # Return false if no artist names given
     return false if artists.empty?
-
+    
     # Set title to nil, if it is an empty string
     title = nil if !title.nil? and title.size<1
   
@@ -62,14 +63,14 @@ class MusicbrainzAutomatcher
     
       # Remove items from the artist array until we get a match
       mbartist_id = false
-        
+      
       ## Ignore if artist name contains two consecutive stars (they contain a sware words)
       unless artist =~ /\*\*/
-
+        
         ## First: lookup based on track name and artist
         unless title.nil?
           mbartist_id = lookup_by_track( artist, title ) 
-        
+          
           ## Second: try removing brackets from the track name
           if !mbartist_id
             matches = title.match(/^(.+)\s+\(.+\)$/)
@@ -86,7 +87,7 @@ class MusicbrainzAutomatcher
           end
         end
       end
-    
+      
       # Response is the MusicBrainz ID
       mbartist_id
     end
@@ -96,18 +97,20 @@ class MusicbrainzAutomatcher
   protected
   
   ## Perform a block if key isn't already cached.
-  def do_cached(string, &block)
-    key = Digest::SHA1.hexdigest(string)
-    
+  def do_cached( key, &block )
     # have a look in the cache
     value = @cache.fetch( key )
-    if value.nil?
-      # Cache MISS : execute the block
-      value = block.call( key )
-      # Store value in the cache
-      @cache.write( key, value, :expires_at => Time.parse("18:00"))
-    end
-    value
+
+    # Cache HIT?
+    return value unless value.nil?
+
+    # Cache MISS : execute the block
+    value = block.call( key )
+    
+    # Store value in the cache
+    @cache.write( key, value, :expires_at => Time.parse("18:00"))
+    
+    return value
   end
   
   # Clean up the artist name array

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: musicbrainz_automatcher
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Patrick Sinclair
@@ -9,59 +10,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +01:00
+date: 2011-06-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: Text
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: text
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
-    version: 
+        version: "0.2"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rbrainz
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
+        version: 0.5.1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
-    version: 
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 description: 
 email: metade@gmail.com
 executables: []
@@ -84,21 +90,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: musicbrainz_automatcher
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: musicbrainz_automatcher matches artists/tracks names to MusicBrainz intelligently