carrierwave-upyun 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3dbb71f891250bee0040c6601c39839250debac93b939750b50fad6311472f4
-  data.tar.gz: 9ca44d2075031de26f9c99e32807bd3f1b2fcba94d7bb6310aa418963a51c84c
+  metadata.gz: ca61aedc9a8cba949a82c3506185ef2e9e0faec3ace731e0ed37d477e9c1b353
+  data.tar.gz: 73782b52b3d7a2a151990ee7f06b6369e2469d84136fb0c5e4482ed13814791a
 SHA512:
-  metadata.gz: 6c18a685aac7bbb758d0dd2c6d8e086efa29673fc214e8054d44b8e05e620c147966e26fbc53a2c8c150ca0d76aa7d72190b52b28d0fa509b02863bcca619a42
-  data.tar.gz: 980c9026cbd69f0219eb0292b2184a36d34ce04dfffd5694ef1a3fd7a5fdc69e1f882573cd9f711e4c410f5b8220e60e387b85b33449024b5cecdaf7b15e618e
+  metadata.gz: e4120deab7bc63594dcfddb9905efaf98c2f1342be1fe96522ae0d8d55559ac3af11595fb978035c47699432606b205b486ded93636647704e8a50ea98250a48
+  data.tar.gz: 8229e0db78f60f957289872e6ac2deb6a4397573d0be05bb501df4331b85c3667b9b3b5f9096d2c79ea959e2d59cfe468ba8648f6675da87284d562ab39956c7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0
+
+- Fix for support Faraday 2.x.
+
 ## 1.0.5
 
 - Fix carrierwave version dependency.

data/README.md

@@ -7,9 +7,14 @@ This gem adds support for [upyun.com](http://www.upyun.com) to [CarrierWave](htt
 
 ## Installation
 
+```bash
+$ bundle add carrierwave-upyun
+```
+
+Or modify your Gemfile to add:
+
 ```ruby
-gem 'carrierwave'
-gem 'carrierwave-upyun'
+gem "carrierwave-upyun"
 ```
 
 > NOTE: 此 Gem 是一个 CarrierWave 的组件，你需要配合 CarrierWave 一起使用。
@@ -24,8 +29,6 @@ CarrierWave.configure do |config|
   config.upyun_username = "xxxxxx"
   config.upyun_password = 'xxxxxx'
   config.upyun_bucket = "my_bucket"
-  # upyun_bucket_domain 以后将会弃用，请改用 upyun_bucket_host
-  # config.upyun_bucket_domain = "my_bucket.files.example.com"
   config.upyun_bucket_host = "http://my_bucket.files.example.com"
 end
 ```

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

@@ -24,12 +24,6 @@ module CarrierWave::Storage
         @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
       #
@@ -78,12 +72,13 @@ module CarrierWave::Storage
       # [NilClass] no file name available
       #
       def filename
-        return unless file_url = url
-        ::File.basename(file_url.split('?').first)
+        return unless url
+
+        ::File.basename(url.split("?").first)
       end
 
       def extension
-        path_elements = path.split('.')
+        path_elements = path.split(".")
         path_elements.last if path_elements.size > 1
       end
 
@@ -111,7 +106,7 @@ module CarrierWave::Storage
       # [Integer] size of file body
       #
       def size
-        headers['content-length'].to_i
+        headers["content-length"].to_i
       end
 
       ##
@@ -124,18 +119,18 @@ module CarrierWave::Storage
       def store(new_file, headers = {})
         # Copy from cache_path
         if new_file.is_a?(self.class)
-          new_file.copy_to(self.escaped_path)
+          new_file.copy_to(escaped_path)
           return true
         end
 
-        res = conn.put(self.escaped_path, new_file.read) do |req|
+        res = conn.put(escaped_path, new_file.read) do |req|
           req.headers = { "Expect" => "", "Mkdir" => "true" }.merge(headers)
         end
 
         check_put_response!(res)
 
         true
-      rescue ConcurrentUploadError => e
+      rescue ConcurrentUploadError
         retry
       end
 
@@ -151,19 +146,18 @@ module CarrierWave::Storage
       # @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}",
+            "X-Upyun-Copy-Source" => "/#{@uploader.upyun_bucket}/#{path}",
             "Content-Length" => 0,
-            "Mkdir" => "true",
+            "Mkdir" => "true"
           }
         end
 
         check_put_response!(res)
 
         File.new(@uploader, @base, new_path)
-      rescue ConcurrentUploadError => e
+      rescue ConcurrentUploadError
         retry
       end
 
@@ -184,14 +178,12 @@ module CarrierWave::Storage
         @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 :authorization, :basic, @uploader.upyun_username, @uploader.upyun_password
             req.request :url_encoded
             req.adapter Faraday.default_adapter
           end
         end
       end
-
-
     end
   end
-end
+end

data/lib/carrierwave/storage/upyun.rb

@@ -19,6 +19,7 @@ module CarrierWave
       DEFAULT_API_URL = "http://v0.api.upyun.com"
 
       class UploadError < RuntimeError; end
+
       class ConcurrentUploadError < RuntimeError; end
 
       ##
@@ -62,9 +63,11 @@ 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
-    end # CloudFiles
-  end # Storage
-end # CarrierWave
+      def clean_cache!(seconds)
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Nowa Zhu
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
 description: UpYun Storage support for CarrierWave
 email:
 - nowazhu@gmail.com
@@ -56,7 +56,7 @@ files:
 homepage: https://github.com/nowa/carrierwave-upyun
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,8 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: UpYun Storage support for CarrierWave
 test_files: []