warehaus 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72ebba4ee312a30fe03cf7ddcf7023fca38b88d
-  data.tar.gz: 4aabbdc0f36b7d1a3bd300500f4b9f4a25208701
+  metadata.gz: 03b7c03389b5a48a63749e1b03c37ae91c0b55ac
+  data.tar.gz: 504d5ab4dbe34758ee1281641ddfc8e4dbd9321e
 SHA512:
-  metadata.gz: 9868913e46d474d36487262513cd3dc2c0150c17a572d7d658b6beea10b6036e6f82900f20e68a41a9f426b8c93460389be278b3c4e0e5e447327bdd5d4e671d
-  data.tar.gz: 2f92512d476e417b2bfe89d83aa56b9e72badac91205493561193ab66c07fbe2d574b192580e1a784f97f43d0308ab9f85c0468d0bebd6d46d4559032d19dcf6
+  metadata.gz: 260414d62bb981dae17add734d03bbc63932302640c015970842cc783f92e02a6b27aea936143c83cfd76c8ed538c288a8ebaaacd3598156e50b892b9730b824
+  data.tar.gz: a1a7dbe846e25b334a515c9140b13f592d23d6c82ac9f5504ce15d7ddd609de70cff0a854d60afcda4ceeef2b541d71d1d33596d18711756dce4d25d1017edb7

data/lib/warehaus.rb

@@ -1,5 +1,7 @@
 require "warehaus/version"
 require "httparty"
+require "net/http"
+require "uri"
 require "json"
 require "zip"
 require "fileutils"
@@ -10,8 +12,8 @@ module Warehaus
 	class Getter
 		include HTTParty
 
-		base_uri '3dwarehouse.sketchup.com'
-		
+		BASE_URI = '3dwarehouse.sketchup.com'
+		base_uri BASE_URI
 		ENTITY_PATH = '/3dw/GetEntity'
 		KMZ_PATH = '/warehouse/getpubliccontent'
 
@@ -32,7 +34,7 @@ module Warehaus
 
 		def fetch_entity
 			log("📠  Fetching JSON representation of model")
-			@response = JSON.parse(self.class.get(ENTITY_PATH, @options), :symbolize_names => true)
+			@response ||= JSON.parse(self.class.get(ENTITY_PATH, @options), :symbolize_names => true)
 		end
 
 		def get_kmz_id
@@ -61,22 +63,38 @@ module Warehaus
 			}
 		end
 
-		def download_kmz
-			log("📥  Downloading KMZ file")
-			@kmz = self.class.get(KMZ_PATH, @kmz_options).parsed_response
-		end
+		def download_kmz(tries=3, redirect=false)
+			return raise_error 'HTTP Redirect too deep' if tries == 0
+			
+			log("📥  Downloading KMZ file") unless redirect
 
-		def write_kmz
 			FileUtils::mkdir_p "#{@model_path}/.tmp"
-			log("📝  Writing KMZ file")
+			url = redirect ? URI.parse( redirect ) : URI.parse("http://" + BASE_URI + "#{KMZ_PATH}?contentId=#{@kmz_options[:query][:contentId]}&fn=#{@kmz_options[:query][:fn]}")
+			
 			begin
-				File.open("#{@model_path}/.tmp/#{@name}.kmz", "w+") do |f|
-					f.write @kmz
-				end
-				FileUtils::mv "#{@model_path}/.tmp/#{@name}.kmz", "#{@model_path}/.tmp/#{@name}.zip"
+				resp = Net::HTTP.get_response(url)
 			rescue Exception => e
 				return raise_error e.message
 			end
+
+				
+			case resp
+			    when Net::HTTPSuccess then
+
+		    		File.open("#{@model_path}/.tmp/#{@name}.kmz", "wb") do |file|
+		        
+		        		file.write(resp.body)
+		        
+		        	end
+		    	
+		    		FileUtils.mv "#{@model_path}/.tmp/#{@name}.kmz", "#{@model_path}/.tmp/#{@name}.zip"
+		        
+		        when Net::HTTPRedirection then
+		   			download_kmz( tries-1, resp['location'])
+		   		else raise_error("Response neither successful nor redirecting")
+		    end
+			
+
 		end
 
 		def unzip_kmz
@@ -105,7 +123,7 @@ module Warehaus
 
 		def cleanup
 			log("🛀  Cleaning up")
-			FileUtils.rm_rf("#{@model_path}/.tmp")
+			FileUtils.rm_rf("#{@model_path}")
 		end
 
 		def unbox
@@ -113,9 +131,7 @@ module Warehaus
 			fetch_entity
 			get_kmz_id
 			download_kmz
-			write_kmz
-			unzip_kmz
-			cleanup
+			unzip_km
 			"#{@path}/#{@name}/"
 		end
 

data/lib/warehaus/version.rb

@@ -1,3 +1,3 @@
 module Warehaus
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warehaus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Erik Sälgström Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler