soundcloud_downloader 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb8409f92f89cbac0b64e44c99daa11d1b8d9c4
-  data.tar.gz: 8c5eddfb8bdbe343ee2dc9f8b81b8b4c32fcc8d4
+  metadata.gz: 403aac9fbf02561bb958961072cacb81a53fb4ef
+  data.tar.gz: f3f9f1934aaeda1aa976cab3ded5e426e62cf84f
 SHA512:
-  metadata.gz: f486e3463b0f02ca24ff396c16a7bdeed05347fa1aaeee85c137df73dd6bc77e69942c1690ad47cf29fd3103eb2690527e701c45e72632a2038de9be020335e7
-  data.tar.gz: e122123f636cc9f26297076fdfa905d9a94e1c72654408d8d9589fe75facd17171d17814eecdbb8c047859329ee4f84445278b920f86ebece9d2088dec7daa4f
+  metadata.gz: ab4e2b3fbfb811bc309de2cf4e6655d2b4bfbb5e5cba771785474e28eba651192f22b7e88bf9dc0969dd57a006e99d1c2275c6616486e7bbf3c7d2eec67fbd88
+  data.tar.gz: ad0ac25262649e7f12aa23b898595752de0d39bc97b60e1d7722d18734afd6838dc9b0660bf8e76460515ff77841cebe5850e642ef78836764d26cf38884c2fa

data/bin/{soundcloud_downloader → soundcloud-downloader}

@@ -3,4 +3,4 @@
 require 'soundcloud_downloader'
 
 song = Song.new(ARGV[0])
-song.download
+song.download

data/lib/soundcloud_downloader/song.rb

@@ -1,8 +1,11 @@
-require "unirest"
+require "excon"
+require "json"
+require "uri"
 
 class Song
   attr_reader :id, :stream_url, :name, :url
   def initialize(url)
+    raise ArgumentError, "Invalid url" if url !~ URI::regexp
     @url = url
     @name = url.split("/").last
     @id ||= get_id
@@ -10,42 +13,35 @@ class Song
   end
 
   def download (file = "#{@name}.mp3")
-    uri = URI(@stream_url)
-    Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-      begin
-        file = open("#{file}", 'wb')
-        http.request_get uri.request_uri do |response|
-          downloaded = 0
-          total_length = response['Content-Length'].to_f
-          response.read_body do |segment|
-            downloaded += (segment.length).to_f
-            print "\rDownloaded " + (((downloaded/total_length)*100).to_i).to_s + "%"
-            STDOUT.flush
-            file.write(segment)
-          end
-        end
-      ensure
-        file.close
-      end
+    streamer = lambda do |chunk, remaining_bytes, total_bytes|
+      file.write(chunk)
+      remaining = ((remaining_bytes.to_f / total_bytes) * 100).to_i
+      STDOUT.flush
+      print "\rRemaining: #{remaining}%"
     end
+    file = open("#{file}", 'wb')
+    Excon.get(@stream_url, :response_block => streamer)
+    puts "\r\nComplete!"
+    file.close
   end
 
   private
 
   def get_stream_url
-    response = Unirest.get "https://api.sndcdn.com/i1/tracks/#{@id}/streams", headers: {}, parameters: { :client_id => $client_id }
-    response.body["http_mp3_128_url"]
+    response = Excon.get("https://api.sndcdn.com/i1/tracks/#{@id}/streams", :query => { :client_id => $client_id })
+    JSON.parse(response.body)["http_mp3_128_url"]
   end
 
   def get_id
-    response = Unirest.get "https://api.sndcdn.com/resolve?_status_code_map%5B302%5D=200", 
-    headers: { "Accept" => "application/json" }, 
-    parameters: {
+    response = Excon.get("https://api.sndcdn.com/resolve?_status_code_map%5B302%5D=200", 
+    :headers => { "Accept" => "application/json" }, 
+    :query => {
       :url => @url,
       :_status_format => 'json',
       :client_id => $client_id
-    }
-    uri = URI.parse(response.body["location"]).path.to_s
+    })
+    location = JSON.parse(response.body)["location"]
+    uri = URI.parse(location).path.to_s
     uri.split('/').last
   end
 end

data/lib/soundcloud_downloader/version.rb

@@ -1,3 +1,3 @@
 module SoundcloudDownloader
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/soundcloud_downloader.gemspec

@@ -19,7 +19,8 @@ computer as MP3 files}
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "unirest", '~> 1.1'
+  spec.add_runtime_dependency "excon"
+  spec.add_runtime_dependency "json"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: soundcloud_downloader
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mico Piira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: unirest
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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
@@ -56,7 +70,7 @@ description: "Downloads songs from SoundCloud to your \ncomputer as MP3 files"
 email:
 - mico.piira@yahoo.com
 executables:
-- soundcloud_downloader
+- soundcloud-downloader
 extensions: []
 extra_rdoc_files: []
 files:
@@ -65,7 +79,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/soundcloud_downloader
+- bin/soundcloud-downloader
 - lib/soundcloud_downloader.rb
 - lib/soundcloud_downloader/song.rb
 - lib/soundcloud_downloader/version.rb