echonest-ruby-api 0.6.0 → 0.7.0

data/fixtures/vcr_cassettes/ten_videos.yml

@@ -0,0 +1,85 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/video?api_key=BNOAEBT3IZYZI6WXI&format=json&name=Weezer&results=10
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 25 Mar 2014 17:51:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '3006'
+      Vary:
+      - Accept-Encoding
+      X-Request-Id:
+      - MAyICk1ET5GlgjjVQx8UtQ
+      Etag:
+      - ! '"6e6c084e73cbd1b42076bf7dd1da50f49b40f49d"'
+      X-Worker-Node:
+      - 7cbef:11396
+      X-Ratelimit-Remaining:
+      - '19'
+      Server:
+      - TornadoServer/3.1
+      X-Ratelimit-Limit:
+      - '20'
+      X-Api-Key:
+      - BNOAEBT3IZYZI6WXI
+      Cache-Control:
+      - max-age=86400
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Ratelimit-Used:
+      - '1'
+      Connection:
+      - Keep-alive
+      Keep-Alive:
+      - timeout=15, max=100
+      Via:
+      - 1.1 ID-0000627501223746 uproxy-3
+    body:
+      encoding: US-ASCII
+      string: ! '{"response": {"status": {"version": "4.2", "code": 0, "message":
+        "Success"}, "start": 0, "total": 744, "video": [{"title": "Weezer - I Just
+        Threw Out The Love of My Dreams", "url": "http://www.youtube.com/watch?v=CFXOas-fCq8&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-22T00:00:00", "image_url": "http://i.ytimg.com/vi/CFXOas-fCq8/default.jpg",
+        "id": "611289c4d72f6e507694c75f4552f9b2"}, {"title": "Weezer- Everyone", "url":
+        "http://www.youtube.com/watch?v=iZKC4pHw1zc&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-08T00:00:00", "image_url": "http://i.ytimg.com/vi/iZKC4pHw1zc/default.jpg",
+        "id": "3f763e82869488809411e63f4cc031b6"}, {"title": "Weezer - Smile", "url":
+        "http://www.youtube.com/watch?v=YUeKEB41OCM&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-08T00:00:00", "image_url": "http://i.ytimg.com/vi/YUeKEB41OCM/default.jpg",
+        "id": "cd47f4d58add3b4ddb2a00c1b7c851c9"}, {"title": "Weezer - Beverly Hills",
+        "url": "http://www.youtube.com/watch?v=U4vSDCdAwPE&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-08T00:00:00", "image_url": "http://i.ytimg.com/vi/U4vSDCdAwPE/default.jpg",
+        "id": "bd22637570143ef73ebbb0817485e7c6"}, {"title": "Weezer - Hash Pipe",
+        "url": "http://www.youtube.com/watch?v=aDG_qive-uk&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-08T00:00:00", "image_url": "http://i.ytimg.com/vi/aDG_qive-uk/default.jpg",
+        "id": "5614b2e3f6933379c2e862090404ae04"}, {"title": "Everybody Get Dangerous
+        - Weezer", "url": "http://www.youtube.com/watch?v=q15RYYK7wMI&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-08T00:00:00", "image_url": "http://i.ytimg.com/vi/q15RYYK7wMI/default.jpg",
+        "id": "5f0dfa0255f408ccff9e83ed59569949"}, {"title": "Everybody Get Dangerous
+        - Weezer", "url": "http://www.youtube.com/watch?v=kBaoxmYha3k&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-05T00:00:00", "image_url": "http://i.ytimg.com/vi/kBaoxmYha3k/default.jpg",
+        "id": "e177249d64da400ac9943d50de4995a8"}, {"title": "Weezer - Perfect Situation",
+        "url": "http://www.youtube.com/watch?v=TgcK8jDFadE&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-05T00:00:00", "image_url": "http://i.ytimg.com/vi/TgcK8jDFadE/default.jpg",
+        "id": "f555e9de148787cf45c67a5f7334e0eb"}, {"title": "weezer- the greatest
+        man that ever lived (with lyrics)", "url": "http://www.youtube.com/watch?v=A60grS9QKg0&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-05T00:00:00", "image_url": "http://i.ytimg.com/vi/A60grS9QKg0/default.jpg",
+        "id": "38aedba9bf15272dc5d167da6c8cb370"}, {"title": "Weezer - Simple Pages",
+        "url": "http://www.youtube.com/watch?v=m9EqvOqz4ko&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-05T00:00:00", "image_url": "http://i.ytimg.com/vi/m9EqvOqz4ko/default.jpg",
+        "id": "488384dd01dc3d820a89d1f381727347"}]}}'
+    http_version: 
+  recorded_at: Tue, 25 Mar 2014 17:50:37 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/top_hottt.yml

@@ -0,0 +1,91 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/top_hottt?api_key=BNOAEBT3IZYZI6WXI&format=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAwNyBNYXIgMjAxNCAwMzoyNzowNCBHTVQ=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        ODU0
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "WC1SZXF1ZXN0LUlk":
+      - !binary |-
+        MDJabVNaSmFRYXl4UlJ5S3JpcFBsQQ==
+      !binary "RXRhZw==":
+      - !binary |-
+        IjUzZTFlN2JiZTY5NzIyYTZlZGU2MmQ5MGI1Yzg3NmUwZWUzZGNjNWMi
+      !binary "WC1Xb3JrZXItTm9kZQ==":
+      - !binary |-
+        NzQ2ZTE6MjY4OTg=
+      !binary "WC1SYXRlbGltaXQtUmVtYWluaW5n":
+      - !binary |-
+        MTk=
+      !binary "U2VydmVy":
+      - !binary |-
+        VG9ybmFkb1NlcnZlci8zLjE=
+      !binary "WC1SYXRlbGltaXQtTGltaXQ=":
+      - !binary |-
+        MjA=
+      !binary "WC1BcGktS2V5":
+      - !binary |-
+        Qk5PQUVCVDNJWllaSTZXWEk=
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bWF4LWFnZT04NjQwMA==
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "WC1SYXRlbGltaXQtVXNlZA==":
+      - !binary |-
+        MQ==
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        S2VlcC1hbGl2ZQ==
+      !binary "S2VlcC1BbGl2ZQ==":
+      - !binary |-
+        dGltZW91dD0xNSwgbWF4PTEwMA==
+      !binary "Vmlh":
+      - !binary |-
+        MS4xIElELTAwMDA2Mjc1MDEyMjM3NDYgdXByb3h5LTI=
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJyZXNwb25zZSI6IHsic3RhdHVzIjogeyJ2ZXJzaW9uIjogIjQuMiIsICJj
+        b2RlIjogMCwgIm1lc3NhZ2UiOiAiU3VjY2VzcyJ9LCAiYXJ0aXN0cyI6IFt7
+        Im5hbWUiOiAiS2F0eSBQZXJyeSIsICJpZCI6ICJBUjBJVlRMMTE4N0I5QUQ1
+        MjAifSwgeyJuYW1lIjogIkF2aWNpaSIsICJpZCI6ICJBUldMQUVFMTIyQkNG
+        Q0EyNDUifSwgeyJuYW1lIjogIkJleW9uY8OpIiwgImlkIjogIkFSNjVLN0Ex
+        MTg3RkI0REFBNCJ9LCB7Im5hbWUiOiAiUGhhcnJlbGwiLCAiaWQiOiAiQVJX
+        WFNQTzEyNDFCOUM2QjFDIn0sIHsibmFtZSI6ICJNaWxleSBDeXJ1cyIsICJp
+        ZCI6ICJBUllBVkJTMTE4N0ZCNUI0NkMifSwgeyJuYW1lIjogIkltYWdpbmUg
+        RHJhZ29ucyIsICJpZCI6ICJBUlJWUkZQMTI2RkUwMjUzMjcifSwgeyJuYW1l
+        IjogIkVtaW5lbSIsICJpZCI6ICJBUlRIOTA0MTE4N0ZCNDNFMUYifSwgeyJu
+        YW1lIjogIlBpdGJ1bGwiLCAiaWQiOiAiQVJLOUJIRTExODdGQjNBQzlEIn0s
+        IHsibmFtZSI6ICJCZWNrIiwgImlkIjogIkFSQzJYUjExMTg3RkI1Q0M5NSJ9
+        LCB7Im5hbWUiOiAiT25lUmVwdWJsaWMiLCAiaWQiOiAiQVI3M1M0RzExODdC
+        OUEwM0MyIn0sIHsibmFtZSI6ICJEYWZ0IFB1bmsiLCAiaWQiOiAiQVJGOEhU
+        UTExODdCOUFFNjkzIn0sIHsibmFtZSI6ICJTaGFraXJhIiwgImlkIjogIkFS
+        NlBKOFIxMTg3RkI1QUQ3MCJ9LCB7Im5hbWUiOiAiTG9yZGUiLCAiaWQiOiAi
+        QVJVWEFLVzEzRDYxMEIwQTlCIn0sIHsibmFtZSI6ICJFbGxpZSBHb3VsZGlu
+        ZyIsICJpZCI6ICJBUktUVEpWMTI1OTJDREEwN0YifSwgeyJuYW1lIjogIk9u
+        ZSBEaXJlY3Rpb24iLCAiaWQiOiAiQVJaSEZBWTEzMDcwOEVFMzY2In1dfX0=
+    http_version: 
+  recorded_at: Fri, 07 Mar 2014 03:27:07 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/urls.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/urls?api_key=BNOAEBT3IZYZI6WXI&format=json&name=Weezer
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 25 Mar 2014 19:27:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '411'
+      Vary:
+      - Accept-Encoding
+      X-Request-Id:
+      - 9+GeAlcQTCKxVobTmu+hOQ
+      Etag:
+      - ! '"d08d0b34bc126745b7819958c8c509f0693588cd"'
+      X-Worker-Node:
+      - 7cbef:23004
+      X-Ratelimit-Remaining:
+      - '19'
+      Server:
+      - TornadoServer/3.1
+      X-Ratelimit-Limit:
+      - '20'
+      X-Api-Key:
+      - BNOAEBT3IZYZI6WXI
+      Cache-Control:
+      - max-age=86400
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Ratelimit-Used:
+      - '1'
+      Connection:
+      - Keep-alive
+      Keep-Alive:
+      - timeout=15, max=100
+      Via:
+      - 1.1 ID-0000627501223746 uproxy-2
+    body:
+      encoding: US-ASCII
+      string: ! '{"response": {"status": {"version": "4.2", "code": 0, "message":
+        "Success"}, "urls": {"official_url": "http://www.weezer.com", "lastfm_url":
+        "http://www.last.fm/music/Weezer", "twitter_url": "https://twitter.com/Weezer",
+        "myspace_url": "http://www.myspace.com/weezer", "wikipedia_url": "http://en.wikipedia.org/wiki/Weezer",
+        "mb_url": "http://musicbrainz.org/artist/6fe07aa5-fec0-4eca-a456-f29bff451b04.html"}}}'
+    http_version: 
+  recorded_at: Tue, 25 Mar 2014 19:27:31 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/videos.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/video?api_key=BNOAEBT3IZYZI6WXI&format=json&name=Weezer&results=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 25 Mar 2014 17:51:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '422'
+      Vary:
+      - Accept-Encoding
+      X-Request-Id:
+      - 6kvvBucfQjOHDAAr7D9bpQ
+      Etag:
+      - ! '"d9db9d4a1e07cec93621ece5d32ff9673ed0b225"'
+      X-Worker-Node:
+      - 962d4:14760
+      X-Ratelimit-Remaining:
+      - '18'
+      Server:
+      - TornadoServer/3.1
+      X-Ratelimit-Limit:
+      - '20'
+      X-Api-Key:
+      - BNOAEBT3IZYZI6WXI
+      Cache-Control:
+      - max-age=86400
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Ratelimit-Used:
+      - '2'
+      Connection:
+      - Keep-alive
+      Keep-Alive:
+      - timeout=15, max=100
+      Via:
+      - 1.1 ID-0000627501223746 uproxy-2
+    body:
+      encoding: US-ASCII
+      string: ! '{"response": {"status": {"version": "4.2", "code": 0, "message":
+        "Success"}, "start": 0, "total": 744, "video": [{"title": "Weezer - I Just
+        Threw Out The Love of My Dreams", "url": "http://www.youtube.com/watch?v=CFXOas-fCq8&feature=youtube_gdata_player",
+        "site": "youtube.com", "date_found": "2014-03-22T00:00:00", "image_url": "http://i.ytimg.com/vi/CFXOas-fCq8/default.jpg",
+        "id": "611289c4d72f6e507694c75f4552f9b2"}]}}'
+    http_version: 
+  recorded_at: Tue, 25 Mar 2014 17:50:37 GMT
+recorded_with: VCR 2.8.0

