sndacs 0.0.1 → 0.1.0

data/Gemfile.lock

@@ -20,7 +20,6 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    test-unit (2.4.8)
 
 PLATFORMS
   ruby
@@ -30,4 +29,3 @@ DEPENDENCIES
   mocha
   rspec (~> 2.0)
   sndacs!
-  test-unit (>= 2.0)

data/README.rdoc

@@ -13,8 +13,26 @@ bases on the s3 gem: https://github.com/qoobaa/s3
 === Initialize the service
 
     require "sndacs"
-    service = Sndacs::Service.new(:access_key_id => "...",
-                              :secret_access_key => "...")
+
+    service = Sndacs::Service.new(:access_key_id => '...'
+                                  :secret_access_key => '...')
+    #=> #<Sndacs::Service:...>
+
+or use even more flexible config style
+
+    require "sndacs"
+
+    # Setup global default configurations, see Sndacs::Config for more info
+    Config.access_key_id = '...'
+    Config.secret_access_key = '...'
+    Config.host = 'storage.grandcloud.cn'
+    Config.content_host = 'storage.sdcloud.cn'
+    Config.proxy = nil
+    Config.timeout = 60
+    Config.use_ssl = false
+    Config.chunk_size = 1048576
+    Config.debug = false
+    service = Sndacs::Service.new
     #=> #<Sndacs::Service:...>
 
 === List buckets
@@ -64,7 +82,7 @@ bases on the s3 gem: https://github.com/qoobaa/s3
     new_object.save
     #=> true
 
-Please note that new objects are created with "public-read" ACL by
+Please note that new objects are created with "private" ACL by
 default.
 
 == See also

data/lib/sndacs/bucket.rb

@@ -1,83 +1,101 @@
 module Sndacs
+
   class Bucket
     include Parser
     include Proxies
     extend Forwardable
 
-    attr_reader :name, :service
+    attr_reader :name, :location, :service
 
     def_instance_delegators :service, :service_request
     private_class_method :new
 
+    # Compares the bucket with other bucket. Returns true if the names
+    # of the buckets are the same, and both have the same locations and services
+    # (see Service equality)
+    def ==(other)
+      self.name == other.name and self.location == other.location and self.service == other.service
+    end
+
     # Retrieves the bucket information from the server. Raises an
-    # S3::Error exception if the bucket doesn't exist or you don't
+    # Sndacs::Error exception if the bucket doesn't exist or you don't
     # have access to it, etc.
     def retrieve
       bucket_headers
+
       self
     end
 
-    # Returns location of the bucket, e.g. "EU"
+    # Returns location of the bucket, e.g. "huabei-1"
     def location(reload = false)
       return @location if defined?(@location) and not reload
+
       @location = location_constraint
     end
 
-    # Compares the bucket with other bucket. Returns true if the names
-    # of the buckets are the same, and both have the same services
-    # (see Service equality)
-    def ==(other)
-      self.name == other.name and self.service == other.service
-    end
+    # Saves the newly built bucket. Raises Sndacs::Error::BucketAlreadyExists
+    # exception if the bucket already exists.
+    #
+    # ==== Options
+    # * <tt>:location</tt> - location of the bucket
+    #   (<tt>huabei-1</tt> or <tt>huadong-1</tt>)
+    # * Any other options are passed through to Connection#request
+    def save(options = {})
+      if options
+        if options.is_a?(String) && options.strip != ''
+          options = {:location => options.strip}
+        end
+
+        if options.is_a?(Hash) && !options.has_key?(:location)
+          options.merge!(:location => location)
+        end
+      else
+        options = {:location => location}
+      end
+
+      create_bucket_configuration(options)
 
-    # Similar to retrieve, but catches S3::Error::NoSuchBucket
-    # exceptions and returns false instead.
-    def exists?
-      retrieve
       true
-    rescue Error::NoSuchBucket
-      false
     end
 
-    # Destroys given bucket. Raises an S3::Error::BucketNotEmpty
-    # exception if the bucket is not empty. You can destroy non-empty
-    # bucket passing true (to force destroy)
+    # Destroys given bucket. Raises an Sndacs::Error::BucketNotEmpty
+    # exception if the bucket is not empty.
+    # You can destroy non-empty bucket passing true (to force destroy)
     def destroy(force = false)
       delete_bucket
+
       true
     rescue Error::BucketNotEmpty
       if force
         objects.destroy_all
+
         retry
       else
         raise
       end
     end
 
