rails_uploads 0.1.4 → 0.1.5

data/README.rdoc

@@ -1,4 +1,4 @@
-=== NOTE: From version 0.1.3 and above RailsUploads::Engine renamed Rails::Uploads::Engine
+=== NOTE: From version 0.1.5 and above defaults must be put in public/uploads folder
 
 ---
 
@@ -19,7 +19,7 @@ Then bundle:
 = Usage
 
 Mount the engine at the end of you routes.rb:
-  mount Rails::Uploads::Engine => '/' # Will be use to generate on the fly missing image presets
+  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|
@@ -29,13 +29,13 @@ Add the column to your table (just a string):
 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, the path it's relative to the public folder (used to generate the url)
+    attached_file :prop, :default => 'file.txt' # It's optional set a default file
   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, the path it's relative to the publica folder (used to generate the url)
+    attached_image :prop, :presets => [:small, :big], :default => 'assets/image.jpg' # It's optional set a default image
   end
 
 Define presets in your application.rb

data/app/controllers/rails_uploads/presets_controller.rb

@@ -1,12 +1,17 @@
 module RailsUploads
   class PresetsController < ApplicationController
 
+    layout false
+
     def generate
       filename = "#{params[:image]}.#{params[:format]}"
       preset = params[:preset].gsub('-', '_').to_sym
-      if ::File.exists?(Rails.root.join('public', 'uploads', 'images', 'original', filename)) and Rails.application.config.uploads.presets.has_key?(preset)
-        RailsUploads::Types::Image.new(filename).send :generate_preset, preset
-        redirect_to request.url, :cb => Random.rand(100000)
+      if Rails.application.config.uploads.presets.has_key?(preset)
+        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) and return
+        end
       end
     end
 

data/config/routes.rb

@@ -1,5 +1,5 @@
 RailsUploads::Engine.routes.draw do
 
-  match 'uploads/images/:preset/:image' => 'presets#generate', :status => 404
+  match 'uploads/images/:preset/:image.:format' => 'presets#generate', :status => 404
 
 end

data/lib/rails_uploads/engine.rb

@@ -1,5 +1,5 @@
 module RailsUploads
-  class Engine < ::Rails::Engine
+  class Engine < Rails::Engine
 
     isolate_namespace RailsUploads
 

data/lib/rails_uploads/types/file.rb

@@ -22,7 +22,7 @@ module RailsUploads
         @options = options
       end
 
-      def has_default?
+      def is_default?
         @default
       end
 
@@ -38,17 +38,14 @@ module RailsUploads
         @deleted
       end 
 
-      def default_path(*args)
-        @options[:default]
-      end
-
       def exists?(*args)
-        is_deleted? ? false : ::File.exists?(realpath(*args))
+        return false if is_deleted?
+        ::File.exists? realpath(*args)
       end
 
       def size(*args)
         return 0 if is_deleted?
-        (exists? ? ::File.size(realpath(*args)) : 0)
+        ::File.size realpath(*args)
       end
 
       def extname
@@ -63,12 +60,12 @@ module RailsUploads
 
       def path(*args)
         return nil if is_deleted?
-        ::File.join('', public_path(*args))
+        ::File.join '', public_path(*args)
       end
 
       def url(*args)
         return nil if is_deleted?
-        ::File.join(Rails.application.config.uploads.base_url, path(*args))
+        ::File.join Rails.application.config.uploads.base_url, path(*args)
       end
       
       def realpath(*args)
@@ -78,9 +75,12 @@ module RailsUploads
 
       def store
         if not is_stored? and is_upload?
-          check_store_dir
+          create_dir
+          @upload.rewind # Hack to avoid empty files
           ::File.open(destination_path, 'wb') do |file|
-            file.write(@upload.read)
+            while chunk = @upload.read(16 * 1024)
+              file.write(chunk)
+            end
           end
           @stored = true
           yield if block_given?
@@ -88,7 +88,7 @@ module RailsUploads
       end
       
       def delete
-        if not has_default? and is_stored? and exists?
+        if not is_default? and is_stored? and exists?
           ::File.delete realpath
           yield if block_given?
           @stored = false
@@ -98,17 +98,21 @@ module RailsUploads
        
       protected
 
-      def check_store_dir(*args)
-        dir = Rails.root.join('public', 'uploads', store_path(*args))
+      def base_path
+        Rails.root.join (Rails.env == 'test' and not is_default?) ? 'tmp' : 'public'
+      end
+
+      def create_dir(*args)
+        dir = base_path.join('uploads', store_path(*args))
         FileUtils.mkdir_p dir unless ::File.directory? dir
       end
 
       def destination_path(*args)
-        Rails.root.join('public', public_path(*args))
+        base_path.join public_path(*args)
       end
 
       def public_path(*args)