data/lib/echonest-ruby-api/artist.rb

@@ -3,6 +3,7 @@ require "bundler/setup"
 require_relative 'base'
 require_relative 'blog'
 require_relative 'biography'
+require_relative 'video'
 require_relative 'foreign_id'
 
 module Echonest
@@ -26,6 +27,7 @@ module Echonest
       end
     end
 
+    # Stuff from blogspot, etc
     def blogs(options = { results: 1 })
       response = get_response(results: options[:results], name: @name)
 
@@ -34,6 +36,27 @@ module Echonest
       end
     end
 
+    # This appears to be from more "reputable" sources?
+    def news(options = { results: 1 })
+      response = get_response(results: options[:results], name: @name)
+
+      response[:news].collect do |b|
+        Blog.new(name: b[:name], site: b[:site], url: b[:url])
+      end
+    end
+
+    def video(options = { results: 1 })
+      response = get_response(results: options[:results], name: @name)
+
+      response[:video].collect do |v|
+        Video.new(title: v[:title], site: v[:site], url: v[:url], date_found: v[:date_found], image_url: v[:image_url])
+      end
+    end
+    
+    def urls
+      get_response(name: @name)[:urls]
+    end
+    
     def familiarity
       response = get_response(name: @name)
       response[entity_name.to_sym][__method__.to_sym]
@@ -72,9 +95,17 @@ module Echonest
       artists
     end
 
-    def songs
+    def top_hottt(options = {})
+      artists = []
+      get_response(options)[:artists].each do |a|
+        artists << Artist.new(@api_key, a[:name], a[:foreign_ids], a[:id])
+      end
+      artists
+    end
+
+    def songs(options = { results: 15 })
       songs = []
-      get_response(name: @name)[:songs].each do |s|
+      get_response(results: options[:results], name: @name)[:songs].each do |s|
         songs << { s[:id] => s[:title] }
       end
       songs

data/lib/echonest-ruby-api/version.rb

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/echonest-ruby-api/video.rb

@@ -0,0 +1,12 @@
+module Echonest
+  class Video
+    attr_accessor :title, :site, :url, :date_found, :image_url
+    def initialize(options = {})
+      @title = options[:title]
+      @site = options[:site]
+      @url = options[:url]
+      @date_found = options[:date_found]
+      @image_url = options[:image_url]
+    end
+  end
+end

data/spec/artist_spec.rb

@@ -17,14 +17,12 @@ describe Echonest::Artist do
   end
 
   describe '#entity_name' do
-
     it 'should always return artist' do
       VCR.use_cassette('entity_name') do
         a = Echonest::Artist.new('Weezer', '12345')
         a.entity_name.should eql 'artist'
       end
     end
