paperclip-s3 1.0.0rc1 → 1.0.0

data/README.textile

@@ -1,11 +1,6 @@
-h1. THIS IS NOT WORKING (YET)!
-
-
 h1. Paperclip S3 Storage
 
-This gem will force paperclip to store attachments on S3. It's great for "Heroku":http://heroku.com apps and thats basically why I wrote it.
-
-I was really lazy writing this over and over again, so I just gemed it.
+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
 
@@ -13,6 +8,32 @@ If you're in fact using "Heroku":http://heroku.com, and you want the attachments
 
 A default, Heroku-working path is on by default, so you can just use it.
 
+h1. 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.)
+
+If you are using "Heroku":http://heroku.com, it's really easy to do this, just
+
+<pre>
+  heroku config:add S3_BUCKET=your_bucket_name
+  heroku config:add S3_KEY=your_access_key
+  heroku config:add S3_SECRET=your_secret_key
+</pre>
+
+Ok, if you're really lazy, you can do that in one line:
+
+<pre>
+  heroku config:add S3_BUCKET=your_bucket_name S3_KEY=your_access_key S3_SECRET=your_secret_key
+</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.)
+
+
+
 h2. Contribute
 
-Feel free to fork, fix/patch/extend this. Everything is welcome.
+Feel free to fork, fix/patch/extend this. Everything is welcome.
+
+h3. TODO
+
+* Clean the Railtie, specially the Rails.env part.

data/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "lib", "paperclip-s3")

data/lib/paperclip-s3.rb

@@ -1,22 +1,28 @@
-require 'rails'
 require 'paperclip'
 require 'paperclip-s3/version'
 require 'paperclip-s3/railtie'
 
 
 module Paperclip
-  module S3    
+  module S3
+    
+    # Use Paperclip::S3::Glue to keep the original gems style
+    module Glue
+      def self.included base
+        base.extend ClassMethods
+      end
+    end
+        
     module ClassMethods
       # 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 = {})
-        ActiveRecord::Base.logger.error {"\n\n\n#################################### Hello from S3 Gem"}
         options[:storage] = :s3
-        options[:path]    = "/:class-:attachment/:id/:style-:basename.:extension"
-        options[:bucket]  = ENV["S3_BUCKET"]
-        options[:s3_credentials] = {
-                                      :access_key_id => ENV['S3_KEY'],
-                                      :secret_access_key => ENV['S3_SECRET']
+        options[:path]    ||= "/:class-:attachment/:id/:style-:basename.:extension"
+        options[:bucket]  ||= ENV["S3_BUCKET"]
+        options[:s3_credentials] ||= {
+                                        :access_key_id => ENV['S3_KEY'],
+                                        :secret_access_key => ENV['S3_SECRET']
                                     }
         super(name, options)
       end

data/lib/paperclip-s3/railtie.rb

@@ -1,6 +1,7 @@
 module Paperclip
   module S3
     if defined? Rails::Railtie # Don't break rails 2.x
+      require 'rails'
       class Railtie < Rails::Railtie
         initializer 'paperclip.force_s3_attachment_on_production' do
           ActiveSupport.on_load :active_record do
@@ -12,7 +13,10 @@ module Paperclip
 
     class Railtie
       def self.insert
-        ActiveRecord::Base.send(:extend, Paperclip::S3::ClassMethods)
+        if (defined?(Rails.env) && Rails.env && Rails.env.production?) or
+           (defined?(RAILS_ENV) && RAILS_ENV && RAILS_ENV =~ /production/)
+              ActiveRecord::Base.send(:include, Paperclip::S3::Glue)
+        end
       end 
     end
   end

data/lib/paperclip-s3/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module S3
-    VERSION = "1.0.0rc1"
+    VERSION = "1.0.0"
   end
 end

data/rails/init.rb

@@ -0,0 +1,2 @@
+require 'paperclip-s3/railtie'
+Paperclip::S3::Railtie.insert

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-s3
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 1.0.0rc1
+  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Hock Isaza"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -05:00
+date: 2011-06-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,10 +49,12 @@ files:
 - Gemfile
 - README.textile
 - Rakefile
+- init.rb
 - lib/paperclip-s3.rb
 - lib/paperclip-s3/railtie.rb
 - lib/paperclip-s3/version.rb
 - paperclip-s3.gemspec
+- rails/init.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -71,9 +73,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: paperclip-s3