downloadr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4c356466b4e4e41b1db9a02b10a55c29eab05f
-  data.tar.gz: e0b65f85469cb03b40fea1ecb9e6ed17b24be785
+  metadata.gz: 3a80035d5c1821c148bd9895ec7aeb4944d0f480
+  data.tar.gz: dc62ba3d63f0763bfef7b0980b0ccac4d4b035c4
 SHA512:
-  metadata.gz: 115d4f880f88188aa63a5c796fd53d3c01d1fc7eb1aea07c76231ec3de15f3129eb2792c96a2aef052a6e24eb6015543b2c95de13d98d5dd53d0f09b4e81f047
-  data.tar.gz: ade2a68e5afafe4feae374c38690a2bd60c96c5e329413e13ed1584a1c675dcdc55e5d2655d156fc39f66575dd575dbeb6aa32d8dee9302824249f94da806ae0
+  metadata.gz: 4c9947310faa5671f25816ccc4fad372ae526363d672c8a96efea6d17fab47db0804dd960178435451608e2ab376bae7f0031e51ce305ca4721210dc352d981f
+  data.tar.gz: 64556525afd68810858bb952dd585739f1d26a32b158844d3a1e399bf371834704b2ea3d648e9eed572d88e9046b4e3d98a9b8126e8aeaa74f93d4407c14eee6

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.0.0

data/downloadr.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', "~> 1.6"
+  spec.add_dependency 'rest-client', '~> 1.7'
+  spec.add_dependency 'addressable', '~> 2.3'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/downloadr.rb

@@ -1,2 +1,3 @@
 require "downloadr/version"
-require "downloadr/http"
+require "downloadr/http"
+require "downloadr/exception"

data/lib/downloadr/exception.rb

@@ -0,0 +1,10 @@
+module Downloadr
+  class ResourceNotFound < StandardError
+  end
+
+  class UnknownDownloadPath < StandardError
+  end
+
+  class SocketError < StandardError
+  end
+end

data/lib/downloadr/http.rb

@@ -1,25 +1,57 @@
-require "net/http"
-require "uri"
+require 'rest_client'
+require 'addressable/uri'
+
+# HTTP/HTTPS Transport handler for downloading a file
 
 module Downloadr
-  # HTTP/HTTPS Transport handler for downloading a file
   class HTTP
-  	attr_reader :uri, :path
-
-  	# @param [String] uri
-  	# @param [String] path
-  	def initialize(uri, path)
-  	  @uri = uri
-  	  @path = path
-  	end
-
-  	def download
-			File.write(@path, Net::HTTP.get(URI.parse(@uri)))
-  	end
-
-  	def self.download(uri, path)
-  	  downloader = Downloadr::HTTP.new(uri, path)
-  	  downloader.download
-  	end
+    attr_reader :uri, :path
+
+    # @param [String] uri
+    # @param [String] download_path
+    def initialize(uri, download_path = nil)
+      @uri = ::Addressable::URI.parse(uri)
+      @path = normalize_path(download_path)
+    end
+
+    def download
+      begin
+        response = ::RestClient::Request.execute(
+                     :method => :get,
+                     :url => @uri.to_s,
+                     :timeout => 100,
+                     :open_timeout => 10
+                   )
+
+      rescue ::SocketError
+        raise Downloadr::SocketError
+      rescue RestClient::ResourceNotFound
+        raise Downloadr::ResourceNotFound
+      end
+
+      File.write(@path, response.to_str)
+    end
+
+    def self.download(uri, download_path = nil)
+      downloader = Downloadr::HTTP.new(uri, download_path)
+      downloader.download
+    end
+
+    private
+    def normalize_path(download_path)
+      if download_path.nil?
+        if @uri.basename.empty? ||
+           @uri.basename.nil?
+          raise Downloadr::UnknownDownloadPath
+        else
+          path = @uri.basename
+        end
+      else
+        path = download_path
+      end
+
+      return path
+    end
+
   end
 end

data/lib/downloadr/version.rb

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

data/spec/downloadr/http_spec.rb

@@ -5,29 +5,63 @@ module Downloader
   describe "HTTP" do
   	context "when initializing Downloadr::HTTP" do
   		before :each do
-				@file_path = Tempfile.new('downloadr')
+				@download_path = Tempfile.new('downloadr')
 				@uri = "http://www.google.com/index.html"
-  			@http_downloadr = Downloadr::HTTP.new(@uri, @file_path)
+  			@http_downloadr = Downloadr::HTTP.new(@uri, @download_path)
   		end
 
   		subject{@http_downloadr}
 
-  		it { should be_kind_of Downloadr::HTTP}
+  		it {should be_kind_of Downloadr::HTTP}
 
   		it "should have the right uri" do
