s3 0.3.8 → 0.3.9

data/extra/s3_paperclip.rb

@@ -5,6 +5,7 @@
 #
 #   has_attached_file :image,
 #                     :s3_host_alias => "bucket.domain.tld",
+#                     :s3_headers => { :cache_control => 10.years.from_now.httpdate },
 #                     :url => ":s3_alias_url",
 #                     :styles => {
 #                       :medium => "300x300>",
@@ -47,13 +48,13 @@ module Paperclip
           @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{^/}, "")}"
+          "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{Paperclip::Storage::S3.encode_path(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{^/}, "")}"
+          "#{attachment.s3_protocol}://s3.amazonaws.com/#{attachment.bucket_name}/#{Paperclip::Storage::S3.encode_path(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{^/}, "")}"
+          "#{attachment.s3_protocol}://#{attachment.bucket_name}.s3.amazonaws.com/#{Paperclip::Storage::S3.encode_path(attachment.path(style)).gsub(%r{^/}, "")}"
         end
       end
 
@@ -73,6 +74,11 @@ module Paperclip
         @s3_host_alias
       end
 
+      def content_disposition(style = default_style)
+        cd = @s3_headers[:content_disposition]
+        cd.respond_to?(:call) ? cd.call(self, style) : cd
+      end
+
       def parse_credentials creds
         creds = find_credentials(creds).stringify_keys
         (creds[RAILS_ENV] || creds).symbolize_keys
@@ -109,6 +115,15 @@ module Paperclip
         file
       end
 
+      # Encodes all characters except forward-slash (/) and explicitly legal URL characters
+      def self.encode_path(path)
+        URI.encode(path, /[^#{URI::REGEXP::PATTERN::UNRESERVED}\/]/)
+      end
+
+      def encoded_path(style)
+        Paperclip::Storage::S3.encode_path(path(style))
+      end
+
       def flush_writes #:nodoc:
         @queued_for_write.each do |style, file|
           begin
@@ -119,7 +134,8 @@ module Paperclip
             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.cache_control = @s3_headers[:cache_control]
+            object.content_disposition = content_disposition(style)
             object.content_encoding = @s3_headers[:content_encoding]
             object.save
           rescue ::S3::Error::ResponseError => e

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/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/version.rb

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

metadata

@@ -1,72 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: s3
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.9
   prerelease: 
-  version: 0.3.8
 platform: ruby
-authors: 
-- "Jakub Ku\xC5\xBAma"
+authors:
+- Jakub Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: proxies
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11258640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11258640
+- !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &11258020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11258020
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &11257380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *11257380
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &11256840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-description: "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
-email: 
+  version_requirements: *11256840
+description: ! 'S3 library provides access to Amazon''s Simple Storage Service. It
+  supports both: European and US buckets through REST API.'
+email:
 - qoobaa@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -94,36 +90,28 @@ files:
 - test/service_test.rb
 - test/signature_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://jah.pl/projects/s3.html
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1379753891873581983
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: s3
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library for accessing S3 objects and buckets
 test_files: []
-