echonest-ruby-api 0.1.5 → 0.2

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in echonest-ruby-api.gemspec
 gemspec
 
-gem 'rake'
+gem 'rake'
+gem 'simplecov', :require => false, :group => :test

data/README.md

@@ -33,7 +33,7 @@ Require the gem in your file:
 
 Create an instance of an object
 
-    artist = Echonest::Artist.new('Weezer', 'YOUR-API-KEY')
+    artist = Echonest::Artist.new('YOUR-API-KEY', 'Weezer')
 
 Then you have access to a bunch of methods:
 
@@ -126,5 +126,8 @@ Testing is done using RSpec. Just run `guard` in the root directory and it'll ru
 
 ## Contributors
 
-Max Woolf (me!)
-abdyer
+* Max Woolf (me!)
+* abdyer
+* garethrees
+* jordanpoulton
+* makersacademy

data/echonest-ruby-api.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'coveralls'
 end

data/fixtures/vcr_cassettes/profile.yml

@@ -0,0 +1,53 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/profile?api_key=BNOAEBT3IZYZI6WXI&format=json&id=ARH6W4X1187B99274F&name=
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 16 Apr 2013 12:06:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '138'
+      Vary:
+      - Accept-Encoding
+      X-Request-Id:
+      - S///jt5dQWqENJNsMyWKVg
+      Etag:
+      - '"aebecfa5ec35629c80f20d15927d4908b4167f44"'
+      X-Worker-Node:
+      - 962d4:4638
+      X-Ratelimit-Remaining:
+      - '19'
+      Server:
+      - TornadoServer/2.4.1
+      X-Ratelimit-Limit:
+      - '20'
+      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-0000627501223666 uproxy-3
+    body:
+      encoding: UTF-8
+      string: '{"response": {"status": {"version": "4.2", "code": 0, "message": "Success"},
+        "artist": {"id": "ARH6W4X1187B99274F", "name": "Radiohead"}}}'
+    http_version: 
+  recorded_at: Tue, 16 Apr 2013 12:06:09 GMT
+recorded_with: VCR 2.4.0

data/fixtures/vcr_cassettes/terms.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://developer.echonest.com/api/v4/artist/terms?api_key=BNOAEBT3IZYZI6WXI&format=json&id=ARH6W4X1187B99274F&name=
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 16 Apr 2013 15:36:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '2111'
+      Vary:
+      - Accept-Encoding
+      X-Request-Id:
+      - gXpEgeizQAGGst47meOWAQ
+      Etag:
+      - ! '"6c7ad38226a2cb3f6808fed206c128221da1472e"'
+      X-Worker-Node:
+      - d1c7d:18043
+      X-Ratelimit-Remaining:
+      - '19'
+      Server:
+      - TornadoServer/2.4.1
+      X-Ratelimit-Limit:
+      - '20'
+      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-0000627501223666 uproxy-3
+    body:
+      encoding: US-ASCII
+      string: ! '{"response": {"status": {"version": "4.2", "code": 0, "message":
+        "Success"}, "start": 0, "terms": [{"frequency": 1.0, "name": "rock", "weight":
+        1.0}, {"frequency": 0.32362762914965709, "name": "alternative rock", "weight":
+        0.69780927835051543}, {"frequency": 0.44937160189619696, "name": "electronic",
+        "weight": 0.68547496318114876}, {"frequency": 0.30395783840385909, "name":
+        "alternative", "weight": 0.51113770250368185}, {"frequency": 0.3330351216068515,
+        "name": "pop", "weight": 0.41310751104565535}, {"frequency": 0.12701643032455379,
+        "name": "art rock", "weight": 0.37453976435935199}, {"frequency": 0.18900195035169701,
+        "name": "90s", "weight": 0.32041605301914583}, {"frequency": 0.15086233578978614,
+        "name": "electronica", "weight": 0.30660898379970547}, {"frequency": 0.15515439522510874,
+        "name": "experimental", "weight": 0.28194035346097202}, {"frequency": 0.11026300031196913,
+        "name": "modern rock", "weight": 0.27899484536082475}, {"frequency": 0.11311005144022887,
+        "name": "post-punk", "weight": 0.2766936671575847}, {"frequency": 0.1958486968107972,
+        "name": "jazz", "weight": 0.25717967599410896}, {"frequency": 0.076972709443209955,
+        "name": "british pop", "weight": 0.23205081001472755}, {"frequency": 0.07795958505745175,
+        "name": "experimental rock", "weight": 0.22984167893961707}, {"frequency":
+        0.11062690830619014, "name": "ambient", "weight": 0.22505522827687777}, {"frequency":
+        0.060773261607601083, "name": "british rock", "weight": 0.17396907216494845},
+        {"frequency": 0.043226336802103069, "name": "alternative pop rock", "weight":
+        0.17286450662739322}, {"frequency": 0.043338377308222591, "name": "indietronica",
+        "weight": 0.17249631811487481}, {"frequency": 0.067005410887189226, "name":
+        "grunge", "weight": 0.1639359351988218}, {"frequency": 0.069209522653945518,
+        "name": "progressive rock", "weight": 0.16053019145802652}, {"frequency":
+        0.082315134619655381, "name": "80s", "weight": 0.14202871870397643}, {"frequency":
+        0.085107639075017574, "name": "indie", "weight": 0.13871502209131076}, {"frequency":
+        0.070086224148814005, "name": "soundtrack", "weight": 0.12039764359351988}]}}'
+    http_version: 
+  recorded_at: Tue, 16 Apr 2013 15:36:58 GMT
+recorded_with: VCR 2.4.0

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

@@ -11,7 +11,8 @@ module Echonest
 
     attr_accessor :id, :name, :foreign_ids
 
-    def initialize(api_key, name = nil, foreign_ids = nil)
+    def initialize(api_key, name = nil, foreign_ids = nil, id = nil)
+      @id = id
       @name = name
       @api_key = api_key
       @foreign_ids = ForeignId.parse_array(foreign_ids) if foreign_ids
@@ -19,20 +20,18 @@ module Echonest
 
     def biographies(options = { results: 1 })
       response = get_response(results: options[:results], name: @name)
-      biographies = []
-      response[:biographies].each do |b|
-        biographies << Biography.new(text: b[:text], site: b[:site], url: b[:url])
+
+      response[:biographies].collect do |b|
+        Biography.new(text: b[:text], site: b[:site], url: b[:url])
       end
-      biographies
     end
 
     def blogs(options = { results: 1 })
       response = get_response(results: options[:results], name: @name)
-      blogs = []
-      response[:blogs].each do |b|
-        blogs << Blog.new(name: b[:name], site: b[:site], url: b[:url])
+
+      response[:blogs].collect do |b|
+        Blog.new(name: b[:name], site: b[:site], url: b[:url])
       end
-      blogs
     end
 
     def familiarity
@@ -75,5 +74,16 @@ module Echonest
       songs
     end
 
+    def profile(options = {})
+      options = {name: @name, id: @id}.merge(options)
+      artist_data = get_response(options)[:artist]
+      Artist.new(@api_key, artist_data[:name], artist_data[:foreign_ids], artist_data[:id])
+    end 
+
+    def terms(options = {})
+      options = {name: @name, id: @id}.merge(options)
+      get_response(options)[:terms]
+    end
+
   end
 end

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

@@ -1,21 +1,11 @@
 class Biography
 
+  attr_accessor :text, :site, :url
+
   def initialize(options = {})
     @text = options[:text]
     @site = options[:site]
     @url = options[:url]
   end
 
-  def text
-    @text
-  end
-
-  def site
-    @site
-  end
-
-  def url
-    @url
-  end
-
 end

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

@@ -1,4 +1,6 @@
 class Blog
+
+  attr_accessor :name, :summary, :url, :date_posted
   def initialize(options = {})
     @name = options[:name]
     @summary = options[:summary]
@@ -6,19 +8,4 @@ class Blog
     @date_posted = options[:date_posted]
   end
 
-  def name
-    @name
-  end
-
-  def summary
-    @summary
-  end
-
-  def url
-    @url
-  end
-
-  def date_posted
-    @date_posted
-  end
 end

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

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = "0.1.5"
+  VERSION = "0.2"
 end

data/spec/artist_spec.rb

@@ -6,6 +6,10 @@ describe Echonest::Artist do
     @a = Echonest::Artist.new('BNOAEBT3IZYZI6WXI', 'Weezer')
   end
 
+  def create_valid_artist_with_id
+    @a = Echonest::Artist.new('BNOAEBT3IZYZI6WXI', nil, nil, 'ARH6W4X1187B99274F')
+  end
+
 
   it 'should allow an Artist to have a name' do
     a = Echonest::Artist.new('12345', 'Weezer')
@@ -175,4 +179,43 @@ describe Echonest::Artist do
 
   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')
+        artist = @a.profile
+        artist.should be_a Echonest::Artist
+        artist.name.should eq "Radiohead"
+      end
+    end
+
+  end
+
+  describe '#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
+    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
+      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
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
+require 'simplecov'
+SimpleCov.start
 require 'rubygems'
 require 'bundler/setup'
 require_relative '../lib/echonest-ruby-api/base.rb'
 require 'echonest-ruby-api'
 require 'vcr'
 require 'webmock/rspec'
+require 'coveralls'
+
+Coveralls.wear!
 
 RSpec.configure do |config|
 
@@ -14,4 +19,4 @@ VCR.configure do |c|
   c.hook_into :webmock
   # TODO: Get rid of this when possible!
   c.allow_http_connections_when_no_cassette = true
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echonest-ruby-api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple ruby wrapper around the Echonest API
 email:
 - max.woolf@boxuk.com
@@ -164,6 +180,7 @@ files:
 - fixtures/vcr_cassettes/playlist.yml
 - fixtures/vcr_cassettes/playlist_next.yml
 - fixtures/vcr_cassettes/playlist_next_2.yml
+- fixtures/vcr_cassettes/profile.yml
 - fixtures/vcr_cassettes/search.yml
 - fixtures/vcr_cassettes/search_2.yml
 - fixtures/vcr_cassettes/single_biography.yml
@@ -172,6 +189,7 @@ files:
 - fixtures/vcr_cassettes/song_search_slow.yml
 - fixtures/vcr_cassettes/songs.yml
 - fixtures/vcr_cassettes/ten_blogs.yml
+- fixtures/vcr_cassettes/terms.yml
 - lib/echonest-ruby-api.rb
 - lib/echonest-ruby-api/artist.rb
 - lib/echonest-ruby-api/base.rb