carrierwave-upyun 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f791f761160e72a58c354c42e721eafa4a7f832eb5ecc5b7bc79a8a870c852b9
-  data.tar.gz: 9af67d6bdf3b6b82cc8e237b4e867a08fdc27e595c90e20b5a8630b3defffdc0
+  metadata.gz: 46d635232316c1ca6dfbdf4314dd97f9aa41a3b8595a68d7bad51311e80a092d
+  data.tar.gz: f59490f9edb05becd23b4ce4686ea45d5feedb6130e821fb1a4c9c0012bff44e
 SHA512:
-  metadata.gz: 9fd03f1cbf3f23f5df6cb1015508d7e29406f2eb55eccf7170417be372220d0eedc59323b9c853473013a094fb55923065572d64e843afc195166d5e478413fb
-  data.tar.gz: a2090f8fd7154ddefbc43914d11929a7f1871e38eea1b0a7bbbd81557053eb88273164120f2b8c785e0f58271e1f8eb58f78b0c8f397d0fb7f596cb42ea9928f
+  metadata.gz: 8a82ebefdccdf6547a213be676dc7394ba73fab6b4b438b53508d8e47c5ba569a03f284b257c25f67f12ff753e84bfb09799aa2659221daadbb6ad2b9bf01bcf
+  data.tar.gz: 691d27d37b8f10f0ea2209a306fd9d22ece505fd16e7a4a9b7c418c731439de24eeb0d50bc126d8b55443c69df70aca3ea9bbcd3701b32442782c0202fc783ee

data/CHANGELOG.md

@@ -1,8 +1,12 @@
+## 1.0.2
+
+- 修正 1.0.1 版本上传文件存储不正确的问题。
+
 ## 1.0.1
 
 - 对于 CarrierWave 的 cache 机制正确支持；
 - 对 UpYun 偶发的 `concurrent put or delete` 错误容错；
-- 清理不必要的 dependency.
+- 清理不必要的 dependency。
 
 ## 1.0.0
 

data/lib/carrierwave-upyun.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "carrierwave/storage/upyun"
+require "carrierwave/storage/upyun/file"
 require "carrierwave/upyun/configuration"
 
 CarrierWave.configure do |config|

data/lib/carrierwave/storage/upyun.rb

@@ -21,125 +21,6 @@ module CarrierWave
       class UploadError < RuntimeError; end
       class ConcurrentUploadError < RuntimeError; end
 
-      class File < CarrierWave::SanitizedFile
-        def initialize(uploader, base, path)
-          @uploader = uploader
-          @path = path
-          @base = base
-        end
-
-        ##
-        # Returns the current path/filename of the file on Cloud Files.
-        #
-        # === Returns
-        #
-        # [String] A path
-        #
-        attr_reader :path
-
-        def escaped_path
-          @escaped_path ||= CGI.escape(@path)
-        end
-
-        def content_type
-          @content_type || ""
-        end
-
-        attr_writer :content_type
-
-        ##
-        # Reads the contents of the file from Cloud Files
-        #
-        # === Returns
-        #
-        # [String] contents of the file
-        #
-        def read
-          res = conn.get(escaped_path)
-          @headers = res.headers
-          res.body
-        end
-
-        ##
-        # Remove the file from Cloud Files
-        #
-        def delete
-          conn.delete(escaped_path)
-          true
-        rescue StandardError => e
-          puts "carrierwave-upyun delete failed: #{e.inspect}"
-          nil
-        end
-
-        ##
-        # Returns the url on the Cloud Files CDN.  Note that the parent container must be marked as
-        # public for this to work.
-        #
-        # === Returns
-        #
-        # [String] file's url
-        #
-        def url
-          return nil unless @uploader.upyun_bucket_host
-
-          [@uploader.upyun_bucket_host, @path].join("/")
-        end
-
-        def content_type
-          headers[:content_type]
-        end
-
-        def content_type=(new_content_type)
-          headers[:content_type] = new_content_type
-        end
-
-        ##
-        # Writes the supplied data into the object on Cloud Files.
-        #
-        # === Returns
-        #
-        # boolean
-        #
-        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
-            # 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
-                         {}
-          end
-        end
-
-        def conn
-          @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
-
       ##
       # Store the file on UpYun
       #

