spotify-to-mp3 0.4.2 → 0.5

data/.rspec

@@ -0,0 +1 @@
+--color --format nested

data/README.md

@@ -42,6 +42,10 @@ Make sure you have rubygems installed and configured:
 
 ## Changelog
 
+2012-08-20
+
+- Set filename artist and title from Grooveshark
+
 2012-01-11
 
 - Touch already downloaded songs. This way songs no more in the download list can be spotted easily.
@@ -57,7 +61,8 @@ Make sure you have rubygems installed and configured:
 ## TODO
 
 - Consider multiple artists songs
-- Distinguish internal errors from user errors
 - Filter Grooveshark results by artist, title and length
-- Split code in multiple files
 - It seems Grooveshark API fails after hundreds of calls
+- Accept tracks from stdin (instead of from a file)
+- Test downloads
+- Test App class

data/bin/spotify-to-mp3

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+# To run it in development: ruby -Ilib bin/spotify-to-mp3
 
 require 'spotify_to_mp3'
 
-SpotifyToMp3::App.new.run
+SpotifyToMp3::DependencyInjection.new.app.run

data/lib/spotify_to_mp3.rb

@@ -1,58 +1,16 @@
-require 'rubygems'
 require 'grooveshark'
 require 'open-uri'
 require 'colorize'
 require 'rest-client'
 require 'fileutils'
+require 'cgi'
 
-require 'spotify_to_mp3/services'
-require 'spotify_to_mp3/songs'
-require 'spotify_to_mp3/sources'
-
-module SpotifyToMp3
-
-  class App
-
-    def initialize
-      @context = {
-        :grooveshark => Grooveshark.new,
-        :spotify => Spotify.new
-      }
-    end
-
-    def run
-      begin
-        file = ARGV.first
-        raise "No songs file specified. Usage: #{$0} file" if file.nil?
-        
-        File.open(file).each_line{|song_id|
-          song_id.strip!
-          next if song_id.empty?
-          begin
-            song = UnresolvedSong.new(@context, song_id)
-            print "Resolving \"#{song}\" "
-            song = song.resolve
-            print "-> Searching \"#{song}\" on Grooveshark "
-            song = song.from_grooveshark
-            print "-> Downloading \"#{song}\" "
-            if File.exists? song.filename
-              FileUtils.touch song.filename # To know about songs no longer in download list
-              puts "Already exists, skipping".green
-            else
-              begin
-                song.download
-                puts "Done".green
-              rescue Exception => exception
-                puts exception.message.red
-              end
-            end
-          rescue
-            puts "#{$!}".red
-          end
-        }
-      rescue
-        puts "#{$!}".red
-      end
-    end
-  end
-end
+require 'spotify_to_mp3/app'
+require 'spotify_to_mp3/app/file_track_ids'
+require 'spotify_to_mp3/dependency_injection'
+require 'spotify_to_mp3/spotify'
+require 'spotify_to_mp3/spotify/track'
+require 'spotify_to_mp3/track_id_resolver'
+require 'spotify_to_mp3/track'
+require 'spotify_to_mp3/grooveshark'
+require 'spotify_to_mp3/grooveshark/track'

data/lib/spotify_to_mp3/app.rb

@@ -0,0 +1,35 @@
+module SpotifyToMp3
+  class App
+    def initialize(track_id_resolver, grooveshark)
+      @track_id_resolver = track_id_resolver
+      @grooveshark = grooveshark
+    end
+
+    def run
+      file = ARGV.first or raise "No songs file specified. Usage: #{$0} file"
+      FileTrackIds.new(file).each do |track_id|
+        begin
+          puts "Resolving \"#{track_id}\" ".blue
+          track = @track_id_resolver.resolve(track_id)
+
+          puts "Searching \"#{track}\" on Grooveshark ".blue
+          grooveshark_track = @grooveshark.get_track(track.grooveshark_query)
+
+          puts "Downloading \"#{grooveshark_track}\" ".blue
+          if File.exists? grooveshark_track.filename
+            FileUtils.touch grooveshark_track.filename # To know about songs no longer in download list
+            puts "Already exists, skipping".green
+          else
+            @grooveshark.download(grooveshark_track)
+            puts "Done".green
+          end
+        rescue Exception => exception # For some reason without the "Exception" it is ignored
+          puts exception.message.red
+          # Continue with the next track
+        end
+      end
+    rescue
+      puts "#{$!}".red
+    end
+  end
+end

data/lib/spotify_to_mp3/app/file_track_ids.rb