-        has_default? ? default_path(*args) : ::File.join('uploads', store_path(*args), filename)
+        ::File.join 'uploads', store_path(*args), filename
       end
 
       def store_path(*args)

data/lib/rails_uploads/types/image.rb

@@ -7,11 +7,7 @@ module RailsUploads
       end
 
       def presets
-        (Rails.application.config.uploads.default_presets | (@options[:presets] or []))
-      end
-
-      def default_path(*args)
-        args.any? ? super().reverse.sub('.', "-#{args[0].to_s.gsub('_', '-')}.".reverse).reverse : super()
+        Rails.application.config.uploads.default_presets | (@options[:presets] or [])
       end
       
       def store
@@ -37,7 +33,7 @@ module RailsUploads
       protected
 
       def generate_preset(name)
-        check_store_dir(name)
+        create_dir(name)
         image = RailsUploads::Magick::Image.new(realpath, realpath(name))
         settings = Rails.application.config.uploads.presets[name]
         if settings.is_a? Proc

data/lib/rails_uploads/validators/attachment_content_type_validator.rb

@@ -1,9 +1,9 @@
 class AttachmentContentTypeValidator < RailsUploads::Validators::Base
   
-  # validates :prop, :attachment_content_type => { :in => ['png', 'gif'] }
+  # validates :attr, :attachment_content_type => { :in => ['png', 'gif'] }
   
-  def validate_each(record, attribute, value)  
-    if !has_default?(record, attribute) and value
+  def validate_each(record, attribute, value)
+    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_presence_validator.rb

@@ -1,11 +1,11 @@
 class AttachmentPresenceValidator < RailsUploads::Validators::Base
   
-  # validates :prop, :attachment_presence => true
+  # validates :attr, :attachment_presence => true
   
   def validate_each(record, attribute, value)
-    if !has_default?(record, attribute) and not (value.kind_of? RailsUploads::Types::File and value.exists?)
-      add_error record, attribute, 'errors.messages.attachment_presence'       
-    end      
+    unless value.present? and value.exists?
+      add_error record, attribute, 'errors.messages.attachment_presence'
+    end
   end  
 
 end

data/lib/rails_uploads/validators/attachment_size_validator.rb

@@ -1,9 +1,9 @@
 class AttachmentSizeValidator < RailsUploads::Validators::Base
   
-  # validates :prop, :attachment_size => { :in => 0..4.megabytes }
+  # validates :attr, :attachment_size => { :in => 0..4.megabytes }
   
   def validate_each(record, attribute, value)
-    if !has_default?(record, attribute) and value 
+    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/validators/base.rb

@@ -3,11 +3,6 @@ module RailsUploads
     class Base < ActiveModel::EachValidator
       
       protected
-    
-      def has_default?(record, attribute)
-        options = record.class.instance_variable_get('@attachments')[attribute]
-        options.has_key?(:default)
-      end
       
       def add_error(record, attribute, type, options={})
         record.errors[attribute] << (options[:message] || I18n.t(type, options))        

data/lib/rails_uploads/version.rb

@@ -1,5 +1,5 @@
 module RailsUploads
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
 end

data/test/dummy/app/models/file_upload.rb

@@ -1,4 +1,4 @@
 class FileUpload < ActiveRecord::Base
   attr_accessible :file
-  attached_file :file, :default => 'file.txt'
+  attached_file :file, :default => 'default.txt'
 end

data/test/dummy/app/models/image_upload.rb

@@ -1,4 +1,4 @@
 class ImageUpload < ActiveRecord::Base
   attr_accessible :image
-  attached_image :image, :presets => [:small, :big], :default => 'assets/image.jpg'
+  attached_image :image, :presets => [:small, :big], :default => 'default.jpg'
 end

data/test/dummy/app/models/validation_upload.rb

@@ -1,9 +1,9 @@
 class ValidationUpload < ActiveRecord::Base
   attr_accessible :file_presence, :file_content_type, :file_size, :file_all, :image_presence, :image_content_type, :image_size, :image_all
   attached_file :file_presence, :file_content_type, :file_size, :file_all
-  attached_file :file_default, :default => 'file.txt'
+  attached_file :file_default, :default => 'default.txt'
   attached_image :image_presence, :image_content_type, :image_size, :image_all, :presets => [:big]
-  attached_image :image_default, :presets => [:big, :small], :default => 'assets/image.jpg'
+  attached_image :image_default, :presets => [:big, :small], :default => 'default.jpg'
   validates :file_presence, :attachment_presence => true
   validates :file_content_type, :attachment_content_type => { :in => ['txt'] }
   validates :file_size, :attachment_size => { :less_than => 15.kilobytes, :greater_than => 10.bytes }