-    # Saves the newly built bucket.
-    #
-    # ==== Options
-    # * <tt>:location</tt> - location of the bucket
-    #   (<tt>:eu</tt> or <tt>us</tt>)
-    # * Any other options are passed through to
-    #   Connection#request
-    def save(options = {})
-      options = {:location => options} unless options.is_a?(Hash)
-      create_bucket_configuration(options)
+    # Similar to retrieve, but catches Sndacs::Error::NoSuchBucket
+    # exceptions and returns false instead.
+    def exists?
+      retrieve
+
       true
+    rescue Error::NoSuchBucket
+      false
     end
 
-    # Returns true if the name of the bucket can be used like +VHOST+
-    # name. If the bucket contains characters like underscore it can't
-    # be used as +VHOST+ (e.g. <tt>bucket_name.s3.amazonaws.com</tt>)
+    # Returns true if the name of the bucket can be used like +VHOST+ name.
+    # If the bucket contains characters like underscore it can't
+    # be used as +VHOST+ (e.g. <tt>bucket_name.storage.grandcloud.cn</tt>)
     def vhost?
-      #"#@name.#{HOST}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
+      #"#@name.#{region_host}" =~ /\A#{URI::REGEXP::PATTERN::HOSTNAME}\Z/
       false
     end
 
     # Returns host name of the bucket according (see #vhost? method)
-    def host
-      vhost? ? "#@name.#{HOST}" : "#{HOST}"
+    def host(public_accessible = false)
+      vhost? ? "#@name.#{region_host(public_accessible)}" : region_host(public_accessible)
     end
 
     # Returns path prefix for non +VHOST+ bucket. Path prefix is used
@@ -102,19 +120,26 @@ module Sndacs
       "#<#{self.class}:#{name}>"
     end
 
-    private
+  private
 
     attr_writer :service
 
-    def location_constraint
-      response = bucket_request(:get, :params => {:location => nil})
-      parse_location_constraint(response.body)
+    def create_bucket_configuration(options = {})
+      location = options[:location].to_s.downcase if options[:location]
+      
+      options[:headers] ||= {}
+      if location and location != REGION_DEFAULT
+        options[:headers][:content_type] = "application/xml"
+        options[:body] = "<CreateBucketConfiguration><LocationConstraint>#{location}</LocationConstraint></CreateBucketConfiguration>"
+      end
+
+      bucket_request(:put, options)
     end
 
     def list_bucket(options = {})
       response = bucket_request(:get, :params => options)
       max_keys = options[:max_keys]
-      objects_attributes = parse_list_bucket_result(response.body)
+      objects_attributes = parse_all_objects_result(response.body)
 
       # If there are more than 1000 objects S3 truncates listing and
       # we need to request another listing for the remaining objects.
@@ -123,11 +148,12 @@ module Sndacs
 
         if max_keys
           break if objects_attributes.length >= max_keys
+
           next_request_options[:max_keys] = max_keys - objects_attributes.length
         end
 
         response = bucket_request(:get, :params => options.merge(next_request_options))
-        objects_attributes += parse_list_bucket_result(response.body)
+        objects_attributes += parse_all_objects_result(response.body)
       end
 
       objects_attributes.map { |object_attributes| Object.send(:new, self, object_attributes) }
@@ -143,37 +169,59 @@ module Sndacs
       end
     end
 
-    def create_bucket_configuration(options = {})
-      location = options[:location].to_s.upcase if options[:location]
-      options[:headers] ||= {}
-      if location and location != "US"
-        options[:body] = "<CreateBucketConfiguration><LocationConstraint>#{location}</LocationConstraint></CreateBucketConfiguration>"
-        options[:headers][:content_type] = "application/xml"
-      end
-      bucket_request(:put, options)
+    def location_constraint
+      response = bucket_request(:get, :params => {:location => nil})
+
+      parse_location_constraint(response.body)
     end
 
     def delete_bucket
       bucket_request(:delete)
     end
 
-    def initialize(service, name) #:nodoc:
+    def initialize(service, name, location = nil) #:nodoc:
       self.service = service
       self.name = name
+
+      unless location
+        begin
+          location = location_constraint
+        rescue
+          location = REGION_DEFAULT
+        end
+      end
+
+      self.location = location
     end
 
     def name=(name)
       raise ArgumentError.new("Invalid bucket name: #{name}") unless name_valid?(name)
+
       @name = name
     end
 
-    def bucket_request(method, options = {})
-      path = "#{path_prefix}#{options[:path]}"
-      service_request(method, options.merge(:host => host, :path => path))
+    def location=(location)
+      @location = location
     end
 
     def name_valid?(name)
       name =~ /\A[a-z0-9][a-z0-9\._-]{2,254}\Z/i and name !~ /\A#{URI::REGEXP::PATTERN::IPV4ADDR}\Z/
     end
+
+    def region_host(public_accessible = false)
+      rhost = public_accessible ? Config.content_host : Config.host
+      if @location
+        rhost = (public_accessible ? REGION_CONTENT_HOST : REGION_HOST) % @location
+      end
+
+      rhost
+    end
+
+    def bucket_request(method, options = {})
+      path = "#{path_prefix}#{options[:path]}"
+
+      service_request(method, options.merge(:host => host, :path => path))
+    end
   end
+
 end

data/lib/sndacs/buckets_extension.rb

@@ -1,4 +1,5 @@
 module Sndacs
+
   module BucketsExtension
     # Builds new bucket with given name
     def build(name)
@@ -8,7 +9,10 @@ module Sndacs
     # Finds the bucket with given name
     def find_first(name)
       bucket = build(name)
+
       bucket.retrieve
+    rescue Error::NoSuchBucket, Error::ForbiddenBucket
+      nil
     end
     alias :find :find_first
 
@@ -23,4 +27,5 @@ module Sndacs
       proxy_target.each { |bucket| bucket.destroy(force) }
     end
   end
+
 end

data/lib/sndacs/config.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
+module Sndacs
+
+  class Config
+
+    class << self
+      attr_accessor :access_key_id
+      attr_accessor :secret_access_key
+
+      attr_accessor :proxy
+      attr_accessor :host
+      attr_accessor :content_host
+      attr_accessor :timeout
+      attr_accessor :use_ssl
+      attr_accessor :chunk_size
+      attr_accessor :debug
+
+      def access_key_id
+        @access_key_id ||= ''
+      end
+
+      def secret_access_key
+        @secret_access_key ||= ''
+      end
+
+      def proxy
+        @proxy ||= nil
+      end
+
+      def host
+        @host ||= 'storage.grandcloud.cn'
+      end
+
+      def content_host
+        @content_host ||= 'storage.sdcloud.cn'
+      end
+
+      def timeout
+        @timeout ||= 60
+      end
+
+      def use_ssl
+        @use_ssl ||= false
+      end
+
+      def chunk_size
+        @chunk_size ||= 1048576
+      end
+
+      def debug
+        @debug ||= false
+      end
+    end
+
+  end
+
+end

data/lib/sndacs/connection.rb

@@ -1,7 +1,11 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
 module Sndacs
 
-  # Class responsible for handling connections to amazon hosts
+  # Class responsible for handling connections to grandcloud hosts
   class Connection
+
     include Parser
 
     attr_accessor :access_key_id, :secret_access_key, :use_ssl, :timeout, :debug, :proxy
@@ -24,13 +28,13 @@ module Sndacs
     # * <tt>:chunk_size</tt> - Size of a chunk when streaming
     #   (1048576 (1 MiB) by default)
     def initialize(options = {})
-      @access_key_id = options.fetch(:access_key_id)
-      @secret_access_key = options.fetch(:secret_access_key)
-      @use_ssl = options.fetch(:use_ssl, false)
-      @debug = options.fetch(:debug, false)
-      @timeout = options.fetch(:timeout, 60)
-      @proxy = options.fetch(:proxy, nil)
-      @chunk_size = options.fetch(:chunk_size, 1048576)
+      @access_key_id = options.fetch(:access_key_id, Config.access_key_id)
+      @secret_access_key = options.fetch(:secret_access_key, Config.secret_access_key)
+      @proxy = options.fetch(:proxy, Config.proxy)
+      @timeout = options.fetch(:timeout, Config.timeout)
+      @use_ssl = options.fetch(:use_ssl, Config.use_ssl)
+      @chunk_size = options.fetch(:chunk_size, Config.chunk_size)
+      @debug = options.fetch(:debug, Config.debug)
     end
 
     # Makes request with given HTTP method, sets missing parameters,
@@ -43,7 +47,7 @@ module Sndacs
     #
     # ==== Options:
     # * <tt>:host</tt> - Hostname to connecto to, defaults
-    #   to <tt>s3.amazonaws.com</tt>
+    #   to <tt>storage.grandcloud.cn</tt>
     # * <tt>:path</tt> - path to send request to (REQUIRED)
     # * <tt>:body</tt> - Request body, only meaningful for
     #   <tt>:put</tt> request
