paperclip-s3 1.3.0 → 1.4.0

data/README.textile

@@ -1,18 +1,20 @@
-h1. Paperclip S3 Storage
+h2. Paperclip S3 Storage
 
 This gem will force paperclip to store attachments on S3 if your application is in production. It's great for "Heroku":http://heroku.com apps.
 
-h1. Important Notes
+h2. Important Notes
 
 If you're in fact using "Heroku":http://heroku.com, and you want the attachments to have custom paths. *PLEASE* do not use *RAILS_ROOT*. Why? Every time you deploy your app to "Heroku":http://heroku.com, you're changing the RAILS_ROOT, so all your uploaded files will be lost and your bucket *WILL* be a mess!
 
 A default, Heroku-working path is on by default, so you can just use it.
 
-h1. How to Use
+h2. How to Use
 
-This gem will read your S3 credentials from the server's environment. You will need to provide a secret key, an access key and a bucket. (You can provide an *_s3_credentials_* hash options with *_access_key_id_* and *_secret_access_key_* instead.)
+Add the gem to your Gemfile with <pre>gem "paperclip-s3"</pre> and run <pre>bundle install</pre>.
 
-If you are using "Heroku":http://heroku.com, it's really easy to do this, just
+Then, you'll need to setup some ENV variables. You will need to provide a secret key, an access key and a bucket. (You can provide an *_s3_credentials_* hash options with *_access_key_id_* and *_secret_access_key_* instead.)
+
+If you are using "Heroku":http://heroku.com, you can use the <pre>config:add</pre> command:
 
 <pre>
   heroku config:add S3_BUCKET=your_bucket_name
@@ -26,9 +28,21 @@ If you are using *https* as the S3 Protocol, you can also specify it as a Heroku
   heroku config:add S3_PROTOCOL=https
 </pre>
 
-`Notice that the S3 protocol will default to *http*`
+<b>Notice that the S3 protocol will default to http</b>
+
+You can optionally specify which environments will use S3 with the S3_ENVIRONMENTS variable (using a comma-separated list).
+
+<pre>
+  ENV['S3_ENVIRONMENTS'] = 'staging,production' # defaults to production only
+</pre>
+
+*After you've done this, you can use paperclip normally*. The gem just extends the methods and changes the options to force the S3 Storage. You can *even* use the same options (like path, default_style, etc.)
 
-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.)
+<pre>
+  class User < ActiveRecord::Base
+    has_attached_file :avatar, default_url: "/images/defaults/photo-missing.jpg"
+  end
+</pre>
 
 h2. Contribute
 

data/lib/paperclip-s3/railtie.rb

@@ -14,11 +14,11 @@ module Paperclip
     class Railtie
       def self.insert
         in_production = false
-
+        s3_environments = ENV['S3_ENVIRONMENTS'] ? ENV['S3_ENVIRONMENTS'].split(',') : ['production']
         if (defined?(Rails.env) && Rails.env)
-          in_production = Rails.env.production?
+          in_production = s3_environments.include?(Rails.env)
         elsif (defined?(RAILS_ENV) && RAILS_ENV)
-          in_production = RAILS_ENV =~ /production/
+          in_production = s3_environments.grep(RAILS_ENV)
         end
 
         ActiveRecord::Base.send(:include, Paperclip::S3::Glue) if in_production

data/lib/paperclip-s3/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-s3
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70133354315620 !ruby/object:Gem::Requirement
+  requirement: &70200707906980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70133354315620
+  version_requirements: *70200707906980
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70133354315120 !ruby/object:Gem::Requirement
+  requirement: &70200707905600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70133354315120
+  version_requirements: *70200707905600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70133354314660 !ruby/object:Gem::Requirement
+  requirement: &70200707904840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70133354314660
+  version_requirements: *70200707904840
 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: -1628456512744789545
+      hash: 2328084954864956587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,10 +85,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1628456512744789545
+      hash: 2328084954864956587
 requirements: []
 rubyforge_project: paperclip-s3
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Simple gem that makes paperclip save the attachments on Amazon S3 for a production