@@ -0,0 +1,21 @@
+module SpotifyToMp3
+  class App
+    class FileTrackIds
+      include Enumerable
+
+      def initialize(file)
+        @file = file
+      end
+
+      def each
+        File.open(@file) do |file|
+          file.each do |track_id|
+            track_id.strip!
+            next if track_id.empty?
+            yield track_id
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/dependency_injection.rb

@@ -0,0 +1,15 @@
+module SpotifyToMp3
+  class DependencyInjection
+    def track_id_resolver
+      @track_id_resolver ||= TrackIdResolver.new(Spotify.new)
+    end
+
+    def grooveshark
+      @grooveshark ||= Grooveshark.new(::Grooveshark::Client.new)
+    end
+
+    def app
+      @app ||= App.new(track_id_resolver, grooveshark)
+    end
+  end
+end

data/lib/spotify_to_mp3/grooveshark.rb

@@ -0,0 +1,18 @@
+module SpotifyToMp3
+  class Grooveshark
+    def initialize(client)
+      @client = client
+    end
+
+    def get_track(query)
+      client_track = @client.search_songs(query).first or raise "Track not found"
+      Track.new(client_track)
+    end
+
+    def download(track)
+      url = @client.get_song_url(track.client_track)
+      file = RestClient::Request.execute(:method => :post, :url => url, :raw_response => true).file
+      FileUtils.mv(file.path, track.filename)
+    end
+  end
+end

data/lib/spotify_to_mp3/grooveshark/track.rb

@@ -0,0 +1,19 @@
+module SpotifyToMp3
+  class Grooveshark
+    class Track
+      attr_reader :client_track
+
+      def initialize(client_track)
+        @client_track = client_track
+      end
+
+      def to_s
+        "#{@client_track.artist} - #{@client_track.name}"
+      end
+
+      def filename
+        "#{self}.mp3".tr('/', '-') # / is not allowed in file names
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/spotify.rb

@@ -0,0 +1,13 @@
+module SpotifyToMp3
+  class Spotify
+    def get_track(uri)
+      content = open('http://ws.spotify.com/lookup/1/.json?uri=' + CGI.escape(uri))
+      json = JSON.parse(content.string)
+      Track.new(json)
+    end
+
+    def resolvable_uri?(uri)
+      uri.start_with?('http://open.spotify.com/track/', 'spotify:track:')
+    end
+  end
+end

data/lib/spotify_to_mp3/spotify/track.rb

@@ -0,0 +1,12 @@
+module SpotifyToMp3
+  class Spotify
+    class Track
+      attr_reader :name, :artist
+
+      def initialize(json)
+        @name = json['track']['name']
+        @artist = json['track']['artists'].first['name']
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/track.rb

@@ -0,0 +1,14 @@
+module SpotifyToMp3
+  class Track
+    attr_reader :grooveshark_query
+
+    def initialize(description, grooveshark_query = nil)
+      @description = description
+      @grooveshark_query = grooveshark_query || @description
+    end
+
+    def to_s
+      @description
+    end
+  end
+end

data/lib/spotify_to_mp3/track_id_resolver.rb

@@ -0,0 +1,26 @@
+module SpotifyToMp3
+  class TrackIdResolver
+    def initialize(spotify)
+      @spotify = spotify
+    end
+
+    def resolve(track_id)
+      resolve_spotify_track(track_id) || resolve_plain_track(track_id)
+    end
+
+    private
+
+    def resolve_spotify_track(id)
+      if @spotify.resolvable_uri?(id)
+        spotify_track = @spotify.get_track(id)
+        description = "#{spotify_track.artist} - #{spotify_track.name}"
+        grooveshark_query = "artist:\"#{spotify_track.artist}\" title:\"#{spotify_track.name}\""
+        Track.new(description, grooveshark_query)
+      end
+    end
+
+    def resolve_plain_track(id)
+      Track.new(id)
+    end
+  end
+end

data/spec/app/file_track_ids_spec.rb

@@ -0,0 +1,32 @@
+require 'spotify_to_mp3'
+require 'tempfile'
+
+module SpotifyToMp3
+  describe App::FileTrackIds do
+    it "reads lines" do
+      open_test_file("1\n2\n3") do |ids|
+        ids.count.should == 3
+      end
+    end
+
+    it "trims spaces" do
+      open_test_file(" 1 ") do |ids|
+        ids.each do |id| id.should == "1" end
+      end
+    end
+
+    it "ignores empty lines" do
+      open_test_file("1\n\n2\n") do |ids|
+        ids.count.should == 2
+      end
+    end
+
+    def open_test_file(content)
+      Tempfile.open('tracks') do |file|
+        file.write(content)
+        file.rewind
+        yield App::FileTrackIds.new(file)
+      end
+    end
+  end
+end

