paperclip-s3 1.2.0 → 1.3.0

data/README.textile

@@ -20,20 +20,16 @@ If you are using "Heroku":http://heroku.com, it's really easy to do this, just
   heroku config:add S3_SECRET=your_secret_key
 </pre>
 
-Ok, if you're really lazy, you can do that in one line:
+If you are using *https* as the S3 Protocol, you can also specify it as a Heroku environment variable.
 
 <pre>
-  heroku config:add S3_BUCKET=your_bucket_name S3_KEY=your_access_key S3_SECRET=your_secret_key
+  heroku config:add S3_PROTOCOL=https
 </pre>
 
-After you've done this, you can use paperclip normally. The gem just extends this methods and changes the options to force the S3 Storage. You can *even* use the same options (like path, default_style, etc.)
-
+`Notice that the S3 protocol will default to *http*`
 
+After you've done this, you can use paperclip normally. The gem just extends this methods and changes the options to force the S3 Storage. You can *even* use the same options (like path, default_style, etc.)
 
 h2. Contribute
 
 Feel free to fork, fix/patch/extend this. Everything is welcome.
-
-h3. TODO
-
-* Clean the Railtie, specially the Rails.env part.

data/lib/paperclip-s3.rb

@@ -6,7 +6,7 @@ require 'paperclip-s3/railtie'
 module Paperclip
   module S3
     
-    # Use Paperclip::S3::Glue to keep the original gems style
+    # Use Paperclip::S3::Glue to keep the original gem style
     module Glue
       def self.included base
         base.extend ClassMethods
@@ -17,9 +17,11 @@ module Paperclip
       # Extends the paperclips has_attached_file method
       # It will use S3 Storage. The credentials will be read from the environment
       def has_attached_file(name, options = {})
+        s3_protocol = !!ENV["S3_PROTOCOL"] ? ENV["S3_PROTOCOL"] : "http"
         options[:storage] = :s3
         options[:path]    ||= "/:class-:attachment/:id/:style-:basename.:extension"
         options[:bucket]  ||= ENV["S3_BUCKET"]
+        options[:s3_protocol] ||= s3_protocol
         options[:s3_credentials] ||= {
                                         :access_key_id => ENV['S3_KEY'],
                                         :secret_access_key => ENV['S3_SECRET']

data/lib/paperclip-s3/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module S3
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-s3
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70300983208200 !ruby/object:Gem::Requirement
+  requirement: &70133354315620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70300983208200
+  version_requirements: *70133354315620
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70300983200960 !ruby/object:Gem::Requirement
+  requirement: &70133354315120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70300983200960
+  version_requirements: *70133354315120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300983199380 !ruby/object:Gem::Requirement
+  requirement: &70133354314660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70300983199380
+  version_requirements: *70133354314660
 description: The gem will simply extend the has_attached_file to make it store on
   Amazon S3 when the application is on production. Great for Heroku applications.
 email:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1150494502619914125
+      hash: -1628456512744789545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1150494502619914125
+      hash: -1628456512744789545
 requirements: []
 rubyforge_project: paperclip-s3
 rubygems_version: 1.8.10