aliyun-sdk 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002610ac26720b767cd7218d665da92926081f17
-  data.tar.gz: 62a0a01d10c1fe2f944c7247f6b52a5cf35a6e60
+  metadata.gz: adaf526c24ef420d2ee095742e60eb898656a67f
+  data.tar.gz: 9a3827d7efe46ebce561983a42cad93d56036dc4
 SHA512:
-  metadata.gz: 783dd45bcc4db86557e81a383f0de230e5c937d060c6cb8ff00cab296a67f963b718c2e13d32e1fdbdf9926f8f165a851f826eb68b53fb62252ed76ccc12c4c2
-  data.tar.gz: 2742836c20960f9dd4df8f546a144ddebae62677f2d650108c3677dc9038bb4d71020356c99a5e3368bc323f5a11e63a45aef37670bce3cd1d82eed2bd500407
+  metadata.gz: ac6518e978b92b880614513e46ee00e34f5224c497cb9522e4419e49f01d71ea077b61d9cfda680f18fde9dd8c52871e59d8b06c5b4bb2c5d61b93c408eecdd9
+  data.tar.gz: 8cfc5141a37ab81d18b9e26dba0046c2cf7eda11501b5b25313e85d17847b0f5f4fc288d06ddec21d6d7722f212a7e88d150916cc0a1b45104db84decfcce516

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+### v0.3.6
+
+- Fix Zlib::Inflate in ruby-1.9.x
+- Add function test(tests/) in travis CI
+- Add Gem version badge
+- Support IP endpoint
+
 ### v0.3.5
 
 - Fix the issue that StreamWriter will read more bytes than wanted

data/README.md

@@ -1,5 +1,6 @@
 # Aliyun OSS SDK for Ruby
 
+[![Gem Version](https://badge.fury.io/rb/aliyun-sdk.svg)](https://badge.fury.io/rb/aliyun-sdk)
 [![Build Status](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk.svg)](https://travis-ci.org/aliyun/aliyun-oss-ruby-sdk)
 [![Coverage Status](https://coveralls.io/repos/aliyun/aliyun-oss-ruby-sdk/badge.svg?branch=master&service=github)](https://coveralls.io/github/aliyun/aliyun-oss-ruby-sdk?branch=master)
 
@@ -325,6 +326,7 @@ Multipart的功能，可以在上传/下载时将大文件进行分片传输。A
     puts obj.metas
 
 关于meta信息有以下几点需要注意：
+
 1. meta信息的key和value都只能是简单的ASCII非换行字符，并且总的大小不能超过8KB。
 2. Copy object时默认将拷贝源object的meta信息，如果用户不希望这么做，需要
    显式地将`:meta_directive`设置成{Aliyun::OSS::MetaDirective::REPLACE}
@@ -395,14 +397,16 @@ SDK的examples/目录下有一些展示SDK功能的示例程序，用户稍加
 
 ## 运行测试
 
-SDK采用rspec进行测试，如果要对SDK进行修改，请确保没有break现有测试。测
-试运行的方法是，在ruby-sdk/目录下运行：
-
-    rspec
+```bash
+bundle exec rake spec
 
-或者用bundle和rake：
+export RUBY_SDK_OSS_ENDPOINT=endpoint
+export RUBY_SDK_OSS_ID=AccessKeyId
+export RUBY_SDK_OSS_KEY=AccessKeySecret
+export RUBY_SDK_OSS_BUCKET=bucket-name
 
-    bundle exec rake spec
+bundle exec rake test
+```
 
 ## 更多
 

data/lib/aliyun/oss/http.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'rest-client'
+require 'resolv'
 require 'fiber'
 
 module Aliyun
@@ -138,21 +139,22 @@ module Aliyun
       end
 
       def get_request_url(bucket, object)
-        url = ""
-        url += "#{@config.endpoint.scheme}://"
-        url += "#{bucket}." if bucket and not @config.cname
-        url += @config.endpoint.host
-        url += "/#{CGI.escape(object)}" if object
-
-        url
+        url = @config.endpoint.dup
+        isIP = !!(url.host =~ Resolv::IPv4::Regex)
+        url.host = "#{bucket}." + url.host if bucket && !@config.cname && !isIP
+        url.path = '/'
+        url.path << "#{bucket}/" if bucket && isIP
+        url.path << "#{CGI.escape(object)}" if object
+
+        url.to_s
       end
 
       def get_resource_path(bucket, object)
-        if bucket
-          res = "/#{bucket}/"
-          res += "#{object}" if object
-          res
-        end
+        res = '/'
+        res << "#{bucket}/" if bucket
+        res << "#{object}" if object
+
+        res
       end
 
       # Handle Net::HTTPRespoonse
@@ -170,14 +172,24 @@ module Aliyun
           elsif encoding == 'deflate'
             begin
               stream = Zlib::Inflate.new
-              r.read_body { |chunk| stream << chunk }
-              stream.finish { |chunk| yield chunk }
+              # 1.9.x doesn't support streaming inflate
+              if RUBY_VERSION < '2.0.0'
+                yield stream.inflate(r.read_body)
+              else
+                r.read_body { |chunk| stream << chunk }
+                stream.finish { |chunk| yield chunk }
+              end
             rescue Zlib::DataError
               # No luck with Zlib decompression. Let's try with raw deflate,
               # like some broken web servers do.
               stream = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-              r.read_body { |chunk| stream << chunk }
-              stream.finish { |chunk| yield chunk }
+              # 1.9.x doesn't support streaming inflate
+              if RUBY_VERSION < '2.0.0'
+                yield stream.inflate(r.read_body)
+              else
+                r.read_body { |chunk| stream << chunk }
+                stream.finish { |chunk| yield chunk }
+              end
             end
           else
             r.read_body { |chunk| yield chunk }

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
 
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
 
 end # Aliyun

data/spec/aliyun/oss/client/bucket_spec.rb

@@ -158,7 +158,7 @@ module Aliyun
 
         it "should get bucket url" do
           expect(@bucket.bucket_url)
-            .to eq('http://rubysdk-bucket.oss-cn-hangzhou.aliyuncs.com')
+            .to eq('http://rubysdk-bucket.oss-cn-hangzhou.aliyuncs.com/')
         end
 
         it "should get access key id" do

data/spec/aliyun/oss/client/client_spec.rb

@@ -24,6 +24,55 @@ module Aliyun
           expect(config.sts_token).to eq('sts-token')
         end
 
+        it "should work with CNAME endpoint" do
+          endpoint = 'rockuw.com'
+          bucket = 'rubysdk-bucket'
+          object = 'rubysdk-object'
+          client = Client.new(
+            access_key_id: 'xxx',
+            access_key_secret: 'yyy',
+            endpoint: endpoint,
+            cname: true)
+
+          # TODO: ignore queries here
+          # bucket operations
+          stub_request(:get, endpoint)
+            .with(:query => {'encoding-type' => 'url'})
+          client.get_bucket(bucket).list_objects.take(1)
+          expect(WebMock)
+            .to have_requested(:get, endpoint)
+                 .with(:query => {'encoding-type' => 'url'})
+
+          # object operations
+          stub_request(:get, "#{endpoint}/#{object}")
+          client.get_bucket(bucket).get_object(object) {}
+          expect(WebMock).to have_requested(:get, "#{endpoint}/#{object}")
+        end
+
+        it "should work with IP endpoint" do
+          endpoint = 'http://127.0.0.1:3000'
+          bucket = 'rubysdk-bucket'
+          object = 'rubysdk-object'
+          client = Client.new(
+            access_key_id: 'xxx',
+            access_key_secret: 'yyy',
+            endpoint: endpoint)
+
+          # TODO: ignore queries here
+          # bucket operations
+          stub_request(:get, "#{endpoint}/#{bucket}/")
+            .with(:query => {'encoding-type' => 'url'})
+          client.get_bucket(bucket).list_objects.take(1)
+          expect(WebMock)
+            .to have_requested(:get, "#{endpoint}/#{bucket}/")
+                 .with(:query => {'encoding-type' => 'url'})
+
+          # object operations
+          stub_request(:get, "#{endpoint}/#{bucket}/#{object}")
+          client.get_bucket(bucket).get_object(object) {}
+          expect(WebMock).to have_requested(:get, "#{endpoint}/#{bucket}/#{object}")
+        end
+
         it "should not set Authorization with anonymous client" do
           endpoint = 'oss-cn-hangzhou.aliyuncs.com'
           bucket = 'rubysdk-bucket'

data/tests/config.rb

@@ -0,0 +1,15 @@
+class TestConf
+  class << self
+    def creds
+      {
+        access_key_id: ENV['RUBY_SDK_OSS_ID'],
+        access_key_secret: ENV['RUBY_SDK_OSS_KEY'],
+        endpoint: ENV['RUBY_SDK_OSS_ENDPOINT']
+      }
+    end
+
+    def bucket
+      ENV['RUBY_SDK_OSS_BUCKET']
+    end
+  end
+end

data/tests/test_content_encoding.rb

@@ -3,18 +3,13 @@ require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
 require 'zlib'
+require_relative 'config'
 
 class TestContentEncoding < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
 
     @prefix = "tests/content_encoding/"
   end
@@ -33,7 +28,7 @@ class TestContentEncoding < Minitest::Test
       key, file: '/tmp/x', content_type: 'text/plain')
 
     @bucket.get_object(
-      key, file: '/tmp/y', headers: {'accept-encoding': 'gzip'})
+      key, file: '/tmp/y', headers: {'accept-encoding' => 'gzip'})
 
     assert File.exist?('/tmp/y')
     diff = `diff /tmp/x /tmp/y`
@@ -50,7 +45,7 @@ class TestContentEncoding < Minitest::Test
       key, file: '/tmp/x', content_type: 'text/plain')
 
     @bucket.get_object(
-      key, file: '/tmp/y', headers: {'accept-encoding': 'deflate'})
+      key, file: '/tmp/y', headers: {'accept-encoding' => 'deflate'})
 
     assert File.exist?('/tmp/y')
     diff = `diff /tmp/x /tmp/y`

data/tests/test_content_type.rb

@@ -2,18 +2,13 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestContentType < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
 
     @types = {
       "html" => "text/html",

data/tests/test_custom_headers.rb

@@ -3,18 +3,13 @@ require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
 require 'zlib'
+require_relative 'config'
 
 class TestCustomHeaders < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
 
     @prefix = "tests/custom_headers/"
   end

data/tests/test_encoding.rb

@@ -3,18 +3,14 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestEncoding < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
+
     @prefix = 'tests/encoding/'
   end
 

data/tests/test_large_file.rb

@@ -4,17 +4,13 @@ require 'benchmark'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestLargeFile < Minitest::Test
   def setup
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
+
     @prefix = 'tests/large_file/'
   end
 

data/tests/test_multipart.rb

@@ -3,21 +3,16 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestMultipart < Minitest::Test
   def setup
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    opts = {
-      endpoint: conf['endpoint'],
-      cname: conf['cname'],
-      access_key_id: conf['access_key_id'],
-      access_key_secret: conf['access_key_secret'],
-    }
-    client = Aliyun::OSS::Client.new(opts)
-    @bucket_name = conf['bucket']
-    @bucket = client.get_bucket(@bucket_name)
-    @protocol = Aliyun::OSS::Protocol.new(Aliyun::OSS::Config.new(opts))
+    Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket_name = TestConf.bucket
+    @bucket = client.get_bucket(TestConf.bucket)
+
+    @protocol = Aliyun::OSS::Protocol.new(Aliyun::OSS::Config.new(TestConf.creds))
     @prefix = 'tests/multipart/'
   end
 
@@ -99,7 +94,4 @@ class TestMultipart < Minitest::Test
       id_marker: bar_ids[4], key_marker: get_key("bar")).to_a
     assert_equal foo_ids, after_5.map(&:id)
   end
-
-  def test_prefix
-  end
 end

data/tests/test_object_acl.rb

@@ -2,18 +2,13 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestObjectACL < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
 
     @prefix = "tests/object_acl/"
   end

data/tests/test_object_key.rb

@@ -3,18 +3,14 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestObjectKey < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
+
     @prefix = 'tests/object_key/'
     @keys = {
       simple: 'simple_key',

data/tests/test_resumable.rb

@@ -2,18 +2,14 @@ require 'minitest/autorun'
 require 'yaml'
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 require 'aliyun/oss'
+require_relative 'config'
 
 class TestResumable < Minitest::Test
   def setup
     Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
-    conf_file = '~/.oss.yml'
-    conf = YAML.load(File.read(File.expand_path(conf_file)))
-    client = Aliyun::OSS::Client.new(
-      :endpoint => conf['endpoint'],
-      :cname => conf['cname'],
-      :access_key_id => conf['access_key_id'],
-      :access_key_secret => conf['access_key_secret'])
-    @bucket = client.get_bucket(conf['bucket'])
+    client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket = client.get_bucket(TestConf.bucket)
+
     @prefix = 'tests/resumable/'
   end
 
@@ -32,6 +28,9 @@ class TestResumable < Minitest::Test
       (10 * 1024).times { f.write(random_string(1024)) }
     end
 
+    # clear checkpoints
+    `rm -rf /tmp/x.cpt && rm -rf /tmp/y.cpt`
+
     @bucket.resumable_upload(key, '/tmp/x', :part_size => 100 * 1024)
     @bucket.resumable_download(key, '/tmp/y', :part_size => 100 * 1024)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tianlong Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -179,6 +179,7 @@ files:
 - spec/aliyun/oss/util_spec.rb
 - spec/aliyun/sts/client_spec.rb
 - spec/aliyun/sts/util_spec.rb
+- tests/config.rb
 - tests/test_content_encoding.rb
 - tests/test_content_type.rb
 - tests/test_custom_headers.rb
@@ -225,6 +226,7 @@ test_files:
 - spec/aliyun/oss/util_spec.rb
 - spec/aliyun/sts/client_spec.rb
 - spec/aliyun/sts/util_spec.rb
+- tests/config.rb
 - tests/test_content_encoding.rb
 - tests/test_content_type.rb
 - tests/test_custom_headers.rb