aliyunoss 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d5f91f7798d9c53064203c5d72a04c316f4e4c
-  data.tar.gz: a984576bb7a203542fe326c7620482ee8f245346
+  metadata.gz: 716bf19a85202b9dd54f69809b80edd10413d239
+  data.tar.gz: e83b18486d76552130a8e897b9e8ea7c01cf90f9
 SHA512:
-  metadata.gz: 711cbd85c09bcef395be43cc99a65bdedf4435e44b1ac350e9a75c17835258d37f82b7a7e5b30204011779e62e27840f54e34f61dafe2a54873a6261f7e0d239
-  data.tar.gz: a384ed6fb2f98eaa46985b491df0a7369197e6ee26e7e037dc7bac821fa14b173088707da9b00dcbdb73716bfc69b6a9fd10aa931351d37cb8d9ea8faa20b17b
+  metadata.gz: 8dba8f48ad17fafee1979d6dbf5d4fa60aa004c2fd6e0a67dd4345a6d8cb798017c2e204eab77bd72844f03956799de62e74f229fb81f79ff7e23dd0aae1fd58
+  data.tar.gz: 804cd0ae4c9c6db0a8ad3702290be2eeb0d669a1a73df999a98565ecf8ea73fa44bbea870394095cc037d5a2d773c258d17de7677c31a4466133b76287f8ffa3

data/Gemfile

@@ -1,6 +1,8 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aliyun-oss.gemspec
 gemspec
 
 gem 'nokogiri', '~> 1.6'
+
+gem 'byebug', :group => ['development', 'test']

data/README.md

@@ -76,7 +76,7 @@ For more usage, see API documentation generated by rdoc.
 
 This gem use rspec for testing. Most of testing needs a valid access key id and access key secret, you should get these info from Aliyun.
 
-Create a file named aliyun-config.yml in path rspec/aliyun/oss, fill in valid access key id and access key secret and cotinue to test.
+Create a file named aliyun-config.yml in path rspec/aliyunoss/config, fill in valid access key id and access key secret and cotinue to test.
 
 ## Contributing
 

data/lib/aliyunoss.rb

@@ -3,10 +3,10 @@ require 'nokogiri'
 require 'net/http'
 require 'logger'
 
-require 'aliyunoss/helper'
 require 'aliyunoss/config'
+require 'aliyunoss/config_helper'
 require 'aliyunoss/extension'
-require 'aliyunoss/http_response_extension'
 require 'aliyunoss/oss_request'
+require 'aliyunoss/oss_exception'
 require 'aliyunoss/api'
 require 'aliyunoss/bucket'

data/lib/aliyunoss/api.rb

@@ -160,7 +160,10 @@ HERE
         request.put
       end
 
-      
+      # get share url for specified object
+      def generate_share_url(bucket, path, expires_in = 3600)
+        Aliyun::Oss::OssRequest.new(bucket, path).url_for_sharing(expires_in)
+      end
 
       # Post Object
       # Not implemented
@@ -186,13 +189,13 @@ HERE
         request = Aliyun::Oss::OssRequest.new(target_bucket, target_path, 'partNumber'=> part_number.to_s, 'uploadId'=> upload_id)
         request['Content-Length'] = part_size
         request['x-oss-copy-source'] = "/" + source_bucket.name + source_path
-        request['x-oss-copy-source-range'] = range if range        
+        request['x-oss-copy-source-range'] = range if range
         request.put
       end
 
       def multipart_upload_complete(bucket, path, upload_id, part_list)
         request = Aliyun::Oss::OssRequest.new(bucket, path, 'uploadId'=> upload_id)
-        xml = '<?xml version="1.0" encoding="UTF-8"?>'        
+        xml = '<?xml version="1.0" encoding="UTF-8"?>'   
         xml << '<CompleteMultipartUpload>'
         part_list.each_pair {|k,v| xml << "<Part><PartNumber>#{k}</PartNumber><ETag>#{v}</ETag></Part>"}
         xml << '</CompleteMultipartUpload>'

data/lib/aliyunoss/bucket.rb

@@ -14,43 +14,47 @@ module Aliyun
 
       # Class methods
       def self.all
-        Aliyun::Oss::API.list_bucket.to_buckets
+        Aliyun::Oss::API.list_bucket.raise_unless(Net::HTTPOK).to_buckets
       end
 
       def self.create(name, location = 'oss-cn-hangzhou')
-        if Aliyun::Oss::API.put_bucket(name, location).class == Net::HTTPOK
-          Bucket.new(:name => name,  :location=> location, :creation_date => Time.now)
-        else
-          nil
-        end
+        Aliyun::Oss::API.put_bucket(name, location).raise_unless(Net::HTTPOK)
+        Bucket.new(:name => name,  :location=> location, :creation_date => Time.now)
       end
 
       # Instance Methods -- object download and upload
       def list_files(options = {})
-        Aliyun::Oss::API.list_object(self, options).to_objects
+        Aliyun::Oss::API.list_object(self, options).raise_unless(Net::HTTPOK).to_objects
       end
 
       def upload(data, path, options = {})
-        Aliyun::Oss::API.put_object(self, path, data, options).raise_if_not(Net::HTTPOK)
+        Aliyun::Oss::API.put_object(self, path, data, options).raise_unless(Net::HTTPOK)
       end
 
       def download(path, options = {})
-        response = Aliyun::Oss::API.get_object(self, path, options)
-        response.raise_if_not(Net::HTTPOK)
-        response.body
+        Aliyun::Oss::API.get_object(self, path, options)
+          .raise_unless(Net::HTTPOK)
+          .body
+      end
+
+      def share(path, expires_in = 3600)
+        Aliyun::Oss::API.generate_share_url(self, path, expires_in)
       end
 
       def delete(path)
-        Aliyun::Oss::API.delete_object(self, path).raise_if_not(Net::HTTPNoContent)
+        Aliyun::Oss::API.delete_object(self, path).raise_unless(Net::HTTPNoContent)
       end
 
       # Multipart upload and copy
       def multipart_pending
-        Aliyun::Oss::API.multipart_upload_unfinished_task(self).to_mutlipart_task
+        Aliyun::Oss::API.multipart_upload_unfinished_task(self)
+          .raise_unless(Net::HTTPOK)
+          .to_mutlipart_task
       end
 
       def multipart_abort(path, upload_id)
-        Aliyun::Oss::API.multipart_upload_abort(self, path, upload_id).raise_if_not(Net::HTTPNoContent)
+        Aliyun::Oss::API.multipart_upload_abort(self, path, upload_id)
+          .raise_unless(Net::HTTPNoContent)
       end
 
       def multipart_upload(data)
@@ -58,7 +62,7 @@ module Aliyun
         response = Aliyun::Oss::API.multipart_upload_part(self, @multipart_path,
                                                @multipart_id,
                                                data, @multipart_sequence)
-        response.raise_if_not(Net::HTTPOK)
+        response.raise_unless(Net::HTTPOK)
         @multipart_list[@multipart_sequence] = response['ETag']
         @multipart_sequence = @multipart_sequence + 1
       end
@@ -69,14 +73,16 @@ module Aliyun
                                                                self, @multipart_path,
                                                                @multipart_sequence,
                                                                size, range)
-        response.raise_if_not(Net::HTTPOK)
+        response.raise_unless(Net::HTTPOK)
         @multipart_list[@multipart_sequence] = response['ETag']
         @multipart_sequence = @multipart_sequence + 1        
       end
 
       def multipart_upload_initiate(path)
         @multipart_path = path
-        @multipart_id = Aliyun::Oss::API.multipart_upload_initiate(self, path).to_multipart_id
+        @multipart_id = Aliyun::Oss::API.multipart_upload_initiate(self, path)
+                        .raise_unless(Net::HTTPOK)
+                        .to_multipart_id
         @multipart_list = {}
         @multipart_sequence = 1
       end
@@ -85,45 +91,45 @@ module Aliyun
         Aliyun::Oss::API.multipart_upload_complete(self, @multipart_path,
                                                    @multipart_id,
                                                    @multipart_list)
-          .raise_if_not(Net::HTTPOK)
+          .raise_unless(Net::HTTPOK)
         @multipart_path = nil
       end
 
       # Instance Methods -- miscellaneous
       def delete!
-        Aliyun::Oss::API.delete_bucket(self).raise_if_not(Net::HTTPNoContent)
+        Aliyun::Oss::API.delete_bucket(self).raise_unless(Net::HTTPNoContent)
       end
 
       def disable_logging
-        Aliyun::Oss::API.delete_logging(self).raise_if_not(Net::HTTPNoContent)
+        Aliyun::Oss::API.delete_logging(self).raise_unless(Net::HTTPNoContent)
       end
 
       def enable_logging(target_bucket_name, log_prefix)
-        Aliyun::Oss::API.enable_bucket_logging(self, target_bucket_name, log_prefix).raise_if_not(Net::HTTPOK)
+        Aliyun::Oss::API.enable_bucket_logging(self, target_bucket_name, log_prefix).raise_unless(Net::HTTPOK)
       end
 
       def logging_status
-        Aliyun::Oss::API.get_bucket_logging(self).to_logging_status
+        Aliyun::Oss::API.get_bucket_logging(self).raise_unless(Net::HTTPOK).to_logging_status
       end
 
       def disable_website_access
-        Aliyun::Oss::API.delete_website(self).raise_if_not(Net::HTTPNoContent)
+        Aliyun::Oss::API.delete_website(self).raise_unless(Net::HTTPNoContent)
       end
 
       def enable_website_access(index_page, error_page)
-        Aliyun::Oss::API.put_bucket_website(self, index_page, error_page).raise_if_not(Net::HTTPOK)
+        Aliyun::Oss::API.put_bucket_website(self, index_page, error_page).raise_unless(Net::HTTPOK)
       end
 
       def website_access_status
-        Aliyun::Oss::API.get_bucket_website(self).to_website_status
+        Aliyun::Oss::API.get_bucket_website(self).raise_unless(Net::HTTPOK).to_website_status
       end
 
       def set_acl(permission)
-        Aliyun::Oss::API.put_bucket_acl(self, permission).raise_if_not(Net::HTTPOK)
+        Aliyun::Oss::API.put_bucket_acl(self, permission).raise_unless(Net::HTTPOK)
       end
 
       def get_acl
-        Aliyun::Oss::API.get_bucket_acl(self).to_acl_status
+        Aliyun::Oss::API.get_bucket_acl(self).raise_unless(Net::HTTPOK).to_acl_status
       end
     end
     

data/lib/aliyunoss/extension.rb

@@ -32,3 +32,72 @@ class String
   end
 
 end
+
+# add methods to HTTPResponse for parsing results
+module Net
+
+  class HTTPResponse
+
+    def raise_unless(status)
+      raise OssException.new(self) unless status === self
+      self
+    end
+
+    def to_buckets
+      raise message unless Net::HTTPOK === self
+      nodes = Nokogiri::XML(self.body).xpath('//Bucket') rescue []
+      nodes.map do |node|
+        bucket = Aliyun::Oss::Bucket.new
+        node.elements.each {|e| bucket.send("#{e.name.underscore}=".to_sym, e.content)}
+        bucket
+      end
+    end
+
+    def to_objects
+      raise message unless Net::HTTPOK === self
+      nodes = Nokogiri::XML(self.body).xpath('//Contents') rescue []
+      nodes.map do |node|
+        hash = Hash.new
+        node.elements.each {|e| hash[e.name.underscore] = e.content unless e.name == 'Owner' }
+        hash
+      end      
+    end
+
+    def to_logging_status
+      raise message unless Net::HTTPOK === self
+      node = Nokogiri::XML(self.body).xpath('//LoggingEnabled') rescue []
+      hash = Hash.new
+      node[0].elements.each {|e| hash[e.name.underscore] = e.content }
+      hash                                                     
+    end
+
+    def to_website_status
+      raise message unless Net::HTTPOK === self
+      xml = Nokogiri::XML(self.body)
+      {'index_page' => xml.xpath('//Suffix')[0].content, 'error_page' => xml.xpath('//Key')[0].content } rescue {}
+    end
+
+    def to_acl_status
+      raise message unless Net::HTTPOK === self
+      Nokogiri::XML(self.body).xpath('//Grant')[0].content
+    end
+
+    def to_multipart_id
+      raise message unless Net::HTTPOK === self
+      Nokogiri::XML(body).xpath('//UploadId').first.content      
+    end
+
+    def to_mutlipart_task
+      raise message unless Net::HTTPOK === self
+      tasks = Array.new
+      nodes = Nokogiri::XML(response.body).xpath('//Upload')
+      nodes.each do |node|
+        path = '/' + node.xpath('Key').first.content
+        id = node.xpath('UploadId').first.content
+        tasks << {'path'=> path, 'upload_id' => id}
+      end
+      tasks
+    end
+  end
+  
+end

data/lib/aliyunoss/oss_exception.rb

@@ -0,0 +1,17 @@
+class OssException < RuntimeError
+  def initialize(http_response)
+    @response = http_response
+  end
+
+  def inspect
+    "Status: #{@response.class.to_s}\nBody: #{@response.body}"
+  end
+
+  def to_s
+    inspect
+  end
+
+  def message
+    inspect
+  end
+end

data/lib/aliyunoss/oss_request.rb

@@ -52,7 +52,6 @@ module Aliyun
           Net::HTTP.start(uri.host, uri.port) do |http|
             response = http.request(request)
             logger.info(response.code.to_s + ' ' + response.message)
-            logger.debug(response.body)
           end
           response          
         end
@@ -64,8 +63,16 @@ module Aliyun
       add_operation :head
       add_operation :post
 
-      def url_for_sharing(expires)
-        raise "not implemented"
+      def url_for_sharing(expires_in)
+        uri = get_uri
+        request = Net::HTTP::Get.new(uri)
+        @headers.each_pair {|k,v| request[k] = v}
+        expires_at = (Time.now + expires_in).utc.to_i
+        request["Date"] = expires_at
+        uri.query = URI.encode_www_form({"OSSAccessKeyId" => access_key_id,
+                                         "Expires" => expires_at,
+                                         "Signature" => signature(request)})
+        uri.to_s
       end
 
       def [](key)
@@ -112,10 +119,7 @@ module Aliyun
         end
 
         return "" if hash.count == 0
-        
-        array = Array.new
-        hash.each_pair {|k,v| array << k + ":" + v }
-        array.sort.join("\n") << "\n"
+        hash.keys.sort.map{|k| "#{k}:#{hash[k]}"}.join("\n") << "\n"
       end
 
       # oss api 20140828.pdf - 4.2
@@ -131,9 +135,11 @@ module Aliyun
       def canonicalized_resource()
         return @path unless @bucket
         return "/#{@bucket.name}#{@path}" if @queries.count == 0
-        
-        array = Array.new
-        @queries.each_pair {|k,v| array << (if v then k+"="+v else k end)}
+
+        array =  @queries.keys.sort.map do |k|
+          if @queries[k] then "#{k}=#{@queries[k]}" else "#{k}" end
+        end
+          
         "/#{@bucket.name}#{@path}?#{array.sort.join('&')}"
       end
 

data/lib/aliyunoss/version.rb

@@ -1,5 +1,5 @@
 module Aliyun
   module Oss
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/aliyunoss/api_spec.rb

@@ -1,19 +1,18 @@
 require 'rspec'
 require 'aliyunoss'
+require 'spec_helper'
 
 describe Aliyun::Oss::API do
 
   before :all do
-    Aliyun::Oss.configure_with('spec/aliyunoss/aliyun-config.yml')
-#    Aliyun::Oss.configure(:log_level=> 'debug')
-    bucket_name = 'aliyun-oss-gem-api-test'
-    response = Aliyun::Oss::API.put_bucket(bucket_name)
+    Aliyun::Oss.configure_with('spec/aliyunoss/config/aliyun-config.yml')
+    bucket_name = "aliyunoss-gem-test-#{rand.to_s.delete('0.')}"
+    location = 'oss-cn-beijing'
+    response = Aliyun::Oss::API.put_bucket(bucket_name, location)
     expect(response).to be_a(Net::HTTPOK)
-  end
 
-  before :each do
     @api = Aliyun::Oss::API
-    @bucket = Aliyun::Oss::Bucket.new(name: 'aliyun-oss-gem-api-test', location: 'oss-cn-hangzhou')
+    @bucket = Aliyun::Oss::Bucket.new(name: bucket_name, location: location)
   end
 
   it 'should get bucket list using GetService api' do
@@ -44,7 +43,7 @@ describe Aliyun::Oss::API do
     response = @api.get_bucket_location(@bucket)
     expect(response).to be_a(Net::HTTPOK)
     node = Nokogiri::XML(response.body).xpath('//LocationConstraint')[0]
-    expect(node.content).to eq('oss-cn-hangzhou')
+    expect(node.content).to include('oss-cn-')
   end
 
   it 'should get bucket logging status' do
@@ -74,7 +73,7 @@ describe Aliyun::Oss::API do
   end
 
   it 'should upload file' do
-    files = ['test-1.png','test-2.png','test-3.png'].map {|f|  File.join(__dir__, f)}
+    files = ['test-1.png','test-2.png','test-3.png'].map {|f|  File.join(__dir__, 'png', f)}
     files.each do |f|
       data = IO.read(f)
       response = @api.put_object(@bucket, "/" + f[/test-\d\.png/], data, 'Content-Type'=>'image/png')
@@ -82,6 +81,13 @@ describe Aliyun::Oss::API do
     end
   end
 
+  it 'should generate share url for uploaded file' do
+    path = '/test-1.png'
+    url = @api.generate_share_url(@bucket, path, 7200)
+    data = Net::HTTP.get(URI(url))
+    expect(data.length).to eq(File.open( File.join(__dir__, 'png', path)).size)
+  end
+
   it 'should copy object' do
     sources = ['/test-1.png','/test-2.png','/test-3.png']
     sources.each do |source_path|
@@ -96,7 +102,7 @@ describe Aliyun::Oss::API do
 
   it 'should get object from oss' do
     response = @api.get_object(@bucket, '/copy-test-1.png')
-    file_name = File.join(__dir__, 'test-1.png')
+    file_name = File.join(__dir__, 'png', 'test-1.png')
     expect(response['Content-Length']).to eq(File.size(file_name).to_s)
     expect(response['Content-Type']).to eq('image/png')
   end
@@ -110,13 +116,12 @@ describe Aliyun::Oss::API do
 
   it 'should delete multiple objects' do
     response = @api.delete_multiple_objects(@bucket, ['copy-test-2.png','copy-test-3.png', 'copy-test-1.png'])
-    puts response.body
     expect(response).to be_a(Net::HTTPOK)
   end
   
   it 'should delete this bucket' do
-   response = @api.delete_bucket(@bucket)
-   expect(response).to be_a(Net::HTTPNoContent)    
+    response = @api.delete_bucket(@bucket)
+    expect(response).to be_a(Net::HTTPNoContent)    
   end
   
 end

data/spec/aliyunoss/bucket_spec.rb

@@ -1,16 +1,14 @@
 require 'rspec'
 require 'aliyunoss'
+require 'spec_helper'
 
 describe Aliyun::Oss::Bucket do
 
   before :all do
-    Aliyun::Oss.configure_with('spec/aliyunoss/aliyun-config.yml')
-  end
-
-  before :each do
-    @bucket_name = 'aliyun-oss-gem-api-test'
-    @location = 'oss-cn-hangzhou'
-    @bucket = Aliyun::Oss::Bucket.all.select {|b| b.name == @bucket_name} .first
+    Aliyun::Oss.configure_with('spec/aliyunoss/config/aliyun-config.yml')
+    @bucket_name = "aliyunoss-gem-test-#{rand.to_s.delete('0.')}"
+    @location = 'oss-cn-beijing'
+    @bucket = Aliyun::Oss::Bucket.new( location: @location, name: @bucket_name)
   end
   
   it 'should create a bucket' do
@@ -29,13 +27,19 @@ describe Aliyun::Oss::Bucket do
   end
   
   it 'should upload data to server' do    
-    files = ['test-1.png','test-2.png','test-3.png'].map {|f|  File.join(__dir__, f)}
+    files = ['test-1.png','test-2.png','test-3.png'].map {|f|  File.join(__dir__, 'png',f)}
     files.each do |f|
       data = IO.read(f)
       @bucket.upload(data, "/" + f[/test-\d\.png/], 'Content-Type'=>'image/png')
     end    
   end
 
+  it 'should generate share url' do
+    url = @bucket.share("/test-1.png")
+    data = Net::HTTP.get(URI(url))
+    expect(data.length).to eq(File.open( File.join(__dir__, "png", "test-1.png")).size)
+  end
+
   it 'should upload data to server in multipart way' do
     path = '/multi-part-test.dat'
     @bucket.multipart_upload_initiate(path)
@@ -48,7 +52,6 @@ describe Aliyun::Oss::Bucket do
   end
 
   it 'should copy data in multipart way' do
-    pending 'I get Forbidden using x-oss-copy-source-range'
     source_path = '/multi-part-test.dat'
     source_object = @bucket.list_files.select {|f| '/' + f['key'] == source_path} .first
     source_size = source_object['size'].to_i
@@ -62,7 +65,7 @@ describe Aliyun::Oss::Bucket do
   it 'should download file from server' do
     ['/test-1.png','/test-2.png','/test-3.png'].each do |path|
       remote_data = @bucket.download(path)
-      local_data = IO.read(File.join(__dir__, path))
+      local_data = IO.read(File.join(__dir__, 'png', path))
       md5 = OpenSSL::Digest::MD5
       expect(md5.digest(remote_data)).to eq(md5.digest(local_data))
     end
@@ -75,25 +78,38 @@ describe Aliyun::Oss::Bucket do
   end
 
   it 'should get and modify logging status' do
-    @bucket.enable_logging('aliyun-oss-gem-api-test', 'access_log')
-    sleep(2)
-    expect(@bucket.logging_status['target_bucket']).to eq('aliyun-oss-gem-api-test')
-    expect(@bucket.logging_status['target_prefix']).to eq('access_log')
+    @bucket.enable_logging(@bucket_name, 'access_log')
+    status = @bucket.logging_status
+    # it seems that changes do not take effect immediately
+    # aliyun return loggint enabled status but without target_prefix
+    # so we retry
+    status = @bucket.logging_status
+    status = @bucket.logging_status if status.count == 0
+    status = @bucket.logging_status if status.count == 0
+    expect(status['target_bucket']).to eq(@bucket_name)
+    expect(status['target_prefix']).to eq('access_log')
     @bucket.disable_logging
   end
 
   it 'should get and modify website access status' do
     @bucket.enable_website_access('index.html','error.html')
-    sleep(2)
-    expect(@bucket.website_access_status['index_page']).to eq('index.html')
-    expect(@bucket.website_access_status['error_page']).to eq('error.html')
+    retries = 0
+    begin
+      status = @bucket.website_access_status
+    rescue
+      retry if (retries+=1) <= 5
+    end
+    expect(status['index_page']).to eq('index.html')
+    expect(status['error_page']).to eq('error.html')
     @bucket.disable_website_access
   end
 
   it 'should get and set access control list' do
     @bucket.set_acl('public-read')
-    sleep(2)
-    expect(@bucket.get_acl).to eq('public-read')
+    status = @bucket.get_acl
+    status = @bucket.get_acl if status == 'private'
+    status = @bucket.get_acl if status == 'private'
+    expect(status).to eq('public-read')
     @bucket.set_acl('private')
   end
 

data/spec/aliyunoss/{aliyun-config.yml.sample → config/aliyun-config.yml.sample}

@@ -1,2 +1,3 @@
 access_key_id: "access key _id from aliyun"
 access_key_secret: "access key secret from aliyun"
+log_level: "warn"

data/spec/aliyunoss/config/incorrect-config.yml

@@ -0,0 +1,3 @@
+this is incorrect yaml
+format file
+access_key_id: "1234567890"

data/spec/aliyunoss/config_spec.rb

@@ -1,12 +1,12 @@
 require 'rspec'
 require 'aliyunoss'
+require 'spec_helper'
 
 describe 'Aliyun::Oss Configuration' do
 
   before :each do
     config = Aliyun::Oss.config
     config[:log_level] = 'info'
-    config[:host] = 'aliyuncs.com'
     config[:access_key_id] = nil
     config[:access_key_secret] = nil
   end
@@ -14,34 +14,28 @@ describe 'Aliyun::Oss Configuration' do
   it 'should load default options' do
     default_config = Aliyun::Oss.config
     expect(default_config).to include(:log_level)
-    expect(default_config).to include(:host)
     expect(default_config).to include(:access_key_id)
   end
 
   it 'should accept configuration from #configure' do
     url = "http://bucket_name.region.aliyuncs.com"
     access_key = "access_key_from_aliyun"
-    Aliyun::Oss.configure(:log_level => 'debug', :host => url, :access_key_id => access_key, :not_used_para => "not used")
+    Aliyun::Oss.configure(:log_level => 'debug', :access_key_id => access_key, :not_used_para => "not used")
     config = Aliyun::Oss.config
     expect(config.keys).not_to include(:not_used_para)
-    expect(config[:host]).to eq(url)
     expect(config[:access_key_id]).to eq(access_key)
     expect(config[:log_level]).to eq('debug')    
   end
 
   it 'should load yaml config file if specified' do
-    Aliyun::Oss.configure_with('spec/aliyunoss/aliyun-config.yml.sample')
+    Aliyun::Oss.configure_with('spec/aliyunoss/config/aliyun-config.yml.sample')
     config = Aliyun::Oss.config
-    expect(config[:host]).to eq('bucket_name.region.aliyuncs.com')
     expect(config[:access_key_id]).to eq('access key _id from aliyun')
   end
 
   it 'should load default configuration if incorrect yaml file specified' do
-    Aliyun::Oss.configure_with('spec/aliyunoss/incorrect-config.yml')
+    Aliyun::Oss.configure_with('spec/aliyunoss/config/incorrect-config.yml')
     config = Aliyun::Oss.config
-    expect(config[:host]).not_to eq('aliyun-yaml.com')
     expect(config[:access_key_id]).not_to eq('1234567890')    
   end
-
-  it 'should load configuration from RAILS_ROOT/config/aliyun-oss.yml in Rails project'
 end

data/spec/aliyunoss/multipart_api_spec.rb

@@ -1,19 +1,17 @@
 require 'rspec'
 require 'aliyunoss'
+require 'spec_helper'
 
-describe Aliyun::Oss::API do
+describe "multipart api" do
 
   before :all do
-    Aliyun::Oss.configure_with('spec/aliyunoss/aliyun-config.yml')
-    Aliyun::Oss.configure(:log_level=> 'debug')
-    bucket_name = 'aliyun-oss-gem-api-test'
-    response = Aliyun::Oss::API.put_bucket(bucket_name)
-    expect(response).to be_a(Net::HTTPOK)
-  end
-
-  before :each do
+    Aliyun::Oss.configure_with('spec/aliyunoss/config/aliyun-config.yml')
+    bucket_name = "aliyunoss-gem-test-#{rand.to_s.delete('0.')}"
+    location = 'oss-cn-beijing'
+    response = Aliyun::Oss::API.put_bucket(bucket_name, location)
+    expect(response).to be_a(Net::HTTPOK)     
     @api = Aliyun::Oss::API
-    @bucket = Aliyun::Oss::Bucket.new(name: 'aliyun-oss-gem-api-test', location: 'oss-cn-hangzhou')
+    @bucket = Aliyun::Oss::Bucket.new(name: bucket_name, location: location)
   end
 
   it 'should upload data in multipart way' do
@@ -67,8 +65,6 @@ describe Aliyun::Oss::API do
     upload_id = Nokogiri::XML(response.body).xpath('//UploadId')[0].content
     expect(upload_id).to_not be_nil
 
-    data = Random.new.bytes(1024 * rand(100..300))
-
     response = @api.multipart_upload_from_copy(upload_id, @bucket, '/multi-part-test.dat',
                                                @bucket, path, 1, 1024*500)
     expect(response).to be_a(Net::HTTPOK)
@@ -96,8 +92,8 @@ describe Aliyun::Oss::API do
   end
 
   it 'should delete this bucket' do
-   response = Aliyun::Oss::API.delete_bucket(@bucket)
-   expect(response).to be_a(Net::HTTPNoContent)
+    response = Aliyun::Oss::API.delete_bucket(@bucket)
+    expect(response).to be_a(Net::HTTPNoContent)
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, "test")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyunoss
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - yijiecc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,21 +69,22 @@ files:
 - lib/aliyunoss/api.rb
 - lib/aliyunoss/bucket.rb
 - lib/aliyunoss/config.rb
+- lib/aliyunoss/config_helper.rb
 - lib/aliyunoss/extension.rb
-- lib/aliyunoss/helper.rb
-- lib/aliyunoss/http_response_extension.rb
+- lib/aliyunoss/oss_exception.rb
 - lib/aliyunoss/oss_request.rb
 - lib/aliyunoss/version.rb
-- spec/aliyunoss/aliyun-config.yml.sample
 - spec/aliyunoss/api_spec.rb
 - spec/aliyunoss/bucket_spec.rb
+- spec/aliyunoss/config/aliyun-config.yml.sample
+- spec/aliyunoss/config/incorrect-config.yml
 - spec/aliyunoss/config_spec.rb
-- spec/aliyunoss/incorrect-config.yml
 - spec/aliyunoss/multipart_api_spec.rb
 - spec/aliyunoss/oss_request_spec.rb
-- spec/aliyunoss/test-1.png
-- spec/aliyunoss/test-2.png
-- spec/aliyunoss/test-3.png
+- spec/aliyunoss/png/test-1.png
+- spec/aliyunoss/png/test-2.png
+- spec/aliyunoss/png/test-3.png
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -109,13 +110,14 @@ signing_key:
 specification_version: 4
 summary: A gem for accessing Aliyun Open Storage Service.
 test_files:
-- spec/aliyunoss/aliyun-config.yml.sample
 - spec/aliyunoss/api_spec.rb
 - spec/aliyunoss/bucket_spec.rb
+- spec/aliyunoss/config/aliyun-config.yml.sample
+- spec/aliyunoss/config/incorrect-config.yml
 - spec/aliyunoss/config_spec.rb
-- spec/aliyunoss/incorrect-config.yml
 - spec/aliyunoss/multipart_api_spec.rb
 - spec/aliyunoss/oss_request_spec.rb
-- spec/aliyunoss/test-1.png
-- spec/aliyunoss/test-2.png
-- spec/aliyunoss/test-3.png
+- spec/aliyunoss/png/test-1.png
+- spec/aliyunoss/png/test-2.png
+- spec/aliyunoss/png/test-3.png
+- spec/spec_helper.rb

data/lib/aliyunoss/http_response_extension.rb

@@ -1,66 +0,0 @@
-module Net
-
-  class HTTPResponse
-
-    def raise_if_not(status)
-      raise message unless status === self
-    end
-
-    def to_buckets
-      raise message unless Net::HTTPOK === self
-      nodes = Nokogiri::XML(self.body).xpath('//Bucket') rescue []
-      nodes.map do |node|
-        bucket = Aliyun::Oss::Bucket.new
-        node.elements.each {|e| bucket.send("#{e.name.underscore}=".to_sym, e.content)}
-        bucket
-      end
-    end
-
-    def to_objects
-      raise message unless Net::HTTPOK === self
-      nodes = Nokogiri::XML(self.body).xpath('//Contents') rescue []
-      nodes.map do |node|
-        hash = Hash.new
-        node.elements.each {|e| hash[e.name.underscore] = e.content unless e.name == 'Owner' }
-        hash
-      end      
-    end
-
-    def to_logging_status
-      raise message unless Net::HTTPOK === self
-      node = Nokogiri::XML(self.body).xpath('//LoggingEnabled') rescue []
-      hash = Hash.new
-      node[0].elements.each {|e| hash[e.name.underscore] = e.content }
-      hash                                                     
-    end
-
-    def to_website_status
-      raise message unless Net::HTTPOK === self
-      xml = Nokogiri::XML(self.body)
-      {'index_page' => xml.xpath('//Suffix')[0].content, 'error_page' => xml.xpath('//Key')[0].content } rescue {}
-    end
-
-    def to_acl_status
-      raise message unless Net::HTTPOK === self
-      Nokogiri::XML(self.body).xpath('//Grant')[0].content
-    end
-
-    def to_multipart_id
-      raise message unless Net::HTTPOK === self
-      Nokogiri::XML(body).xpath('//UploadId').first.content      
-    end
-
-    def to_mutlipart_task
-      raise message unless Net::HTTPOK === self
-      tasks = Array.new
-      nodes = Nokogiri::XML(response.body).xpath('//Upload')
-      nodes.each do |node|
-        path = '/' + node.xpath('Key').first.content
-        id = node.xpath('UploadId').first.content
-        tasks << {'path'=> path, 'upload_id' => id}
-      end
-      tasks
-    end
-  end
-  
-end

data/spec/aliyunoss/incorrect-config.yml

@@ -1,4 +0,0 @@
-this is incorrect yaml
-format file
-host: incorrect-yaml.com
-access_key_id: "incorrect-1234567890"