firstfm 0.7.0 → 0.8.0

data/test/fixtures/user_artists.json

@@ -0,0 +1,78 @@
+{
+  "topartists": {
+    "artist": [
+      {
+        "name": "Dream Theater",
+        "playcount": "1859",
+        "mbid": "28503ab7-8bf2-4666-a7bd-2644bfc7cb1d",
+        "url": "http:\/\/www.last.fm\/music\/Dream+Theater",
+        "streamable": "0",
+        "image": [
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/34\/65549370.jpg",
+            "size": "small"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/64\/65549370.jpg",
+            "size": "medium"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/126\/65549370.jpg",
+            "size": "large"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/252\/65549370.jpg",
+            "size": "extralarge"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/_\/65549370\/Dream+Theater+dreamtheater2011new2.jpg",
+            "size": "mega"
+          }
+        ],
+        "@attr": {
+          "rank": "1"
+        }
+      },
+      {
+        "name": "Dire Straits",
+        "playcount": "1604",
+        "mbid": "614e3804-7d34-41ba-857f-811bad7c2b7a",
+        "url": "http:\/\/www.last.fm\/music\/Dire+Straits",
+        "streamable": "0",
+        "image": [
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/34\/38129505.png",
+            "size": "small"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/64\/38129505.png",
+            "size": "medium"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/126\/38129505.png",
+            "size": "large"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/252\/38129505.png",
+            "size": "extralarge"
+          },
+          {
+            "#text": "http:\/\/userserve-ak.last.fm\/serve\/500\/38129505\/Dire+Straits.png",
+            "size": "mega"
+          }
+        ],
+        "@attr": {
+          "rank": "2"
+        }
+      }
+    ],
+    "@attr": {
+      "user": "RJ",
+      "type": "overall",
+      "page": "1",
+      "perPage": "50",
+      "totalPages": "176",
+      "total": "8778"
+    }
+  }
+}

data/test/fixtures/venues.json

@@ -0,0 +1,98 @@
+{
+  "results": {
+    "opensearch:Query": {
+      "#text": "",
+      "role": "request",
+      "searchTerms": "arena",
+      "startPage": "1"
+    },
+    "opensearch:totalResults": "3105",
+    "opensearch:startIndex": "0",
+    "opensearch:itemsPerPage": "50",
+    "venuematches": {
+      "venue": [
+        {
+          "id": "8778545",
+          "name": "Arena",
+          "location": {
+            "geo:point": {
+              "geo:lat": "48.187281",
+              "geo:long": "16.412927"
+            },
+            "city": "Vienna",
+            "country": "Austria",
+            "street": "Baumgasse 80",
+            "postalcode": "1030"
+          },
+          "url": "http:\/\/www.last.fm\/venue\/8778545+Arena",
+          "website": "http:\/\/arenavie.com\/web",
+          "phonenumber": "+43-(0)1-7988595",
+          "image": [
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/34\/2149974.jpg",
+              "size": "small"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/64\/2149974.jpg",
+              "size": "medium"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/126\/2149974.jpg",
+              "size": "large"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/252\/2149974.jpg",
+              "size": "extralarge"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/_\/2149974\/Arena.jpg",
+              "size": "mega"
+            }
+          ]
+        },
+        {
+          "id": "10319137",
+          "name": "Arena Anhembi",
+          "location": {
+            "geo:point": {
+              "geo:lat": "-23.515061",
+              "geo:long": "-46.640958"
+            },
+            "city": "S\u00e3o Paulo",
+            "country": "Brazil",
+            "street": "Av. Olavo Fontoura, 1.209 - Santana",
+            "postalcode": "02012-021"
+          },
+          "url": "http:\/\/www.last.fm\/venue\/10319137+Arena+Anhembi",
+          "website": "http:\/\/www.anhembi.com.br",
+          "phonenumber": "(11) 2226-0400",
+          "image": [
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/34\/103421661.png",
+              "size": "small"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/64\/103421661.png",
+              "size": "medium"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/126\/103421661.png",
+              "size": "large"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/252\/103421661.png",
+              "size": "extralarge"
+            },
+            {
+              "#text": "http:\/\/userserve-ak.last.fm\/serve\/_\/103421661\/Arena+Anhembi.png",
+              "size": "mega"
+            }
+          ]
+        }
+      ]
+    },
+    "@attr": {
+      "for": "arena"
+    }
+  }
+}

data/test/test_artist.rb

@@ -1,71 +1,62 @@
 require 'helper'
- 
+
 class TestArtist < Test::Unit::TestCase
-  
+
   def test_should_search_artists
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/artists.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/artists.json"))
     artists = Firstfm::Artist.search("Cher")
     assert_equal 30, artists.size
     assert_equal 9, artists.total_pages
     assert_equal 1, artists.current_page
     assert_equal 424, artists.total_entries
     artist = artists.first
-    assert_equal "Cher", artist.name
-    assert_equal 666642, artist.listeners
-    assert_equal "http://www.last.fm/music/Cher", artist.url
-    assert_equal "bfcc6d75-a6a5-4bc6-8282-47aec8531818", artist.mbid
-    assert artist.streamable
+    assert_equal "Cheryl Cole", artist.name
+    assert_equal 627821, artist.listeners
+    assert_equal "http://www.last.fm/music/Cheryl+Cole", artist.url
+    assert_equal "2d499150-1c42-4ffb-a90c-1cc635519d33", artist.mbid
+    assert !artist.streamable
     assert_equal 5, artist.images.size
   end
-  
+
   def test_should_get_top_tracks
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/top_tracks.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/top_tracks.json"))
     tracks = Firstfm::Artist.get_top_tracks("Cher")
     assert_equal 50, tracks.size
-    assert_equal 20, tracks.total_pages
+    assert_equal 509, tracks.total_pages
     assert_equal 1, tracks.current_page
-    assert_equal 1000, tracks.total_entries
+    assert_equal 25441, tracks.total_entries
     track = tracks.first
     assert_equal "Believe", track.name
-    assert_equal 35805, track.listeners
+    assert_equal 371216, track.listeners
     assert_equal "http://www.last.fm/music/Cher/_/Believe", track.url
-    assert_equal nil, track.mbid
-    assert track.streamable
+    assert_equal "32ca187e-ee25-4f18-b7d0-3b6713f24635", track.mbid
+    assert !track.streamable
     assert_equal 4, track.images.size
     assert_equal 1, track.rank
     assert_equal "Cher", track.artist.name
   end
-  
-  def test_should_get_images
-    artist = Firstfm::Artist.new :name => "Cher"
-    
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/get_images.xml"))
-    images = artist.get_images
-    assert_equal 50, images.size
-    assert images.detect {|i| i.with_width(600) }
-  end
 
   def test_should_get_tags
     artist = Firstfm::Artist.new :name => "Cher"
-    
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/artist.xml"))
+
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/artist.json"))
     tags = artist.get_tags
     assert_equal 5, tags.size
     assert (tags - ["pop", "female vocalists", "80s", "dance", "rock"]).empty?
   end
-  
+
   def test_should_get_correction
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/get_correction.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/get_correction.json"))
     artist = Firstfm::Artist.get_correction("Guns")
     assert_equal "Guns N' Roses", artist.name
-    assert_equal "6e40312c-2a6d-445b-b2c9-f68e86f6a0a3", artist.mbid
+    assert_equal "eeb1195b-f213-4ce1-b28c-8565211f8e43", artist.mbid
     assert_equal "http://www.last.fm/music/Guns+N%27+Roses", artist.url
   end
-  
+
   def test_should_get_correction_even_if_correct
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/get_correction_blank.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/get_correction_blank.json"))
     artist = Firstfm::Artist.get_correction("Eminem")
     assert_equal "Eminem", artist.name
   end
-  
+
 end

data/test/test_geo.rb

@@ -1,114 +1,114 @@
 # encoding: utf-8
 
 require 'helper'
- 
+
 class TestGeo < Test::Unit::TestCase
-  
+
   def test_should_get_events
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_events.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_events.json"))
     events = Firstfm::Geo.get_events
-    assert_equal 2, events.size
-    
+    assert_equal 10, events.size
+
     event = events.first
-    assert_equal "Entre Coche", event.title
-    assert_equal "1405068", event.id
-    assert_equal "La Boite", event.venue.name
-    
+    assert_equal "Fiestas de La Paloma", event.title
+    assert_equal "4174420", event.id
+    assert_equal "Fiestas de La Paloma - Plaza de las Vistillas", event.venue.name
+
     event = events.last
-    assert_equal "Bonafide", event.title
-    assert_equal "1443807", event.id
-    assert_equal "Ritmo y Compás", event.venue.name
+    assert_equal "XIV LechuRock", event.title
+    assert_equal "4161678", event.id
+    assert_equal "Plaza de toros", event.venue.name
   end
-  
+
   def test_should_get_events_with_one_event_as_result
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_event.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_event.json"))
     events = Firstfm::Geo.get_events
     assert_equal 1, events.size
-    
+
     event = events.first
-    assert_equal "Entre Coche", event.title
-    assert_equal "1405068", event.id
-    assert_equal "La Boite", event.venue.name
+    assert_equal "Fiestas de La Paloma", event.title
+    assert_equal "4174420", event.id
+    assert_equal "Fiestas de La Paloma - Plaza de las Vistillas", event.venue.name
   end
-  
+
   def test_should_get_metro_artist_chart
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.json"))
     artists = Firstfm::Geo.get_metro_artist_chart
     assert_equal 2, artists.size
     artist1 = artists.first
     artist2 = artists.last
-    
-    assert_equal "Coldplay", artist1.name
-    assert_equal "cc197bad-dc9c-440d-a5b5-d52ba2e14234", artist1.mbid
-    assert_equal "http://www.last.fm/music/Coldplay", artist1.url
-    assert_equal 558, artist1.listeners
-    assert artist1.streamable
-    
-    assert_equal "Adele", artist2.name
-    assert_equal "1de93a63-3a9f-443a-ba8a-a43b5fe0121e", artist2.mbid
-    assert_equal "http://www.last.fm/music/Adele", artist2.url
-    assert_equal 552, artist2.listeners
-    assert artist2.streamable
+
+    assert_equal "Muse", artist1.name
+    assert_equal "1695c115-bf3f-4014-9966-2b0c50179193", artist1.mbid
+    assert_equal "http://www.last.fm/music/Muse", artist1.url
+    assert_equal 359, artist1.listeners
+    assert !artist1.streamable
+
+    assert_equal "Major Lazer", artist2.name
+    assert_equal "75be165a-ad83-4d12-bd28-f589a15c479f", artist2.mbid
+    assert_equal "http://www.last.fm/music/Major+Lazer", artist2.url
+    assert_equal 310, artist2.listeners
+    assert !artist2.streamable
   end
-  
+
   def test_should_get_metro_hype_artist_chart
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.json"))
     artists = Firstfm::Geo.get_metro_hype_artist_chart
     assert_equal 2, artists.size
     artist1 = artists.first
     artist2 = artists.last
-    
-    assert_equal "Coldplay", artist1.name
-    assert_equal "cc197bad-dc9c-440d-a5b5-d52ba2e14234", artist1.mbid
-    assert_equal "http://www.last.fm/music/Coldplay", artist1.url
-    assert_equal 558, artist1.listeners
-    assert artist1.streamable
-    
-    assert_equal "Adele", artist2.name
-    assert_equal "1de93a63-3a9f-443a-ba8a-a43b5fe0121e", artist2.mbid
-    assert_equal "http://www.last.fm/music/Adele", artist2.url
-    assert_equal 552, artist2.listeners
-    assert artist2.streamable
+
+    assert_equal "Muse", artist1.name
+    assert_equal "1695c115-bf3f-4014-9966-2b0c50179193", artist1.mbid
+    assert_equal "http://www.last.fm/music/Muse", artist1.url
+    assert_equal 359, artist1.listeners
+    assert !artist1.streamable
+
+    assert_equal "Major Lazer", artist2.name
+    assert_equal "75be165a-ad83-4d12-bd28-f589a15c479f", artist2.mbid
+    assert_equal "http://www.last.fm/music/Major+Lazer", artist2.url
+    assert_equal 310, artist2.listeners
+    assert !artist2.streamable
   end
-  
+
   def test_should_get_metro_unique_artist_chart
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.json"))
     artists = Firstfm::Geo.get_metro_unique_artist_chart
     assert_equal 2, artists.size
     artist1 = artists.first
     artist2 = artists.last
-    
-    assert_equal "Coldplay", artist1.name
-    assert_equal "cc197bad-dc9c-440d-a5b5-d52ba2e14234", artist1.mbid
-    assert_equal "http://www.last.fm/music/Coldplay", artist1.url
-    assert_equal 558, artist1.listeners
-    assert artist1.streamable
-    
-    assert_equal "Adele", artist2.name
-    assert_equal "1de93a63-3a9f-443a-ba8a-a43b5fe0121e", artist2.mbid
-    assert_equal "http://www.last.fm/music/Adele", artist2.url
-    assert_equal 552, artist2.listeners
-    assert artist2.streamable
+
+    assert_equal "Muse", artist1.name
+    assert_equal "1695c115-bf3f-4014-9966-2b0c50179193", artist1.mbid
+    assert_equal "http://www.last.fm/music/Muse", artist1.url
+    assert_equal 359, artist1.listeners
+    assert !artist1.streamable
+
+    assert_equal "Major Lazer", artist2.name
+    assert_equal "75be165a-ad83-4d12-bd28-f589a15c479f", artist2.mbid
+    assert_equal "http://www.last.fm/music/Major+Lazer", artist2.url
+    assert_equal 310, artist2.listeners
+    assert !artist2.streamable
   end
-  
+
   def test_should_get_top_artists
-    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.xml"))
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/geo_get_metro_artist_chart.json"))
     artists = Firstfm::Geo.get_top_artists
     assert_equal 2, artists.size
     artist1 = artists.first
     artist2 = artists.last
-    
-    assert_equal "Coldplay", artist1.name
-    assert_equal "cc197bad-dc9c-440d-a5b5-d52ba2e14234", artist1.mbid
-    assert_equal "http://www.last.fm/music/Coldplay", artist1.url
-    assert_equal 558, artist1.listeners
-    assert artist1.streamable
-    
-    assert_equal "Adele", artist2.name
-    assert_equal "1de93a63-3a9f-443a-ba8a-a43b5fe0121e", artist2.mbid
-    assert_equal "http://www.last.fm/music/Adele", artist2.url
-    assert_equal 552, artist2.listeners
-    assert artist2.streamable
+
+    assert_equal "Muse", artist1.name
+    assert_equal "1695c115-bf3f-4014-9966-2b0c50179193", artist1.mbid
+    assert_equal "http://www.last.fm/music/Muse", artist1.url
+    assert_equal 359, artist1.listeners
+    assert !artist1.streamable
+
+    assert_equal "Major Lazer", artist2.name
+    assert_equal "75be165a-ad83-4d12-bd28-f589a15c479f", artist2.mbid
+    assert_equal "http://www.last.fm/music/Major+Lazer", artist2.url
+    assert_equal 310, artist2.listeners
+    assert !artist2.streamable
   end
-  
+
 end