sandro-metamuse 0.1.3 → 0.1.4

data/History

@@ -1,7 +1,11 @@
-0.1.3 07/19/2009
+0.1.4 08/19/2009
+  * Return an invalid artist when an artist search fails. Closes gh-6
+  * artist.albums.uniq returns unique albums by name. Closes gh-7
+
+0.1.3 08/19/2009
   * Artist controls validity and whether or not to use #best_guess
 
-0.1.2 07/18/2009
+0.1.2 08/18/2009
   * Modified Cracks date parser, queries for Radiohead now work
   * Ruby 1.9 compatibility
   * Moved Metamuse queries from echonest to Lastfm

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/metamuse/album.rb

@@ -19,6 +19,13 @@ module Metamuse
       end
     end
 
+    def hash
+      [artist, name].hash
+    end
+
+    def eql?(other)
+      name == other.name
+    end
   end
 end
 

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

@@ -4,8 +4,12 @@ class Metamuse::Services::Lastfm::Artist
   include ::Metamuse::InstanceInitialize
 
   def self.build(response)
-    data = response['lfm']['artist']
-    new data
+    if response['lfm']['status'] == 'ok'
+      data = response['lfm']['artist']
+      new data
+    else
+      new :invalid => true
+    end
   end
 
   def initialize(attrs={})
@@ -44,6 +48,6 @@ class Metamuse::Services::Lastfm::Artist
   end
 
   def valid?
-    url !~ %r(/music/\+noredirect/)
+    url && url !~ %r(/music/\+noredirect/)
   end
 end

data/metamuse.gemspec

@@ -1,11 +1,8 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{metamuse}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]

data/spec/metamuse/album_spec.rb

@@ -1,14 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Metamuse::Album do
+  subject { Metamuse::Album }
+
   describe "#<=>" do
     context "comparing nil ranks" do
       before do
-        @nil1 = Metamuse::Album.new :rank => nil
-        @nil2 = Metamuse::Album.new :rank => nil
-        @album1 = Metamuse::Album.new(:rank => 1)
-        @album3 = Metamuse::Album.new(:rank => 3)
-        @album5 = Metamuse::Album.new(:rank => 5)
+        @nil1   = subject.new :rank => nil
+        @nil2   = subject.new :rank => nil
+        @album1 = subject.new :rank => 1
+        @album3 = subject.new :rank => 3
+        @album5 = subject.new :rank => 5
       end
 
       it "moves the nil from the beginning to the end" do
@@ -32,4 +34,33 @@ describe Metamuse::Album do
       end
     end
   end
+
+  describe "#hash" do
+    it "hashes based on the artist and album name" do
+      artist = Metamuse::Artist.new :name => 'Radiohead'
+      album = subject.new :name => 'In Rainbows', :artist => artist
+      album.hash.should == [artist, 'In Rainbows'].hash
+    end
+  end
+
+  describe "#eql?" do
+    it "evaluates equality by name" do
+      album1 = subject.new :name => 'In Rainbows'
+      album2 = subject.new :name => 'In Rainbows'
+      album1.should eql(album2)
+    end
+  end
+
+  describe "a unique set of albums" do
+    before do
+      @album1 = subject.new :name => 'In Rainbows'
+      @album2 = subject.new :name => 'Hail to the Thief'
+      @album3 = subject.new :name => 'In Rainbows'
+    end
+
+    it "removes the duplicate album name from the set" do
+      albums = [@album1, @album2, @album3]
+      albums.uniq.should == [@album1, @album2]
+    end
+  end
 end

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

@@ -3,6 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 describe Metamuse::Services::Lastfm::Artist do
   subject { Metamuse::Services::Lastfm::Artist }
 
+  describe ".build" do
+    context "unsuccessful response from lastfm" do
+      it "returns an invalid artist with no similar artists" do
+        response = {'lfm' => {'status' => 'failed'}}
+        artist = subject.build(response)
+        artist.should_not be_valid
+        artist.similar_artists.should be_empty
+      end
+    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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sandro-metamuse
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sandro Turriate