aliyunoss 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 716bf19a85202b9dd54f69809b80edd10413d239
-  data.tar.gz: e83b18486d76552130a8e897b9e8ea7c01cf90f9
+  metadata.gz: e0859a2ea3ada1c1b72d5aa4bf7c19b475f2eee2
+  data.tar.gz: 3097869be179d2db30cf5c62cbac7f30994bc0bc
 SHA512:
-  metadata.gz: 8dba8f48ad17fafee1979d6dbf5d4fa60aa004c2fd6e0a67dd4345a6d8cb798017c2e204eab77bd72844f03956799de62e74f229fb81f79ff7e23dd0aae1fd58
-  data.tar.gz: 804cd0ae4c9c6db0a8ad3702290be2eeb0d669a1a73df999a98565ecf8ea73fa44bbea870394095cc037d5a2d773c258d17de7677c31a4466133b76287f8ffa3
+  metadata.gz: dedf4b7a770d1cf47d24433121c873906be73773d80910a018f445f7e61a50eb9dba647d824d36747275113cb3ef9e6467d4bd6bb90657aff484ab8ee678f062
+  data.tar.gz: cf277b1cb70111c855c9a997e523940d5198f60290196db1b67c8bd6b4d3ae755e96dd5a9768bde540490c035f386b7668c5c31f08429a1f65ee5f24b600781c

data/Gemfile

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

data/aliyunoss.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
+
 end

data/lib/aliyunoss/#oss_request.rb#

@@ -0,0 +1,154 @@
+# coding: utf-8
+require 'base64'
+require 'openssl'
+
+module Aliyun
+  module Oss
+
+    class OssRequest
+      
+      include ConfigHelper
+      attr_accessor :bucket, :path, :body, :queris, :domain
+      
+      def initialize(bucket, path, domain = nil, queries = {}, headers = {})
+        @bucket = bucket
+        @path = path
+        @queries = queries
+        @domain = domain
+        @headers = {"Content-Type" => "", "Content-MD5" => "", "Date" => Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')}.merge(headers)
+      end
+
+      def get_uri
+        if @domain
+          uri = URI("http://#{domain}/")
+        else
+          if @bucket
+            uri = URI("http://#{bucket.name}.#{bucket.location}.#{host}")
+          else
+            uri = URI("http://oss.#{host}")
+          end
+        end
+        uri.path = @path
+        uri.query = @queries.to_query_string if @queries.count > 0
+        uri
+      end
+
+      def self.add_operation(verb)
+        define_method(verb) do
+          uri = get_uri
+
+          request = Net::HTTP.send(:const_get, verb.to_s.capitalize).new(uri)
+          
+          @headers.each_pair {|k,v| request[k] = v}
+          
+          if @body
+            request.body = @body
+            digest = OpenSSL::Digest::MD5.digest(@body)
+            request['Content-MD5'] = Base64.encode64(digest).strip
+            request['Content-Length'] = @body.bytesize
+          end
+
+          request['Authorization'] = 'OSS ' +  access_key_id + ':' +
+                                     signature(request)
+        
+          logger.info(verb.to_s.upcase + ' ' + uri.to_s + ' ' + request.to_hash.to_s)
+          
+          response = nil
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            response = http.request(request)
+            logger.info(response.code.to_s + ' ' + response.message)
+          end
+          response          
+        end
+      end
+
+      add_operation :get
+      add_operation :put
+      add_operation :delete
+      add_operation :head
+      add_operation :post
+
+      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)
+        @headers[key]
+      end
+
+      def []=(key, value)
+        @headers[key] = value
+      end
+
+      private
+      def signature(req)
+        verb = req.class.to_s.gsub(/Net::HTTP::/, '').upcase
+        data = verb + "\n" + req["Content-MD5"] + "\n" +
+               req["Content-Type"] + "\n" + req["Date"] + "\n" +
+               canonicalized_oss_headers(req) + 
+               canonicalized_resource()
+        
+        digest = OpenSSL::Digest.new('sha1')
+        hmac = OpenSSL::HMAC.digest(digest, access_key_secret, data)
+        Base64.encode64(hmac).strip
+      end
+
+      # oss api 20140828.pdf - 4.2
+      # 1) 将所有以“x-oss-”为前缀的 HTTP 请求头的名字转换成小写字母。如 ’X-OSS-Meta-Name: TaoBao’
+      #    转换成 ’x-oss-meta-name: TaoBao’ 。
+      # 2) 将上一步得到的所有 HTTP 请求头按照字典序进行升序排列。
+      # 3) 如果有相同名字的请求头,则根据标准 RFC 2616, 4.2 章进行合并(两个值之间只用逗号分隔)。
+      #    如有两个名为’x-oss-meta-name’的请求头,对应的值分别为’TaoBao’和’Alipay’,则合并后
+      #    为: ’x-oss-meta-name:TaoBao,Alipay’ 。
+      # 4) 删除请求头和内容之间分隔符两端出现的任何空格。
+      #    如 ’x-oss-meta-name: TaoBao,Alipay’ 转换成: ’x-oss-meta-name:TaoBao,Alipay’ 。
+      # 5) 将所有的头和内容用 ’\n’ 分隔符分隔拼成最后的 CanonicalizedOSSHeader 。
+      def canonicalized_oss_headers(req)
+        hash = Hash.new
+        req.each_header do |header|          
+          header = header.downcase
+          next unless header.start_with?('x-oss-')
+          if hash.has_key?(header)
+            hash[header] = hash[header] + "," + req[header].strip
+          else
+            hash[header] = req[header].strip
+          end
+        end
+
+        return "" if hash.count == 0
+        hash.keys.sort.map{|k| "#{k}:#{hash[k]}"}.join("\n") << "\n"
+      end
+
+      # oss api 20140828.pdf - 4.2
+      # 1) 将 CanonicalizedResource 置成空字符串( “” );
+      # 2) 放入要访问的 OSS 资源:“ /BucketName/ObjectName ”(无 ObjectName 则不填)
+      # 3) 如果请求的资源包括子资源 (sub-resource) ,那么将所有的子资源按照字典序,从小到大排列并
+      #    以 ’&’ 为分隔符生成子资源字符串。在 CanonicalizedResource 字符串尾添加“?”和子资源字
+      #    符串。此时的 CanonicalizedResource 例子如: /BucketName/ObjectName?acl &uploadId=UploadId
+      # 4) 如果用户请求在查询字符串 (query string) 中指定了要重写 (override) 返回请求的 header,那么将这
+      #    些查询字符串及其请求值按照字典序,从小到大排列,以 ’&’ 为分隔符,按参数的字典序添加到
+      #    CanonicalizedResource 中。此时的 CanonicalizedResource 例子:
+      #    /BucketName/ObjectName?acl&response-content-type=ContentType & uploadId =UploadId
+      def canonicalized_resource()
+        return @path unless @bucket
+        return "/#{@bucket.name}#{@path}" if @queries.count == 0
+
+        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
+
+    end
+    
+  end
+end

