scashin133-s3 0.3.8 → 0.3.11

data/Gemfile

@@ -1,4 +1,2 @@
-source :gemcutter
-
-# Specify your gem's dependencies in s3.gemspec
+source "http://rubygems.org"
 gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    scashin133-s3 (0.3.8)
-      proxies
+    scashin133-s3 (0.3.11)
+      proxies (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -19,6 +19,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   mocha
-  proxies
   scashin133-s3!
   test-unit (>= 2.0)

data/README.rdoc

@@ -1,21 +1,78 @@
 = S3
 
 S3 library provides access to {Amazon's Simple Storage Service}[http://aws.amazon.com/s3/].
-It supports both: European and US buckets through {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/RESTAPI.html].
 
-* homepage[http://jah.pl/projects/s3.html]
-* gemcutter[http://gemcutter.org/gems/s3]
-* repository[http://github.com/qoobaa/s3]
-* {issue tracker}[http://github.com/qoobaa/s3/issues]
-* rdoc[http://qoobaa.github.com/s3]
+It supports both: European and US buckets through the {REST API}[http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html].
 
 == Installation
 
-  gem install s3
+    gem install s3
 
 == Usage
 
-See homepage[http://jah.pl/projects/s3.html] for details.
+=== Initialize the service
+
+    require "s3"
+    service = S3::Service.new(:access_key_id => "...",
+                              :secret_access_key => "...")
+    #=> #<S3::Service:...>
+
+=== List buckets
+
+    service.buckets
+    #=> [#<S3::Bucket:first-bucket>,
+    #    #<S3::Bucket:second-bucket>]
+
+=== Find bucket
+
+    first_bucket = service.buckets.find("first-bucket")
+    #=> #<S3::Bucket:first-bucket>
+
+=== List objects in a bucket
+
+    first_bucket.objects
+    #=> [#<S3::Object:/first-bucket/lenna.png>,
+    #    #<S3::Object:/first-bucket/lenna_mini.png>]
+
+=== Find object in a bucket
+
+    object = first_bucket.objects.find("lenna.png")
+    #=> #<S3::Object:/first-bucket/lenna.png>
+
+=== Access object metadata (cached from find)
+
+    object.content_type
+    #=> "image/png"
+
+=== Access object content (downloads the object)
+
+    object.content
+    #=> "\x89PNG\r\n\x1A\n\x00\x00\x00\rIHDR\x00..."
+
+=== Delete an object
+
+    object.destroy
+    #=> true
+
+=== Create an object
+
+    new_object = bucket.objects.build("bender.png")
+    #=> #<S3::Object:/synergy-staging/bender.png>
+
+    new_object.content = open("bender.png")
+
+    new_object.save
+    #=> true
+
+Please note that new objects are created with "public-read" ACL by
+default.
+
+== See also
+
+* rubygems[http://rubygems.org/gems/s3]
+* repository[http://github.com/qoobaa/s3]
+* {issue tracker}[http://github.com/qoobaa/s3/issues]
+* documentation[http://rubydoc.info/github/qoobaa/s3/master/frames]
 
 == Copyright
 

data/lib/s3/bucket.rb

@@ -19,11 +19,8 @@ module S3
 
     # Returns location of the bucket, e.g. "EU"
     def location(reload = false)
-      if reload or @location.nil?
-        @location = location_constraint
-      else
-        @location
-      end
+      return @location if defined?(@location) and not reload
+      @location = location_constraint
     end
 
     # Compares the bucket with other bucket. Returns true if the names
@@ -88,12 +85,18 @@ module S3
       vhost? ? "" : "#@name/"
     end
 
-    # Returns the objects in the bucket and caches the result (see
-    # #reload method).
+    # Returns the objects in the bucket and caches the result
     def objects
       Proxy.new(lambda { list_bucket }, :owner => self, :extend => ObjectsExtension)
     end
 
+    # Returns the object with the given key. Does not check whether the
+    # object exists. But also does not issue any HTTP requests, so it's
+    # much faster than objects.find
+    def object(key)
+      Object.send(:new, self, :key => key)
+    end
+
     def inspect #:nodoc:
       "#<#{self.class}:#{name}>"
     end
@@ -113,13 +116,20 @@ module S3
 
     def list_bucket(options = {})
       response = bucket_request(:get, :params => options)
+      max_keys = options[:max_keys]
       objects_attributes = parse_list_bucket_result(response.body)
 
-      # If there are more than 1000 objects S3 truncates listing
-      # and we need to request another listing for the remaining objects.
+      # If there are more than 1000 objects S3 truncates listing and
+      # we need to request another listing for the remaining objects.
       while parse_is_truncated(response.body)
-        marker = objects_attributes.last[:key]
-        response = bucket_request(:get, :params => options.merge(:marker => marker))
+        next_request_options = {:marker => objects_attributes.last[:key]}
+
+        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)
       end
 

data/lib/s3/buckets_extension.rb

@@ -12,14 +12,13 @@ module S3
     end
     alias :find :find_first
 
-    # Find all buckets in the service
+    # Finds all buckets in the service
     def find_all
       proxy_target
     end
 
-    # Destroy all buckets in the service. Doesn't destroy non-empty
-    # buckets by default, pass true to force destroy (USE WITH
-    # CARE!).
+    # Destroys all buckets in the service. Doesn't destroy non-empty
+    # buckets by default, pass true to force destroy (USE WITH CARE!).
     def destroy_all(force = false)
       proxy_target.each { |bucket| bucket.destroy(force) }
     end

data/lib/s3/connection.rb

@@ -61,12 +61,15 @@ module S3
       params = options.fetch(:params, {})
       headers = options.fetch(:headers, {})
 
+      # Must be done before adding params
+      # Encodes all characters except forward-slash (/) and explicitly legal URL characters
+      path = URI.escape(path, /[^#{URI::REGEXP::PATTERN::UNRESERVED}\/]/)
+
       if params
         params = params.is_a?(String) ? params : self.class.parse_params(params)
         path << "?#{params}"
       end
 
-      path = URI.escape(path)
       request = Request.new(@chunk_size, method.to_s.upcase, !!body, method.to_s.upcase != "HEAD", path)
 
       headers = self.class.parse_headers(headers)

data/lib/s3/object.rb

@@ -6,7 +6,7 @@ module S3
     extend Forwardable
 
     attr_accessor :content_type, :content_disposition, :content_encoding, :cache_control
-    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class
+    attr_reader :last_modified, :etag, :size, :bucket, :key, :acl, :storage_class, :metadata
     attr_writer :content
 
     def_instance_delegators :bucket, :name, :service, :bucket_request, :vhost?, :host, :path_prefix
@@ -70,10 +70,11 @@ module S3
       false
     end
 
-    # Download the content of the object, and caches it. Pass true
-    # to clear the cache and download the object again.
+    # Downloads the content of the object, and caches it. Pass true to
+    # clear the cache and download the object again.
     def content(reload = false)
-      get_object if reload or @content.nil?
+      return @content if defined?(@content) and not reload
+      get_object
       @content
     end
 
@@ -150,7 +151,7 @@ module S3
       headers[:content_disposition] = options[:content_disposition] if options[:content_disposition]
       headers[:cache_control] = options[:cache_control] if options[:cache_control]
       headers[:x_amz_copy_source] = full_key
-      headers[:x_amz_metadata_directive] = "REPLACE"
+      headers[:x_amz_metadata_directive] = options[:replace] == false ? "COPY" : "REPLACE"
       headers[:x_amz_copy_source_if_match] = options[:if_match] if options[:if_match]
       headers[:x_amz_copy_source_if_none_match] = options[:if_none_match] if options[:if_none_match]
       headers[:x_amz_copy_source_if_unmodified_since] = options[:if_modified_since] if options[:if_modified_since]
@@ -234,6 +235,7 @@ module S3
     end
 
     def parse_headers(response)
+      @metadata = response.to_hash.select { |k, v| k.to_s.start_with?("x-amz-meta") }
       self.etag = response["etag"] if response.key?("etag")
       self.content_type = response["content-type"] if response.key?("content-type")
       self.content_disposition = response["content-disposition"] if response.key?("content-disposition")

data/lib/s3/parser.rb

@@ -3,7 +3,7 @@ module S3
     include REXML
 
     def rexml_document(xml)
-      xml.force_encoding(Encoding::UTF_8) if xml.respond_to? :force_encoding
+      xml.force_encoding(::Encoding::UTF_8) if xml.respond_to? :force_encoding
       Document.new(xml)
     end
 
@@ -44,7 +44,7 @@ module S3
       message = document.elements["Error/Message"].text
       [code, message]
     end
-    
+
     def parse_is_truncated xml
       rexml_document(xml).elements["ListBucketResult/IsTruncated"].text =='true'
     end

data/lib/s3/service.rb

@@ -39,6 +39,13 @@ module S3
       Proxy.new(lambda { list_all_my_buckets }, :owner => self, :extend => BucketsExtension)
     end
 
+    # Returns the bucket with the given name. Does not check whether the
+    # bucket exists. But also does not issue any HTTP requests, so it's
+    # much faster than buckets.find
+    def bucket(name)
+      Bucket.send(:new, self, name)
+    end
+
     # Returns "http://" or "https://", depends on <tt>:use_ssl</tt>
     # value from initializer
     def protocol
@@ -68,15 +75,13 @@ module S3
     end
 
     def connection
-      if @connection.nil?
-        @connection = Connection.new(:access_key_id => @access_key_id,
-                                     :secret_access_key => @secret_access_key,
-                                     :use_ssl => @use_ssl,
-                                     :timeout => @timeout,
-                                     :debug => @debug,
-                                     :proxy => @proxy)
-      end
-      @connection
+      return @connection if defined?(@connection)
+      @connection = Connection.new(:access_key_id => @access_key_id,
+                               :secret_access_key => @secret_access_key,
+                               :use_ssl => @use_ssl,
+                               :timeout => @timeout,
+                               :debug => @debug,
+                               :proxy => @proxy)
     end
   end
 end

data/lib/s3/signature.rb

@@ -52,9 +52,9 @@ module S3
       expires = options[:expires_at]
 
       headers = options[:headers] || {}
-      headers.merge!('date' => expires.to_i.to_s)
+      headers.merge!("date" => expires.to_i.to_s)
 
-      options.merge!(:resource => "/#{bucket}/#{resource}",
+      options.merge!(:resource => "/#{bucket}/#{URI.escape(resource)}",
                      :method => options[:method] || :get,
                      :headers => headers)
       signature = canonicalized_signature(options)
@@ -119,7 +119,7 @@ module S3
       string_to_sign << canonicalized_amz_headers
       string_to_sign << canonicalized_resource
 
-      digest = OpenSSL::Digest::Digest.new('sha1')
+      digest = OpenSSL::Digest::Digest.new("sha1")
       hmac = OpenSSL::HMAC.digest(digest, secret_access_key, string_to_sign)
       base64 = Base64.encode64(hmac)
       base64.chomp
@@ -139,7 +139,7 @@ module S3
       headers = []
 
       # 1. Convert each HTTP header name to lower-case. For example,
-      # 'X-Amz-Date' becomes 'x-amz-date'.
+      # "X-Amz-Date" becomes "x-amz-date".
       request.each { |key, value| headers << [key.downcase, value] if key =~ /\Ax-amz-/io }
       #=> [["c", 0], ["a", 1], ["a", 2], ["b", 3]]
 
@@ -152,9 +152,9 @@ module S3
       # "header-name:comma-separated-value-list" pair as prescribed by
       # RFC 2616, section 4.2, without any white-space between
       # values. For example, the two metadata headers
-      # 'x-amz-meta-username: fred' and 'x-amz-meta-username: barney'
-      # would be combined into the single header 'x-amz-meta-username:
-      # fred,barney'.
+      # "x-amz-meta-username: fred" and "x-amz-meta-username: barney"
+      # would be combined into the single header "x-amz-meta-username:
+      # fred,barney".
       combined_headers = headers.inject([]) do |new_headers, header|
         existing_header = new_headers.find { |h| h.first == header.first }
         if existing_header
@@ -176,8 +176,8 @@ module S3
       end
 
       # 5. Trim any white-space around the colon in the header. For
-      # example, the header 'x-amz-meta-username: fred,barney' would
-      # become 'x-amz-meta-username:fred,barney'
+      # example, the header "x-amz-meta-username: fred,barney" would
+      # become "x-amz-meta-username:fred,barney"
       joined_headers = unfolded_headers.map do |header|
         key = header.first.strip
         value = header.last.strip
@@ -222,7 +222,23 @@ module S3
       # 4. If the request addresses a sub-resource, like ?location,
       # ?acl, or ?torrent, append the sub-resource including question
       # mark.
-      string << "?#{$1}" if uri.query =~ /&?(acl|torrent|logging|location)(?:&|=|\Z)/
+      sub_resources = [
+        "acl",
+        "location",
+        "logging",
+        "notification",
+        "partNumber",
+        "policy",
+        "requestPayment",
+        "torrent",
+        "uploadId",
+        "uploads",
+        "versionId",
+        "versioning",
+        "versions",
+        "website"
+      ]
+      string << "?#{$1}" if uri.query =~ /&?(#{sub_resources.join("|")})(?:&|=|\Z)/
       string
     end
   end

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.8"
+  VERSION = "0.3.11"
 end

data/s3.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-# Load version requiring the canonical "s3/version", otherwise Ruby will think 
+# Load version requiring the canonical "s3/version", otherwise Ruby will think
 # is a different file and complaint about a double declaration of S3::VERSION.
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "s3/version"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "scashin133-s3"
 
-  s.add_dependency "proxies"
+  s.add_dependency "proxies", "~> 0.2.0"
   s.add_development_dependency "test-unit", ">= 2.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "bundler", ">= 1.0.0"

data/test/object_test.rb

@@ -22,6 +22,7 @@ class ObjectTest < Test::Unit::TestCase
     @response_binary["content-encoding"] = nil
     @response_binary["last-modified"] = Time.now.httpdate
     @response_binary["content-length"] = 20
+    @response_binary["x-amz-meta-test"] = "metadata"
 
     @xml_body = <<-EOXML
     <?xml version="1.0" encoding="UTF-8"?>
@@ -132,6 +133,14 @@ class ObjectTest < Test::Unit::TestCase
     assert @object_lena.retrieve
   end
 
+  test "retrieve headers" do
+    @object_lena.expects(:object_request).twice.with(:head, {}).returns(@response_binary)
+    assert @object_lena.retrieve
+
+    meta = {"x-amz-meta-test" => ["metadata"]}
+    assert_equal meta, @object_lena.retrieve.metadata
+  end
+
   test "exists" do
     @object_lena.expects(:retrieve).returns(true)
     assert @object_lena.exists?
@@ -157,18 +166,18 @@ 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"
@@ -176,7 +185,7 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
-  test "copy" do
+  test "replace" 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)
 
     new_object = @object_lena.copy(:key => "Lena-copy.png")
@@ -184,4 +193,13 @@ class ObjectTest < Test::Unit::TestCase
     assert_equal "Lena-copy.png", new_object.key
     assert_equal "Lena.png", @object_lena.key
   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 => "COPY" }).returns(@response_xml)
+
+    new_object = @object_lena.copy(:key => "Lena-copy.png", :replace => false)
+
+    assert_equal "Lena-copy.png", new_object.key
+    assert_equal "Lena.png", @object_lena.key
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scashin133-s3
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -16,22 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -07:00
-default_executable: 
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 0
+        version: 0.2.0
   requirement: *id001
-  name: proxies
   prerelease: false
+  name: proxies
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -45,8 +46,8 @@ dependencies:
         - 0
         version: "2.0"
   requirement: *id002
-  name: test-unit
   prerelease: false
+  name: test-unit
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -59,8 +60,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  name: mocha
   prerelease: false
+  name: mocha
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -75,8 +76,8 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id004
-  name: bundler
   prerelease: false
+  name: bundler
   type: :development
 description: "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
 email: 
@@ -95,8 +96,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- extra/s3_attachment_fu.rb
-- extra/s3_paperclip.rb
 - lib/s3.rb
 - lib/s3/bucket.rb
 - lib/s3/buckets_extension.rb
@@ -116,7 +115,6 @@ files:
 - test/service_test.rb
 - test/signature_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://jah.pl/projects/s3.html
 licenses: []
 
@@ -148,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scashin133-s3
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library for accessing S3 objects and buckets

data/extra/s3_attachment_fu.rb

@@ -1,159 +0,0 @@
-require "singleton"
-require "s3"
-
-# S3 Backend for attachment-fu plugin. After installing attachment-fu
-# plugin, copy the file to:
-# +vendor/plugins/attachment-fu/lib/technoweenie/attachment_fu/backends+
-#
-# To configure S3Backend create initializer file in your Rails
-# application, e.g. +config/initializers/s3_backend.rb+.
-#
-#   Technoweenie::AttachmentFu::Backends::S3Backend.configuration do |config|
-#     config.access_key_id = "..." # your access key id
-#     config.secret_access_key = "..." # your secret access key
-#     config.bucket_name = "..." # default bucket name to store attachments
-#     config.use_ssl = false # pass true if you want to communicate via SSL
-#   end
-
-module Technoweenie
-  module AttachmentFu
-    module Backends
-      module S3Backend
-
-        # S3Backend configuration class
-        class Configuration
-          include Singleton
-
-          ATTRIBUTES = [:access_key_id, :secret_access_key, :use_ssl, :bucket_name]
-
-          attr_accessor *ATTRIBUTES
-        end
-
-        # Method used to configure S3Backend, see the example above
-        def self.configuration
-          if block_given?
-            yield Configuration.instance
-          end
-          Configuration.instance
-        end
-
-        # :nodoc:
-        def self.included(base)
-          include S3
-
-          service = Service.new(:access_key_id => configuration.access_key_id,
-                                :secret_access_key => configuration.secret_access_key,
-                                :use_ssl => configuration.use_ssl)
-
-          bucket_name = base.attachment_options[:bucket_name] || configuration.bucket_name
-
-          base.cattr_accessor :bucket
-          base.bucket = service.buckets.build(bucket_name) # don't connect
-
-          base.before_update :rename_file
-        end
-
-        # The attachment ID used in the full path of a file
-        def attachment_path_id
-          ((respond_to?(:parent_id) && parent_id) || id).to_s
-        end
-
-        # The pseudo hierarchy containing the file relative to the bucket name
-        # Example: <tt>:table_name/:id</tt>
-        def base_path
-          [attachment_options[:path_prefix], attachment_path_id].join("/")
-        end
-
-        # The full path to the file relative to the bucket name
-        # Example: <tt>:table_name/:id/:filename</tt>
-        def full_filename(thumbnail = nil)
-          [base_path, thumbnail_name_for(thumbnail)].join("/")
-        end
-
-        # All public objects are accessible via a GET request to the S3 servers. You can generate a
-        # url for an object using the s3_url method.
-        #
-        #   @photo.s3_url
-        #
-        # The resulting url is in the form: <tt>http(s)://:server/:bucket_name/:table_name/:id/:file</tt> where
-        # the <tt>:server</tt> variable defaults to <tt>AWS::S3 URL::DEFAULT_HOST</tt> (s3.amazonaws.com) and can be
-        # set using the configuration parameters in <tt>RAILS_ROOT/config/amazon_s3.yml</tt>.
-        #
-        # The optional thumbnail argument will output the thumbnail's filename (if any).
-        def s3_url(thumbnail = nil)
-          if attachment_options[:cname]
-            ["#{s3_protocol}#{bucket.name}", full_filename(thumbnail)].join("/")
-          else
-            ["#{s3_protocol}#{s3_hostname}#{bucket.path_prefix}", full_filename(thumbnail)].join("/")
-          end
-        end
-        alias :public_url :s3_url
-        alias :public_filename :s3_url
-
-        # Name of the bucket used to store attachments
-        def bucket_name
-          self.class.bucket.name
-        end
-
-        # :nodoc:
-        def create_temp_file
-          write_to_temp_file current_data
-        end
-
-        # :nodoc:
-        def current_data
-          # Object.value full_filename, bucket_name
-          object = self.class.bucket.objects.find(full_filename)
-          object.content
-        end
-
-        # Returns http:// or https:// depending on use_ssl setting
-        def s3_protocol
-          attachment_options[:use_ssl] ?  "https://" : "http://"
-        end
-
-        # Returns hostname of the bucket
-        # e.g. +bucketname.com.s3.amazonaws.com+. Additionally you can
-        # pass :cname => true option in has_attachment method to
-        # return CNAME only, e.g. +bucketname.com+
-        def s3_hostname
-          attachment_options[:cname] ? self.class.bucket.name : self.class.bucket.host
-        end
-
-        protected
-
-        # Frees the space in S3 bucket, used by after_destroy callback
-        def destroy_file
-          object = self.class.bucket.objects.find(full_filename)
-          object.destroy
-        end
-
-        # Renames file if filename has been changed - copy the file to
-        # new key and delete old one
-        def rename_file
-          return unless filename_changed?
-
-          old_full_filename = [base_path, filename_was].join("/")
-
-          object = self.class.bucket.objects.find(old_full_filename)
-          new_object = object.copy(:key => full_filename, :acl => attachment_options[:acl])
-          object.destroy
-          true
-        end
-
-        # Saves the file to storage
-        def save_to_storage
-          if save_attachment?
-            object = self.class.bucket.objects.build(full_filename)
-
-            object.content_type = content_type
-            object.acl = attachment_options[:acl]
-            object.content = temp_path ? File.open(temp_path) : temp_data
-            object.save
-          end
-          true
-        end
-      end
-    end
-  end
-end

data/extra/s3_paperclip.rb

@@ -1,157 +0,0 @@
-# S3 backend for paperclip plugin. Copy the file to:
-# +config/initializers/+ directory
-#
-# Example configuration for CNAME bucket:
-#
-#   has_attached_file :image,
-#                     :s3_host_alias => "bucket.domain.tld",
-#                     :url => ":s3_alias_url",
-#                     :styles => {
-#                       :medium => "300x300>",
-#                       :thumb => "100x100>"
-#                     },
-#                     :storage => :s3,
-#                     :s3_credentials => {
-#                       :access_key_id => "...",
-#                       :secret_access_key => "..."
-#                     },
-#                     :bucket => "bucket.domain.tld",
-#                     :path => ":attachment/:id/:style.:extension"
-module Paperclip
-  module Storage
-    module S3
-      def self.extended base
-        begin
-          require "s3"
-        rescue LoadError => e
-          e.message << " (You may need to install the s3 gem)"
-          raise e
-        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_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],
-            :use_ssl => @s3_protocol == "https"
-          ))
-          @bucket = @service.buckets.build(@bucket_name)
-        end
-        Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-        Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol}://s3.amazonaws.com/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-        Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{attachment.path(style).gsub(%r{^/}, "")}"
-        end
-      end
-
-      def expiring_url(style_name = default_style, time = 3600)
-        bucket.objects.build(path(style_name)).temporary_url(Time.now + time)
-      end
-
-      def bucket_name
-        @bucket_name
-      end
-
-      def bucket
-        @bucket
-      end
-
-      def s3_host_alias
-        @s3_host_alias
-      end
-
-      def parse_credentials creds
-        creds = find_credentials(creds).stringify_keys
-        (creds[RAILS_ENV] || creds).symbolize_keys
-      end
-
-      def exists?(style = default_style)
-        if original_filename
-          bucket.objects.build(path(style)).exists?
-        else
-          false
-        end
-      end
-
-      def s3_protocol
-        @s3_protocol
-      end
-
-      # Returns representation of the data of the file assigned to the given
-      # style, in the format most representative of the current storage.
-      def to_file style = default_style
-        return @queued_for_write[style] if @queued_for_write[style]
-        begin
-          file = Tempfile.new(path(style))
-          file.binmode if file.respond_to?(:binmode)
-          file.write(bucket.objects.find(path(style)).content)
-          file.rewind
-        rescue ::S3::Error::NoSuchKey
-          file.close if file.respond_to?(:close)
-          file = nil
-        end
-        file
-      end
-
-      def flush_writes #:nodoc:
-        @queued_for_write.each do |style, file|
-          begin
-            log("saving #{path(style)}")
-            object = bucket.objects.build(path(style))
-            file.rewind
-            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]
-            object.save
-          rescue ::S3::Error::ResponseError => e
-            raise
-          end
-        end
-        @queued_for_write = {}
-      end
-
-      def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
-          begin
-            log("deleting #{path}")
-            bucket.objects.find(path).destroy
-          rescue ::S3::Error::ResponseError
-            # Ignore this.
-          end
-        end
-        @queued_for_delete = []
-      end
-
-      def find_credentials creds
-        case creds
-        when File
-          YAML::load(ERB.new(File.read(creds.path)).result)
-        when String
-          YAML::load(ERB.new(File.read(creds)).result)
-        when Hash
-          creds
-        else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
-        end
-      end
-      private :find_credentials
-
-    end
-  end
-end