@@ -55,7 +59,7 @@ module Sndacs
     # ==== Returns
     # Net::HTTPResponse object -- response from the server
     def request(method, options)
-      host = options.fetch(:host, HOST)
+      host = options.fetch(:host, Config.host)
       path = options.fetch(:path)
       body = options.fetch(:body, nil)
       params = options.fetch(:params, {})
@@ -67,7 +71,10 @@ module Sndacs
 
       if params
         params = params.is_a?(String) ? params : self.class.parse_params(params)
-        path << "?#{params}"
+
+        if params != ''
+          path << "?#{params}"
+        end
       end
 
       request = Request.new(@chunk_size, method.to_s.upcase, !!body, method.to_s.upcase != "HEAD", path)
@@ -83,6 +90,7 @@ module Sndacs
         else
           request.body = body
         end
+
         request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size
       end
 
@@ -105,6 +113,7 @@ module Sndacs
       params.each do |key, value|
         if interesting_keys.include?(key)
           parsed_key = key.to_s.gsub("_", "-")
+
           case value
           when nil
             result << parsed_key
@@ -113,6 +122,7 @@ module Sndacs
           end
         end
       end
+
       result.join("&")
     end
 
@@ -144,18 +154,21 @@ module Sndacs
           if interesting_keys.include?(key)
             parsed_key = key.to_s.gsub("_", "-")
             parsed_value = value
+
             case value
             when Range
               parsed_value = "bytes=#{value.first}-#{value.last}"
             end
+
             parsed_headers[parsed_key] = parsed_value
           end
         end
       end
+
       parsed_headers
     end
 
-    private
+  private
 
     def port
       use_ssl ? 443 : 80
@@ -171,6 +184,7 @@ module Sndacs
       http.use_ssl = @use_ssl
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @use_ssl
       http.read_timeout = @timeout if @timeout
+
       http
     end
 
@@ -195,9 +209,17 @@ module Sndacs
         http.request(request)
       end
 
-      if response.code.to_i == 307
+      case response.code.to_i
+      when 301
+        if response.body
+          doc = Document.new response.body
+
+          send_request(doc.elements["Error"].elements["Endpoint"].text, request, true)
+        end
+      when 307
         if response.body
           doc = Document.new response.body
+
           send_request(doc.elements["Error"].elements["Endpoint"].text, request, true)
         end
       else
@@ -214,12 +236,15 @@ module Sndacs
           raise Error::ResponseError.new(nil, response)
         else
           code, message = parse_error(response.body)
+
           raise Error::ResponseError.exception(code).new(message, response)
         end
       else
         raise(ConnectionError.new(response, "Unknown response code: #{response.code}"))
       end
+
       response
     end
   end
+
 end

data/lib/sndacs/exceptions.rb

@@ -1,4 +1,5 @@
 module Sndacs
+
   module Error
 
     # All responses with a code between 300 and 599 that contain an
@@ -12,7 +13,7 @@ module Sndacs
     class ResponseError < StandardError
       attr_reader :response
 
-      # Creates new S3::ResponseError.
+      # Creates new Sndacs::ResponseError.
       #
       # ==== Parameters
       # * <tt>message</tt> - what went wrong
@@ -23,7 +24,7 @@ module Sndacs
       end
 
       # Factory for all other Exception classes in module, each for
-      # every error response available from AmazonAWS
+      # every error response available from SNDA Cloud Storage
       #
       # ==== Parameters
       # * <tt>code</tt> - Code name of exception
@@ -32,7 +33,7 @@ module Sndacs
       # Descendant of ResponseError suitable for that exception code
       # or ResponseError class if no class found
       def self.exception(code)
-        S3::Error.const_get(code)
+        Sndacs::Error.const_get(code)
       rescue NameError
         ResponseError
       end
@@ -52,6 +53,7 @@ module Sndacs
     class EntityTooSmall < ResponseError; end
     class EntityTooLarge < ResponseError; end
     class ExpiredToken < ResponseError; end
+    class ForbiddenBucket < ResponseError; end
     class IncompleteBody < ResponseError; end
     class IncorrectNumberOfFilesInPostRequestPOST < ResponseError; end
     class InlineDataTooLarge < ResponseError; end
@@ -107,4 +109,5 @@ module Sndacs
     class UnresolvableGrantByEmailAddress < ResponseError; end
     class UserKeyMustBeSpecified < ResponseError; end
   end
+
 end