data/lib/carrierwave/storage/upyun/file.rb

@@ -0,0 +1,186 @@
+# frozen_string_literal: true
+
+require "faraday"
+
+module CarrierWave::Storage
+  class UpYun
+    class File
+      def initialize(uploader, base, path)
+        @uploader = uploader
+        @path = path
+        @base = base
+      end
+
+      ##
+      # Returns the current path/filename of the file on Cloud Files.
+      #
+      # === Returns
+      #
+      # [String] A path
+      #
+      attr_reader :path
+
+      def escaped_path
+        @escaped_path ||= CGI.escape(@path)
+      end
+
+      def content_type
+        @content_type || ""
+      end
+
+      attr_writer :content_type
+
+      ##
+      # Reads the contents of the file from Cloud Files
+      #
+      # === Returns
+      #
+      # [String] contents of the file
+      #
+      def read
+        res = conn.get(escaped_path)
+        @headers = res.headers
+        res.body
+      end
+
+      ##
+      # Remove the file from Cloud Files
+      #
+      def delete
+        conn.delete(escaped_path)
+        true
+      rescue StandardError => e
+        puts "carrierwave-upyun delete failed: #{e.inspect}"
+        nil
+      end
+
+      ##
+      # Returns the url on the Cloud Files CDN.  Note that the parent container must be marked as
+      # public for this to work.
+      #
+      # === Returns
+      #
+      # [String] file's url
+      #
+      def url
+        return nil unless @uploader.upyun_bucket_host
+
+        [@uploader.upyun_bucket_host, @path].join("/")
+      end
+
+      ##
+      # Return file name, if available
+      #
+      # === Returns
+      #
+      # [String] file name
+      #   or
+      # [NilClass] no file name available
+      #
+      def filename
+        return unless file_url = url
+        ::File.basename(file_url.split('?').first)
+      end
+
+      def extension
+        path_elements = path.split('.')
+        path_elements.last if path_elements.size > 1
+      end
+
+      def content_type
+        headers[:content_type]
+      end
+
+      def content_type=(new_content_type)
+        headers[:content_type] = new_content_type
+      end
+
+      def headers
+        @headers ||= begin
+          conn.get(@path).headers
+        rescue Faraday::ClientError
+          {}
+        end
+      end
+
+      ##
+      # Writes the supplied data into the object on Cloud Files.
+      #
+      # === Returns
+      #
+      # boolean
+      #
+      def store(new_file, headers = {})
+        # Copy from cache_path
+        if new_file.is_a?(self.class)
+          new_file.copy_to(self.escaped_path)
+          return true
+        end
+
+        res = conn.put(self.escaped_path, new_file.read) do |req|
+          req.headers = { "Expect" => "", "Mkdir" => "true" }.merge(headers)
+        end
+
+        check_put_response!(res)
+
+        true
+      rescue ConcurrentUploadError => e
+        retry
+      end
+
+      ##
+      # Creates a copy of this file and returns it.
+      #
+      # === Parameters
+      #
+      # [new_path (String)] The path where the file should be copied to.
+      #
+      # === Returns
+      #
+      # @return [CarrierWave::Storage::UpYun::File] the location where the file will be stored.
+      #
+      def copy_to(new_path)
+        escaped_new_path = CGI.escape(new_path)
+        res = conn.put(new_path) do |req|
+          req.headers = {
+            "X-Upyun-Copy-Source" => "/#{@uploader.upyun_bucket}/#{self.path}",
+            "Content-Length" => 0,
+            "Mkdir" => "true",
+          }
+        end
+
+        check_put_response!(res)
+
+        File.new(@uploader, @base, new_path)
+      rescue ConcurrentUploadError => e
+        retry
+      end
+
+      private
+
+      def check_put_response!(res)
+        if res.status != 200
+          # 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
+      end
+
+      def conn
+        @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
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nowa Zhu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -57,6 +57,7 @@ files:
 - README.md
 - lib/carrierwave-upyun.rb
 - lib/carrierwave/storage/upyun.rb
+- lib/carrierwave/storage/upyun/file.rb
 - lib/carrierwave/upyun/configuration.rb
 homepage: https://github.com/nowa/carrierwave-upyun
 licenses: []