uber-s3 0.1.7 → 0.1.8

data/lib/uber-s3/authorization.rb

@@ -9,10 +9,10 @@ class UberS3
       req_canonical_resource    = "/#{client.bucket}/#{path}".split('?').first
       req_canonical_amz_headers = ''
 
-      headers.keys.select {|k| k =~ /^x-amz-acl/ }.each do |amz_key|
+      headers.keys.sort.select {|k| k =~ /^x-amz-/ }.each do |amz_key|
         req_canonical_amz_headers << amz_key+':'+headers[amz_key]+"\n"
       end
-      
+
       canonical_string_to_sign = "#{req_verb}\n"+
                                  "#{req_content_md5}\n"+
                                  "#{req_content_type}\n"+

data/lib/uber-s3/object.rb

@@ -9,7 +9,7 @@ class UberS3
     include Operation::Object::Meta
     include Operation::Object::StorageClass
 
-    attr_accessor :bucket, :key, :value, :size, :error
+    attr_accessor :bucket, :key, :response, :value, :size, :error
     
     def initialize(bucket, key, value=nil, options={})
       self.bucket        = bucket
@@ -30,9 +30,24 @@ class UberS3
     def exists?
       bucket.connection.head(key).status == 200
     end
+
+    def head
+      bucket.connection.head(key)
+    end
     
     def fetch
-      self.value = bucket.connection.get(key).body
+      self.response = bucket.connection.get(key)
+      self.value = response.body
+
+      # Meta..
+      self.meta ||= {}
+      response.header.keys.sort.select {|k| k =~ /^x-amz-meta-/ }.each do |amz_key|
+        # TODO.. value is an array.. meaning a meta attribute can have multiple values
+        meta[amz_key.gsub(/^x-amz-meta-/, '')] = response.header[amz_key].first
+
+        # TODO.. em-http adapters return headers that look like X_AMZ_META_ .. very annoying.
+      end
+
       self
     end
     
@@ -71,6 +86,11 @@ class UberS3
       if !storage_class.nil?
         headers['x-amz-storage-class'] = storage_class.to_s.upcase
       end
+
+      # Meta
+      if !meta.nil? && !meta.empty?
+        meta.each {|k,v| headers["x-amz-meta-#{k}"] = v }
+      end
       
       # Let's do it
       response = bucket.connection.put(key, headers, value)

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

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :meta
       end
     end
 

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70223953646180 !ruby/object:Gem::Requirement
+  requirement: &70252802210360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *70223953646180
+  version_requirements: *70252802210360
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70223953645120 !ruby/object:Gem::Requirement
+  requirement: &70252802209240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70223953645120
+  version_requirements: *70252802209240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223953644560 !ruby/object:Gem::Requirement
+  requirement: &70252802208760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223953644560
+  version_requirements: *70252802208760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223953643000 !ruby/object:Gem::Requirement
+  requirement: &70252802207340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70223953643000
+  version_requirements: *70252802207340
 description: A simple & very fast S3 client supporting sync / async HTTP adapters
 email:
 - peter@nulayer.com