zerofetcher 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c66bf584a355d5d78988ad95422a0824b50d1f
-  data.tar.gz: ef18802a07eb539e06c4b9d35f1210f8d60b77fc
+  metadata.gz: 75fc18bc583f446f3fe864120b4e87d9be2387a1
+  data.tar.gz: b5ede370c9aa3a889629dd7ee582dd6b6ad1728a
 SHA512:
-  metadata.gz: 7b4f93f922edfadf325fa25df818c22ce0480b49f578dffc0140049fba38f9f184ed94f83458659dbaf802b267bd33447b676238c46cf4663103c37fd3716de3
-  data.tar.gz: 1b0e325d84daf55cfb01c8b41770b34a6e17b26f9478bba21909b3cd6d581d8ed9774fb6c8a405b805911712fc9382d8870d3ef11900663b42d6729a3e3156ac
+  metadata.gz: db221df67a46256f3765d1bbe58d6e96550c0e73ec99a7550e1a08c1d90769be34ac6b5adacd0032b4a10295b25aaa9b28e04874f2ecac545014b60a3f3a0ae8
+  data.tar.gz: e4e39d4626e8f0dcde52bc15f828d56f0cc9f0ef3493c5b3845d65b757730b696f8d0a57e0ebe1f42d05f5e9dd12da1d4374efb0716889a1023c0fb4b779369c

data/lib/zerofetcher.rb

@@ -62,6 +62,10 @@ class ZeroFetcher
         # Load data from API
         data = self.loadDataFromApi(end_point, config['fetcher']['api_key'], site_id)
         
+        if data == false
+            return
+        end
+        
         # Create empty collection hash
         collection_config = {};
 
@@ -517,7 +521,14 @@ ErrorDocument 404 /404/index.html'
     
         res = Net::HTTP.get_response(uri)
         
-        return JSON.parse(res.body)['data']
+        begin  
+            json_data = JSON.parse(res.body)
+        rescue
+            puts "Server did not return JSON data. Check to make sure your endpoint is valid ["+end_point+"]"
+            return false
+        end  
+        
+        return json_data['data']
     end
     
     def self.getAndSaveFile(source, dest)
@@ -527,11 +538,17 @@ ErrorDocument 404 /404/index.html'
             
             begin
                 open(dest, 'wb') do |file|
-                    file << open(uri).read
-                end
-                
-                rescue OpenURI::HTTPError => ex
+                    begin
+                        file << open(uri).read
+                    rescue
+                        puts uri + " could not be read"
+                        return false
+                    end
+                end                
+            rescue
+                puts 'source ['+source+'] Could not be opened to save'
                 self.log('source ['+source+'] Could not be opened to save')
+                return false
             end
         end
     end
@@ -546,16 +563,19 @@ ErrorDocument 404 /404/index.html'
         }
       
         # Save Original
-        self.getAndSaveFile(source, dest)
-        self.optimizeImage(dest)
+        if self.getAndSaveFile(source, dest)
+            self.optimizeImage(dest)
+        end
         
         # Save Variants
         if @@image_variants
             @@image_variants.each do |variant|
                 v_source = self.getImageVariantSource(source, variant)
                 v_dest = self.getImageVariantDestination(dest, variant)
-                self.getAndSaveFile( v_source, v_dest )
-                self.optimizeImage( v_dest )
+                
+                if self.getAndSaveFile( v_source, v_dest )
+                    self.optimizeImage( v_dest )
+                end
                 
                 images[ variant['key'] ] = File.basename( v_dest )
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zerofetcher
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Brian Liccardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optimizer