rails_uploads 0.2.1 → 0.2.2

data/README.rdoc

@@ -22,24 +22,24 @@ ImageMagick must be install, you can install it with homebrew:
   
 = Usage
 
-Mount the engine at the end of you routes.rb:
+Mount the engine at the end of you routes.rb (local storage only):
   mount RailsUploads::Engine => '/' # Will be use to generate on the fly missing image presets
 
 Add the column to your table (just a string):
   create_table :models do |t|
-    t.string :prop
+    t.string :attr
   end
 
 If you need a file:
   class Model < ActiveRecord::Base
-    attr_accessible :prop
-    attached_file :prop, :default => 'file.txt' # It's optional set a default file
+    attr_accessible :attr
+    attached_file :attr, :default => 'file.txt'
   end
 
 If you need a image:
   class Model < ActiveRecord::Base
-    attr_accessible :prop
-    attached_image :prop, :presets => [:small, :big], :default => 'assets/image.jpg' # It's optional set a default image
+    attr_accessible :attr
+    attached_image :attr, :presets => [:small, :big], :default => 'assets/image.jpg'
   end
 
 Define presets in your application.rb
@@ -51,27 +51,14 @@ Define presets in your application.rb
   config.uploads.default_presets = [:small] # Define the default presets for all models with attached images
   config.uploads.storage = :local # The default it's local, you can use :s3 as well
 
-If you want to use S3 create a s3.yml file in your config directory like this:
-  development:
-    bucket: development-bucket
-    access_key_id: development_access_key_id
-    secret_access_key: development_secret_access_key
-
-  test:
-    bucket: test-bucket
-    access_key_id: test_access_key_id
-    secret_access_key: test_secret_access_key
-
-  production:
-    bucket: production-bucket
-    access_key_id: production_access_key_id
-    secret_access_key: production_secret_access_key
+If you want to use S3 create a s3.yml config file with this generator and complete it:
+  rails g uploads:s3:config
 
 The validation works very similar to paperclip:
   class Model < ActiveRecord::Base
-    attr_accessible :prop
-    attached_file :prop
-    validates :prop, :attachment_presence => true, :attachment_size => { :in => 0..4.megabytes }, :attachment_content_type => { :in => ['txt'] }
+    attr_accessible :attr
+    attached_file :attr
+    validates :attr, :attachment_presence => true, :attachment_size => { :in => 0..4.megabytes }, :attachment_content_type => { :in => ['txt'] }
   end
 
 If you want to translate the errores the keys are:
@@ -87,24 +74,29 @@ In your views:
   a{ :href => record.image.url(:big) } # To get the a thumb
 
 In your forms:
-  = f.file_field :prop
+  = f.file_field :attr
 
 = FAQ
 
 == How can I use a cdn with this plugin?
 
-Just define a base url in your application.rb:
+Define a base url in your application.rb:
   config.uploads.base_url = 'http://cdn.example.com'
 
-== Can I automatically create buckets?
+== How can I automatically create buckets?
 
-Yes, use this rake task after create the s3.yml file:
+Use this rake task after create the s3.yml file:
   rake uploads:s3:buckets:create
   
 == How can I clean a preset?
 
-Just remove the corresponding folder in uploads/images manually or with this rake task:
-  rake uploads:preset:clean NAME=preset
+Use this rake task:
+  rake uploads:preset:clean MODEL=models PRESETS=first_preset,second_preset
+
+== How can I refresh a preset?
+
+Use this rake task:
+  rake uploads:preset:refresh MODEL=models PRESETS=first_preset,second_preset
 
 == How to migrate from versions before 0.1.0?
 

data/app/controllers/rails_uploads/presets_controller.rb

@@ -8,7 +8,7 @@ module RailsUploads
         image = RailsUploads::Types::Image.new(filename)
         if image.exists? and !image.exists?(preset)
           image.send :generate_preset, preset
-          redirect_to request.url, :cb => Random.rand(100000)
+          redirect_to image.url(params[:preset]).to_s, :cb => Random.rand(100000)
         end
       end
     end

data/lib/generators/uploads/s3/config_generator.rb

@@ -0,0 +1,13 @@
+module Uploads
+  module S3
+    class ConfigGenerator < Rails::Generators::Base
+      
+      source_root File.expand_path('../templates', __FILE__)
+
+      def install
+        copy_file 's3.yml', 'config/s3.yml'
+      end
+
+    end
+  end
+end

data/lib/generators/uploads/s3/templates/s3.yml

@@ -0,0 +1,16 @@
+
+development:
+  bucket: development-bucket
+  access_key_id: development_access_key_id
+  secret_access_key: development_secret_access_key
+
+test:
+  bucket: test-bucket
+  access_key_id: test_access_key_id
+  secret_access_key: test_secret_access_key
+
+production:
+  bucket: production-bucket
+  access_key_id: production_access_key_id
+  secret_access_key: production_secret_access_key
+

data/lib/rails_uploads/active_record/base.rb

@@ -16,7 +16,7 @@ module RailsUploads
       def check_changed_attachments
         @stored_attachments = []
         @deleted_attachments = []
-        self.class.send(:attachments).each do |attr, options|
+        self.class.attachments.each do |attr, options|
           if changed_attributes.has_key? attr.to_s
             stored = attributes[attr.to_s]
             deleted = changed_attributes[attr.to_s]
@@ -27,7 +27,7 @@ module RailsUploads
       end
       
       def iterate_attachments
-        self.class.send(:attachments).each do |attr, options|
+        self.class.attachments.each do |attr, options|
           next unless instance = send(attr)
           yield instance
         end
@@ -54,6 +54,8 @@ module RailsUploads
       end   
 
       module ClassMethods
+
+        attr_reader :attachments
     
         def self.extended(base)
           [:image].each do |type|
@@ -76,8 +78,6 @@ module RailsUploads
         end
 
         protected
-
-        attr_reader :attachments
         
         def define_attachment(*args)
           options = args.extract_options!

data/lib/rails_uploads/railtie.rb

@@ -10,9 +10,9 @@ module RailsUploads
     initializer 'rails_uploads' do
       ::ActiveRecord::Base.send :include, RailsUploads::ActiveRecord::Base
       if config.uploads.storage == :s3
-        require 'aws-sdk'
+        require 'aws-sdk' 
         RailsUploads::Storages::S3.config = YAML.load_file(Rails.root.join('config', 's3.yml'))
-      end 
+      end
     end
 
   end

data/lib/rails_uploads/storages/local.rb

@@ -2,8 +2,8 @@ module RailsUploads
   module Storages
     class Local
 
-      def initialize(tmp)
-        @tmp = tmp
+      def initialize(default)
+        @tmp = (Rails.env == 'test' and not default)
       end
 
       def exists?(path)

data/lib/rails_uploads/storages/s3.rb

@@ -5,7 +5,14 @@ module RailsUploads
       cattr_accessor :config
 
       def initialize(default)
-        config = self.class.config[default ? Rails.env : 'production']
+        if (Rails.env == 'test' and not default)
+          env = 'test'
+        elsif default
+          env = 'production'
+        else
+          env = Rails.env
+        end
+        config = self.class.config[env]
         AWS.config access_key_id: config['access_key_id'], secret_access_key: config['secret_access_key']
         @bucket = AWS::S3.new.buckets[config['bucket']]
         @tmp = {}
@@ -37,15 +44,15 @@ module RailsUploads
           if upload.present?
             @tmp[source] = upload.path
           else
-            tmp = Tempfile.open('s3', Rails.root.join('tmp')) do |file|
-              object(source).read do |chunk|
-                file.write(chunk)
-              end
-            end
-            @tmp[source] = tmp.path
+            remote = Tempfile.new('s3')
+            remote.binmode
+            object(source).read { |chunk| remote.write(chunk) }
+            remote.close
+            remote.open
+            @tmp[source] = remote.path
           end
         end
-        tmp = Tempfile.new('s3', Rails.root.join('tmp'))
+        tmp = Tempfile.new('s3')
         yield RailsUploads::Magick::Image.new(@tmp[source], tmp.path)
         store tmp, output
       end

data/lib/rails_uploads/types/file.rb

@@ -25,6 +25,10 @@ module RailsUploads
         @options = options
       end
 
+      def is_default?
+        @default
+      end
+
       def exists?(*args)
         return false if is_deleted?
         storage.exists? path(*args)
@@ -78,19 +82,14 @@ module RailsUploads
       protected
 
       def build_storage(type=nil)
-        tmp = (Rails.env == 'test' and not is_default?)
         type = (type or Rails.application.config.uploads.storage)
-        RailsUploads::Storages.const_get(type.to_s.classify).new(tmp)
+        RailsUploads::Storages.const_get(type.to_s.classify).new(is_default?)
       end
 
       def storage
         @storage
       end
 
-      def is_default?
-        @default
-      end
-
       def is_upload?
         @upload != false
       end

data/lib/rails_uploads/types/image.rb

@@ -13,8 +13,6 @@ module RailsUploads
       def delete
         super { presets.each { |name| storage.delete path(name) if exists?(name) } if presets.any? }
       end
-      
-      protected
 
       def generate_preset(name)
         storage.magick destination_path, destination_path(name), @upload do |image|
@@ -32,6 +30,12 @@ module RailsUploads
         end
       end
 
+      def delete_preset(name)
+        storage.delete path(name)
+      end
+
+      protected
+
       def store_path(*args)
         ::File.join('images', (args[0] ? args[0].to_s.gsub('_', '-') : 'original'))
       end

data/lib/rails_uploads/validators/attachment_content_type_validator.rb

@@ -1,7 +1,7 @@
 class AttachmentContentTypeValidator < RailsUploads::Validators::Base
   
   def validate_each(record, attribute, value)
-    if value.present? and not value.send(:is_default?)
+    if value.present? and not value.is_default?
       unless options[:in].include? value.extname.from(1)
         add_error record, attribute, 'errors.messages.attachment_content_type', types: options[:in].join(', ')
       end

data/lib/rails_uploads/validators/attachment_size_validator.rb

@@ -1,7 +1,7 @@
 class AttachmentSizeValidator < RailsUploads::Validators::Base
   
   def validate_each(record, attribute, value)
-    if value.present? and not value.send(:is_default?)
+    if value.present? and not value.is_default?
       if options.has_key? :in
         unless options[:in].include? value.size
           add_error record, attribute, 'attachment_size_in', greater_than: options[:in].begin, less_than: options[:in].end

data/lib/rails_uploads/version.rb

@@ -1,5 +1,5 @@
 module RailsUploads
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
 end

data/lib/tasks/rails_uploads_tasks.rake

@@ -1,4 +1,25 @@
 
+module RailsUploads
+  module Task
+
+    def self.iterate_images
+      model = ENV['MODEL'].classify.constantize
+      presets = ENV['PRESETS'].split(',').map(&:to_sym)
+      model.find_each do |record|
+        model.attachments.each do |attr, options|
+          if options[:type] == :image
+            presets.each do |preset|
+              image = record.send(attr)
+              yield image, preset
+            end
+          end
+        end
+      end
+    end
+
+  end
+end
+
 namespace :uploads do
 
   task :migrate do
@@ -19,12 +40,21 @@ namespace :uploads do
   end
 
   namespace :presets do
+    desc 'Refresh preset'
+    task :refresh => :clean do
+      RailsUploads::Task.iterate_images do |image, preset|
+        puts "Generating preset #{image.url(preset)}."
+        image.generate_preset preset
+      end
+      puts "Presets refreshed successfully."
+    end
     desc 'Clean preset'
-    task :clean, [:preset] do
-      if ENV['NAME'].present?
-        path = Rails.root.join('public', 'uploads', 'images', ENV['NAME'])
-        ::FileUtils.rm_rf path if ::File.directory? path
+    task :clean => :environment do
+      RailsUploads::Task.iterate_images do |image, preset|
+        puts "Deleting preset #{image.url(preset)}."
+        image.delete_preset preset
       end
+      puts "Presets cleaned successfully."
     end
   end
 

data/test/dummy/log/development.log

@@ -20,3 +20,4 @@ Migrating to CreateImageUploads (20130124013431)
    (3.1ms)  commit transaction
    (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml