fog-dtdream 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6398420d365c49d09affecd30f8cfd33b24cb332
-  data.tar.gz: 6afaf704a2a6f74e7d8e5aa923e6eb52def8f8ab
+  metadata.gz: f8c5290adef3beff7f2be88066e5adc31b613f73
+  data.tar.gz: 815decd956a9bb646000c7fb148395b3a43ddca4
 SHA512:
-  metadata.gz: fd17846c872247acb8d5229e73ddbcc6a396f77a3e02ca349b0e0e1e987f1dae4610aeef1a16056e1f67326ae85f06f21e9b0871eff47bf528a6931670d78c83
-  data.tar.gz: 8081c3e90cab87be249b1ce6c5764cb29b484b3a89ce2a4cb87d3f85eba838c75a9e1f24c94b7d1fedbd9c4e878cc352ae9903b0c56b0fc78bc035181164532d
+  metadata.gz: e41c00d5e2d7866a14a10845cf5d7de046728eee5cfc247b9556bbd3c131de390dd3ec1f6f32e1e1f8472e4417df1a1c59750b0de39cc0491017ad8777e93b87
+  data.tar.gz: 61c636ed394e684a92212a7530251f9202fe8da2863ed88b807d8528431f37f63d1aaae09d57f132e817b4b460d9d4e17c112812e7560db177e3b978e9b0de08

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*~

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 TODO: Write your name
+Copyright (c) 2015 dengqinsi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,14 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -2,8 +2,6 @@
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/fog/dtdream`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -13,27 +11,321 @@ gem 'fog-dtdream'
 ```
 
 And then execute:
-
+```shell
     $ bundle
+```
 
 Or install it yourself as:
 
+```shell
     $ gem install fog-dtdream
+```
 
 ## Usage
+Before you can use fog-dtdream, you must require it in your application:
 
-TODO: Write usage instructions here
+```ruby
+require 'fog/dtdream'
+```
 
-## Development
+Since it's a bad practice to have your credentials in source code, you should load them from default fog configuration file: ```~/.fog```. This file could look like this:
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```
+default:
+  :aliyun_accesskey_id:     <YOUR_ACCESS_KEY_ID>,
+  :aliyun_accesskey_secret: <YOUR_SECRET_ACCESS_KEY>,
+  :aliyun_oss_endpoint:     <YOUR_OSS_ENDPOINT>,
+  :aliyun_oss_location:     <YOUR_OSS_LOACTION>,
+  :aliyun_oss_bucket:       <YOUR_OSS_BUCKET>
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### Connecting to OSS
+```ruby
+conn = Fog::Storage[:dtdream]
+```
+
+If you haven't modified your default fog configuration file or you don't want to use it, you can load your credentials by this way:
+```ruby
+opt = {
+  :provider                => 'dtdream',
+  :aliyun_accesskey_id     => <YOUR_ACCESS_KEY_ID>,
+  :aliyun_accesskey_secret => <YOUR_SECRET_ACCESS_KEY>,
+  :aliyun_oss_endpoint     => <YOUR_OSS_ENDPOINT>,
+  :aliyun_oss_location     => <YOUR_OSS_LOACTION>,
+  :aliyun_oss_bucket       => <YOUR_OSS_BUCKET>,
+}
+conn = Fog::Storage.new(opt)
+```
+
+## Fog::Dtdream Abstractions
+
+Fog::Dtdream provides both a **model** and **request** abstraction. The request abstraction provides the most efficient interface and the model abstraction wraps the request abstraction to provide a convenient `ActiveModel` like interface.
+
+### Request Layer
+The Fog::Storage object supports a number of methods that wrap individual HTTP requests to the OSS API.
+
+To see a list of requests supported by the storage service:
+
+conn.requests
+
+This returns:
+```
+[[nil, :copy_object], [nil, :delete_bucket], [nil, :delete_object], [nil, :get_bucket], [nil, :get_object], [nil, :get_object_http_url], [nil, :get_object_https_url], [nil, :head_object], [nil, :put_bucket], [nil, :put_object], [nil, :list_buckets], [nil, :list_objects], [nil, :get_containers], [nil, :get_container], [nil, :delete_container], [nil, :put_container]]
+```
+
+#### Example Requests(list_buckets)
+To request all of buckets:
+
+```ruby
+conn.list_buckets
+```
+
+And this returns like the flowing;
+```
+[{"Location"=>"oss-cn-beijing", "Name"=>"dt1", "CreationDate"=>"2015-07-30T08:38:02.000Z"},  {"Location"=>"oss-cn-shenzhen", "Name"=>"ruby1", "CreationDate"=>"2015-07-30T02:22:34.000Z"}, {"Location"=>"oss-cn-qingdao", "Name"=>"yuanhang123", "CreationDate"=>"2015-05-18T03:06:31.000Z"}]
+```
+
+You can also request in this way;
+```ruby
+conn.list_buckets(:prefix=>"pre")
+```
+
+Here is a summary of the optional parameters:
+<table>
+<tr>
+<th>Parameters</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>:prefix</td>
+<td>
+The bucket name of the results must start with 'prefix'.It won't filter prefix information if not set<br>
+Data Types: String<br>
+Defaults:none
+</td>
+</tr>
+<tr>
+<td>:marker</td>
+<td>
+The result will start from the marker alphabetically.It wil start from the first if not set.<br>
+Data Types: String<br>
+Defaults: none
+</tr>
+<tr>
+<td>:maxKeys</td>
+<td>
+Set the max number of the results. It will set to 100 if not set. The max value of maxKeys is 1000.<br>
+Data Types: String<br>
+Defaults: 100
+</td>
+</tr>
+</table>
+
+To learn more about `Fog::Dtdream` request methods, you can refer to our source code. To learn more about OSS API, refer to [AliYun OSS API](https://docs.aliyun.com/?spm=5176.383663.9.2.jpghde#/pub/oss/api-reference/abstract).
+
+### Model Layer
+Fog models behave in a manner similar to `ActiveModel`. Models will generally respond to `create`, `save`,  `destroy`, `reload` and `attributes` methods. Additionally, fog will automatically create attribute accessors.
+
+Here is a summary of common model methods:
+
+<table>
+<tr>
+<th>Method</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>create</td>
+<td>
+Accepts hash of attributes and creates object.<br>
+Note: creation is a non-blocking call and you will be required to wait for a valid state before using resulting object.
+</td>
+</tr>
+<tr>
+<td>save</td>
+<td>Saves object.<br>
+Note: not all objects support updating object.</td>
+</tr>
+<tr>
+<td>destroy</td>
+<td>
+Destroys object.<br>
+Note: this is a non-blocking call and object deletion might not be instantaneous.
+</td>
+<tr>
+<td>reload</td>
+<td>Updates object with latest state from service.</td>
+<tr>
+<td>attributes</td>
+<td>Returns a hash containing the list of model attributes and values.</td>
+</tr>
+<td>identity</td>
+<td>
+Returns the identity of the object.<br>
+Note: This might not always be equal to object.id.
+</td>
+</tr>
+</table>
+
+The remainder of this document details the model abstraction.
+
+**Note:** Fog sometimes refers to OSS containers as directories.
+
+## List Directories
+
+To retrieve a list of directories:
+
+```ruby
+conn.directories
+```
+
+This returns a collection of `Fog::Storage::Dtdream::Directory` models:
+
+## Get Directory
+
+To retrieve a specific directory:
+
+```ruby
+conn.directories.get "dir"
+```
+
+This returns a `Fog::Storage::Dtdream::Directory` instance:
+
+## Create Directory
+
+To create a directory:
+
+```ruby
+conn.directories.create :key => 'backups'
+```
+
+## Delete Directory
+
+To delete a directory:
+
+```ruby
+directory.destroy
+```
+
+**Note**: Directory must be empty before it can be deleted.
+
+
+## Directory URL
+
+To get a directory's URL:
+
+```ruby
+directory.public_url
+```
+
+## List Files
+
+To list files in a directory:
+
+```ruby
+directory.files
+```
+
+**Note**: File contents is not downloaded until `body` attribute is called.
+
+## Upload Files
 
-## Contributing
+To upload a file into a directory:
+
+```ruby
+file = directory.files.create :key => 'space.jpg', :body => File.open "space.jpg"
+```
+
+**Note**: For files larger than 5 GB please refer to the [Upload Large Files](#upload_large_files) section.
+
+### Additional Parameters
+
+The `create` method also supports the following key values:
+
+<table>
+<tr>
+<th>Key</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>:content_type</td>
+<td>The content type of the object. Cloud Files will attempt to auto detect this value if omitted.</td>
+</tr>
+<tr>
+<td>:origin</td>
+<td>The origin is the URI of the object's host.</td>
+</tr>
+<tr>
+<td>:etag</td>
+<td>The MD5 checksum of your object's data. If specified, Cloud Files will validate the integrity of the uploaded object.</td>
+</tr>
+</table>
+
+## Upload Large Files
+
+OSS requires files larger than 5 GB (the OSS default limit) to be uploaded into segments along with an accompanying manifest file. All of the segments must be uploaded to the same container.
+
+Segmented files are downloaded like ordinary files. See [Download Files](#download-files) section for more information.
+
+## Download Files
+
+The most efficient way to download files from a private or public directory is as follows:
+
+```ruby
+File.open('downloaded-file.jpg', 'w') do | f |
+  directory.files.get("my_big_file.jpg") do | data, remaining, content_length |
+    f.syswrite data
+  end
+end
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fog-dtdream. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+This will download and save the file.
 
+**Note**: The `body` attribute of file will be empty if a file has been downloaded using this method.
+
+If a file object has already been loaded into memory, you can save it as follows:
+
+```ruby
+File.open('germany.jpg', 'w') {|f| f.write(file_object.body) }
+```
+
+**Note**: This method is more memory intensive as the entire object is loaded into memory before saving the file as in the example above.
+
+
+## File URL
+
+To get a file's URL:
+
+```ruby
+file.public_url
+```
+
+## Copy File
+
+Cloud Files supports copying files. To copy files into a container named "trip" with a name of "europe.jpg" do the following:
+
+```ruby
+file.copy("trip", "europe.jpg")
+```
+
+To move or rename a file, perform a copy operation and then delete the old file:
+
+```ruby
+file.copy("trip", "germany.jpg")
+file.destroy
+```
+
+## Delete File
+
+To delete a file:
+
+```ruby
+file.destroy
+```
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## License
 

data/fog-dtdream.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["dengqinsi"]
   spec.email         = ["dengqs@dtdream.com"]
 
-  spec.summary       = %q{Module use 'fog' gem to support Aliyun Web Services.}
-  spec.description   = %q{Support aliyun OSS in version 0.0.3. It will support more aliyun services later.}
-  spec.homepage      = "https://github.com/denques/fog-aliyun.git"
+  spec.summary       = %q{Use 'fog' gem to support Aliyun Web Services.}
+  spec.description   = %q{As a FOG provider, fog-dtdream support aliyun OSS. Maybe it will support more aliyun services later.}
+  spec.homepage      = "https://git.oschina.net/dengqinsi/fog-dtdream.git"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog-json',  '~> 1.0'
   spec.add_dependency 'fog-xml',   '~> 0.1'
   spec.add_dependency 'ipaddress', '~> 0.8'
-  spec.add_dependency 'activesupport', '~> 4.2'
+  spec.add_dependency 'xml-simple', '~> 1.1'
 end

data/lib/fog/bin/dtdream.rb

@@ -0,0 +1,29 @@
+class Dtdream < Fog::Bin
+  class << self
+    def class_for(key)
+      case key
+      when :storage
+        Fog::Storage::Dtdream
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :storage
+          Fog::Logger.warning("Dtdream[:storage] is not recommended, use Storage[:openstack] for portability")
+          Fog::Storage.new(:provider => 'dtdream')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Dtdream.services
+    end
+  end
+end

data/lib/fog/dtdream/models/storage/directories.rb

@@ -9,10 +9,13 @@ module Fog
 
         def all
           containers = service.get_containers()
+	  if nil == containers
+	    return nil
+	  end
           data = Array.new
           i = 0
           containers.each do |entry|
-            key = entry["Prefix"]
+            key = entry["Prefix"][0]
             key[-1] = ''
             data[i] = {:key=>key}
             i = i + 1

data/lib/fog/dtdream/models/storage/directory.rb

@@ -12,37 +12,20 @@ module Fog
           requires :key
           prefix = key+'/'
           ret = service.list_objects(:prefix=>prefix)["Contents"]
-          if ret.size == 1
+          
+          if ret.nil?
+            puts " Not found: Direction not exist!"
+            false
+          elsif ret.size == 1
             service.delete_container(key)
             true
           else
-            if ret.size == 0
-              raise Fog::Storage::Dtdream::NotFound, " Not found: Direction not exist!"
-            elsif ret.size > 1
-              raise Fog::Storage::Dtdream::NotFound, " Forbidden: Direction not empty!"
-            end
+            raise Fog::Storage::Dtdream::Error, " Forbidden: Direction not empty!"
             false
           end
         end
 
         def files
-          # requires :key
-          # if key != "" && key != "." && key != nil
-          #   prefix = key+"/"
-          # end
-          # files = service.list_objects({:prefix => prefix})["Contents"]
-          # data = Array.new
-          # i = 0
-          # files.each do |file|
-          #   if file["Key"][0][-1] != "/"
-          #     key = file["Key"][0]
-          #     data[i] = {:key=>key}
-          #     i = i + 1
-          #   end
-          # end
-          #
-          # #load(data)
-          # data
           @files ||= begin
             Fog::Storage::Dtdream::Files.new(
               :directory    => self,

data/lib/fog/dtdream/models/storage/file.rb

@@ -33,10 +33,17 @@ module Fog
 
         def copy(target_directory_key, target_file_key, options={})
           requires :directory, :key
-          options['Content-Type'] ||= content_type if content_type
-          options['Access-Control-Allow-Origin'] ||= access_control_allow_origin if access_control_allow_origin
-          options['Origin'] ||= origin if origin
-          service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
+          if directory.key == ""
+            source_object = key
+          else
+            source_object = directory.key+"/"+key
+          end
+          if target_directory_key == ""
+            target_object = target_file_key
+          else
+            target_object = target_directory_key+"/"+target_file_key
+          end
+          service.copy_object(nil, source_object, nil, target_object, options)
           target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
@@ -105,7 +112,13 @@ module Fog
           else
             object = directory.key+"/"+key
           end
-          data = service.put_object_with_body(object, body, options)
+          if body.is_a?(::File)
+            data = service.put_object(object, body, options).data
+          elsif body.is_a?(String)
+            data = service.put_object_with_body(object, body, options).data
+          else
+            raise Fog::Storage::Dtdream::Error, " Forbidden: Invalid body type: #{body.class}!"
+          end
           update_attributes_from(data)
           refresh_metadata
 
@@ -176,7 +189,7 @@ module Fog
         end
 
         def update_attributes_from(data)
-          merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
+          merge_attributes(data[:headers].reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
         end
       end
     end

data/lib/fog/dtdream/models/storage/files.rb

@@ -18,22 +18,23 @@ module Fog
           if directory.key != "" && directory.key != "." && directory.key != nil
             prefix = directory.key+"/"
           end
-          files = service.list_objects({:prefix => prefix})["ListBucketResult"]["Contents"]
+          files = service.list_objects({:prefix => prefix})["Contents"]
           data = Array.new
           i = 0
           files.each do |file|
-            if file["Key"][-1] != "/"
-	      content_length = file["Size"].to_i
-              key = file["Key"]
-          lastModified = file["LastModified"]
-          if lastModified != nil && lastModified != ""
-            last_modified = (Time.parse(lastModified)).localtime
-          else
-            last_modified = nil
-          end
-              data[i] = {:content_length=>content_length,
-	                 :key=>key,
-			 :last_modified=>last_modified}
+            if file["Key"][0][-1] != "/"
+	      content_length = file["Size"][0].to_i
+              key = file["Key"][0]
+              lastModified = file["LastModified"][0]
+              if lastModified != nil && lastModified != ""
+                last_modified = (Time.parse(lastModified)).localtime
+              else
+                last_modified = nil
+              end
+              data[i] = {:content_length => content_length,
+                         :key            => key,
+                         :last_modified  => last_modified,
+                         :etag           => file["ETag"][0]}
               i = i + 1
             end
           end
@@ -69,7 +70,7 @@ module Fog
           
           data = service.head_object(object).data
           contentLen = data[:headers]["Content-Length"].to_i
-          if data[:status] != 200 || contentLen <= 0
+          if data[:status] != 200
             return nil
           end
           lastModified = data[:headers]["Last-Modified"]
@@ -83,7 +84,9 @@ module Fog
           file_data = {
               :content_length => contentLen,
               :key            => key,
-              :last_modified  => last_modified
+              :last_modified  => last_modified,
+              :content_type   => data[:headers]["Content-Type"],
+              :etag           => data[:headers]["ETag"]	
           }
           
           if block_given?
@@ -153,7 +156,9 @@ module Fog
           file_data = {
               :content_length => data[:headers]["Content-Length"].to_i,
               :key            => key,
-              :last_modified  => last_modified
+              :last_modified  => last_modified,
+              :content_type   => data[:headers]["Content-Type"],
+              :etag           => data[:headers]["ETag"]	
           }
           new(file_data)
         rescue Fog::Storage::Dtdream::NotFound

data/lib/fog/dtdream/requests/storage/copy_object.rb

@@ -10,8 +10,12 @@ module Fog
         # * target_container_name<~String> - Name of bucket to create copy in
         # * target_object_name<~String> - Name for new copy of object
         # * options<~Hash> - Additional headers options={}
-        def copy_object(source_bucket, source_object, target_bucket, target_object)
-          #headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options)
+        def copy_object(source_bucket, source_object, target_bucket, target_object, options = {})
+          options = options.reject {|key, value| value.nil?}
+          bucket = options[:bucket]
+          bucket ||= @aliyun_oss_bucket
+          source_bucket ||= bucket
+          target_bucket ||= bucket
           headers = { 'x-oss-copy-source' => "/#{source_bucket}/#{source_object}" }
           location = get_bucket_location(target_bucket)
           endpoint = "http://"+location+".aliyuncs.com"

data/lib/fog/dtdream/requests/storage/get_bucket.rb

@@ -14,7 +14,7 @@ module Fog
                   :endpoint => endpoint
           )
           xml = ret.data[:body]
-          result = Hash.from_xml(xml)
+          result = XmlSimple.xml_in(xml)
         end
         
         def get_bucket_location(bucket)
@@ -27,7 +27,7 @@ module Fog
                   :bucket   => bucket,
                   :resource => resource
           )
-          location = Hash.from_xml(ret.data[:body])["LocationConstraint"]
+          location = XmlSimple.xml_in(ret.data[:body])
         end
 	
         def get_bucket_acl(bucket)
@@ -43,7 +43,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-          acl = Hash.from_xml(ret.data[:body])["AccessControlPolicy"]["AccessControlList"]["Grant"]
+          acl = XmlSimple.xml_in(ret.data[:body])["AccessControlList"][0]["Grant"][0]
         end
         
         #{"AllowedOrigin"=>["1"], "AllowedMethod"=>["DELETE"], "AllowedHeader"=>["1"], "ExposeHeader"=>["1"], "MaxAgeSeconds"=>["1"]}
@@ -53,14 +53,18 @@ module Fog
           attribute = '?cors'
           resource = bucket+'/'+attribute
           ret = request(
-                  :expects  => [200, 203],
+                  :expects  => [200, 203, 404],
                   :method   => 'GET',
                   :path     => attribute,
                   :bucket   => bucket,
                   :resource => resource,
                   :endpoint => endpoint
           )
-          cors = Hash.from_xml(ret.data[:body])["CORSConfiguration"]["CORSRule"]
+          if 404 != ret.data[:status]
+            cors = XmlSimple.xml_in(ret.data[:body])["CORSRule"][0]
+          else
+            nil
+          end
         end
 
         #{"ID"=>["651a67ed-5b4f-4d9b-87ae-49dbaaa4b0ad"], "Prefix"=>["1"], "Status"=>["Enabled"], "Expiration"=>[{"Days"=>["30"]}]}
