spot_tracks 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29f96934a558b8b35c7908c36673091e5aa0780
-  data.tar.gz: cd1bd699b5df6052fcb191ebf71d563d1f1dd46a
+  metadata.gz: 836a29e21cf32e9c681f3c699e3c61fd73e94445
+  data.tar.gz: 26685ca6cd55114faf3d774ee152b68a279d33f7
 SHA512:
-  metadata.gz: 34e6c9092096196faa0993e64f9415b0a90f38f1b92bd4eee897c29d5f416c7581537de501ba1258988968e7f4c8fa36d2fafda675d070844c5dc55f6851e425
-  data.tar.gz: 75cb56b98bcb30d2f796a30530d6f6012f549f937da458c40910882735290a99b01f4df4f3897fb6fb0a14822729731e6f8d307ddffd82c24db2c84f8377d50f
+  metadata.gz: ff1e9f09539a926dc2a07639bb333968dc626ca9dbdf8267585f6cb686a642a82848b26c48205b90786e1101956bc087466bfe26035291c496adbf11ecaf43cf
+  data.tar.gz: 8e40593814c1267ac0bfe1db098bf7b9eba15126da25ad0c10b77ee02ccff9987a62767c3bfcfdd5f08a4ea38023a2463d7bbacb3d2b7afdb32c3894fbb7fc96

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+### v0.0.2
+
+**New**
+- Add Track model
+- Include Images
+
+**Fixed**
+- Handle no Spotify results

data/README.md

@@ -1,6 +1,6 @@
 # SpotTracks
 
-TODO: Write a gem description
+SpotTracks is an easy way to get spotify play links from your recently played tracks.
 
 ## Installation
 
@@ -18,7 +18,28 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+SpotTracks pulls your Last.fm RSS feed, and looks up those tracks on Spotify. It returns a json hash with your data:
+
+    SpotTracks::Feed.new('mttwrnr').to_json
+    #=> {
+          "title":"mttwrnr's Recently Played Tracks",
+          "url":"http://www.last.fm/user/mttwrnr",
+          "entries":[{
+            "title":"Duck Sauce – NRG - Radio Edit",
+            "urls":{
+              "lastfm":"http://www.last.fm/music/Duck+Sauce/_/NRG+-+Radio+Edit",
+              "spotify":"spotify:track:6MbFmc3lDtnlihb7DEabRA"
+            }
+          },{
+            "title":"The Magician – When The Night Is Over - Clancy Remix [feat. Newtimers]",
+            "urls":{
+              "lastfm":"http://www.last.fm/music/The+Magician/_/When+The+Night+Is+Over+-+Clancy+Remix+%5Bfeat.+Newtimers%5D",
+              "spotify":"spotify:track:58ScEoCoWkICs0HD7xHYKI"
+            }
+          }]
+        }
+
+Enjoy!
 
 ## Contributing
 

data/lib/spot_tracks/feed.rb

@@ -18,15 +18,9 @@ module SpotTracks
       client.url
     end
 
-    def entries
+    def tracks
       client.entries.map do |entry|
-        {
-          title: entry.title,
-          urls: {
-            lastfm: entry.url,
-            spotify: player.spotify_uri(entry.title)
-          }
-        }
+        SpotTracks::Track.search entry.title
       end
     end
 
@@ -34,7 +28,7 @@ module SpotTracks
       {
         title: title,
         url: url,
-        entries: entries
+        tracks: tracks.map(&:to_h)
       }.to_json
     end
 
@@ -47,9 +41,5 @@ module SpotTracks
     def rss_url
       "#{HOST}/1.0/user/#{username}/recenttracks.rss"
     end
-
-    def player
-      @player ||= SpotTracks::Player.new
-    end
   end
 end

data/lib/spot_tracks/player.rb

@@ -5,19 +5,9 @@ module SpotTracks
   class Player
     HOST = 'https://api.spotify.com'
 
-    def spotify_uri(title)
-      data = search(title)
-      return unless data.is_a?(Hash)
-
-      tracks = data['tracks'] || {}
-      items  = tracks['items'] || [{}]
-
-      items.first['uri']
-    end
-
     def search(term)
       path = "v1/search?q=#{CGI.escape(term)}&type=track"
-      api_data("#{HOST}/#{path}")
+      SpotTracks::Track.parse api_data("#{HOST}/#{path}")
     end
 
     private

data/lib/spot_tracks/track.rb

@@ -0,0 +1,43 @@
+module SpotTracks
+  class Track
+    attr_reader :name, :artist, :image, :uri
+
+    def initialize(params = {})
+      @name = params[:name]
+      @artist = params[:artist]
+      @image = params[:image]
+      @uri = params[:uri]
+    end
+
+    def self.search(title)
+      SpotTracks::Player.new.search(title)
+    end
+
+    def self.parse(data = {})
+      tracks = data.fetch('tracks', {})
+      item   = tracks.fetch('items', []).first
+
+      album  = item['album']
+      artist = item['artists'].first
+      image  = album['images'].first
+
+      new({
+        name:   item['name'],
+        artist: artist['name'],
+        image:  image['url'],
+        uri:    item['uri']
+      })
+    end
+
+    def title
+      "#{artist} - #{name}"
+    end
+
+    def to_h
+      {
+        title: title, name: name, artist: artist,
+        urls: { image: image, uri: uri }
+      }
+    end
+  end
+end

data/lib/spot_tracks/version.rb

@@ -1,3 +1,3 @@
 module SpotTracks
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/spot_tracks.rb

@@ -3,4 +3,5 @@ require "spot_tracks/version"
 module SpotTracks
   autoload :Feed,   'spot_tracks/feed'
   autoload :Player, 'spot_tracks/player'
+  autoload :Track,  'spot_tracks/track'
 end

data/spec/fixtures/api.yml

@@ -0,0 +1,16 @@
+api:
+  tracks:
+    href: https://api.spotify.com/v1/search?query=Major+Lazer+-+Get+Free
+    items:
+      - name: Get Free
+        album:
+          name: Get Free
+          images:
+            - height: 640
+              width: 640
+              url: https://i.scdn.co/image/8c0c53664893cbce7f579b819d39d0e19d729710
+        artists:
+          - name: Major Lazer
+        external_urls:
+        uri: spotify:track:6nVEdIiB3h5b2TbQhFnQUk
+

data/spec/fixtures/track.yml

@@ -0,0 +1,5 @@
+track:
+  title: baz
+  urls:
+    image: imgurl
+    spotify: spotify:track:qux

data/spec/spec_helper.rb

@@ -2,4 +2,11 @@ require 'simplecov'
 SimpleCov.start
 
 require 'rspec'
+require 'yaml'
 require 'spot_tracks'
+
+RSpec.configure do |config|
+  def fixture(name)
+    YAML.load_file("./spec/fixtures/#{name}.yml")[name.to_s]
+  end
+end

data/spec/spot_tracks/feed_spec.rb

@@ -1,25 +1,14 @@
 require 'spec_helper'
 
 describe SpotTracks::Feed do
-  let(:user){ 'mttwrnr' }
-  let(:subject){ SpotTracks::Feed.new(user) }
-  let(:data){
-    {
-      title: 'baz',
-      urls: {
-        lastfm: 'qux',
-        spotify: 'spotify:track:qux'
-      }
-    }
-  }
-  let(:entry){ double(title: 'baz', url: 'qux')}
-  let(:player){ double(spotify_uri: 'spotify:track:qux') }
-  let(:client){ double(title: 'foo', url: 'http://bar', entries: [entry]) }
-  let(:rss_url){ "http://ws.audioscrobbler.com/1.0/user/#{user}/recenttracks.rss" }
+  let(:entry){ double(title: 'baz', url: 'qux') }
+  let(:feedjira){ double(title: 'foo', url: 'http://bar', entries: [entry]) }
+  let(:subject){ SpotTracks::Feed.new('mttwrnr') }
 
   before do
-    Feedjira::Feed.stub(:fetch_and_parse).with(rss_url){ client }
-    SpotTracks::Player.stub(:new){ player }
+    param = "http://ws.audioscrobbler.com/1.0/user/mttwrnr/recenttracks.rss"
+    Feedjira::Feed.stub(:fetch_and_parse).with(param){ feedjira }
+    SpotTracks::Player.stub(:new){ double(search: {}) }
   end
 
   context 'attributes' do
@@ -36,15 +25,15 @@ describe SpotTracks::Feed do
     end
   end
 
-  context '#entries' do
-    it 'should return a mapped set of values' do
-      subject.entries.should eq([data])
+  context '#tracks' do
+    it 'should return an array of tracks' do
+      subject.tracks.should be_a_kind_of(Array)
     end
   end
 
   context '#to_json' do
-    it 'should return a json version of entries values' do
-      result = "{\"title\":\"foo\",\"url\":\"http://bar\",\"entries\":[{\"title\":\"baz\",\"urls\":{\"lastfm\":\"qux\",\"spotify\":\"spotify:track:qux\"}}]}"
+    it 'should return a json version of tracks values' do
+      result = "{\"title\":\"foo\",\"url\":\"http://bar\",\"tracks\":[{}]}"
       subject.to_json.should eq(result)
     end
   end

data/spec/spot_tracks/player_spec.rb

@@ -1,33 +1,15 @@
 require 'spec_helper'
 
 describe SpotTracks::Player do
-  let(:json){ "{\"tracks\":{\"items\":[{\"uri\":\"spotify:track:foo\"}]}}" }
   let(:subject){ SpotTracks::Player.new }
 
-  context '#spotify_uri' do
-    it 'should return a spotify uri' do
-      subject.stub(:open){ double(read: json) }
-      subject.spotify_uri('track').should match(/^spotify:.*/)
-    end
-
-    it 'should handle a missing uri' do
-      subject.stub(:get){ "{\"tracks\":{\"items\":[{}]}}" }
-      subject.spotify_uri('track').should be_nil
-    end
-
-    it 'should handle missing items' do
-      subject.stub(:get){ "{\"tracks\":{}}" }
-      subject.spotify_uri('track').should be_nil
-    end
-
-    it 'should handle missing tracks' do
-      subject.stub(:get){ "{}" }
-      subject.spotify_uri('track').should be_nil
-    end
+  before do
+    subject.stub(:open){ double(read: fixture(:api).to_json ) }
+  end
 
-    it 'should handle missing data' do
-      subject.stub(:get){ "[]" }
-      subject.spotify_uri('track').should be_nil
+  context '#search' do
+    it 'returns a ticket' do
+      subject.search('foo').should be_a_kind_of(SpotTracks::Track)
     end
   end
 end

data/spec/spot_tracks/track_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe SpotTracks::Track do
+  let(:data){ fixture(:api) }
+  let(:subject){ SpotTracks::Track.new({
+    name: 'foo', artist: 'bar',
+    image: 'baz', uri: 'qux'
+  }) }
+
+  context 'attributes' do
+    it 'accepts a hash of attributes' do
+      subject.name.should eq('foo')
+      subject.artist.should eq('bar')
+      subject.image.should eq('baz')
+      subject.uri.should eq('qux')
+    end
+  end
+
+  context '#search' do
+    it 'uses the player search' do
+      SpotTracks::Player.any_instance.should_receive(:search).with('bar - foo').once
+      SpotTracks::Track.search('bar - foo')
+    end
+  end
+
+  context '#parse' do
+    let(:track){ SpotTracks::Track.parse(data) }
+    it 'converts json data' do
+      track.name.should eq('Get Free')
+      track.artist.should eq('Major Lazer')
+      track.image.should eq('https://i.scdn.co/image/8c0c53664893cbce7f579b819d39d0e19d729710')
+      track.uri.should eq('spotify:track:6nVEdIiB3h5b2TbQhFnQUk')
+    end
+  end
+
+  context '#title' do
+    it 'should combine the track and artist' do
+      subject.title.should eq('bar - foo')
+    end
+  end
+
+  context '#to_h' do
+    let(:formatted){
+      { title: 'bar - foo',
+        name: 'foo', artist: 'bar',
+        urls: { image: 'baz', uri: 'qux' } }
+    }
+
+    it 'returns the data in hash format' do
+      subject.to_h.should eq(formatted)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spot_tracks
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,10 +98,14 @@ files:
 - lib/spot_tracks.rb
 - lib/spot_tracks/feed.rb
 - lib/spot_tracks/player.rb
+- lib/spot_tracks/track.rb
 - lib/spot_tracks/version.rb
+- spec/fixtures/api.yml
+- spec/fixtures/track.yml
 - spec/spec_helper.rb
 - spec/spot_tracks/feed_spec.rb
 - spec/spot_tracks/player_spec.rb
+- spec/spot_tracks/track_spec.rb
 - spot_tracks.gemspec
 homepage: ''
 licenses:
@@ -127,6 +132,9 @@ signing_key:
 specification_version: 4
 summary: A small gem to get recent spotify tracks
 test_files:
+- spec/fixtures/api.yml
+- spec/fixtures/track.yml
 - spec/spec_helper.rb
 - spec/spot_tracks/feed_spec.rb
 - spec/spot_tracks/player_spec.rb
+- spec/spot_tracks/track_spec.rb