carrierwave-qiniu 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c31fa44d0fdafba5f24aba143952d5c5c33810d0
-  data.tar.gz: e7ad971651fedef17c05a662e90916ecb7c4cdb8
+  metadata.gz: fd2c088b63699b4a104b7d9e9b727218909c0f00
+  data.tar.gz: f26b4ff276ef9ce1302f8a6defffb153c765e603
 SHA512:
-  metadata.gz: 742f03dc1b02fa9d4400175f6e3885fd4a21cb486d6d4dbe64c08f9bb6049ed7eb8e67f269fb4924b0318483f64ddd68df4011e7f539e732fc8acb41718048e2
-  data.tar.gz: e97243f33b257c4b754a9e881b9995fab0dccd26cd8ff4b340a494aa4c3084ce25e98edde0d097deed49c78b0b5e69a8151ff7755fe5c185d713cecff6b8a1f9
+  metadata.gz: b791a994c6807846af2d5840df21f232e8a29bab92d064633c19e0af7be5bf979fcab45d2bf3c61e42704982e6268d075ab9b2b2cb45e9366124828e031aa21e
+  data.tar.gz: 459eb0bbcf617d18b62f17bd1995bd7040392cd2a9f1af4bbd99d31e87f3bab39a05d7fcd2e50ddd90bb12eb01be2d6725ccc5506ece5aa0bb70d9f4326096c7

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 
 ## CHANGE LOG
 
+### v0.2.2
+增加对七牛SDK中复制图片功能的支持
+https://github.com/huobazi/carrierwave-qiniu/pull/49
+
 ### v0.2.1
+增加
+
+    qiniu_callback_url
+    qiniu_callback_body
+    qiniu_can_overwrite
 
 https://github.com/huobazi/carrierwave-qiniu/pull/47
 

data/lib/carrierwave-qiniu.rb

@@ -2,9 +2,10 @@
 require "carrierwave-qiniu/version"
 require "carrierwave/storage/qiniu"
 require "carrierwave/qiniu/configuration"
+require "carrierwave/uploader/base"
 
 ::CarrierWave.configure do |config|
   config.storage_engines[:qiniu] = "::CarrierWave::Storage::Qiniu".freeze
 end
 
-::CarrierWave::Uploader::Base.send(:include, ::CarrierWave::Qiniu::Configuration)
+::CarrierWave::Uploader::Base.send(:include, ::CarrierWave::Qiniu::Configuration)

data/lib/carrierwave-qiniu/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Carrierwave
   module Qiniu
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/carrierwave/storage/qiniu.rb

@@ -9,20 +9,20 @@ module CarrierWave
 
       class Connection
         def initialize(options={})
-          @qiniu_bucket_domain = options[:qiniu_bucket_domain]
-          @qiniu_bucket        = options[:qiniu_bucket]
-          @qiniu_bucket_private= options[:qiniu_bucket_private] || false
-          @qiniu_access_key    = options[:qiniu_access_key]
-          @qiniu_secret_key    = options[:qiniu_secret_key]
-          @qiniu_block_size    = options[:qiniu_block_size] || 1024*1024*4
-          @qiniu_protocol      = options[:qiniu_protocol] || "http"
-          @qiniu_async_ops     = options[:qiniu_async_ops] || ''
-          @qiniu_can_overwrite = options[:qiniu_can_overwrite] || false
-          @qiniu_expires_in    = options[:qiniu_expires_in] || options[:expires_in] || 3600
-          @qiniu_up_host       = options[:qiniu_up_host]
+          @qiniu_bucket_domain          = options[:qiniu_bucket_domain]
+          @qiniu_bucket                 = options[:qiniu_bucket]
+          @qiniu_bucket_private         = options[:qiniu_bucket_private] || false
+          @qiniu_access_key             = options[:qiniu_access_key]
+          @qiniu_secret_key             = options[:qiniu_secret_key]
+          @qiniu_block_size             = options[:qiniu_block_size] || 1024*1024*4
+          @qiniu_protocol               = options[:qiniu_protocol] || "http"
+          @qiniu_async_ops              = options[:qiniu_async_ops] || ''
+          @qiniu_can_overwrite          = options[:qiniu_can_overwrite] || false
+          @qiniu_expires_in             = options[:qiniu_expires_in] || options[:expires_in] || 3600
+          @qiniu_up_host                = options[:qiniu_up_host]
           @qiniu_private_url_expires_in = options[:qiniu_private_url_expires_in] || 3600
-          @qiniu_callback_url  = options[:qiniu_callback_url] || ''
-          @qiniu_callback_body = options[:qiniu_callback_body] || ''
+          @qiniu_callback_url           = options[:qiniu_callback_url] || ''
+          @qiniu_callback_body          = options[:qiniu_callback_body] || ''
           @qiniu_persistent_notify_url  = options[:qiniu_persistent_notify_url] || ''
           init
         end
@@ -37,9 +37,9 @@ module CarrierWave
             @qiniu_expires_in,
             nil
           )
-          put_policy.persistent_ops = @qiniu_async_ops
-          put_policy.callback_url = @qiniu_callback_url if @qiniu_callback_url.present?
-          put_policy.callback_body = @qiniu_callback_body if @qiniu_callback_body.present?
+          put_policy.persistent_ops        = @qiniu_async_ops
+          put_policy.callback_url          = @qiniu_callback_url if @qiniu_callback_url.present?
+          put_policy.callback_body         = @qiniu_callback_body if @qiniu_callback_body.present?
           put_policy.persistent_notify_url = @qiniu_persistent_notify_url if @qiniu_persistent_notify_url.present?
 
           ::Qiniu::Storage.upload_with_put_policy(
@@ -50,6 +50,17 @@ module CarrierWave
 
         end
 
+        #
+        # @note 复制
+        # @param origin [String]
+        # @param target [String]
+        # @return [Boolean]
+        #
+        def copy(origin, target)
+          code, result, _ = ::Qiniu::Storage.copy(@qiniu_bucket, origin, @qiniu_bucket, target)
+          code == 200 ? result : nil
+        end
+
         def delete(key)
           ::Qiniu::Storage.delete(@qiniu_bucket, key) rescue nil
         end
@@ -89,7 +100,7 @@ module CarrierWave
             :user_agent => UserAgent
           }
           options[:block_size] = @qiniu_block_size if @qiniu_block_size
-          options[:up_host] = @qiniu_up_host if @qiniu_up_host
+          options[:up_host]    = @qiniu_up_host if @qiniu_up_host
 
           ::Qiniu.establish_connection! options
 
@@ -119,6 +130,22 @@ module CarrierWave
           qiniu_connection.delete(@path)
         end
 
+
+
+        #
+        # @note 从指定路径复制图片
+        # @param origin_path [String] 原图片路径
+        # @return [Boolean]
+        #
+        def copy_from(origin_path)
+
+          # 先删除目标图片，避免出现0字节文件，无法复制
+          qiniu_connection.delete(@path)
+
+          qiniu_connection.copy(origin_path, @path)
+
+        end
+
         ##
         # Reads the contents of the file from Cloud Files
         #
@@ -173,7 +200,11 @@ module CarrierWave
 
       def store!(file)
         f = ::CarrierWave::Storage::Qiniu::File.new(uploader, uploader.store_path(uploader.filename))
-        f.store(file)
+        if file && file.copy_from_path
+          f.copy_from file.copy_from_path
+        else
+          f.store(file)
+        end
         f
       end
 
@@ -183,4 +214,4 @@ module CarrierWave
 
     end
   end
-end
+end

data/lib/carrierwave/uploader/base.rb

@@ -0,0 +1,35 @@
+#encoding: utf-8
+module CarrierWave
+
+  class SanitizedFile
+
+    attr_accessor :copy_from_path
+
+  end
+
+  module Uploader
+    module Cache
+
+      alias_method :old_cache!, :cache!
+
+      def cache!(new_file = sanitized_file)
+
+        old_cache! new_file
+
+        if new_file.kind_of? CarrierWave::Storage::Qiniu::File
+
+          @file.copy_from_path = new_file.path
+
+        elsif new_file.kind_of? CarrierWave::Uploader::Base
+
+          @file.copy_from_path = new_file.file.path
+
+        end
+
+      end
+    end
+
+  end
+
+
+end

data/spec/upload_spec.rb

@@ -93,5 +93,25 @@ require 'carrierwave/processing/mini_magick'
       open(photo.image.thumb.url).should_not be_nil
 
     end
+
+    it 'does copy from image works' do
+      f = load_file("mm.jpg")
+
+      photo = Photo.new(image: f)
+
+      photo.save
+
+      photo2 = Photo.new
+
+      photo2.image = photo.image
+
+      photo2.save
+
+      puts "The image was copied from #{photo.image.url} to #{photo2.image.url}"
+
+      expect(photo2.image.url).not_to eq(photo.image.url)
+
+      open(photo2.image.url).should_not be_nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -57,6 +57,7 @@ files:
 - lib/carrierwave-qiniu/version.rb
 - lib/carrierwave/qiniu/configuration.rb
 - lib/carrierwave/storage/qiniu.rb
+- lib/carrierwave/uploader/base.rb
 - spec/mm.jpg
 - spec/spec_helper.rb
 - spec/upload_spec.rb