@@ -70,14 +74,18 @@ module Fog
           attribute = '?lifecycle'
           resource = bucket+'/'+attribute
           ret = request(
-                  :expects  => [200, 203],
+                  :expects  => [200, 203, 404],
                   :method   => 'GET',
                   :path     => attribute,
                   :bucket   => bucket,
                   :resource => resource,
                   :endpoint => endpoint
           )
-          lifecycle = Hash.from_xml(ret.data[:body])["LifecycleConfiguration"]["Rule"]
+	  if 404 != ret.data[:status]
+            lifecycle = XmlSimple.xml_in(ret.data[:body])["Rule"][0]
+          else
+            nil
+          end	    
         end
         
         #返回log的prefix，如果没有设置log开关，返回nil
@@ -94,7 +102,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-          logging = Hash.from_xml(ret.data[:body])["BucketLoggingStatus"]["LoggingEnabled"]
+          logging = XmlSimple.xml_in(ret.data[:body])["LoggingEnabled"][0]["TargetPrefix"]
         end
 
         #{"AllowEmptyReferer"=>["true"], "RefererList"=>[{}]}
@@ -111,7 +119,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-          referer = Hash.from_xml(ret.data[:body])["RefererConfiguration"]
+          referer = XmlSimple.xml_in(ret.data[:body])
         end
         
         #{"IndexDocument"=>[{"Suffix"=>["abc.html"]}], "ErrorDocument"=>[{"Key"=>["error.html"]}]}
@@ -121,14 +129,18 @@ module Fog
           attribute = '?website'
           resource = bucket+'/'+attribute
           ret = request(
-                  :expects  => [200, 203],
+                  :expects  => [200, 203, 404],
                   :method   => 'GET',
                   :path     => attribute,
                   :bucket   => bucket,
                   :resource => resource,
                   :endpoint => endpoint
           )
-          website = Hash.from_xml(ret.data[:body])["WebsiteConfiguration"]
+	  if 404 != ret.data[:status]
+            website = XmlSimple.xml_in(ret.data[:body])
+          else
+            nil
+          end
         end
         
       end

data/lib/fog/dtdream/requests/storage/get_container.rb

@@ -26,7 +26,7 @@ module Fog
               path+="&marker="+marker
             end
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
@@ -34,13 +34,13 @@ module Fog
           elsif marker
             path+="?marker="+marker
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
             end
           elsif maxKeys
-            path+="?maxKeys="+maxKeys
+            path+="?max-keys="+maxKeys
             if delimiter
               path+="&delimiter="+delimiter
             end
@@ -59,7 +59,7 @@ module Fog
               :bucket => bucket
           )
           xml = ret.data[:body]
-          result = Hash.from_xml(xml)["ListBucketResult"]["CommonPrefixes"]
+          result = XmlSimple.xml_in(xml)["CommonPrefixes"]
         end
       end
       

data/lib/fog/dtdream/requests/storage/get_containers.rb

@@ -29,7 +29,7 @@ module Fog
               path+="&marker="+marker
             end
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
@@ -38,14 +38,14 @@ module Fog
           elsif marker
             path+="?marker="+marker
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
             end
 
           elsif maxKeys
-            path+="?maxKeys="+maxKeys
+            path+="?max-keys="+maxKeys
             if delimiter
               path+="&delimiter="+delimiter
             end
@@ -64,7 +64,7 @@ module Fog
               :bucket => bucket
           )
           xml = ret.data[:body]
-          result = Hash.from_xml(xml)["ListBucketResult"]["CommonPrefixes"]
+          result = XmlSimple.xml_in(xml)["CommonPrefixes"]
         end
       end
 

data/lib/fog/dtdream/requests/storage/get_object.rb

@@ -19,7 +19,7 @@ module Fog
           end
           resource = bucket+'/'+object
           para = {
-            :expects  => [200, 206],
+            :expects  => [200, 206, 404],
             :method   => 'GET',
             :path     => object,
             :bucket   => bucket,

data/lib/fog/dtdream/requests/storage/get_object_https_url.rb

@@ -32,65 +32,6 @@ module Fog
             url = "acl is wrong with value:"+acl
           end
         end
-        # creates a temporary url
-        #
-        # ==== Parameters
-        # * container<~String> - Name of container containing object
-        # * object<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
-        # * method<~String> - The method to use for accessing the object (GET, PUT, HEAD)
-        # * options<~Hash> - An optional options hash
-        #   * 'scheme'<~String> - The scheme to use (http, https)
-        #   * 'host'<~String> - The host to use
-        #   * 'port'<~Integer> - The port to use
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
-        #
-        # ==== See Also
-        # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
-        def create_temp_url(container, object, expires, method, options = {})
-          raise ArgumentError, "Insufficient parameters specified." unless (container && object && expires && method)
-          raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
-
-          scheme = options[:scheme] || @scheme
-          host = options[:host] || @host
-          port = options[:port] || @port
-
-          # POST not allowed
-          allowed_methods = %w{GET PUT HEAD}
-          unless allowed_methods.include?(method)
-            raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(', ')}")
-          end
-
-          expires        = expires.to_i
-          object_path_escaped   = "#{@path}/#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object,"/")}"
-          object_path_unescaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{object}"
-          string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}"
-
-          hmac = Fog::HMAC.new('sha1', @openstack_temp_url_key)
-          sig  = sig_to_hex(hmac.sign(string_to_sign))
-
-          temp_url_options = {
-            :scheme => scheme,
-            :host => host,
-            :port => port,
-            :path => object_path_escaped,
-            :query => "temp_url_sig=#{sig}&temp_url_expires=#{expires}"
-          }
-          URI::Generic.build(temp_url_options).to_s
-        end
-
-        private
-
-        def sig_to_hex(str)
-          str.unpack("C*").map { |c|
-            c.to_s(16)
-          }.map { |h|
-            h.size == 1 ? "0#{h}" : h
-          }.join
-        end
       end
 
       class Mock

data/lib/fog/dtdream/requests/storage/list_buckets.rb

@@ -15,17 +15,17 @@ module Fog
               path+="&marker="+marker
             end
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             
           elsif marker
             path+="?marker="+marker
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             
           elsif maxKeys
-            path+="?maxKeys="+maxKeys
+            path+="?max-keys="+maxKeys
           end
           
           ret = request(
@@ -34,7 +34,7 @@ module Fog
                   :path     => path
           )
           xml = ret.data[:body]
-          result = Hash.from_xml(xml)["ListAllMyBucketsResult"]["Buckets"]["Bucket"]
+          result = XmlSimple.xml_in(xml)["Buckets"][0]
         end
         
       end

data/lib/fog/dtdream/requests/storage/list_objects.rb

@@ -18,7 +18,7 @@ module Fog
               path+="&marker="+marker
             end
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
@@ -27,14 +27,14 @@ module Fog
           elsif marker
             path+="?marker="+marker
             if maxKeys
-              path+="&maxKeys="+maxKeys
+              path+="&max-keys="+maxKeys
             end
             if delimiter
               path+="&delimiter="+delimiter
             end
             
           elsif maxKeys
-            path+="?maxKeys="+maxKeys
+            path+="?max-keys="+maxKeys
             if delimiter
               path+="&delimiter="+delimiter
             end
@@ -53,7 +53,7 @@ module Fog
                   :bucket => bucket
           )
           xml = ret.data[:body]
-          result = Hash.from_xml(xml)
+          result = XmlSimple.xml_in(xml)
         end
 
         def list_multipart_uploads(bucket, endpoint, options = {})
@@ -72,7 +72,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-	  result = Hash.from_xml(ret.data[:body])["ListMultipartUploadsResult"]["Upload"]
+          uploadid = XmlSimple.xml_in(ret.data[:body])["Upload"]
 
         end
 
@@ -92,7 +92,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-	  result = Hash.from_xml(ret.data[:body])["ListPartsResult"]["Part"]
+          parts = XmlSimple.xml_in(ret.data[:body])["Part"]
         end
         
       end

data/lib/fog/dtdream/requests/storage/put_object.rb

@@ -19,9 +19,8 @@ module Fog
           end
           
           #object size ����100M���߷�Ƭ�ϴ���֧�ֶϵ�����
-          if file.size >100 * 1024 * 1024
-            put_multipart_object(bucket, object, file)
-            return
+          if file.size >104857600
+            return put_multipart_object(bucket, object, file)
           end
           
           body = file.read
@@ -47,7 +46,7 @@ module Fog
           endpoint = "http://"+location+".aliyuncs.com"
           
           #object size ����100M���߷�Ƭ�ϴ���֧�ֶϵ�����
-#          if body.size >100 * 1024 * 1024
+#          if body.size >104857600
 #            put_multipart_object_with_body(bucket, object, body)
 #            return
 #          end
@@ -89,7 +88,11 @@ module Fog
           
           #����bucket��uploads�¼����ҵ���Ӧupload������������򴴽�upload�¼�
           uploads = list_multipart_uploads(bucket, endpoint)
-          upload = uploads.find do |tmpupload| tmpupload["Key"][0] == object end
+          if nil != uploads
+	    upload = uploads.find do |tmpupload| tmpupload["Key"][0] == object end
+          else
+            upload = nil
+          end
           
           parts = nil
           uploadedSize = 0
@@ -143,7 +146,7 @@ module Fog
                   :resource => resource,
                   :endpoint => endpoint
           )
-          uploadid = Hash.from_xml(ret.data[:body])["InitiateMultipartUploadResult"]["UploadId"]
+          uploadid = XmlSimple.xml_in(ret.data[:body])["UploadId"][0]
         end
         
         def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
@@ -178,7 +181,8 @@ module Fog
             part = parts[i]
             request_part[i] = {"PartNumber"=>part["PartNumber"], "ETag"=>part["ETag"]}
           end
-          body = request_part.to_xml({root:"CompleteMultipartUpload", children:"Part", skip_instruct:true, skip_types:true})
+          body = XmlSimple.xml_out({"Part"=>request_part},'RootName'=>'CompleteMultipartUpload')
+
           path = object+"?uploadId="+uploadId
           resource = bucket+'/'+path
           ret = request(

data/lib/fog/dtdream/storage.rb

@@ -1,6 +1,5 @@
 require 'fog/dtdream/core'
-require "active_support/core_ext/hash"
-require "active_support/core_ext/hash/conversions"
+require 'xmlsimple'
 
 module Fog
   module Storage
@@ -108,7 +107,7 @@ module Fog
             if params[:headers]
               params[:headers].each do |k,v| 
                 if k != "Range"
-                  headers += "#{k}: #{v}\n"
+                  headers += "#{k}:#{v}\n"
                 end
               end
             end

data/lib/fog/dtdream/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Dtdream
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/fog/dtdream.rb

@@ -2,6 +2,7 @@ require "fog/dtdream/core"
 require "fog/dtdream/storage"
 require "fog/dtdream/version"
 
+
 module Fog
   module Dtdream
     # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-dtdream
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - dengqinsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-description: Support aliyun OSS in version 0.0.3. It will support more aliyun services
-  later.
+        version: '1.1'
+description: As a FOG provider, fog-dtdream support aliyun OSS. Maybe it will support
+  more aliyun services later.
 email:
 - dengqs@dtdream.com
 executables: []
@@ -135,12 +135,13 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - fog-dtdream.gemspec
+- lib/fog/bin/dtdream.rb
 - lib/fog/dtdream.rb
 - lib/fog/dtdream/core.rb
 - lib/fog/dtdream/models/storage/directories.rb
@@ -165,7 +166,7 @@ files:
 - lib/fog/dtdream/requests/storage/put_object.rb
 - lib/fog/dtdream/storage.rb
 - lib/fog/dtdream/version.rb
-homepage: https://github.com/denques/fog-aliyun.git
+homepage: https://git.oschina.net/dengqinsi/fog-dtdream.git
 licenses:
 - MIT
 metadata: {}
@@ -188,6 +189,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Module use 'fog' gem to support Aliyun Web Services.
+summary: Use 'fog' gem to support Aliyun Web Services.
 test_files: []
 has_rdoc: