scrobbler-ng 2.0.6 → 2.0.7

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 6
 :major: 2
-:build: 
 :minor: 0
+:patch: 7
+:build: 

data/lib/scrobbler/album.rb

@@ -34,6 +34,10 @@ module Scrobbler
       raise ArgumentError unless data.kind_of?(Hash)
       super(data)
       
+      if @artist.is_a?(String) then
+        @artist = Artist.new(:name => @artist)
+      end
+      
       raise ArgumentError, "Artist or mbid is required" if @artist.nil? && @mbid.nil?
       raise ArgumentError, "Name is required" if @name.empty?
     end
@@ -74,8 +78,7 @@ module Scrobbler
               next unless tag.name == 'tag'
               @top_tags << Tag.new_from_libxml(tag)
             end
-          when 'wiki'
-            # @todo Handle wiki entries
+          when 'wiki'            # @todo Handle wiki entries
           when 'text'
             # ignore, these are only blanks
           when '#text'
@@ -107,7 +110,7 @@ module Scrobbler
     # @todo Add language code for wiki translation
     def load_info
       return nil if @info_loaded
-      xml = Base.request('album.getinfo', {:artist => @artist, :album => @name})
+      xml = Base.request('album.getinfo', {:artist => @artist.name, :album => @name})
       unless xml.root['status'] == 'failed'
         xml.root.children.each do |childL1|
           next unless childL1.name == 'album'

data/lib/scrobbler/base.rb

@@ -91,12 +91,14 @@ module Scrobbler
     # @param [Hash] parameters The parameters passed as URL params.
     # @return [String]
     def Base.load_from_cache(parameters)
+      found = nil
       @@cache.each do |cache|
         if cache.has?(parameters)
-          return cache.get(parameters)
+          found = cache.get(parameters)
+          break
         end
       end
-      nil
+      found
     end
     
     # Save a request answer to all caches that would store it.

data/scrobbler-ng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrobbler-ng}
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker", "Jonathan Rudenberg", "Uwe L. Korn"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-11}
   s.description = %q{A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations.}
   s.email = %q{uwelk@xhochy.org}
   s.extra_rdoc_files = [

data/test/unit/album_spec.rb

@@ -8,7 +8,7 @@ describe Scrobbler::Album do
   end
   
   it 'should know the artist' do
-    @album.artist.should eql('Carrie Underwood')
+    @album.artist.name.should eql('Carrie Underwood')
   end
   
   it "should know it's name" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scrobbler-ng
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - John Nunemaker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency