qiniu-rs 3.4.7 → 3.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf083b2df630fdf57286a4c9395f2cb029ee0d4
-  data.tar.gz: 4a7c0cf9a120bd8c7da77387347915e49c25d5b9
+  metadata.gz: 2f87f2956e22e85cef5c2e7048d8f8fd82bd5ea5
+  data.tar.gz: 2ba960e3f82c940a35c8a4b1ff5eb9c9ab66d18e
 SHA512:
-  metadata.gz: cec69bf917c779f6694bb03e9ad0b8a5a61fe1c5ecffcd696a229535f3f694421d8506aa670ca3a517e0cfaa19a18ddce0f00c251c723954559dc9023b81992a
-  data.tar.gz: 358319b26b7e9cdc619c2c38dc08465966abf721ad44bdb6cffaf02fd3b747d506c97f6399b4e9345a013b33db08dd91ca64201d23514041aca1e7da25e5ea04
+  metadata.gz: 8959845cd4be8e3e10dc9e551ccf73923cbd8a5069b2b65fec71ee4eaab89612658cd992c5c68c5f39f5ed7c76f431848024b74a4601190892b5104498ce104c
+  data.tar.gz: 9451573a36352d11318e74f26b9636eed0184aed048d04f03245a1f325b21b8e08c36e779dc1f18f4669f4cbe6a4e32516671093ae8b7e98608487c2db06c041

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGE LOG
 
+### v3.4.9
+
+- 去掉publish和unpublish接口的封装函数。 [https://github.com/qiniu/ruby-sdk/pull/89](https://github.com/qiniu/ruby-sdk/pull/89) (#8143)
+
+### v3.4.8
+
+- 修复断点续上传功能中一直重试上传出错片的Bug。[https://github.com/qiniu/ruby-sdk/pull/87](https://github.com/qiniu/ruby-sdk/pull/87) (#7205)
+
 ### v3.4.7
 
 - 停止追加新功能，仅进行Bug修正维护。  

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.4.7)
+    qiniu-rs (3.4.9)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -12,7 +12,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.7)
+    json (1.8.1)
     mime-types (1.23)
     rake (10.0.3)
     rest-client (1.6.7)

data/lib/qiniu/rs.rb

@@ -204,16 +204,6 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
-      def publish(domain, bucket)
-        code, data = RS.publish(domain, bucket)
-        code == StatusOK
-      end
-
-      def unpublish(domain)
-        code, data = RS.unpublish(domain)
-        code == StatusOK
-      end
-
       def drop(bucket)
         code, data = RS.drop(bucket)
         code == StatusOK

data/lib/qiniu/rs/rs.rb

@@ -40,16 +40,6 @@ module Qiniu
           Auth.request Config.settings[:rs_host] + '/delete/' + encode_entry_uri(bucket, key)
         end
 
-        def publish(domain, bucket)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/publish/#{encoded_domain}/from/#{bucket}"
-        end
-
-        def unpublish(domain)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/unpublish/#{encoded_domain}"
-        end
-
         def drop(bucket)
           Auth.request Config.settings[:rs_host] + "/drop/#{bucket}"
         end

data/lib/qiniu/rs/up.rb

@@ -200,6 +200,8 @@ module Qiniu
                         break
                     elsif i == retry_times && data["crc32"] != body_crc32
                         Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
                     end
                 end
             elsif progress[:offset] + progress[:restsize] != block_size
@@ -230,6 +232,8 @@ module Qiniu
                         break
                     elsif i == retry_times && data["crc32"] != body_crc32
                         Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
                     end
                 end
             end

data/lib/qiniu/rs/version.rb

@@ -5,7 +5,7 @@ module Qiniu
     module Version
       MAJOR = 3
       MINOR = 4
-      PATCH = 7
+      PATCH = 10
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

data/qiniu-rs.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/qiniu/rs/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["why404"]
-  gem.email         = ["why404@gmail.com"]
-  gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html}
-  gem.summary       = %q{Qiniu Resource (Cloud) Storage SDK for Ruby}
+  gem.email         = ["sdk@qiniu.com"]
+  gem.description   = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby. Please use new SDK https://rubygems.org/gems/qiniu}
+  gem.summary       = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby}
   gem.homepage      = "https://github.com/qiniu/ruby-sdk/tree/qiniu-rs"
 
   gem.files         = `git ls-files`.split($\)

data/spec/qiniu/rs/rs_spec.rb

@@ -123,24 +123,6 @@ module Qiniu
         end
       end
 
-=begin
-      context ".publish" do
-        it "should works" do
-          code, data = Qiniu::RS::RS.publish(@domain, @bucket)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-
-      context ".unpublish" do
-        it "should works" do
-          code, data = Qiniu::RS::RS.unpublish(@domain)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-=end
-
       context ".move" do
         it "should works" do
           code, data = Qiniu::RS::RS.move(@bucket, @key, @bucket, @key2)

data/spec/qiniu/rs_spec.rb

@@ -32,9 +32,6 @@ module Qiniu
     end
 
     after :all do
-      #result = Qiniu::RS.unpublish(@domain)
-      #result.should_not be_false
-
       result1 = Qiniu::RS.drop(@bucket)
       puts result1.inspect
       result1.should_not be_false
@@ -278,24 +275,6 @@ module Qiniu
       end
     end
 
-=begin
-    context ".publish" do
-      it "should works" do
-        result = Qiniu::RS.publish(@domain, @bucket)
-        result.should_not be_false
-      end
-    end
-=end
-
-=begin
-    context ".unpublish" do
-      it "should works" do
-        result = Qiniu::RS.unpublish(@domain)
-        result.should_not be_false
-      end
-    end
-=end
-
     context ".batch_copy" do
       it "should works" do
         result = Qiniu::RS.batch_copy @bucket, @key, @bucket, @key2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.10
 platform: ruby
 authors:
 - why404
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,9 +108,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-description: 'Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html'
+description: Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby. Please use new
+  SDK https://rubygems.org/gems/qiniu
 email:
-- why404@gmail.com
+- sdk@qiniu.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -177,10 +178,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Qiniu Resource (Cloud) Storage SDK for Ruby
+summary: Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby
 test_files:
 - spec/qiniu/rs/abstract_spec.rb
 - spec/qiniu/rs/eu_spec.rb