qiniu 6.8.1 → 6.9.0

data/spec/qiniu/image_spec.rb

@@ -6,7 +6,7 @@ require 'qiniu'
 require 'qiniu/fop'
 
 module Qiniu
-    module Fop
+  module Fop
     describe Fop do
 
       before :all do
@@ -32,10 +32,11 @@ module Qiniu
         data["width"].should_not be_zero
         data["height"].should_not be_zero
 
-        result = Qiniu.get(@bucket, @key)
-        result["url"].should_not be_empty
-        puts result.inspect
-        @source_image_url = result["url"]
+        code, domains, = Qiniu::Storage.domains(@bucket)
+        code.should be 200
+        domains.should_not be_empty
+        @bucket_domain = domains.first['domain']
+        @source_image_url = "http://#{@bucket_domain}/#{@key}"
 
         @mogrify_options = {
             :thumbnail => "!120x120>",
@@ -48,37 +49,32 @@ module Qiniu
         }
       end
 
-      after :all do
-      end
-
-      context ".info" do
-        it "should works" do
-          code, data = Qiniu::Fop::Image.info(@source_image_url)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-
-      context ".exif" do
-        it "should works" do
-          result = Qiniu.get(@bucket, 'gogopher.jpg')
-          result["url"].should_not be_empty
-          puts result.inspect
+      # context ".info" do
+      #   it "should works" do
+      #     pending('This function cannot work for private bucket file')
+      #     code, data = Qiniu::Fop::Image.info(@source_image_url)
+      #     code.should == 200
+      #     puts data.inspect
+      #   end
+      # end
 
-          code, data, headers = Qiniu::Fop::Image.exif(result["url"])
-          code.should == 200
-          puts data.inspect
-          puts headers.inspect
-        end
-      end
-
-      context ".mogrify_preview_url" do
-        it "should works" do
-          mogrify_preview_url = Qiniu::Fop::Image.mogrify_preview_url(@source_image_url, @mogrify_options)
-          puts mogrify_preview_url.inspect
-        end
-      end
+      # context ".exif" do
+      #   it "should works" do
+      #     pending('This function cannot work for private bucket file')
+      #     code, data, headers = Qiniu::Fop::Image.exif("http://#{@bucket_domain}/gogopher.jpg")
+      #     code.should == 200
+      #     puts data.inspect
+      #     puts headers.inspect
+      #   end
+      # end
 
+      # context ".mogrify_preview_url" do
+      #   it "should works" do
+      #     pending('This function cannot work for private bucket file')
+      #     mogrify_preview_url = Qiniu::Fop::Image.mogrify_preview_url(@source_image_url, @mogrify_options)
+      #     puts mogrify_preview_url.inspect
+      #   end
+      # end
     end
-    end # module Fop
+  end # module Fop
 end # module Qiniu

data/spec/qiniu/management_spec.rb

@@ -44,14 +44,6 @@ module Qiniu
         end
       end
 
-      context ".get" do
-        it "should works" do
-          code, data = Storage.get(@bucket, @key)
-          puts data.inspect
-          code.should == 200
-        end
-      end
-
       context ".batch" do
         it "should works" do
           code, data = Storage.batch("stat", @bucket, [@key])
@@ -68,17 +60,9 @@ module Qiniu
         end
       end
 
-      context ".batch_get" do
-        it "should works" do
-          code, data = Storage.batch_get(@bucket, [@key])
-          puts data.inspect
-          code.should == 200
-        end
-      end
-
       context ".batch_copy" do
         it "should works" do
-          code, data = Storage.batch_copy @bucket, @key, @bucket, @key2
+          code, data = Storage.batch_copy [@bucket, @key, @bucket, @key2]
           puts data.inspect
           code.should == 200
 

data/spec/qiniu/pfop_spec.rb

@@ -23,21 +23,21 @@ module Qiniu
           code, body, headers = Qiniu::Storage.stat(@bucket, @key)
           if code == 404 || code == 612 then
             # 文件不存在，尝试上传
-            pp = Qiniu::Auth.PutPolicy.new(@bucket, @key)
+            pp = Qiniu::Auth::PutPolicy.new(@bucket, @key)
             code, body, headers = Qiniu::Storage.upload_with_put_policy(
               pp,
-              local_file
+              local_file,
+              nil,
+              nil,
+              bucket: @bucket
             )
             puts "Put a test file for Persistance cases"
             puts code.inspect
             puts body.inspect
-            puts header.inspect
+            puts headers.inspect
           end
         end
 
-        after :all do
-        end
-
         context ".pfop" do
           it "should works" do
             pp = Persistance::PfopPolicy.new(

data/spec/qiniu/qiniu_spec.rb

@@ -152,22 +152,6 @@ module Qiniu
       end
     end
 
-    context ".get" do
-      it "should works" do
-        result = Qiniu.get(@bucket, @key, "qiniu_spec.rb", 10)
-        expect(result).to_not be_empty
-        puts result.inspect
-      end
-    end
-
-    context ".download" do
-      it "should works" do
-        result = Qiniu.download(@bucket, @key, "rs_spec.rb", 10)
-        expect(result).to_not be_empty
-        puts result.inspect
-      end
-    end
-
     context ".batch" do
       it "should works" do
         result = Qiniu.batch("stat", @bucket, [@key])
@@ -184,43 +168,27 @@ module Qiniu
       end
     end
 
-    context ".batch_get" do
-      it "should works" do
-        result = Qiniu.batch_get(@bucket, [@key])
-        expect(result).to_not be_empty
-        puts result.inspect
-      end
-    end
-
-    context ".batch_download" do
-      it "should works" do
-        result = Qiniu.batch_download(@bucket, [@key])
-        expect(result).to_not be_empty
-        puts result.inspect
-      end
-    end
-
 =begin
     context ".batch_copy" do
       it "should works" do
         result = Qiniu.batch_copy [@bucket, @key, @bucket, @key2]
-        result.should_not be_false
+        result.should_not be_falsey
 
         #result2 = Qiniu.stat(@bucket, @key2)
-        #result2.should_not be_false
+        #result2.should_not be_falsey
       end
     end
 
     context ".batch_move" do
       it "should works" do
         result = Qiniu.batch_move [@bucket, @key, @bucket, @key2]
-        result.should_not be_false
+        result.should_not be_falsey
 
         #result2 = Qiniu.stat(@bucket, @key2)
-        #result2.should_not be_false
+        #result2.should_not be_falsey
 
         result3 = Qiniu.batch_move [@bucket, @key2, @bucket, @key]
-        result3.should_not be_false
+        result3.should_not be_falsey
       end
     end
 =end
@@ -255,39 +223,45 @@ module Qiniu
       end
     end
 
-    context ".image_info" do
-      it "should works" do
-        data = Qiniu.get(@test_image_bucket, @test_image_key)
-        expect(data).to_not be_empty
-        puts data.inspect
-        result = Qiniu.image_info(data["url"])
-        expect(result).to_not be_empty
-        puts result.inspect
-      end
-    end
-
-    context ".image_mogrify_save_as" do
-      it "should works" do
-        data = Qiniu.get(@test_image_bucket, @test_image_key)
-        expect(data).to_not be_empty
-        puts data.inspect
-
-        dest_key = "cropped-" + @test_image_key
-        src_img_url = data["url"]
-        mogrify_options = {
-          :thumbnail => "!120x120>",
-          :gravity => "center",
-          :crop => "!120x120a0a0",
-          :quality => 85,
-          :rotate => 45,
-          :format => "jpg",
-          :auto_orient => true
-        }
-        result2 = Qiniu.image_mogrify_save_as(@test_image_bucket, dest_key, src_img_url, mogrify_options)
-        expect(result2).to_not be_empty
-        puts result2.inspect
-      end
-    end
+    # context ".image_info" do
+    #   it "should works" do
+    #     pending 'This function cannot work for private bucket file'
+    #     code, domains, = Qiniu::Storage.domains(@test_image_bucket)
+    #     code.should be 200
+    #     domains.should_not be_empty
+    #     domain = domains.first['domain']
+    #     url = "http://#{domain}/#{@test_image_key}"
+
+    #     result = Qiniu.image_info(url)
+    #     expect(result).to_not be_falsey
+    #     puts result.inspect
+    #   end
+    # end
+
+    # context ".image_mogrify_save_as" do
+    #   it "should works" do
+    #     pending 'This function cannot work for private bucket file'
+    #     code, domains, = Qiniu::Storage.domains(@test_image_bucket)
+    #     code.should be 200
+    #     domains.should_not be_empty
+    #     domain = domains.first['domain']
+    #     src_img_url = "http://#{domain}/#{@test_image_key}"
+
+    #     dest_key = "cropped-" + @test_image_key
+    #     mogrify_options = {
+    #       :thumbnail => "!120x120>",
+    #       :gravity => "center",
+    #       :crop => "!120x120a0a0",
+    #       :quality => 85,
+    #       :rotate => 45,
+    #       :format => "jpg",
+    #       :auto_orient => true
+    #     }
+    #     result2 = Qiniu.image_mogrify_save_as(@test_image_bucket, dest_key, src_img_url, mogrify_options)
+    #     expect(result2).to_not be_falsey
+    #     puts result2.inspect
+    #   end
+    # end
 
     context ".generate_upload_token" do
       it "should works" do

data/spec/qiniu/upload_spec.rb

@@ -49,6 +49,10 @@ module Qiniu
 
       ### 测试单文件直传
       context ".upload_with_token" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
@@ -79,6 +83,10 @@ module Qiniu
       end
 
       context ".upload_with_token_2" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
@@ -108,6 +116,10 @@ module Qiniu
       end # .upload_with_token_2
 
       context ".upload_with_put_policy" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
@@ -149,6 +161,10 @@ module Qiniu
       end # .upload_with_put_policy
 
       context ".upload_buffer_with_put_policy" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
@@ -180,6 +196,10 @@ module Qiniu
 
       ### 测试断点续上传
       context ".resumable_upload_with_token" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key_5m)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key_5m)
           puts data.inspect
@@ -207,6 +227,10 @@ module Qiniu
       end
 
       context ".resumable_upload_with_token2" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key_4m)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key_4m)
           puts data.inspect
@@ -234,6 +258,10 @@ module Qiniu
       end
 
       context ".resumable_upload_with_token3" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key_8m)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key_8m)
           puts data.inspect
@@ -261,6 +289,10 @@ module Qiniu
       end
 
       context ".resumable_upload_with_token4" do
+        before do
+          Qiniu::Storage.delete(@bucket, @key_1m)
+        end
+
         after do
           code, data = Qiniu::Storage.delete(@bucket, @key_1m)
           puts data.inspect

data/spec/qiniu/utils_spec.rb

@@ -1,19 +1,15 @@
 # -*- encoding: utf-8 -*-
 
 require 'spec_helper'
-require 'fakeweb'
 require 'qiniu/utils'
 
 module Qiniu
   module RS
     describe Utils do
-      before :all do
-        Struct.new("Response", :code, :body)
-      end
+      include WebMock::API
 
       after :each do
-        FakeWeb.clean_registry
-        FakeWeb.allow_net_connect = true
+        WebMock.disable!
       end
 
       context "safe_json_parse" do
@@ -25,8 +21,8 @@ module Qiniu
 
       context ".send_request_with" do
         it "should works" do
-          FakeWeb.allow_net_connect = false
-          FakeWeb.register_uri(:get, "http://develoepr.qiniu.com/", :body => {:abc => 123}.to_json)
+          WebMock.enable!
+          stub_request(:get, "develoepr.qiniu.com/").to_return(body: {abc: 123}.to_json)
           res = Utils.send_request_with 'http://develoepr.qiniu.com/', nil, :method => :get
           res.should == [200, {"abc" => 123}, {}]
         end
@@ -34,11 +30,11 @@ module Qiniu
         [400, 500].each do |code|
           context "upstream return http #{code}" do
             it "should raise RestClient::RequestFailed" do
-              FakeWeb.allow_net_connect = false
-              FakeWeb.register_uri(:get, "http://develoepr.qiniu.com/", :status => code)
-              lambda {
-                res = Utils.send_request_with 'http://develoepr.qiniu.com/', nil, :method => :get
-              }.should raise_error RestClient::RequestFailed
+              WebMock.enable!
+              stub_request(:get, "develoepr.qiniu.com/").to_return(status: code)
+              expect do
+                Utils.send_request_with 'http://develoepr.qiniu.com/', nil, :method => :get
+              end.to raise_error RestClient::RequestFailed
             end
           end
         end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'bundler/setup'
 require 'qiniu'
 require 'rspec'
+require 'webmock'
 
 RSpec.configure do |config|
   config.before :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.9.0
 platform: ruby
 authors:
 - why404
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,56 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -74,9 +60,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,43 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.1'
 description: 'Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html'
 email:
 - sdk@qiniu.com
@@ -128,28 +88,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- docs/README.md
-- examples/copy.rb
-- examples/delete.rb
-- examples/download.rb
-- examples/fetch.rb
-- examples/fops.rb
-- examples/list.rb
-- examples/move.rb
-- examples/pfop_vframe.rb
-- examples/pfop_watermark.rb
-- examples/stat.rb
-- examples/upload.rb
-- examples/upload_callback.rb
-- examples/upload_pfops.rb
 - lib/qiniu-rs.rb
 - lib/qiniu.rb
 - lib/qiniu/abstract.rb
@@ -174,12 +115,8 @@ files:
 - lib/qiniu/upload.rb
 - lib/qiniu/utils.rb
 - lib/qiniu/version.rb
-- qiniu.gemspec
-- rails3/Gemfile
-- rails3/qiniu.gemspec
 - spec/qiniu/abstract_spec.rb
 - spec/qiniu/auth_spec.rb
-- spec/qiniu/image_logo_for_test.png
 - spec/qiniu/image_spec.rb
 - spec/qiniu/management_spec.rb
 - spec/qiniu/misc_spec.rb
@@ -200,9 +137,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -210,27 +147,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby
 test_files:
-- examples/copy.rb
-- examples/delete.rb
-- examples/download.rb
-- examples/fetch.rb
-- examples/fops.rb
-- examples/list.rb
-- examples/move.rb
-- examples/pfop_vframe.rb
-- examples/pfop_watermark.rb
-- examples/stat.rb
-- examples/upload.rb
-- examples/upload_callback.rb
-- examples/upload_pfops.rb
 - spec/qiniu/abstract_spec.rb
 - spec/qiniu/auth_spec.rb
-- spec/qiniu/image_logo_for_test.png
 - spec/qiniu/image_spec.rb
 - spec/qiniu/management_spec.rb
 - spec/qiniu/misc_spec.rb