sandro-metamuse 0.1.2 → 0.1.3

data/History

@@ -1,3 +1,6 @@
+0.1.3 07/19/2009
+  * Artist controls validity and whether or not to use #best_guess
+
 0.1.2 07/18/2009
   * Modified Cracks date parser, queries for Radiohead now work
   * Ruby 1.9 compatibility

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/metamuse/artist.rb

@@ -18,6 +18,10 @@ module Metamuse
       super
     end
 
+    def best_guess
+      invalid? ? similar_artists.first : self
+    end
+
     def tracks
       @tracks ||= albums.map{|a| a.tracks}.flatten
     end
@@ -44,6 +48,14 @@ module Metamuse
       "#<#{self.class.inspect}:#{object_id.inspect}, name: #{name.inspect}, albums: #{album_names.inspect}>"
     end
 
+    def valid?
+      ! invalid?
+    end
+
+    def invalid?
+      @invalid
+    end
+
     private
 
     def album_names

data/lib/metamuse/services/lastfm.rb

@@ -11,7 +11,7 @@ module Metamuse
       end
 
       def self.artist(name)
-        attributes = artist_info(name).best_guess.attributes.rename_key(:url, :lastfm_url)
+        attributes = artist_info(name).attributes.rename_key(:url, :lastfm_url)
         ::Metamuse::Artist.new attributes
       end
 

data/lib/metamuse/services/lastfm/artist.rb

@@ -26,10 +26,6 @@ class Metamuse::Services::Lastfm::Artist
   end
   alias image= images=
 
-  def best_guess
-    valid? ? self : similar_artists.first
-  end
-
   def similar_artists=(attrs={})
     attrs['artist'].each do |artist_attrs|
       @similar_artists << self.class.new(artist_attrs)
@@ -42,6 +38,11 @@ class Metamuse::Services::Lastfm::Artist
     @listeners = stats['listeners']
   end
 
+  def url=(url)
+    @url = url
+    @invalid = ! valid?
+  end
+
   def valid?
     url !~ %r(/music/\+noredirect/)
   end

data/metamuse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metamuse}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2009-08-15}
+  s.date = %q{2009-08-16}
   s.email = %q{sandro.turriate@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/spec/metamuse/artist_spec.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Metamuse::Artist do
-  subject { Metamuse::Artist.new :name => 'Mozart' }
-
   describe ".build_artist" do
     subject { Metamuse::Artist }
     it "gets and enhances freebase artist information" do
@@ -14,6 +12,18 @@ describe Metamuse::Artist do
     end
   end
 
+  subject { Metamuse::Artist.new :name => 'Mozart' }
+
+  describe "#invalid?" do
+    it "declares new artists are valid by default" do
+      subject.should_not be_invalid
+    end
+
+    it "is invalid when built with an invalid flag" do
+      Metamuse::Artist.new(:invalid => true).should be_invalid
+    end
+  end
+
   describe "#tracks" do
     it "collects all of the tracks from the every album" do
       album1 = fake(:tracks => [1,2])
@@ -96,4 +106,18 @@ describe Metamuse::Artist do
       subject.tracks.should == freebase_artist.tracks
     end
   end
+
+  describe "#best_guess" do
+    it "returns itself when the artist is valid" do
+      mock(subject).invalid? { false }
+      subject.best_guess.should == subject
+    end
+
+    it "returns the most similar artist when the artist is invalid" do
+      similar_artist = fake(:similar_artist)
+      mock(subject).similar_artists { [similar_artist] }
+      mock(subject).invalid? { true }
+      subject.best_guess.should == similar_artist
+    end
+  end
 end

data/spec/metamuse/services/lastfm/artist_spec.rb

@@ -3,20 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 describe Metamuse::Services::Lastfm::Artist do
   subject { Metamuse::Services::Lastfm::Artist }
 
-  describe "#best_guess" do
-    it "returns itself when the artist is valid" do
-      artist = subject.new :url => 'http://last.fm/music/Coldplay'
-      artist.best_guess.should == artist
-    end
-
-    it "returns the most similar artist when the artist is invalid" do
-      similar_artist = fake(:similar_artist)
-      artist = subject.new :url => 'http://last.fm/music/+noredirect/Cold Play'
-      mock(artist).similar_artists { [similar_artist] }
-      artist.best_guess.should == similar_artist
-    end
-  end
-
   describe "#valid?" do
     it "is an invalid artist when the url contains '+noredirect'" do
       artist = subject.new :url => 'http://last.fm/music/+noredirect/Cold Play'
@@ -28,4 +14,17 @@ describe Metamuse::Services::Lastfm::Artist do
       artist.should be_valid
     end
   end
+
+  describe "#url=" do
+    it "sets the url instance variable" do
+      artist = subject.new(:url => 'http://something.com')
+      artist.instance_variable_get(:@url).should == 'http://something.com'
+      artist.url.should == 'http://something.com'
+    end
+
+    it "sets the invalid instance variable" do
+      artist = subject.new(:url => 'http://last.fm/music/+noredirect/Cold Play')
+      artist.should_not be_valid
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sandro-metamuse
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: []