data/lib/aliyunoss/api.rb

@@ -9,7 +9,7 @@ module Aliyun
 
       # List all buckets
       def list_bucket(params = {})
-        Aliyun::Oss::OssRequest.new(nil, '/', params).get
+        Aliyun::Oss::OssRequest.new(nil, '/', nil, {}, {}).get
       end
       alias :get_service :list_bucket
 
@@ -34,49 +34,49 @@ HERE
         
       # Delete bucket logging
       def delete_logging(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'logging'=>nil).delete
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'logging'=>nil).delete
       end
 
       # Delete bucket website
       def delete_website(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'website'=>nil).delete
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'website'=>nil).delete
       end
       alias :disable_website :delete_website
 
       # List objects in bucket
       def list_object(bucket, queries = {})
-        Aliyun::Oss::OssRequest.new(bucket, '/', queries).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, queries).get
       end
 
       # Get bucket acl
       def get_bucket_acl(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'acl'=>nil).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'acl'=>nil).get
       end
 
       # Get bucket location
       def get_bucket_location(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'location'=>nil).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'location'=>nil).get
       end
 
       # Query bucket logging status
       def get_bucket_logging(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'logging'=>nil).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'logging'=>nil).get
       end
 
       # Query bucket website status
       def get_bucket_website(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'website'=>nil).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'website'=>nil).get
       end
 
       # Set bucket acl permission
       def put_bucket_acl(bucket, permission)
-        Aliyun::Oss::OssRequest.new(bucket, '/', {}, 'x-oss-acl'=> permission).put
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, {}, 'x-oss-acl'=> permission).put
       end
       alias :set_bucket_acl :put_bucket_acl
 
       # Enable or disable bucket logging
       def enable_bucket_logging(bucket, bucket_name_for_logging, log_prefix)
-        request = Aliyun::Oss::OssRequest.new(bucket, '/', 'logging'=>nil)
+        request = Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'logging'=>nil)
         request.body = <<HERE
 <?xml version="1.0" encoding="UTF-8"?>
 <BucketLoggingStatus>
@@ -91,7 +91,7 @@ HERE
       end
 
       def disable_bucket_logging(bucket)
-        request = Aliyun::Oss::OssRequest.new(bucket, '/', 'logging'=>nil)
+        request = Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'logging'=>nil)
         request.body = <<HERE
 <?xml version="1.0" encoding="UTF-8"?>
 <BucketLoggingStatus>
@@ -103,7 +103,7 @@ HERE
 
       # Set bucket website access
       def put_bucket_website(bucket, index_page, error_page)
-        request = Aliyun::Oss::OssRequest.new(bucket, '/', 'website'=>nil)
+        request = Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'website'=>nil)
         request.body = <<HERE
 <?xml version="1.0" encoding="UTF-8"?>
 <WebsiteConfiguration>
@@ -123,7 +123,7 @@ HERE
       # Copy Object
       def copy_object(source_bucket, source_path, target_bucket, target_path, headers = {})
         headers = headers.merge({'x-oss-copy-source'=> "/" + source_bucket.name + source_path})
-        Aliyun::Oss::OssRequest.new(target_bucket, target_path, {}, headers).put
+        Aliyun::Oss::OssRequest.new(target_bucket, target_path, nil, {}, headers).put
       end
 
       # Delete Object
@@ -138,24 +138,24 @@ HERE
         xml << "<Quiet>#{quiet_mode}</Quiet>"
         objects.each {|o| xml << "<Object><Key>#{o}</Key></Object>"}
         xml << '</Delete>'
-        request = Aliyun::Oss::OssRequest.new(bucket, '/', 'delete'=>nil)
+        request = Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'delete'=>nil)
         request.body = xml
         request.post
       end
 
       # Get Object
       def get_object(bucket, path, headers = {})
-        Aliyun::Oss::OssRequest.new(bucket, path, {}, headers).get
+        Aliyun::Oss::OssRequest.new(bucket, path, nil, {}, headers).get
       end
 
       # Head Object
       def head_object(bucket, path, headers = {})
-        Aliyun::Oss::OssRequest.new(bucket, path, {}, headers).head
+        Aliyun::Oss::OssRequest.new(bucket, path, nil, {}, headers).head
       end
 
       # Put Object
       def put_object(bucket, path, data, headers = {})
-        request = Aliyun::Oss::OssRequest.new(bucket, path, {}, headers)
+        request = Aliyun::Oss::OssRequest.new(bucket, path, nil, {}, headers)
         request.body = data
         request.put
       end
@@ -176,17 +176,17 @@ HERE
 
       # Multipart Initiate
       def multipart_upload_initiate(bucket, path)
-        Aliyun::Oss::OssRequest.new(bucket, path, 'uploads'=>nil).post
+        Aliyun::Oss::OssRequest.new(bucket, path, nil, 'uploads'=>nil).post
       end
 
       def multipart_upload_part(bucket, path, upload_id, data, part_number)
-        request = Aliyun::Oss::OssRequest.new(bucket, path, 'partNumber'=> part_number.to_s, 'uploadId'=> upload_id)
+        request = Aliyun::Oss::OssRequest.new(bucket, path, nil, 'partNumber'=> part_number.to_s, 'uploadId'=> upload_id)
         request.body = data
         request.put
       end
 
       def multipart_upload_from_copy(upload_id, source_bucket, source_path, target_bucket, target_path, part_number, part_size, range = nil)
-        request = Aliyun::Oss::OssRequest.new(target_bucket, target_path, 'partNumber'=> part_number.to_s, 'uploadId'=> upload_id)
+        request = Aliyun::Oss::OssRequest.new(target_bucket, target_path, nil, '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
@@ -194,7 +194,7 @@ HERE
       end
 
       def multipart_upload_complete(bucket, path, upload_id, part_list)
-        request = Aliyun::Oss::OssRequest.new(bucket, path, 'uploadId'=> upload_id)
+        request = Aliyun::Oss::OssRequest.new(bucket, path, nil, 'uploadId'=> upload_id)
         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>"}
@@ -204,15 +204,15 @@ HERE
       end
 
       def multipart_upload_abort(bucket, path, upload_id)
-        Aliyun::Oss::OssRequest.new(bucket, path, 'uploadId'=> upload_id).delete
+        Aliyun::Oss::OssRequest.new(bucket, path, nil, 'uploadId'=> upload_id).delete
       end
 
       def multipart_upload_finished_parts(bucket, path, upload_id)
-        Aliyun::Oss::OssRequest.new(bucket, path, 'uploadId'=> upload_id).get
+        Aliyun::Oss::OssRequest.new(bucket, path, nil, 'uploadId'=> upload_id).get
       end
 
       def multipart_upload_unfinished_task(bucket)
-        Aliyun::Oss::OssRequest.new(bucket, '/', 'uploads'=>nil).get
+        Aliyun::Oss::OssRequest.new(bucket, '/', nil, 'uploads'=>nil).get
       end
       
     end

data/lib/aliyunoss/bucket.rb

@@ -2,7 +2,7 @@ module Aliyun
   module Oss
 
     class Bucket
-      attr_accessor :location, :name, :creation_date
+      attr_accessor :location, :name, :creation_date, :domain, :extranet_endpoint, :intranet_endpoint
 
       def initialize(params = {})
         params.each_pair {|k,v| send("#{k.to_s}=", v) }

data/lib/aliyunoss/extension.rb

@@ -48,7 +48,7 @@ module Net
       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)}
+        node.elements.each {|e| bucket.send("#{e.name.underscore}=".to_sym, e.content) rescue nil }
         bucket
       end
     end

data/lib/aliyunoss/oss_request.rb

@@ -8,20 +8,25 @@ module Aliyun
     class OssRequest
       
       include ConfigHelper
-      attr_accessor :bucket, :path, :body, :queris
+      attr_accessor :bucket, :path, :body, :queris, :domain
       
-      def initialize(bucket, path, queries = {}, headers = {})
+      def initialize(bucket, path, domain = nil, queries = {}, headers = {})
         @bucket = bucket
         @path = path
         @queries = queries
+        @domain = domain
         @headers = {"Content-Type" => "", "Content-MD5" => "", "Date" => Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')}.merge(headers)
       end
 
       def get_uri
-        if @bucket
-          uri = URI("http://#{bucket.name}.#{bucket.location}.#{host}")
+        if @domain
+          uri = URI("http://#{domain}/")
         else
-          uri = URI("http://oss.#{host}")
+          if @bucket
+            uri = URI("http://#{bucket.name}.#{bucket.location}.#{host}")
+          else
+            uri = URI("http://oss.#{host}")
+          end
         end
         uri.path = @path
         uri.query = @queries.to_query_string if @queries.count > 0
@@ -109,7 +114,7 @@ module Aliyun
       def canonicalized_oss_headers(req)
         hash = Hash.new
         req.each_header do |header|          
-          header = header.downcase
+          header = header.to_s.downcase
           next unless header.start_with?('x-oss-')
           if hash.has_key?(header)
             hash[header] = hash[header] + "," + req[header].strip

data/lib/aliyunoss/version.rb

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

data/spec/aliyunoss/api_spec.rb

@@ -9,8 +9,9 @@ describe Aliyun::Oss::API do
     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)
 
+    expect(response).to be_a(Net::HTTPOK)
+    
     @api = Aliyun::Oss::API
     @bucket = Aliyun::Oss::Bucket.new(name: bucket_name, location: location)
   end

data/spec/aliyunoss/bucket_spec.rb

@@ -31,7 +31,7 @@ describe Aliyun::Oss::Bucket do
     files.each do |f|
       data = IO.read(f)
       @bucket.upload(data, "/" + f[/test-\d\.png/], 'Content-Type'=>'image/png')
-    end    
+    end
   end
 
   it 'should generate share url' do

data/spec/aliyunoss/oss_request_spec.rb

@@ -24,7 +24,7 @@ describe Aliyun::Oss::OssRequest do
     path = '/ObjectName'
     queries = {"acl"=>nil, "uploadId"=>"UploadId",
                "response-content-type"=>"ContentType" }
-    result = Aliyun::Oss::OssRequest.new(bucket, path, queries).
+    result = Aliyun::Oss::OssRequest.new(bucket, path, nil, queries).
              send(:canonicalized_resource)
     expect(result).to eq("/BucketName/ObjectName?acl&response-content-type=ContentType&uploadId=UploadId")
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aliyunoss
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - yijiecc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,7 @@ files:
 - Rakefile
 - aliyunoss.gemspec
 - lib/aliyunoss.rb
+- lib/aliyunoss/#oss_request.rb#
 - lib/aliyunoss/api.rb
 - lib/aliyunoss/bucket.rb
 - lib/aliyunoss/config.rb
@@ -105,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem for accessing Aliyun Open Storage Service.