-  			expect(subject.uri).to be(@uri)
+  			expect(subject.uri).to eql(::Addressable::URI.parse(@uri))
   		end
 
   		it "should have the right file path" do
-  			expect(subject.path).to be(@file_path)
+  			expect(subject.path).to be(@download_path)
   		end
   	end
 
+    context "when initializing Downloadr::HTTP w/o a download path" do
+      before :each do
+        @uri = "http://www.google.com/index.html"
+        @http_downloadr = Downloadr::HTTP.new(@uri)
+      end
+
+      subject{@http_downloadr}
+
+      it {should be_kind_of Downloadr::HTTP}
+
+      it "should have the right uri" do
+        expect(subject.uri).to eql(::Addressable::URI.parse(@uri))
+      end
+
+      it "should have the right file path" do
+        expect(subject.path).to eql("index.html")
+      end
+    end
+
+    context "when initializing Downloadr::HTTP w/o a download path or uri filename" do
+      before :each do
+        @uri = "http://www.google.com"
+      end
+
+      subject{@http_downloadr}
+
+      it "should have the right uri" do
+        expect {
+          Downloadr::HTTP.new(@uri) 
+        }.to raise_error(Downloadr::UnknownDownloadPath)
+      end
+    end
+
+
   	context "when downloading a file via HTTP" do
   		before :each do
-				@file_path = Tempfile.new('downloadr')
+				@download_path = Tempfile.new('downloadr')
 				@uri = "http://www.google.com/index.html"
-  			@http_downloadr = Downloadr::HTTP.new(@uri, @file_path)
+  			@http_downloadr = Downloadr::HTTP.new(@uri, @download_path)
   		end
 
   		subject{@http_downloadr}
@@ -53,27 +87,76 @@ module Downloader
 
   	context "when downloading via self.download" do
   		before :each do
-  			@file_path = Tempfile.new('downloadr')
+  			@download_path = Tempfile.new('downloadr')
 				@uri = "http://www.google.com/index.html"
   		end
 
   		it "should start with an empty file" do
-  			expect(@file_path.size).to be(0)
+  			expect(@download_path.size).to be(0)
   		end
 
   		it "should return a Fixnum when being downloaded" do
-  			expect(Downloadr::HTTP.download(@uri, @file_path)).to be_kind_of ::Fixnum
+  			expect(Downloadr::HTTP.download(@uri, @download_path)).to be_kind_of ::Fixnum
   		end
 
   		it "should have created a file on disk" do
-  			Downloadr::HTTP.download(@uri, @file_path)
-  			expect(@file_path.size).to be > 0
+  			Downloadr::HTTP.download(@uri, @download_path)
+  			expect(@download_path.size).to be > 0
   		end
 
   		it "should have content that looks like google" do
-  			Downloadr::HTTP.download(@uri, @file_path)
-  			expect(File.read(@file_path)).to include("google")
+  			Downloadr::HTTP.download(@uri, @download_path)
+  			expect(File.read(@download_path)).to include("google")
   		end
   	end
+
+    context "when attempting to download from a uri that returns a 404" do
+      before :each do
+        @download_path = Tempfile.new('downloadr')
+        @uri = "http://www.google.com/this_file_does_not_exist"
+      end
+
+      it "should start with an empty file" do
+        expect(@download_path.size).to be(0)
+      end
+
+      it "should throw an exception when attempting to download" do
+        expect {
+          Downloadr::HTTP.download(@uri, @download_path)
+        }.to raise_error(Downloadr::ResourceNotFound)
+      end
+
+      it "should not have created a file on disk" do
+        expect {
+          Downloadr::HTTP.download(@uri, @download_path)
+        }.to raise_error(Downloadr::ResourceNotFound)
+        expect(@download_path.size).to be(0)
+      end
+    end
+
+    context "when attempting to download from a uri that doesn't resolve" do
+      before :each do
+        @download_path = Tempfile.new('downloadr')
+        @uri = "http://abc.local/this_server_does_not_exist"
+      end
+
+      it "should start with an empty file" do
+        expect(@download_path.size).to be(0)
+      end
+
+      it "should throw an exception when attempting to download" do
+        expect {
+          Downloadr::HTTP.download(@uri, @download_path)
+        }.to raise_error(Downloadr::SocketError)
+      end
+
+      it "should not have created a file on disk" do
+        expect {
+          Downloadr::HTTP.download(@uri, @download_path)
+        }.to raise_error(Downloadr::SocketError)
+        expect(@download_path.size).to be(0)
+      end
+    end    
+
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: downloadr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jonathan Claudius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +98,7 @@ files:
 - Rakefile
 - downloadr.gemspec
 - lib/downloadr.rb
+- lib/downloadr/exception.rb
 - lib/downloadr/http.rb
 - lib/downloadr/version.rb
 - spec/downloadr/http_spec.rb