data/spec/grooveshark_spec.rb

@@ -0,0 +1,23 @@
+require 'spotify_to_mp3'
+
+module SpotifyToMp3
+  describe Grooveshark do
+    context "#get_track" do
+      before(:each) do
+        @grooveshark = DependencyInjection.new.grooveshark
+      end
+
+      it "finds by plain query" do
+        @grooveshark.get_track("Cake - I Will Survive").should be
+      end
+
+      it "finds by artist and title" do
+        @grooveshark.get_track('artist:"Cake" title:"I Will Survive"').should be
+      end
+
+      it "fails with nonexistent tracks" do
+        expect { @grooveshark.get_track('XXXXXXXXXXXXXXX') }.to raise_error
+      end
+    end
+  end
+end

data/spec/spotify_spec.rb

@@ -0,0 +1,41 @@
+require 'spotify_to_mp3'
+
+module SpotifyToMp3
+  describe Spotify do
+    before(:each) do
+      @spotify = SpotifyToMp3::Spotify.new
+    end
+
+    context '#get_track' do
+      it "resolves HTTP URLs" do
+        track = @spotify.get_track('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE')
+        track.name.should == "I Will Survive"
+        track.artist.should == "Cake"
+      end
+
+      it "resolves Spotify URIs" do
+        track = @spotify.get_track('spotify:track:0qgiFuYhYuwtFXEwYakddE')
+        track.name.should == "I Will Survive"
+        track.artist.should == "Cake"
+      end
+
+      it "fails on nonexistent URI" do
+        expect { @spotify.get_track('spotify:track:not-found') }.to raise_error
+      end
+    end
+
+    context "#resolvable_uri?" do
+      it "accepts HTTP URLs" do
+        @spotify.resolvable_uri?('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE').should be_true
+      end
+
+      it "accepts Spotify URIs" do
+        @spotify.resolvable_uri?('spotify:track:0qgiFuYhYuwtFXEwYakddE').should be_true
+      end
+
+      it "refuses other URIs" do
+        @spotify.resolvable_uri?('123').should be_false
+      end
+    end
+  end
+end

data/spec/track_id_resolver_spec.rb

@@ -0,0 +1,24 @@
+require 'spotify_to_mp3'
+
+module SpotifyToMp3
+  describe TrackIdResolver do
+    before(:each) do
+      @resolver = DependencyInjection.new.track_id_resolver
+    end
+
+    it "resolves Spotify HTTP URLs" do
+      track = @resolver.resolve('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE')
+      track.to_s.should == "Cake - I Will Survive"
+    end
+
+    it "resolves Spotify URIs" do
+      track = @resolver.resolve('spotify:track:0qgiFuYhYuwtFXEwYakddE')
+      track.to_s.should == "Cake - I Will Survive"
+    end
+
+    it "resolves track titles" do
+      track = @resolver.resolve('Cake - I Will Survive')
+      track.to_s.should == "Cake - I Will Survive"
+    end
+  end
+end

data/spotify-to-mp3.gemspec

@@ -1,17 +1,17 @@
-Gem::Specification.new do |s|
-  s.name = 'spotify-to-mp3'
-  s.summary = 'Spotify to MP3'
-  s.description = 'Download MP3 files of Spotify tracks'
-  s.version = '0.4.2'
-  s.author = 'Francesc Rosàs'
-  s.email = 'francescrosasbosque@gmail.com'
-  s.homepage = 'https://github.com/frosas/spotify-to-mp3'
+Gem::Specification.new do |gem|
+  gem.name = 'spotify-to-mp3'
+  gem.summary = 'Spotify to MP3'
+  gem.description = 'Download Spotify tracks as MP3 files from Grooveshark'
+  gem.version = '0.5'
+  gem.author = 'Francesc Rosàs'
+  gem.email = 'francescrosasbosque@gmail.com'
+  gem.homepage = 'https://github.com/frosas/spotify-to-mp3'
 
-  s.add_dependency 'grooveshark'
-  s.add_dependency 'colorize'
-  s.add_dependency 'rest-client'
+  gem.add_dependency 'grooveshark'
+  gem.add_dependency 'colorize'
+  gem.add_dependency 'rest-client'
 
-  s.files = `git ls-files`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-  s.require_paths = ['.']
+  gem.files = `git ls-files`.split("\n")
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ['lib']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify-to-mp3
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grooveshark
@@ -59,28 +59,39 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Download MP3 files of Spotify tracks
+description: Download Spotify tracks as MP3 files from Grooveshark
 email: francescrosasbosque@gmail.com
 executables:
 - spotify-to-mp3
 extensions: []
 extra_rdoc_files: []
 files:
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.md
 - bin/spotify-to-mp3
 - lib/spotify_to_mp3.rb
-- lib/spotify_to_mp3/services.rb
-- lib/spotify_to_mp3/songs.rb
-- lib/spotify_to_mp3/sources.rb
+- lib/spotify_to_mp3/app.rb
+- lib/spotify_to_mp3/app/file_track_ids.rb
+- lib/spotify_to_mp3/dependency_injection.rb
+- lib/spotify_to_mp3/grooveshark.rb
+- lib/spotify_to_mp3/grooveshark/track.rb
+- lib/spotify_to_mp3/spotify.rb
+- lib/spotify_to_mp3/spotify/track.rb
+- lib/spotify_to_mp3/track.rb
+- lib/spotify_to_mp3/track_id_resolver.rb
+- spec/app/file_track_ids_spec.rb
+- spec/grooveshark_spec.rb
+- spec/spotify_spec.rb
+- spec/track_id_resolver_spec.rb
 - spotify-to-mp3.gemspec
 homepage: https://github.com/frosas/spotify-to-mp3
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/spotify_to_mp3/services.rb

@@ -1,40 +0,0 @@
-require 'cgi'
-
-module SpotifyToMp3
-
-  class Grooveshark
-
-    def initialize
-      @client = ::Grooveshark::Client.new
-    end
-
-    def song_url(song)
-      @client.get_song_url(song)
-    end
-
-    def song(query)
-      song = @client.search_songs(query).first
-      raise "Song not found" if song.nil?
-      song
-    end
-  end
-
-  class Spotify
-      
-    def track(uri)
-      content = open('http://ws.spotify.com/lookup/1/.json?uri=' + CGI.escape(uri))
-      json = JSON.parse(content.string)
-      Track.new(json)
-    end
-
-    class Track
-      
-      attr_reader :name, :artist
-
-      def initialize(json)
-        @name = json['track']['name']
-        @artist = json['track']['artists'].first['name']
-      end
-    end
-  end
-end

data/lib/spotify_to_mp3/songs.rb

@@ -1,65 +0,0 @@
-class UnresolvedSong
-    
-  def initialize(context, id)
-    @context = context
-    @id = id
-  end
-
-  def resolve
-    if @id.start_with?('http://open.spotify.com/track/', 'spotify:track:')
-      track = @context[:spotify].track(@id)
-      source = SpotifySource.new(@context, track)
-    else
-      source = PlainSource.new(@context, @id)
-    end
-    ResolvedSong.new(@context, source)
-  end
-
-  def to_s
-    @id
-  end
-end
-
-class ResolvedSong
-
-  def initialize(context, source)
-    @context = context
-    @source = source
-  end
-
-  def from_grooveshark
-    GroovesharkSong.new(@context, @source.grooveshark_query)
-  end
-
-  def to_s
-    "#{@source}"
-  end
-end
-
-class GroovesharkSong
-    
-  def initialize(context, query)
-    @context = context
-    @raw_grooveshark_song = @context[:grooveshark].song(query)
-  end
-
-  def download
-    download_url(@context[:grooveshark].song_url(@raw_grooveshark_song))
-  end
-
-  def to_s
-    "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}"
-  end
-
-  def filename
-    name = "#{@raw_grooveshark_song.artist} - #{@raw_grooveshark_song.name}.mp3"
-    name.tr('/', '-') # / is not allowed in file names
-  end
-
-  private
-
-  def download_url(url)
-    file = RestClient::Request.execute(:method => :post, :url => url, :raw_response => true).file
-    FileUtils.mv(file.path, filename)
-  end
-end

data/lib/spotify_to_mp3/sources.rb

@@ -1,43 +0,0 @@
-class Source
-    
-  def grooveshark_query
-    raise "Not implemented"
-  end
-
-  def to_s
-    raise "Not implemented"
-  end
-end
-
-class SpotifySource < Source
-    
-  def initialize(context, track)
-    @context = context
-    @track = track
-  end
-
-  def grooveshark_query
-    "artist:\"#{@track.artist}\" title:\"#{@track.name}\""
-  end
-
-  def to_s
-    "#{@track.artist} - #{@track.name}"
-  end
-end
-
-class PlainSource < Source
-    
-  attr_reader :grooveshark_query, :to_s
-
-  def initialize(context, id)
-    parts = id.split(' - ', 2)
-    if parts.length < 2
-      @grooveshark_query = id
-      @to_s = id
-    else
-      artist, name = parts
-      @grooveshark_query = "artist:\"#{artist}\" title:\"#{name}\""
-      @to_s = "#{artist} - #{name}"
-    end
-  end
-end