ejaydj 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7b3aac4292a3b24563d8e1adaabf9444ce3954
-  data.tar.gz: 72da1fddaa35c3c8fd223bce31e14c5cc35d5c6e
+  metadata.gz: 9812683c836ac5484095c4ea461f544d38ffa4ec
+  data.tar.gz: 8934f32b70874c13c2222c3ae2c75d9fdfcb8cd5
 SHA512:
-  metadata.gz: 55a91144630f2b6da1211b2a55c9da9dfaa0b49ee62178e4969ee077a7eee9499274d1863b66032e044bc2760abea2c0d58e0bece780003a3a681fff7c57e9d5
-  data.tar.gz: d3e2db30fba50dc890d78d2e26d57179de69571909df28c8eb1021e2454fa9d989a72a1e34505ca91f86a92a652b85c690bb6a6c62173beeded225ea096e99b6
+  metadata.gz: bb76809bf2a7ab1e78b409598daae49b38baba9c4b60f39018998d48c95d925cb1e48c4a304aaaf72e815f434ee7b4872b2a8aaf1b9e3fe069ae22182f7c4460
+  data.tar.gz: f8588a303c859e12403c7fa191780ae0ca8fbb0ba447567d33759109fce32c1510e58dcb833c141ad7005e1c64a64bf8d9550da1b20e59255ce01addbd2d1d54

data/README.md

@@ -54,7 +54,7 @@ Given a `dj` object from the above configuration, tweeting your music is as simp
 ```
 
 The tweet format will look like:
-`NP: {song} by {artist} from {playlist} playlist: {playlist_url}`
+`NP: {song} by {artist} from playlist: {playlist_url}`
 Each songs is based on the provided time (default is current time). It will automatically lookup for tracks in the scheduled playlists.
 
 ## Playlists Schedule

data/lib/ejaydj/djs/twitter_bot.rb

@@ -10,8 +10,8 @@ module Ejaydj
                     :twitter_access_token_secret,
                     :twitter_client
 
-      MAX_SONG_LENGTH   = 50
-      MAX_ARTIST_LENGTH = 50
+      MAX_SONG_LENGTH   = 40
+      MAX_ARTIST_LENGTH = 40
 
       def initialize(attributes={}, &block)
         super(attributes, &block)
@@ -22,14 +22,13 @@ module Ejaydj
         tweet = tweet_string
 
         twitter_client.update(tweet)
-
         {message: tweet, song: @song}
       end
 
       private
 
       def tweet_string
-        tweet_string = ("NP: #{@song.name} by #{@song.artist} from playlist: #{shorten_url(@song.playlist.url)}")
+        tweet_string = ("NP: #{@song.name} by #{@song.artist}: #{shorten_url(@song.url)} | playlist: #{shorten_url(@song.playlist.url)}")
         shorten_tweet(tweet_string)
       end
 
@@ -39,7 +38,7 @@ module Ejaydj
         @song.name    = "#{@song.name[0..MAX_SONG_LENGTH]}..." if @song.name.length > MAX_SONG_LENGTH
         @song.artist  = "#{@song.artist[0..MAX_ARTIST_LENGTH]}..." if @song.artist.length > MAX_ARTIST_LENGTH
 
-        "NP: #{@song.name} by #{@song.artist} | #{shorten_url(@song.playlist.url)}"
+        "NP: #{@song.name} by #{@song.artist}: #{shorten_url(@song.url)} | #{shorten_url(@song.playlist.url)}"
       end
 
       def shorten_url(url)

data/lib/ejaydj/services/track_service.rb

@@ -10,13 +10,14 @@ module Ejaydj
       def all
         response_items = @music_client.playlist_tracks(user_id: @user_id, playlist_id: @playlist_id)
 
-        response_items.map do |track|
+        response_items.map do |item|
           Track.new(
-            id:            track["track"]["id"],
-            name:          track["track"]["name"],
-            album:         track["track"]["album"]["name"],
-            artist:        track["track"]["artists"][0]["name"],
-            duration_ms:   track["track"]["duration_ms"]
+            id:            item["track"]["id"],
+            name:          item["track"]["name"],
+            album:         item["track"]["album"]["name"],
+            artist:        item["track"]["artists"][0]["name"],
+            duration_ms:   item["track"]["duration_ms"],
+            url:           item["track"]["external_urls"]["spotify"]
           )
         end
       end

data/lib/ejaydj/track.rb

@@ -4,6 +4,7 @@ module Ejaydj
                   :album,
                   :artist,
                   :duration_ms,
+                  :url,
                   :playlist
 
     def initialize(attributes={})
@@ -13,6 +14,7 @@ module Ejaydj
       @artist        = attributes[:artist]
       @playlist      = attributes[:playlist]
       @duration_ms   = attributes[:duration_ms]
+      @url           = attributes[:url]
     end
   end
 end

data/lib/ejaydj/version.rb

@@ -1,3 +1,3 @@
 module Ejaydj
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dj_spec.rb

@@ -30,7 +30,8 @@ RSpec.describe Ejaydj::Dj do
                     "name"          => "Track 1",
                     "album"         => {"name" => "Album 1"},
                     "artists"       => [{"name" => "Artist 1"}],
-                    "playlist_id"   => 1
+                    "playlist_id"   => 1,
+                    "external_urls" => {"spotify" => "http://www.spotify.com"}
                    }}
     ]
   end
@@ -93,7 +94,8 @@ RSpec.describe Ejaydj::Dj do
                                    "name"          => "Track 2",
                                    "album"         => {"name" => "Album 2"},
                                    "artists"       => [{"name" => "Artist 2"}],
-                                   "playlist_id"   => 2
+                                   "playlist_id"   => 2,
+                                   "external_urls" => {"spotify" => "http://www.spotify.com"}
                      }}
       dj.reload!
       expect(dj.playlists.first.tracks.count).to eq(track_items.count)

data/spec/djs/twitter_bot_spec.rb

@@ -36,12 +36,13 @@ RSpec.describe Ejaydj::Djs::TwitterBot do
       {"track" => { "id"            => 1,
                     "name"          => "Track 1",
                     "album"         => {"name" => "Album 1"},
-                    "artists"       => [{"name" => "Artist 1"}]
+                    "artists"       => [{"name" => "Artist 1"}],
+                    "external_urls" => {"spotify" => "http://www.spotify.com"}
                    }}
     ]
   end
 
-  let(:shorten_url) { 'http://goo.gl' }
+  let(:shorten_url) { 'http://goo.gl/Abc123' }
 
   before do
     allow(music_client).to receive(:user_playlists).and_return(playlist_items)
@@ -54,7 +55,7 @@ RSpec.describe Ejaydj::Djs::TwitterBot do
       tweet = twitter_bot_dj.tweet_me_a_song(time: Time.new(2014, 11, 20, 7, 0, 0))
       song = tweet[:song]
 
-      expect(tweet[:message]).to eq("NP: #{song.name} by #{song.artist} from playlist: #{shorten_url}")
+      expect(tweet[:message]).to eq("NP: #{song.name} by #{song.artist}: #{shorten_url} | playlist: #{shorten_url}")
     end
 
     context "when tweet string is over 140" do

data/spec/playlist_spec.rb

@@ -15,7 +15,8 @@ RSpec.describe Ejaydj::Playlist do
                     "name"          => "Track 1",
                     "album"         => {"name" => "Album 1"},
                     "artists"       => [{"name" => "Artist 1"}],
-                    "playlist_id"   => 1
+                    "playlist_id"   => 1,
+                    "external_urls" => {"spotify" => "http://www.spotify.com"}
                    }}
     ]
   end
@@ -58,7 +59,8 @@ RSpec.describe Ejaydj::Playlist do
                                    "name"          => "Track 2",
                                    "album"         => {"name" => "Album 2"},
                                    "artists"       => [{"name" => "Artist 2"}],
-                                   "playlist_id"   => 2
+                                   "playlist_id"   => 2,
+                                   "external_urls" => {"spotify" => "http://www.spotify.com"}
                      }}
       playlist.reload!
       expect(playlist.tracks.count).to eq(track_items.count)

data/spec/services/track_service_spec.rb

@@ -13,14 +13,16 @@ RSpec.describe Ejaydj::Services::TrackService do
                     "name"          => "Track 1",
                     "album"         => {"name" => "Album 1"},
                     "artists"       => [{"name" => "Artist 1"}],
-                    "playlist_id"   => 1
+                    "playlist_id"   => 1,
+                    "external_urls" => {"spotify" => "http://www.spotify.com"}
                    }},
 
        {"track" => {"id"            => 2,
                     "name"          => "Track 2",
                     "album"         => {"name" => "Album 2"},
                     "artists"       => [{"name" => "Artist 2"}],
-                    "playlist_id"   => 2
+                    "playlist_id"   => 2,
+                    "external_urls" => {"spotify" => "http://www.spotify.com"}
                    }}
       ]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejaydj
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ejay Canaria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client