ejaydj 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9812683c836ac5484095c4ea461f544d38ffa4ec
-  data.tar.gz: 8934f32b70874c13c2222c3ae2c75d9fdfcb8cd5
+  metadata.gz: d5060bcb5ae6ef7ae2cf3a75627164313c76b918
+  data.tar.gz: 18994145135deecba2939b136452962cc60feeb9
 SHA512:
-  metadata.gz: bb76809bf2a7ab1e78b409598daae49b38baba9c4b60f39018998d48c95d925cb1e48c4a304aaaf72e815f434ee7b4872b2a8aaf1b9e3fe069ae22182f7c4460
-  data.tar.gz: f8588a303c859e12403c7fa191780ae0ca8fbb0ba447567d33759109fce32c1510e58dcb833c141ad7005e1c64a64bf8d9550da1b20e59255ce01addbd2d1d54
+  metadata.gz: 852b21e0f4c8ddf64906343242cec4fef702376e315480dadfbb7c32feaaec73cbbaedaa025c165d07eceaccd9d76bbb440ec8aa365349f4cf01124f3c123c97
+  data.tar.gz: 9762aac22846b2805e9dd1c6aca7fa650b7e6ca2b8155fd863f548f995dfcf989363bbcd11386e2c5787b7c697c50d3651bdb6b1898f85d33e049149e1f6ee7e

data/README.md

@@ -21,8 +21,8 @@ Or install it yourself as:
 ## Configuration
 
 ### Prerequisites
-1. [Twitter consumer and access token](https://developer.spotify.com/my-applications/#!/)
-2. [Spotify client id and secret](https://apps.twitter.com/)
+1. [Spotify client id and secret](https://apps.twitter.com/)
+2. [Twitter consumer and access token](https://developer.spotify.com/my-applications/#!/)
 
 ### Set the Spotify and Twitter credentials in your new TwitterBot DJ then add your playlists
 

data/lib/ejaydj/dj.rb

@@ -1,8 +1,11 @@
 require 'ejaydj/services/playlist_service'
 require 'ejaydj/spotify/client'
+require 'ejaydj/mixins'
 
 module Ejaydj
   class Dj
+    include Mixins
+
     PLAYLIST_SCHEDULE = {
       600..1159   => :morning_playlists,      # 6AM  - 12PM
       1200..1759  => :noon_playlists,         # 12PM - 5:59PM
@@ -20,7 +23,6 @@ module Ejaydj
                   :night_playlists,
                   :late_night_playlists
 
-
     def initialize(attributes={})
       instantiate_variables_from attributes
       yield self if block_given?
@@ -36,23 +38,20 @@ module Ejaydj
 
     def reload!
       @playlists = all_playlists
-      @playlists.each {|playlist| playlist.reload!}
+      @playlists.each(&:reload!)
     end
 
     private
 
     def current_playlist(time)
       playlist_name = scheduled_playlist(time.strftime('%k%M').to_i)
-      playlist = playlists.select do |playlist|
+      playlist = playlists.find do |playlist|
         playlist.name == playlist_name
-      end.first
+      end
     end
 
     def scheduled_playlist(time)
-      scheduled_playlists = PLAYLIST_SCHEDULE.select do |schedule, value|
-        schedule.cover? time
-      end.values.first
-
+      scheduled_playlists = PLAYLIST_SCHEDULE.select {|sched| sched.cover? time}.values[0]
       send(scheduled_playlists).sample
     end
 
@@ -71,9 +70,5 @@ module Ejaydj
                           client_id: music_client_id,
                           client_secret: music_client_secret)
     end
-
-    def instantiate_variables_from(attributes)
-      attributes.each {|key, val| instance_variable_set(:"@#{key}", val) }
-    end
   end
 end

data/lib/ejaydj/mixins.rb

@@ -0,0 +1,10 @@
+module Ejaydj
+  module Mixins
+
+    protected
+
+    def instantiate_variables_from(attributes)
+      attributes.each {|key, val| instance_variable_set(:"@#{key}", val) }
+    end
+  end
+end

data/lib/ejaydj/playlist.rb

@@ -1,21 +1,18 @@
 require 'ejaydj/services/track_service'
+require 'ejaydj/mixins'
 
 module Ejaydj
   class Playlist
-    attr_reader :id,
-                :user_id,
-                :name,
-                :url,
-                :number_of_tracks
+    include Mixins
 
-    def initialize(attributes={})
-      @id               = attributes[:id]
-      @user_id          = attributes[:user_id]
-      @name             = attributes[:name]
-      @url              = attributes[:url]
-      @number_of_tracks = attributes[:number_of_tracks]
+    attr_accessor :id,
+                  :user_id,
+                  :name,
+                  :url,
+                  :number_of_tracks
 
-      @music_client     = attributes[:music_client]
+    def initialize(attributes={})
+      instantiate_variables_from attributes
     end
 
     def next_track

data/lib/ejaydj/track.rb

@@ -1,5 +1,9 @@
+require 'ejaydj/mixins'
+
 module Ejaydj
   class Track
+    include Mixins
+
     attr_accessor :name,
                   :album,
                   :artist,
@@ -8,13 +12,7 @@ module Ejaydj
                   :playlist
 
     def initialize(attributes={})
-      @id            = attributes[:id]
-      @name          = attributes[:name]
-      @album         = attributes[:album]
-      @artist        = attributes[:artist]
-      @playlist      = attributes[:playlist]
-      @duration_ms   = attributes[:duration_ms]
-      @url           = attributes[:url]
+      instantiate_variables_from attributes
     end
   end
 end

data/lib/ejaydj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejaydj
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ejay Canaria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -140,6 +140,7 @@ files:
 - lib/ejaydj.rb
 - lib/ejaydj/dj.rb
 - lib/ejaydj/djs/twitter_bot.rb
+- lib/ejaydj/mixins.rb
 - lib/ejaydj/playlist.rb
 - lib/ejaydj/services/playlist_service.rb
 - lib/ejaydj/services/track_service.rb