ejaydj 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38b5750ecee9604f8398c422f9e2452b1711fdf
-  data.tar.gz: ab623da78d7a86b04939a968e45465543c3708ad
+  metadata.gz: 1c7b3aac4292a3b24563d8e1adaabf9444ce3954
+  data.tar.gz: 72da1fddaa35c3c8fd223bce31e14c5cc35d5c6e
 SHA512:
-  metadata.gz: 131e5c70deb7eadffd3c1d948fc599162fda8613a473c612f494292630b66d4d214fbf5bf269432025671d01eb4261c131602795f0d8ea04b1ebec4b044fe8e9
-  data.tar.gz: c0bf2ee4c103d4995f8b6541e16d6e62c7de92184460fd16a841c3b123ecdf18d6f62d8ddb71d2bfbe92e0030e4775040cd06b4401c1583f16e7192816fc9c3d
+  metadata.gz: 55a91144630f2b6da1211b2a55c9da9dfaa0b49ee62178e4969ee077a7eee9499274d1863b66032e044bc2760abea2c0d58e0bece780003a3a681fff7c57e9d5
+  data.tar.gz: d3e2db30fba50dc890d78d2e26d57179de69571909df28c8eb1021e2454fa9d989a72a1e34505ca91f86a92a652b85c690bb6a6c62173beeded225ea096e99b6

data/ejaydj.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client", "~> 1.7"
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "twitter"
+  spec.add_runtime_dependency "googl"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/ejaydj/djs/twitter_bot.rb

@@ -1,4 +1,5 @@
 require 'twitter'
+require 'googl'
 
 module Ejaydj
   module Djs
@@ -9,20 +10,42 @@ module Ejaydj
                     :twitter_access_token_secret,
                     :twitter_client
 
+      MAX_SONG_LENGTH   = 50
+      MAX_ARTIST_LENGTH = 50
+
       def initialize(attributes={}, &block)
         super(attributes, &block)
       end
 
       def tweet_me_a_song(time: Time.now)
-        song = play_me_a_song(time: time)
-        tweet = "NP: #{song.name} by #{song.artist} from #{song.playlist.name} playlist: #{song.playlist.url}"
+        @song = play_me_a_song(time: time)
+        tweet = tweet_string
+
         twitter_client.update(tweet)
 
-        {message: tweet, song: song}
+        {message: tweet, song: @song}
       end
 
       private
 
+      def tweet_string
+        tweet_string = ("NP: #{@song.name} by #{@song.artist} from playlist: #{shorten_url(@song.playlist.url)}")
+        shorten_tweet(tweet_string)
+      end
+
+      def shorten_tweet(tweet_string)
+        return tweet_string unless tweet_string.length > 140
+
+        @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)}"
+      end
+
+      def shorten_url(url)
+        Googl.shorten(url).short_url
+      end
+
       def twitter_client
         @twitter_client ||= Twitter::REST::Client.new do |config|
           config.consumer_key        = @twitter_consumer_key

data/lib/ejaydj/track.rb

@@ -1,11 +1,10 @@
 module Ejaydj
   class Track
-    attr_reader   :name,
+    attr_accessor :name,
                   :album,
                   :artist,
-                  :duration_ms
-
-    attr_accessor :playlist
+                  :duration_ms,
+                  :playlist
 
     def initialize(attributes={})
       @id            = attributes[:id]

data/lib/ejaydj/version.rb

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

data/spec/djs/twitter_bot_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Ejaydj::Djs::TwitterBot do
 
   let(:playlist_items) do
     [
-      {"name" => "Morning Playlist", "owner" => {"id" => 1}, "external_urls" => {"spotify" => "/playlist_morning"}, "tracks" => {"total" => 10}}
+      {"name" => "Morning Playlist", "owner" => {"id" => 1}, "external_urls" => {"spotify" => "http://spotify.com"}, "tracks" => {"total" => 10}}
     ]
   end
 
@@ -41,9 +41,12 @@ RSpec.describe Ejaydj::Djs::TwitterBot do
     ]
   end
 
+  let(:shorten_url) { 'http://goo.gl' }
+
   before do
     allow(music_client).to receive(:user_playlists).and_return(playlist_items)
     allow(music_client).to receive(:playlist_tracks).and_return(track_items)
+    allow(Googl).to receive(:shorten).and_return(double('GoogleURL', short_url: shorten_url))
   end
 
   describe '#tweet_me_a_song' do
@@ -51,7 +54,18 @@ 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 #{song.playlist.name} playlist: #{song.playlist.url}")
+      expect(tweet[:message]).to eq("NP: #{song.name} by #{song.artist} from playlist: #{shorten_url}")
+    end
+
+    context "when tweet string is over 140" do
+      it "shrinks the tweet less than 140 text" do
+        track_items.first["track"]["name"] = "This is a very long track name, yeah it is, yeah it is yeah it is...................................."
+
+        tweet = twitter_bot_dj.tweet_me_a_song(time: Time.new(2014, 11, 20, 7, 0, 0))
+        song = tweet[:song]
+
+        expect(tweet[:message].length).to be <= 140
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ejaydj
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ejay Canaria
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: googl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement