paperclip-azure 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8285df5718393e0e9cda5f0cfd3465eb49cd2347
-  data.tar.gz: 74a802a4572dbaab662b6d1bebaf5cdf750ebfce
+  metadata.gz: 6a436c5fe249cd01c90a3396d6283eaf8ce193a7
+  data.tar.gz: 8d17a7d45bca35b39619e733a860a5594ced8806
 SHA512:
-  metadata.gz: 03e5de1b225b119b900d3d64cac609bfc84859a597cb1cb710690bfb36a1b27ea0219172e7910fe539fca5cbb03c1ab417e8c6e77177b31cd56f0e6d45a6ea82
-  data.tar.gz: 9233945f21ebd52697428d7b472c40b13c02250569c11cb29833901235a8f68fe4e6e4f1c8dff19c763eaafef76af63309ccdb936b5dcf3e10c372c3a21b1bf8
+  metadata.gz: a639a7f4bf18d39940b20a31b1b9ae474d64992b2c800e842a01555506afd52e771e97292112573416533e10fa849be25d65239f3637425b5924e5288e7d8d05
+  data.tar.gz: 7731080268f782451a563dd8fe36b34dfe80ae97e9f875ba3d8df3786ea500808147548e2fc872d31796719e91db112812f6b7eef81d53aad409700dbc9715ce

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/paperclip/storage/azure.rb

@@ -125,7 +125,28 @@ module Paperclip
         
         unless instances[options]
           signer = ::Azure::Core::Auth::SharedKey.new options[:storage_account_name], options[:access_key]
-          instances[options] = ::Azure::BlobService.new(signer, options[:storage_account_name])
+          service = ::Azure::BlobService.new(signer, options[:storage_account_name])
+
+          service.filters << ::Azure::Core::Http::RetryPolicy.new do |response, retry_data|
+            status_code = response.status_code == 0 ? 500 : response.status_code
+            @retry_count ||= 0
+            
+            if (status_code >= 300 && status_code < 500 && status_code != 408) ||
+                status_code == 501 ||
+                status_code == 505 ||
+                response[:error].description == 'Blob type of the blob reference doesn\'t match blob type of the blob.' ||
+                @retry_count >= 5
+              @retry_count = 0
+            else
+              @retry_count += 1
+          
+              sleep ((2**@retry_count) - 1) * 5
+            end
+
+            @retry_count > 0
+          end
+
+          instances[options] = service
         end
 
         instances[options] 
@@ -140,7 +161,7 @@ module Paperclip
       end
       
       def azure_container
-        @azure_container ||= with_azure_error_handling { azure_interface.get_container_properties container_name }
+        @azure_container ||= azure_interface.get_container_properties container_name
       end
 
       def azure_object(style_name = default_style)
@@ -167,7 +188,7 @@ module Paperclip
       end
 
       def create_container
-        with_azure_error_handling { azure_interface.create_container container_name }
+        azure_interface.create_container container_name
       end
 
       def flush_writes #:nodoc:
@@ -196,21 +217,19 @@ module Paperclip
       end
 
       def save_blob(container_name, storage_path, file)
-        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
+        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
         end
       end
 
@@ -219,7 +238,7 @@ module Paperclip
           begin
             log("deleting #{path}")
 
-            with_azure_error_handling { azure_interface.delete_blob container_name, path }
+            azure_interface.delete_blob container_name, path
           rescue ::Azure::Core::Http::HTTPError => e
             raise unless e.status_code == 404
           end
@@ -230,12 +249,10 @@ module Paperclip
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
         
-        with_azure_error_handling do
-          blob, content = azure_interface.get_blob(container_name, path(style).sub(%r{\A/},''))
+        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)
-          end
+        ::File.open(local_dest_path, 'wb') do |local_file|
+          local_file.write(content)
         end
       rescue ::Azure::Core::Http::HTTPError => e
         raise unless e.status_code == 404
@@ -260,22 +277,6 @@ 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.3"
+  s.version = "0.2.4"
 
   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-29"
+  s.date = "2015-02-16"
   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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jordan Yaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure