s3 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.1)
+    s3 (0.3.2)
       proxies
       trollop
 

data/extra/s3_paperclip.rb

@@ -29,15 +29,16 @@ module Paperclip
         end
 
         base.instance_eval do
-          @s3_credentials = parse_credentials(@options[:s3_credentials])
-          @bucket_name    = @options[:bucket]         || @s3_credentials[:bucket]
-          @bucket_name    = @bucket_name.call(self) if @bucket_name.is_a?(Proc)
-          @s3_options     = @options[:s3_options]     || {}
-          @s3_permissions = @options[:s3_permissions] || :public_read
-          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == :public_read ? "http" : "https")
-          @s3_headers     = @options[:s3_headers]     || {}
-          @s3_host_alias  = @options[:s3_host_alias]
-          @url            = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
+          @s3_credentials   = parse_credentials(@options[:s3_credentials])
+          @bucket_name      = @options[:bucket]           || @s3_credentials[:bucket]
+          @bucket_name      = @bucket_name.call(self) if @bucket_name.is_a?(Proc)
+          @s3_options       = @options[:s3_options]       || {}
+          @s3_permissions   = @options[:s3_permissions]   || :public_read
+          @s3_storage_class = @options[:s3_storage_class] || :standard
+          @s3_protocol      = @options[:s3_protocol]      || (@s3_permissions == :public_read ? "http" : "https")
+          @s3_headers       = @options[:s3_headers]       || {}
+          @s3_host_alias    = @options[:s3_host_alias]
+          @url              = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
           @service = ::S3::Service.new(@s3_options.merge(
             :access_key_id => @s3_credentials[:access_key_id],
             :secret_access_key => @s3_credentials[:secret_access_key],
@@ -112,6 +113,7 @@ module Paperclip
             object = bucket.objects.build(path(style))
             object.content = file.read
             object.acl = @s3_permissions
+            object.storage_class = @s3_storage_class
             object.content_type = instance_read(:content_type)
             object.content_disposition = @s3_headers[:content_disposition]
             object.content_encoding = @s3_headers[:content_encoding]

data/lib/s3/connection.rb

@@ -114,7 +114,7 @@ module S3
     # Hash of headers translated from symbol to string, containing
     # only interesting headers
     def self.parse_headers(headers)
-      interesting_keys = [:content_type, :x_amz_acl, :range,
+      interesting_keys = [:content_type, :x_amz_acl, :x_amz_storage_class, :range,
                           :if_modified_since, :if_unmodified_since,
                           :if_match, :if_none_match,
                           :content_disposition, :content_encoding,
@@ -161,7 +161,7 @@ module S3
     end
 
     def proxy_settings
-      @proxy.values_at(:host, :port, :user, :password) unless @proxy.blank?
+      @proxy.values_at(:host, :port, :user, :password) unless @proxy.nil? || @proxy.empty?
     end
 
     def http(host)

data/lib/s3/object.rb

@@ -6,7 +6,7 @@ module S3
     extend Forwardable
 
     attr_accessor :content_type, :content_disposition, :content_encoding
-    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl
+    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class
     attr_writer :content
 
     def_instance_delegators :bucket, :name, :service, :bucket_request, :vhost?, :host, :path_prefix
@@ -40,6 +40,16 @@ module S3
     def acl=(acl)
       @acl = acl.to_s.gsub("_", "-") if acl
     end
+    
+    # Assigns a new storage class (RRS) to the object. Please note 
+    # that the storage class is not retrieved from the server and set
+    # to "STANDARD" by default.
+    #
+    # ==== Example
+    #   object.storage_class = :reduced_redundancy
+    def storage_class=(storage_class)
+      @storage_class = storage_class.to_s.upcase if storage_class
+    end
 
     # Retrieves the object from the server. Method is used to download
     # object information only (content type, size and so on). It does
@@ -215,6 +225,7 @@ module S3
     def dump_headers
       headers = {}
       headers[:x_amz_acl] = @acl || "public-read"
+      headers[:x_amz_storage_class] = @storage_class || "STANDARD"
       headers[:content_type] = @content_type || "application/octet-stream"
       headers[:content_encoding] = @content_encoding if @content_encoding
       headers[:content_disposition] = @content_disposition if @content_disposition

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/connection_test.rb

@@ -115,6 +115,7 @@ class ConnectionTest < Test::Unit::TestCase
     expected = {
       "content-type" => nil,
       "x-amz-acl" => nil,
+      "x-amz-storage-class" => nil,
       "if-modified-since" => nil,
       "if-unmodified-since" => nil,
       "if-match" => nil,
@@ -125,6 +126,7 @@ class ConnectionTest < Test::Unit::TestCase
     actual = S3::Connection.parse_headers(
       :content_type => nil,
       :x_amz_acl => nil,
+      :x_amz_storage_class => nil,
       :if_modified_since => nil,
       :if_unmodified_since => nil,
       :if_match => nil,
@@ -139,6 +141,7 @@ class ConnectionTest < Test::Unit::TestCase
     expected = {
       "content-type" => "text/html",
       "x-amz-acl" => "public-read",
+      "x-amz-storage-class" => "STANDARD",
       "if-modified-since" => "today",
       "if-unmodified-since" => "tomorrow",
       "if-match" => "1234",
@@ -149,6 +152,7 @@ class ConnectionTest < Test::Unit::TestCase
     actual = S3::Connection.parse_headers(
       :content_type => "text/html",
       :x_amz_acl => "public-read",
+      :x_amz_storage_class => "STANDARD",
       :if_modified_since => "today",
       :if_unmodified_since => "tomorrow",
       :if_match => "1234",

data/test/object_test.rb

@@ -101,7 +101,7 @@ class ObjectTest < Test::Unit::TestCase
   end
 
   test "save" do
-    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :content_type=>"application/octet-stream" }).returns(@response_binary)
+    @object_lena.expects(:object_request).with(:put, :body=>"test", :headers=>{ :x_amz_acl=>"public-read", :x_amz_storage_class=>"STANDARD", :content_type=>"application/octet-stream" }).returns(@response_binary)
     assert @object_lena.save
   end
 
@@ -149,6 +149,24 @@ class ObjectTest < Test::Unit::TestCase
     actual = @object_lena.acl
     assert_equal expected, actual
   end
+  
+  test "storage-class writer" do
+    expected = nil
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+    
+    assert @object_lena.storage_class = :standard
+    
+    expected = "STANDARD"
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+    
+    assert @object_lena.storage_class = :reduced_redundancy
+
+    expected = "REDUCED_REDUNDANCY"
+    actual = @object_lena.storage_class
+    assert_equal expected, actual
+  end
 
   test "copy" do
     @bucket_images.expects(:bucket_request).with(:put, :path => "Lena-copy.png", :headers => { :x_amz_acl => "public-read", :content_type => "application/octet-stream", :x_amz_copy_source => "images/Lena.png", :x_amz_metadata_directive => "REPLACE" }).returns(@response_xml)

data/test/test_helper.rb

@@ -1,7 +1,6 @@
-require "bundler"
+require "rubygems"
+require "bundler/setup"
 
-Bundler.setup
 Bundler.require
-
 require "test/unit"
 require "mocha"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency