carrierwave-upyun 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6915aa09ab9b7059d576c1dc6162cfaefd60ba5c48bcb4361724f321b43ebe93
-  data.tar.gz: 03af17a59f9c9aa13a742565c4e20c8c1c1c7a1df7726736c99047e21c8e2ca4
+  metadata.gz: f791f761160e72a58c354c42e721eafa4a7f832eb5ecc5b7bc79a8a870c852b9
+  data.tar.gz: 9af67d6bdf3b6b82cc8e237b4e867a08fdc27e595c90e20b5a8630b3defffdc0
 SHA512:
-  metadata.gz: 6888113e3efb214f774fa9f28df17c16465c5b66aded6d35949b4fc5435a211c8a9129ebd4349bc4a6fb32d9ca23ca59711906810e485d3d49a096f97e3273b1
-  data.tar.gz: 357b98e4ff157f305d60843bbaa54d88bd7f1f19b66885ee127c724de44254b6ad1ce444dddc98ee7c230a5789a9546fbfadc1bd07e60cee6b374f27961321a2
+  metadata.gz: 9fd03f1cbf3f23f5df6cb1015508d7e29406f2eb55eccf7170417be372220d0eedc59323b9c853473013a094fb55923065572d64e843afc195166d5e478413fb
+  data.tar.gz: a2090f8fd7154ddefbc43914d11929a7f1871e38eea1b0a7bbbd81557053eb88273164120f2b8c785e0f58271e1f8eb58f78b0c8f397d0fb7f596cb42ea9928f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.0.1
+
+- 对于 CarrierWave 的 cache 机制正确支持；
+- 对 UpYun 偶发的 `concurrent put or delete` 错误容错；
+- 清理不必要的 dependency.
+
+## 1.0.0
+
+- 支持 CarrierWave 2.0.0+;
+
 ## 0.2.2
 
 - 减少 Gem 文件尺寸，避免带入不必要的问题；
@@ -24,4 +34,4 @@
 
 ## 0.1.6
 
-- 改进 Upyun 初始化，将少连接的过程;
+- 改进 Upyun 初始化，将少连接的过程;

data/lib/carrierwave-upyun.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "carrierwave/storage/upyun"
 require "carrierwave/upyun/configuration"
 
 CarrierWave.configure do |config|
-  config.storage_engines.merge!({upyun: "CarrierWave::Storage::UpYun"})
+  config.storage_engines.merge!(upyun: "CarrierWave::Storage::UpYun")
 end
 
-CarrierWave::Uploader::Base.send(:include, CarrierWave::UpYun::Configuration)
+CarrierWave::Uploader::Base.include CarrierWave::UpYun::Configuration

data/lib/carrierwave/storage/upyun.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 require "faraday"
 
 module CarrierWave
@@ -15,7 +16,10 @@ module CarrierWave
     #
     #
     class UpYun < Abstract
-      DEFAULT_API_URL = 'http://v0.api.upyun.com'
+      DEFAULT_API_URL = "http://v0.api.upyun.com"
+
+      class UploadError < RuntimeError; end
+      class ConcurrentUploadError < RuntimeError; end
 
       class File < CarrierWave::SanitizedFile
         def initialize(uploader, base, path)
@@ -31,9 +35,7 @@ module CarrierWave
         #
         # [String] A path
         #
-        def path
-          @path
-        end
+        attr_reader :path
 
         def escaped_path
           @escaped_path ||= CGI.escape(@path)
@@ -43,9 +45,7 @@ module CarrierWave
           @content_type || ""
         end
 
-        def content_type=(new_content_type)
-          @content_type = new_content_type
-        end
+        attr_writer :content_type
 
         ##
         # Reads the contents of the file from Cloud Files
@@ -64,13 +64,11 @@ module CarrierWave
         # Remove the file from Cloud Files
         #
         def delete
-          begin
-            conn.delete(escaped_path)
-            true
-          rescue => e
-            puts "carrierwave-upyun delete failed: #{e.inspect}"
-            nil
-          end
+          conn.delete(escaped_path)
+          true
+        rescue StandardError => e
+          puts "carrierwave-upyun delete failed: #{e.inspect}"
+          nil
         end
 
         ##