-
   end
 
   describe '#biographies' do
@@ -70,6 +68,53 @@ describe Echonest::Artist do
 
   end
 
+  describe '#news' do
+
+    it 'should download a specified number of news articles' do
+      VCR.use_cassette('ten_news_articles') do
+        create_valid_artist
+        @a.news(results: 10).count.should be 10
+      end
+    end
+
+    it 'should return one news article by default' do
+      VCR.use_cassette('news') do
+        create_valid_artist
+        @a.news.count.should be 1
+      end
+    end
+
+  end
+  
+  describe '#videos' do
+
+    it 'should download a specified number of video streams' do
+      VCR.use_cassette('ten_videos') do
+        create_valid_artist
+        @a.video(results: 10).count.should be 10
+      end
+    end
+
+    it 'should return one video by default' do
+      VCR.use_cassette('videos') do
+        create_valid_artist
+        @a.video.count.should be 1
+      end
+    end
+
+  end
+  
+  describe '#urls' do
+    
+    it 'should return a hash of urls' do
+      VCR.use_cassette('urls') do
+        create_valid_artist
+        @a.urls.should be_a Hash
+      end
+    end
+    
+  end
+  
   describe '#familiarity' do
 
     it 'should allow us to find out how familiar an artist is' do
@@ -103,11 +148,9 @@ describe Echonest::Artist do
         @a.hotttnesss(type: 'mainstream').should be_a Float
       end
     end
-
   end
 
   describe '#images' do
-
     it 'should allow us to get an array of urls' do
       VCR.use_cassette('images') do
         create_valid_artist
@@ -139,86 +182,103 @@ describe Echonest::Artist do
       end
     end
 
-  end
-
-  describe '#list_genres' do
+  end # /images
 
+  describe '#list_genres', vcr: {cassette_name: 'list_genres'} do
     it 'should return an array of acceptable genres' do
-      VCR.use_cassette('list_genres') do
-        create_valid_artist
-        @a.list_genres.should be_a Array
-      end
+      create_valid_artist
+      @a.list_genres.should be_a Array
     end
 
     it 'should return an array in the correct format' do
-      VCR.use_cassette('list_genres') do
-        create_valid_artist
-        @a.list_genres.each do |g|
-          g[:name].should be_a String
-        end
+      create_valid_artist
+      @a.list_genres.each do |g|
+        g[:name].should be_a String
       end
     end
-
   end
 
-  describe '#search' do
+  describe '#search', vcr: {cassette_name: 'search'} do
     it 'should return an Array of artists' do
-      VCR.use_cassette('search') do
-        create_valid_artist
-        @a.search.should be_a Array
-      end
+      create_valid_artist
+      @a.search.should be_a Array
     end
 
     it 'should return an Artist object for each result' do
-      VCR.use_cassette('search') do
-        create_valid_artist
-        @a.search.each do |k|
-          k.class.should be Echonest::Artist
-        end
+      create_valid_artist
+      @a.search.each do |k|
+        k.class.should be Echonest::Artist
       end
     end
 
     it 'should fill in id of each returned artist' do
-      VCR.use_cassette('search') do
-        create_valid_artist
-        @a.search.each do |k|
-          k.id.should_not be_nil
-        end
+      create_valid_artist
+      @a.search.each do |k|
+        k.id.should_not be_nil
       end
     end
 
-    it 'should search the specified bucket' do
-      VCR.use_cassette('search_2') do
+    context 'with bucket', vcr: {cassette_name: 'search_2'} do
+      it 'should search the specified bucket' do
         create_valid_artist
         results = @a.search(bucket: "id:musicbrainz")
         foreign_id = results.first.foreign_ids.first
         foreign_id.catalog.should eq("musicbrainz")
       end
     end
-  end
+  end # /search
 
-  describe '#songs' do
+  describe '#top_hottt', vcr: {cassette_name: 'top_hottt'} do
+    it 'should return an Array of artists' do
+      create_valid_artist
+      @a.top_hottt.should be_a Array
+    end
 
-    it 'should return an Array of a Hash of songs' do
-      VCR.use_cassette('songs') do
-        create_valid_artist
-        @a.songs.should be_a Array
+    it 'should return an Artist object for each result' do
+      create_valid_artist
+      @a.top_hottt.each do |k|
+        k.class.should be Echonest::Artist
       end
     end
 
-    it 'should return a valid hash for each song' do
-      VCR.use_cassette('songs') do
-        create_valid_artist
-        @a.songs.each do |k|
-          k.should be_a Hash
-        end
+    it 'should fill in id of each returned artist' do
+      create_valid_artist
+      @a.top_hottt.each do |k|
+        k.id.should_not be_nil
       end
     end
 
+    it 'should only make one network request' do
+      create_valid_artist
+      @a.expects(:get_response).times(1).returns({:artists=>[]})
+      artists = @a.top_hottt
+      artists.should eq([])
+    end
+
+  end # /top_hottt
+
+  describe '#songs', vcr: {cassette_name: 'songs'} do
+    it 'should return an Array of a Hash of songs' do
+      create_valid_artist
+      @a.songs.should be_a Array
+    end
+
+    it 'should return a valid hash for each song' do
+      create_valid_artist
+      @a.songs.each do |k|
+        k.should be_a Hash
+      end
+    end
+    it 'should be able to fetch more than the default amount' do
+      VCR.use_cassette('songs_more') do
+        @a = Echonest::Artist.new('BNOAEBT3IZYZI6WXI', 'Bob Marley')
+        songs = @a.songs(results: 20)
+        songs.size.should be > 15
+      end
+    end
   end
 
   describe "#profile" do
-
     it 'should return an artist profile given an id' do
       VCR.use_cassette('profile') do
         @a = Echonest::Artist.new('BNOAEBT3IZYZI6WXI', nil, nil, 'ARH6W4X1187B99274F')
@@ -227,45 +287,35 @@ describe Echonest::Artist do
         artist.name.should eq "Radiohead"
       end
     end
-
   end
 
-  describe '#terms' do
-
+  describe '#terms', vcr: {cassette_name: 'terms'} do
     it 'should return an array of hashes of terms' do
-      VCR.use_cassette('terms') do
-        create_valid_artist_with_id
-        @a.terms.should be_a Array
-      end
+      create_valid_artist_with_id
+      @a.terms.should be_a Array
     end
 
     it 'should return valid hash for each term' do
-      VCR.use_cassette('terms') do
-        create_valid_artist_with_id
-        @a.terms.each do |k|
-          k.should be_a Hash
-        end
+      create_valid_artist_with_id
+      @a.terms.each do |k|
+        k.should be_a Hash
       end
     end
 
     it 'should return modern rock for Radiohead' do
-      VCR.use_cassette('terms') do
-        create_valid_artist_with_id
-        @a.terms.map{|t| t[:name]}.should include("modern rock")
-      end
+      create_valid_artist_with_id
+      @a.terms.map{|t| t[:name]}.should include("modern rock")
     end
 
     it 'should work even when artist has both name and id' do
       # If we try, echonest will respond with error:
       # 'limit - Only one of \"name\" or \"id\" is allowed'
-      VCR.use_cassette('terms') do
-        create_valid_artist_with_id
-        @a.name = "Weezer"
-        expect {
-          @a.terms
-        }.to_not raise_error
-      end
+      create_valid_artist_with_id
+      @a.name = "Weezer"
+      expect {
+        @a.terms
+      }.to_not raise_error
     end
+  end # /terms
 
-  end
 end