qiniu-rs 2.3.3 → 3.0.3

data/spec/qiniu/rs/rs_spec.rb

@@ -11,31 +11,34 @@ module Qiniu
     describe RS do
 
       before :all do
-=begin
-        code, data = Qiniu::RS::Auth.exchange_by_password!("test@qbox.net", "test")
+
+        @bucket = "test_bucket_1234"
+        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
+        @domain = 'iovip.qbox.me/test'
+
+        code, data = Qiniu::RS::RS.mkbucket(@bucket)
         code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
         puts data.inspect
-=end
+      end
 
-        code2, data2 = Qiniu::RS::IO.put_auth()
-        code2.should == 200
-        data2["url"].should_not be_empty
-        data2["expiresIn"].should_not be_zero
-        puts data2.inspect
+      context "IO.upload_file" do
+        it "should works" do
+          code, data = Qiniu::RS::IO.put_auth()
+          code.should == 200
+          data["url"].should_not be_empty
+          data["expiresIn"].should_not be_zero
+          puts data.inspect
+          @put_url = data["url"]
 
-        @put_url = data2["url"]
-        @bucket = "test"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
-        @domain = 'cdn.example.com'
+          code2, data2 = Qiniu::RS::IO.upload_file(@put_url, __FILE__, @bucket, @key)
+          code2.should == 200
+          puts data2.inspect
+        end
       end
 
-      context "IO.upload_file" do
+      context ".buckets" do
         it "should works" do
-          code, data = Qiniu::RS::IO.upload_file(@put_url, __FILE__, @bucket, @key)
+          code, data = Qiniu::RS::RS.buckets
           code.should == 200
           puts data.inspect
         end

data/spec/qiniu/rs_spec.rb

@@ -13,16 +13,69 @@ module Qiniu
 
       @test_image_bucket = 'test_images_12345'
       @test_image_key = 'image_logo_for_test.png'
+
+      result = Qiniu::RS.mkbucket(@bucket)
+      result.should_not be_false
     end
 
-=begin
-    context ".login!" do
+    context ".buckets" do
       it "should works" do
-        result = Qiniu::RS.login!("test@qbox.net", "test")
-        result.should be_true
+        result = Qiniu::RS.buckets
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_protected" do
+      it "should works" do
+        result = Qiniu::RS.set_protected(@bucket, 1)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_separator" do
+      it "should works" do
+        result = Qiniu::RS.set_separator(@bucket, "-")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_style" do
+      it "should works" do
+        result = Qiniu::RS.set_style(@bucket, "small.jpg", "imageMogr/auto-orient/thumbnail/!120x120r/gravity/center/crop/!120x120/quality/80")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".unset_style" do
+      it "should works" do
+        result = Qiniu::RS.unset_style(@bucket, "small.jpg")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_watermark" do
+      it "should works" do
+        options = {
+          :text => "Powered by QiniuRS"
+        }
+        result = Qiniu::RS.set_watermark(1, options)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".get_watermark" do
+      it "should works" do
+        result = Qiniu::RS.get_watermark(1)
+        result.should_not be_false
+        puts result.inspect
       end
     end
-=end
 
     context ".put_auth" do
       it "should works" do
@@ -60,6 +113,22 @@ module Qiniu
       end
     end
 
+    context ".upload_file" do
+      it "should works" do
+        uptoken_opts = {:scope => @bucket, :expires_in => 3600}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => __FILE__,
+          :bucket => @bucket,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        result = Qiniu::RS.upload_file(upload_opts)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
     context ".stat" do
       it "should works" do
         result = Qiniu::RS.stat(@bucket, @key)
@@ -183,6 +252,9 @@ module Qiniu
         puts data.inspect
 
         dest_bucket = "test_thumbnails_bucket"
+        result = Qiniu::RS.mkbucket(dest_bucket)
+        result.should_not be_false
+
         dest_key = "cropped-" + @test_image_key
         src_img_url = data["url"]
         mogrify_options = {
@@ -194,10 +266,10 @@ module Qiniu
           :format => "jpg",
           :auto_orient => true
         }
-        result = Qiniu::RS.image_mogrify_save_as(dest_bucket, dest_key, src_img_url, mogrify_options)
-        result.should_not be_false
-        result.should_not be_empty
-        puts result.inspect
+        result2 = Qiniu::RS.image_mogrify_save_as(dest_bucket, dest_key, src_img_url, mogrify_options)
+        result2.should_not be_false
+        result2.should_not be_empty
+        puts result2.inspect
       end
     end
 

data/spec/spec_helper.rb

@@ -6,7 +6,19 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.before :all do
+#=begin
     Qiniu::RS.establish_connection! :access_key => "3fPHl_SLkPXdioqI_A8_NGngPWVJhlDk2ktRjogH",
-                                    :secret_key => "bXTPMDJrVYRJUiSDRFtFYwycVD_mjXxYWrCYlDHy"
+                                    :secret_key => "bXTPMDJrVYRJUiSDRFtFYwycVD_mjXxYWrCYlDHy",
+#=end
+=begin
+    Qiniu::RS.establish_connection! :access_key => "bE21M6FW9V7zAFrBY5psgKOKJQLiBj12qMWTpc57",
+                                    :secret_key => "uMo7Nyq_eDK_CuQ8_FYCxoTHQZqjiaPh-cbiKO7L",
+                                    :auth_url   => "http://m1.qbox.me:13001/oauth2/token",
+                                    :rs_host    => "http://m1.qbox.me:13003",
+                                    :io_host    => "http://m1.qbox.me:13004",
+                                    :up_host    => "http://m1.qbox.me:13019",
+                                    :pub_host   => "http://m1.qbox.me:13012",
+                                    :eu_host    => "http://m1.qbox.me:13050"
+=end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
-description: ! 'Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://docs.qiniutek.com/v2/sdk/ruby/'
+description: ! 'Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://docs.qiniutek.com/v3/sdk/ruby/'
 email:
 - why404@gmail.com
 executables: []
@@ -143,10 +143,12 @@ files:
 - lib/qiniu/rs.rb
 - lib/qiniu/rs/auth.rb
 - lib/qiniu/rs/config.rb
+- lib/qiniu/rs/eu.rb
 - lib/qiniu/rs/exceptions.rb
 - lib/qiniu/rs/image.rb
 - lib/qiniu/rs/io.rb
 - lib/qiniu/rs/log.rb
+- lib/qiniu/rs/pub.rb
 - lib/qiniu/rs/rs.rb
 - lib/qiniu/rs/utils.rb
 - lib/qiniu/rs/version.rb
@@ -155,9 +157,11 @@ files:
 - lib/qiniu/tokens/upload_token.rb
 - qiniu-rs.gemspec
 - spec/qiniu/rs/auth_spec.rb
+- spec/qiniu/rs/eu_spec.rb
 - spec/qiniu/rs/image_logo_for_test.png
 - spec/qiniu/rs/image_spec.rb
 - spec/qiniu/rs/io_spec.rb
+- spec/qiniu/rs/pub_spec.rb
 - spec/qiniu/rs/rs_spec.rb
 - spec/qiniu/rs/utils_spec.rb
 - spec/qiniu/rs/version_spec.rb
@@ -177,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -269804960925193007
+      hash: -762983906388000240
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -269804960925193007
+      hash: -762983906388000240
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -195,9 +199,11 @@ specification_version: 3
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby
 test_files:
 - spec/qiniu/rs/auth_spec.rb
+- spec/qiniu/rs/eu_spec.rb
 - spec/qiniu/rs/image_logo_for_test.png
 - spec/qiniu/rs/image_spec.rb
 - spec/qiniu/rs/io_spec.rb
+- spec/qiniu/rs/pub_spec.rb
 - spec/qiniu/rs/rs_spec.rb
 - spec/qiniu/rs/utils_spec.rb
 - spec/qiniu/rs/version_spec.rb