Bump to pre2

rmetzler · Jun 9, 2011 · 9da31e7 · 9da31e7
1 parent 49226fa
commit 9da31e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lib/paperclip-s3.rb b/lib/paperclip-s3.rb
@@ -2,24 +2,23 @@
 
 module Paperclip
   module S3
-
-    # 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 = {})
-      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']
-                                   }
-      super(name, options)
+    module Zinergia
+      # 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 = {})
+        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']
+                                     }
+        super(name, options)
+      end
     end
 
 
   end
 end
 
-if defined?(ActiveRecord) and defined?(Rails)
-  ActiveRecord::Base.send :extend, Paperclip::S3 if Rails.env.production?
-end
+ActiveRecord::Base.send :extend, Paperclip::S3::Zinergia if Rails.env.production?
diff --git a/lib/paperclip-s3/version.rb b/lib/paperclip-s3/version.rb
@@ -1,5 +1,5 @@
 module Paperclip
   module S3
-    VERSION = "1.0.0pre"
+    VERSION = "1.0.0pre2"
   end
 end