@@ -83,6 +81,7 @@ module CarrierWave
         #
         def url
           return nil unless @uploader.upyun_bucket_host
+
           [@uploader.upyun_bucket_host, @path].join("/")
         end
 
@@ -101,34 +100,42 @@ module CarrierWave
         #
         # boolean
         #
-        def store(data, headers = {})
-          res = conn.put(escaped_path, data) do |req|
-            req.headers = {'Expect' => '', 'Mkdir' => 'true'}.merge(headers)
+        def store(new_file, headers = {})
+          res = conn.put(escaped_path, new_file.read) do |req|
+            req.headers = { "Expect" => "", "Mkdir" => "true" }.merge(headers)
           end
+
           if res.status != 200
-            puts "Update failed: #{res.body}"
-            return false
+            # code: 42900007 -> concurrent put or delete
+            json = JSON.parse(res.body)
+            # retry upload
+            raise ConcurrentUploadError, res.body if json["code"] == 42_900_007
+
+            raise UploadError, res.body
           end
 
           true
+        rescue ConcurrentUploadError => e
+          puts "Warning: UpYun error #{e.message}, retry again."
+          retry
         end
 
         def headers
           @headers ||= begin
             conn.get(@path).headers
-          rescue Faraday::ClientError
-            {}
+                       rescue Faraday::ClientError
+                         {}
           end
         end
 
         def conn
-          return @conn if defined?(@conn)
-
-          api_host = @uploader.upyun_api_host || DEFAULT_API_URL
-          @conn = Faraday.new(url: "#{api_host}/#{@uploader.upyun_bucket}") do |req|
-            req.request :basic_auth, @uploader.upyun_username, @uploader.upyun_password
-            req.request :url_encoded
-            req.adapter Faraday.default_adapter
+          @conn ||= begin
+            api_host = @uploader.upyun_api_host || DEFAULT_API_URL
+            Faraday.new(url: "#{api_host}/#{@uploader.upyun_bucket}") do |req|
+              req.request :basic_auth, @uploader.upyun_username, @uploader.upyun_password
+              req.request :url_encoded
+              req.adapter Faraday.default_adapter
+            end
           end
         end
       end # File
@@ -146,7 +153,7 @@ module CarrierWave
       #
       def store!(file)
         f = File.new(uploader, self, uploader.store_path)
-        f.store(file.read, 'Content-Type' => file.content_type)
+        f.store(file, "Content-Type" => file.content_type)
         f
       end
 
@@ -165,8 +172,8 @@ module CarrierWave
       end
 
       def cache!(file)
-        f = File.new(uploader, self, uploader.store_path)
-        f.store(file.read, 'Content-Type' => file.content_type)
+        f = File.new(uploader, self, uploader.cache_path)
+        f.store(file, "Content-Type" => file.content_type)
         f
       end
 
@@ -174,11 +181,9 @@ module CarrierWave
         File.new(uploader, self, uploader.cache_path(identifier))
       end
 
-      def delete_dir!(path)
-      end
+      def delete_dir!(path); end
 
-      def clean_cache!(seconds)
-      end
+      def clean_cache!(seconds); end
     end # CloudFiles
   end # Storage
 end # CarrierWave

data/lib/carrierwave/upyun/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module UpYun
     module Configuration
@@ -10,13 +12,13 @@ module CarrierWave
         add_config :upyun_bucket_host
       end
     end
-    
+
     module ClassMethods
       def add_config(name)
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.#{name}(value=nil)
             @#{name} = value if value
-            return @#{name} if self.object_id == #{self.object_id} || defined?(@#{name})
+            return @#{name} if self.object_id == #{object_id} || defined?(@#{name})
             name = superclass.#{name}
             return nil if name.nil? && !instance_variable_defined?("@#{name}")
             @#{name} = name && !name.is_a?(Module) && !name.is_a?(Symbol) && !name.is_a?(Numeric) && !name.is_a?(TrueClass) && !name.is_a?(FalseClass) ? name.dup : name
@@ -31,7 +33,7 @@ module CarrierWave
             value.instance_of?(Proc) ? value.call : value
           end
         RUBY
-      end   
+      end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nowa Zhu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -45,76 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: UpYun Storage support for CarrierWave
 email:
 - nowazhu@gmail.com