carrierwave-qiniu 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1283fa0bce68604381eb4205a7f8822d8c3d4cec
-  data.tar.gz: 5c4bf47715f08955f616054a6953858360fa2678
+  metadata.gz: 2f480f9beeba0f2721902bff9075edcc12929ea8
+  data.tar.gz: 59992dcd0be07822fd1f0584f7cd793df52b36f4
 SHA512:
-  metadata.gz: b56cbc02bdea0362f2c922724bda4c295a4d893d59a643272ab31150986c1de26d54be141c0057fdfab9737c1257cfea0c8eab941126b7775d7e3004dfe5c4c8
-  data.tar.gz: 41935e2de0415de62d26d06834bdfe41cdc768c4701746dbb2d57ac9e7956bcb358dfed967add495d5844e59cdc03705a97b9e2acf0ac35bfacc4038ce139bf1
+  metadata.gz: b237b492ab50e519611d23b1e70b6322c0c52587ec8a53e8be2bfaea9bcf814558b0694497129bc2db2deb2570ff71d818bc15f79f0042e4c05f34090c48a33f
+  data.tar.gz: 572cca06fbeb64d780f4c90e4c776ca94dad3e1ce67c371af9f2e7278fee244c76838080a02896940190c5b4a17bf4b4f733903fbbff610a39aa0281f403b7f1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 
 ## CHANGE LOG
 
+### v0.2.4
+
+- Add test for upload failed
+https://github.com/huobazi/carrierwave-qiniu/pull/57
+
 ### v0.2.3
 
 - Add extension method

data/Gemfile

@@ -1,5 +1,5 @@
 #source 'https://rubygems.org'
-source 'https://ruby.taobao.org'
+source 'https://gems.ruby-china.org'
 
 # Specify your gem's dependencies in carrierwave-qiniu.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?0.2.0)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?0.2.3)](http://badge.fury.io/rb/carrierwave-qiniu)
 
 This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 example: https://github.com/huobazi/carrierwave-qiniu-example
@@ -78,7 +78,8 @@ class AvatarUploader < CarrierWave::Uploader::Base
 
 end
 ```
-You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-example 
+You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-example
+
 or see the spec test on https://github.com/huobazi/carrierwave-qiniu/blob/master/spec/upload_spec.rb
 
 ## Contributing

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave/storage/qiniu.rb

@@ -42,12 +42,16 @@ module CarrierWave
           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(
-            put_policy,
-            file.path,
-            key
-          )
-
+          resp_code, resp_body, resp_headers =
+            ::Qiniu::Storage.upload_with_put_policy(
+              put_policy,
+              file.path,
+              key
+            )
+
+          if resp_code < 200 or resp_code >= 300
+            raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
+          end
         end
 
         #
@@ -58,7 +62,9 @@ module CarrierWave
         #
         def copy(origin, target)
           code, result, _ = ::Qiniu::Storage.copy(@qiniu_bucket, origin, @qiniu_bucket, target)
-          code == 200 ? result : nil
+          if resp_code < 200 or resp_code >= 300
+            raise ::CarrierWave::IntegrityError, "Copy failed, status code: #{resp_code}, response: #{resp_body}"
+          end
         end
 
         def delete(key)
@@ -204,7 +210,7 @@ module CarrierWave
 
       def store!(file)
         f = ::CarrierWave::Storage::Qiniu::File.new(uploader, uploader.store_path(uploader.filename))
-        if file && file.copy_from_path
+        if file && file.respond_to?(:copy_from_path) and file.copy_from_path
           f.copy_from file.copy_from_path
         else
           f.store(file)

data/spec/upload_spec.rb

@@ -72,6 +72,25 @@ require 'carrierwave/processing/mini_magick'
   end
 
   context "Upload Image" do
+    it "should save failed" do
+      class WrongUploader < PhotoUploader
+        self.qiniu_bucket = 'not_exists'
+      end
+
+      class Photo < ActiveRecord::Base
+        mount_uploader :image, WrongUploader
+      end
+
+      f = load_file("mm.jpg")
+      photo = Photo.new(:image => f)
+      photo.save
+      expect(photo).to_not be_valid
+
+      expect {
+        photo.save!
+      }.to raise_error
+    end
+
     it "does upload image" do
       f = load_file("mm.jpg")
       photo = Photo.new(:image => f)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave