meta-spotify 0.1.2 → 0.1.3

data/HISTORY

@@ -1,3 +1,13 @@
+=== 0.1.3 / 2009-11-16
+
+* 1 minor enhancement
+
+  * Added popularity to artists and albums when they are a result of a search
+  
+* 1 bug fix
+
+  * Search results with only one result were failing
+  
 === 0.1.2 / 2009-11-15
 
 * 2 minor enhancements

data/VERSION

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

data/lib/meta-spotify/album.rb

@@ -8,6 +8,7 @@ module MetaSpotify
     
     def initialize(hash)
       @name = hash['name']
+      @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
       if hash.has_key? 'artist'
         @artists = []
         if hash['artist'].is_a? Array

data/lib/meta-spotify/artist.rb

@@ -7,6 +7,7 @@ module MetaSpotify
     
     def initialize(hash)
       @name = hash['name']
+      @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
       @uri = hash['href'] if hash.has_key? 'href'
       if hash.has_key? 'albums'
         @albums = []

data/lib/meta-spotify/track.rb

@@ -3,10 +3,11 @@ module MetaSpotify
     
     URI_REGEX = /^spotify:track:[A-Za-z0-9]+$/
   
-    attr_reader :album, :artists, :track_number, :length, :popularity
+    attr_reader :album, :artists, :track_number, :length
     
     def initialize(hash)
       @name = hash['name']
+      @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
       if hash.has_key? 'artist'
         @artists = []
         if hash['artist'].is_a? Array
@@ -17,7 +18,6 @@ module MetaSpotify
       end
       @album = Album.new(hash['album']) if hash.has_key? 'album'
       @track_number = hash['track_number'].to_i if hash.has_key? 'track_number'
-      @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
       @length = hash['length'].to_f if hash.has_key? 'length'
     end
   end

data/lib/meta-spotify.rb

@@ -10,7 +10,7 @@ module MetaSpotify
     include HTTParty
     base_uri 'http://ws.spotify.com'
     
-    attr_reader :name, :uri
+    attr_reader :name, :uri, :popularity
     
     def self.search(string, opts={})
       item_name = self.name.downcase.gsub(/^.*::/,'')
@@ -21,8 +21,12 @@ module MetaSpotify
       result = result[item_name+'s']
       items = []
       unless result[item_name].nil?
-        result[item_name].each do |item|
-          items << self.new(item)
+        if result[item_name].is_a? Array
+          result[item_name].each do |item|
+            items << self.new(item)
+          end
+        else
+          items << self.new(result[item_name])
         end
       end
       return { (item_name+'s').to_sym => items,

data/meta-spotify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta-spotify}
-  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 = ["Phil Nash"]
-  s.date = %q{2009-11-15}
+  s.date = %q{2009-11-16}
   s.email = %q{philnash@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "test/fixtures/album_search.xml",
      "test/fixtures/artist.xml",
      "test/fixtures/artist_search.xml",
+     "test/fixtures/artist_search_one_result.xml",
      "test/fixtures/artist_with_albumdetail.xml",
      "test/fixtures/track.xml",
      "test/fixtures/track_search.xml",

data/test/fixtures/artist_search_one_result.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<artists xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns="http://www.spotify.com/ns/music/1">
+  <opensearch:Query role="request" startPage="1" searchTerms="1200 Micrograms"/>
+  <opensearch:totalResults>1</opensearch:totalResults>
+  <opensearch:startIndex>0</opensearch:startIndex>
+  <opensearch:itemsPerPage>100</opensearch:itemsPerPage>
+  <artist href="spotify:artist:3AUNfvctGVnEOGZiAh0JIK">
+    <name>1200 Micrograms</name>
+
+    <popularity>0.48196</popularity>
+  </artist>
+</artists>

data/test/test_album.rb

@@ -28,6 +28,7 @@ class TestAlbum < Test::Unit::TestCase
       assert_kind_of Array, @results[:albums]
       assert_kind_of MetaSpotify::Album, @results[:albums].first
       assert_equal "Foo Foo", @results[:albums].first.name
+      assert_equal 0.29921, @results[:albums].first.popularity
       assert_equal 1, @results[:query][:start_page]
       assert_equal 'request', @results[:query][:role]
       assert_equal "foo", @results[:query][:search_terms]

data/test/test_artist.rb

@@ -2,22 +2,46 @@ require 'helper'
 
 class TestArtist < Test::Unit::TestCase
   context "searching for an artist name" do
-    setup do
-      FakeWeb.register_uri(:get,
-                           "http://ws.spotify.com/search/1/artist?q=foo",
-                           :body => fixture_file("artist_search.xml"))
-      @results = MetaSpotify::Artist.search('foo')
+    context "many results" do
+      setup do
+        FakeWeb.register_uri(:get,
+                             "http://ws.spotify.com/search/1/artist?q=foo",
+                             :body => fixture_file("artist_search.xml"))
+        @results = MetaSpotify::Artist.search('foo')
+      end
+      should "return a list of results and search meta" do
+        assert_kind_of Array, @results[:artists]
+        assert_kind_of MetaSpotify::Artist, @results[:artists].first
+        assert_equal "Foo Fighters", @results[:artists].first.name
+        assert_equal 0.89217, @results[:artists].first.popularity
+        assert_equal 1, @results[:query][:start_page]
+        assert_equal 'request', @results[:query][:role]
+        assert_equal "foo", @results[:query][:search_terms]
+        assert_equal 100, @results[:items_per_page]
+        assert_equal 0, @results[:start_index]
+        assert_equal 9, @results[:total_results]
+      end
     end
-    should "return a list of results and search meta" do
-      assert_kind_of Array, @results[:artists]
-      assert_kind_of MetaSpotify::Artist, @results[:artists].first
-      assert_equal "Foo Fighters", @results[:artists].first.name
-      assert_equal 1, @results[:query][:start_page]
-      assert_equal 'request', @results[:query][:role]
-      assert_equal "foo", @results[:query][:search_terms]
-      assert_equal 100, @results[:items_per_page]
-      assert_equal 0, @results[:start_index]
-      assert_equal 9, @results[:total_results]
+    context "a single result" do
+      setup do
+        FakeWeb.register_uri(:get,
+                             "http://ws.spotify.com/search/1/artist?q=1200%20Micrograms",
+                             :body => fixture_file("artist_search_one_result.xml"))
+        @results = MetaSpotify::Artist.search('1200 Micrograms')
+      end
+      should "still return a list of results, for consistency" do
+        assert_kind_of Array, @results[:artists]
+        assert_equal 1, @results[:artists].length
+        assert_kind_of MetaSpotify::Artist, @results[:artists].first
+        assert_equal "1200 Micrograms", @results[:artists].first.name
+        assert_equal 0.48196, @results[:artists].first.popularity
+        assert_equal 1, @results[:query][:start_page]
+        assert_equal 'request', @results[:query][:role]
+        assert_equal "1200 Micrograms", @results[:query][:search_terms]
+        assert_equal 100, @results[:items_per_page]
+        assert_equal 0, @results[:start_index]
+        assert_equal 1, @results[:total_results]
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: meta-spotify
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +00:00
+date: 2009-11-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - test/fixtures/album_search.xml
 - test/fixtures/artist.xml
 - test/fixtures/artist_search.xml
+- test/fixtures/artist_search_one_result.xml
 - test/fixtures/artist_with_albumdetail.xml
 - test/fixtures/track.xml
 - test/fixtures/track_search.xml