uber-s3 0.1.3 → 0.1.4

data/lib/uber-s3/bucket.rb

@@ -1,6 +1,5 @@
 class UberS3
   class Bucket
-    
     attr_accessor :client, :name
     
     def initialize(client, name)
@@ -24,11 +23,11 @@ class UberS3
     def object(key)
       Object.new(self, key)
     end
+    alias_method :[], :object
 
     def get(key)
       object(key).fetch
     end
-    alias_method :[], :get
 
     def exists?(key)
       object(key).exists?
@@ -40,6 +39,8 @@ class UberS3
     
     
     class ObjectList
+      include Enumerable
+      
       attr_accessor :bucket, :key, :options, :objects
       
       def initialize(bucket, key, options={})
@@ -52,14 +53,10 @@ class UberS3
       def fetch(marker=nil)
         @objects = []
 
-        response = bucket.connection.get("/?prefix=#{CGI.escape(key)}&marker=#{marker}")
-        # response = bucket.connection.get("/?prefix=#{CGI.escape(key)}&marker=#{marker}&max-keys=2")
-        
-        if response[:status] != 200
-          raise UberS3Error, response.inspect
-        else
-          @objects = parse_contents(response[:body])
-        end
+        default_max_keys = 500
+        response = bucket.connection.get("/?prefix=#{CGI.escape(key)}&marker=#{marker}&max-keys=#{default_max_keys}")        
+
+        @objects = parse_contents(response.body)
       end
       
       def parse_contents(xml)

data/lib/uber-s3/connection/em_http.rb

@@ -5,9 +5,8 @@ module UberS3::Connection
   class EmHttp < Adapter
     
     # NOTE: this will be very difficult to support
-    # with our interface.. will need lots of work
-    # perhaps will limit async capabilities to
-    # fibered mode
+    # with our interface.. will need lots of work.
+    # We may only want to support async with fibers.
     
   end
 end

data/lib/uber-s3/connection/em_http_fibered.rb

@@ -14,12 +14,12 @@ module UberS3::Connection
         
       r = EM::HttpRequest.new(url).send(verb, params)
 
-      {
+      UberS3::Response.new({
         :status => r.response_header.status,
         :header => r.response_header,
         :body   => r.response,
         :raw    => r
-      }
+      })
     end
     
   end

data/lib/uber-s3/connection/net_http.rb

@@ -25,12 +25,12 @@ module UberS3::Connection
         response_body = r.body
       end
       
-      {
+      UberS3::Response.new({
         :status => r.code.to_i,
         :header => r.header.to_hash,
         :body   => response_body,
         :raw    => r
-      }
+      })
     end
     
   end

data/lib/uber-s3/error.rb

@@ -0,0 +1,89 @@
+class UberS3
+  
+  module Error
+  
+    class Standard < StandardError
+      def initialize(key, message)
+        super("#{key}: #{message}")
+      end
+    end
+  
+    class Unknown < StandardError; end
+    
+    class AccessDenied < Standard; end
+    class AccountProblem < Standard; end
+    class AmbiguousGrantByEmailAddress < Standard; end
+    class BadDigest < Standard; end
+    class BucketAlreadyExists < Standard; end
+    class BucketAlreadyOwnedByYou < Standard; end
+    class BucketNotEmpty < Standard; end
+    class CredentialsNotSupported < Standard; end
+    class CrossLocationLoggingProhibited < Standard; end
+    class EntityTooSmall < Standard; end
+    class EntityTooLarge < Standard; end
+    class ExpiredToken < Standard; end
+    class IllegalVersioningConfigurationException < Standard; end
+    class IncompleteBody < Standard; end
+    class IncorrectNumberOfFilesInPostRequest < Standard; end
+    class InlineDataTooLarge < Standard; end
+    class InternalError < Standard; end
+    class InvalidAccessKeyId < Standard; end
+    class InvalidAddressingHeader < Standard; end
+    class InvalidArgument < Standard; end
+    class InvalidBucketName < Standard; end
+    class InvalidDigest < Standard; end
+    class InvalidLocationConstraint < Standard; end
+    class InvalidPart < Standard; end
+    class InvalidPartOrder < Standard; end
+    class InvalidPayer < Standard; end
+    class InvalidPolicyDocument < Standard; end
+    class InvalidRange < Standard; end
+    class InvalidRequest < Standard; end
+    class InvalidSecurity < Standard; end
+    class InvalidSOAPRequest < Standard; end
+    class InvalidStorageClass < Standard; end
+    class InvalidTargetBucketForLogging < Standard; end
+    class InvalidToken < Standard; end
+    class InvalidURI < Standard; end
+    class KeyTooLong < Standard; end
+    class MalformedACLError < Standard; end
+    class MalformedPOSTRequest < Standard; end
+    class MalformedXML < Standard; end
+    class MaxMessageLengthExceeded < Standard; end
+    class MaxPostPreDataLengthExceededError < Standard; end
+    class MetadataTooLarge < Standard; end
+    class MethodNotAllowed < Standard; end
+    class MissingAttachment < Standard; end
+    class MissingContentLength < Standard; end
+    class MissingRequestBodyError < Standard; end
+    class MissingSecurityElement < Standard; end
+    class MissingSecurityHeader < Standard; end
+    class NoLoggingStatusForKey < Standard; end
+    class NoSuchBucket < Standard; end
+    class NoSuchKey < Standard; end
+    class NoSuchUpload < Standard; end
+    class NoSuchVersion < Standard; end
+    class NotImplemented < Standard; end
+    class NotSignedUp < Standard; end
+    class NotSuchBucketPolicy < Standard; end
+    class OperationAborted < Standard; end
+    class PermanentRedirect < Standard; end
+    class PreconditionFailed < Standard; end
+    class Redirect < Standard; end
+    class RequestIsNotMultiPartContent < Standard; end
+    class RequestTimeout < Standard; end
+    class RequestTimeTooSkewed < Standard; end
+    class RequestTorrentOfBucketError < Standard; end
+    class SignatureDoesNotMatch < Standard; end
+    class ServiceUnavailable < Standard; end
+    class SlowDown < Standard; end
+    class TemporaryRedirect < Standard; end
+    class TokenRefreshRequired < Standard; end
+    class TooManyBuckets < Standard; end
+    class UnexpectedContent < Standard; end
+    class UnresolvableGrantByEmailAddress < Standard; end
+    class UserKeyMustBeSpecified < Standard; end
+
+  end
+
+end

data/lib/uber-s3/object.rb

@@ -1,25 +1,23 @@
 class UberS3
   class Object
-    include Operation::Object::All
+    include Operation::Object::AccessPolicy
+    include Operation::Object::CacheControl
+    include Operation::Object::ContentDisposition
+    include Operation::Object::ContentEncoding
+    include Operation::Object::ContentMd5
+    include Operation::Object::ContentType
+    include Operation::Object::Expires
+    include Operation::Object::Meta
+    include Operation::Object::StorageClass
 
-    attr_accessor :bucket, :key, :value, :size, :errors
-    
-    # attr_accessor :access,
-    #               :cache_control,
-    #               :content_disposition,
-    #               :content_encoding,
-    #               :size,
-    #               :content_md5,
-    #               :content_type,
-    #               :expires,
-    #               :storage_class
+    attr_accessor :bucket, :key, :value, :size, :error
     
     def initialize(bucket, key, value=nil, options={})
       self.bucket        = bucket
       self.key           = key
       self.value         = value
       
-      # Init state of object
+      # Init current state
       infer_content_type!
       
       # Call operation methods based on options passed
@@ -31,11 +29,11 @@ class UberS3
     end
     
     def exists?
-      bucket.connection.head(key)[:status] == 200
+      bucket.connection.head(key).status == 200
     end
     
     def fetch
-      self.value = bucket.connection.get(key)[:body]
+      self.value = bucket.connection.get(key).body
       self
     end
     
@@ -57,7 +55,9 @@ class UberS3
 
       # Content MD5 integrity check
       if !content_md5.nil?
-        # Our object expects a md5 hex digest
+        self.content_md5 = Digest::MD5.hexdigest(value) if content_md5 == true
+
+        # We expect a md5 hex digest here
         md5_digest = content_md5.unpack('a2'*16).collect {|i| i.hex.chr }.join
         headers['Content-MD5'] = Base64.encode64(md5_digest).strip
       end
@@ -75,18 +75,15 @@ class UberS3
       # Let's do it
       response = bucket.connection.put(key, headers, value)
       
-      if response[:status] != 200
-        # TODO: .. we should raise stuff here!!!!!!!! exception handling....................
-        self.errors = response[:body]    
-      else
-        self.errors = nil
-      end
+      # Update error state
+      self.error = response.error
       
-      response[:status] == 200
+      # Test for success....
+      response.status == 200      
     end
     
     def delete
-      bucket.connection.delete(key)[:status] == 204
+      bucket.connection.delete(key).status == 204
     end
     
     def value

data/lib/uber-s3/operation/object/content_md5.rb

@@ -14,6 +14,7 @@ module UberS3::Operation::Object
     end
     
     module InstanceMethods
+      # TODO.. move stuff from object.rb to here... need callback / chaining stuff...
     end
     
   end

data/lib/uber-s3/operation.rb

@@ -1,35 +1,7 @@
 class UberS3
   module Operation
-    
-    module Bucket
-      module All
-        def self.included(base)
-          Operation.include_modules(base, 'bucket')
-        end
-      end
-    end
-    
-    module Object
-      module All
-        def self.included(base)
-          Operation.include_modules(base, 'object')
-        end
-      end
-    end
-    
-    def include_modules(base, path)
-      # Auto include modules of a particular path
-      Dir[File.dirname(__FILE__)+"/operation/#{path}/*.rb"].each do |op|
-        group_module_name = self.to_s + '::' + path.split('_').map {|x| x.capitalize}.join("")
-        op_klass_name = File.basename(op).gsub(/.rb$/i, '').split('_').map {|x| x.capitalize}.join("")
-          
-        require op
-        op_klass = instance_eval(group_module_name+'::'+op_klass_name)
-        
-        base.send :include, op_klass
-      end
-    end
-    module_function :include_modules
-        
   end
 end
+
+# Load object operation modules
+Dir[File.dirname(__FILE__) + '/operation/object/*.rb'].each {|f| require f }

data/lib/uber-s3/response.rb

@@ -0,0 +1,49 @@
+class UberS3  
+  class Response
+    
+    attr_accessor :status, :header, :body, :raw, :error_key, :error_message
+    
+    def initialize(options={})
+      if !([:status, :header, :body, :raw] - options.keys).empty?
+        raise "Expecting keys :status, :header, :body and :raw"
+      end
+      
+      self.status = options[:status]
+      self.header = options[:header]
+      self.body   = options[:body]
+      self.raw    = options[:raw]
+      
+      check_for_errors!
+    end
+    
+    # TODO: can/should we normalize the keys..? downcase.. etc.?
+    # def header=(header)
+    # end
+    
+    def check_for_errors!
+      return if status < 400 || body.to_s.empty?
+      
+      # Errors are XML
+      doc = Util::XmlDocument.new(body)
+      
+      self.error_key      = doc.xpath('//Error/Code').first.text
+      self.error_message  = doc.xpath('//Error/Message').first.text
+      
+      error_klass = instance_eval("Error::#{error_key}") rescue nil
+      
+      if error_klass.nil?
+        raise Error::Unknown, "HTTP Response: #{status}, Body: #{body}"
+      else
+        raise error_klass.new(error_key, error_message)
+      end
+    end
+    
+    def error
+      if !error_key.nil?
+        "#{error_key}: #{error_message}"
+      end
+    end
+    
+        
+  end
+end

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/uber-s3.rb

@@ -29,7 +29,8 @@ class UberS3
 end
 
 require 'uber-s3/version'
-require 'uber-s3/exceptions'
+require 'uber-s3/error'
+require 'uber-s3/response'
 require 'uber-s3/connection'
 require 'uber-s3/authorization'
 require 'uber-s3/operation'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70300780746280 !ruby/object:Gem::Requirement
+  requirement: &70197560327260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70300780746280
+  version_requirements: *70197560327260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300780745880 !ruby/object:Gem::Requirement
+  requirement: &70197560326480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300780745880
+  version_requirements: *70197560326480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300780745320 !ruby/object:Gem::Requirement
+  requirement: &70197560325160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,8 +43,8 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70300780745320
-description: A simple & very fast S3 client supporting sync and async communication
+  version_requirements: *70197560325160
+description: A simple & very fast S3 client supporting sync / async HTTP adapters
 email:
 - peter@nulayer.com
 executables: []
@@ -58,7 +58,7 @@ files:
 - lib/uber-s3/connection/em_http_fibered.rb
 - lib/uber-s3/connection/net_http.rb
 - lib/uber-s3/connection.rb
-- lib/uber-s3/exceptions.rb
+- lib/uber-s3/error.rb
 - lib/uber-s3/object.rb
 - lib/uber-s3/operation/object/access_policy.rb
 - lib/uber-s3/operation/object/cache_control.rb
@@ -70,6 +70,7 @@ files:
 - lib/uber-s3/operation/object/meta.rb
 - lib/uber-s3/operation/object/storage_class.rb
 - lib/uber-s3/operation.rb
+- lib/uber-s3/response.rb
 - lib/uber-s3/util/xml_document.rb
 - lib/uber-s3/version.rb
 - lib/uber-s3.rb
@@ -96,6 +97,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A simple & very fast S3 client supporting sync and async communication
+summary: A simple & very fast S3 client supporting sync / async HTTP adapters
 test_files: []
 has_rdoc: 

data/lib/uber-s3/exceptions.rb

@@ -1,7 +0,0 @@
-class UberS3
-  
-  class UberS3Error < StandardError; end
-  
-  
-  
-end