paperclip-azure 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81f27902f4dd3e53c6cf261424f669ef9e12691
-  data.tar.gz: ea0e4b80cd819d7aa37c7055e69489628e9f8361
+  metadata.gz: 8285df5718393e0e9cda5f0cfd3465eb49cd2347
+  data.tar.gz: 74a802a4572dbaab662b6d1bebaf5cdf750ebfce
 SHA512:
-  metadata.gz: 24b0de19b078bb55685eed33a07e7e8633d380e3a904c53e3f8b14480085c684f474216400a98c81c327011f4ff6f06c65768e3b7f103da7d4137a088bd2d389
-  data.tar.gz: 2fd2fca79cdaf86e804d9a4f270c32c73701e89dc65ff1c771185a02cfceee2ff4d1b6fa3e6e368873c4a9983b889a01ebb07d9937d95fa4d235e4067384ea16
+  metadata.gz: 03e5de1b225b119b900d3d64cac609bfc84859a597cb1cb710690bfb36a1b27ea0219172e7910fe539fca5cbb03c1ab417e8c6e77177b31cd56f0e6d45a6ea82
+  data.tar.gz: 9233945f21ebd52697428d7b472c40b13c02250569c11cb29833901235a8f68fe4e6e4f1c8dff19c763eaafef76af63309ccdb936b5dcf3e10c372c3a21b1bf8

data/README.md

@@ -41,7 +41,7 @@ Or, at the level of the model such as in the following example:
 
 In the even that are using a Blob that has been configured for Private access, you will need to use the Shared Access Signature functionality of Azure.  This functionality has been baked in to the `Attachment#expiring_url` method. Simply specify a time and a style and you will get a proper URL as follows:
 
-  object.attachment.expiring_url(30.minutes.since, :thumb)
+    object.attachment.expiring_url(30.minutes.since, :thumb)
 
 For more information about Azure Shared Access Signatures, please refer to [here](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-shared-access-signature-part-1/).
 
@@ -58,6 +58,6 @@ For more information about Azure Shared Access Signatures, please refer to [here
 
 ## Copyright
 
-Copyright (c) 2015 Jordan. See [LICENSE](LICENSE.txt) for
+Copyright (c) 2015. See [LICENSE](LICENSE.txt) for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/paperclip/storage/azure.rb

@@ -86,6 +86,11 @@ module Paperclip
         end
       end
 
+      def auto_connect_duration
+        @auto_connect_duration ||= @options[:auto_connect_duration] || azure_credentials[:auto_connect_duration] || 10
+        @auto_connect_duration
+      end
+
       def azure_credentials
         @azure_credentials ||= parse_credentials(@options[:azure_credentials])
       end
@@ -135,7 +140,7 @@ module Paperclip
       end
       
       def azure_container
-        @azure_container ||= azure_interface.get_container_properties container_name
+        @azure_container ||= with_azure_error_handling { azure_interface.get_container_properties container_name }
       end
 
       def azure_object(style_name = default_style)
@@ -162,7 +167,7 @@ module Paperclip
       end
 
       def create_container
-        azure_interface.create_container container_name
+        with_azure_error_handling { azure_interface.create_container container_name }
       end
 
       def flush_writes #:nodoc:
@@ -191,19 +196,21 @@ module Paperclip
       end
 
       def save_blob(container_name, storage_path, file)
-        if file.size < 64.megabytes
-          azure_interface.create_block_blob container_name, storage_path, file.read
-        else 
-          blocks = []; count = 0
-          while data = file.read(4.megabytes)
-            block_id = "block_#{(count += 1).to_s.rjust(5, '0')}"
-            
-            azure_interface.create_blob_block container_name, storage_path, block_id, data
-
-            blocks << [block_id]
-          end
+        with_azure_error_handling do
+          if file.size < 64.megabytes
+            azure_interface.create_block_blob container_name, storage_path, file.read
+          else 
+            blocks = []; count = 0
+            while data = file.read(4.megabytes)
+              block_id = "block_#{(count += 1).to_s.rjust(5, '0')}"
+              
+              azure_interface.create_blob_block container_name, storage_path, block_id, data
+
+              blocks << [block_id]
+            end
 
-          azure_interface.commit_blob_blocks container_name, storage_path, blocks
+            azure_interface.commit_blob_blocks container_name, storage_path, blocks
+          end
         end
       end
 
@@ -211,7 +218,8 @@ module Paperclip
         @queued_for_delete.each do |path|
           begin
             log("deleting #{path}")
-            azure_interface.delete_blob container_name, path
+
+            with_azure_error_handling { azure_interface.delete_blob container_name, path }
           rescue ::Azure::Core::Http::HTTPError => e
             raise unless e.status_code == 404
           end
@@ -222,10 +230,12 @@ module Paperclip
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
         
-        blob, content = azure_interface.get_blob(container_name, path(style).sub(%r{\A/},''))
+        with_azure_error_handling do
+          blob, content = azure_interface.get_blob(container_name, path(style).sub(%r{\A/},''))
 
-        ::File.open(local_dest_path, 'wb') do |local_file|
-          local_file.write(content)
+          ::File.open(local_dest_path, 'wb') do |local_file|
+            local_file.write(content)
+          end
         end
       rescue ::Azure::Core::Http::HTTPError => e
         raise unless e.status_code == 404
@@ -250,6 +260,22 @@ module Paperclip
           raise ArgumentError, "Credentials given are not a path, file, proc, or hash."
         end
       end
+
+      def with_azure_error_handling
+        count = 0
+
+        begin
+          yield
+        rescue Exception => e
+          if count <= auto_connect_duration
+            sleep 2** count
+            count += 1
+            retry
+          end
+
+          raise
+        end
+      end
     end
   end
 end

data/paperclip-azure.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "paperclip-azure"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jordan Yaker", "Supportify, Inc."]
-  s.date = "2015-01-19"
+  s.date = "2015-01-29"
   s.description = "An Azure Blob Storage implementation for Paperclip."
   s.email = "help@supportify.io"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-azure
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jordan Yaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure