uploader 2.0.2 → 3.0.0

data/lib/active_record/acts/uploader_upload.rb

@@ -1,279 +0,0 @@
-module ActiveRecord
-  module Acts #:nodoc:
-
-    module UploaderUpload #:nodoc:
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        
-        # options:
-        #   S3_no_wait - Immediately send files to S3 instead of waiting for an aysnc process to send them over.
-        #   keep_local_file - If using S3 determines whether or not to keep files local as well as sending to S3.
-        #
-        # acts_as_uploader requires an option for :has_attached_file.  These values will be passed to paperclip.
-        # i.e.
-        # acts_as_uploader :has_attached_file => {
-        # :url     => "/uploads/:class/:id/:style_:basename.:extension",
-        # :path    => ":rails_root/public/uploads/:class/:id/:style_:basename.:extension",
-        # :styles  => { :icon => "30x30!", :thumb => "100>", :small => "150>", :medium => "300>", :large => "660>"},
-        # :default_url => "/images/profile_default.jpg" },
-        # :disable_halt_nonimage_processing => false
-        #
-        # disable_halt_nonimage_processing - By default all post processing is turned off for non image files.  This is useful if you want to setup styles to generate thumbnails for
-        #                                    images but don't want the default Geometry processor to die on non-image files.
-        def acts_as_uploader(options = {})
-
-          default_options = {
-            :S3_no_wait => false,
-            :keep_local_file => true
-          }
-          
-          options = default_options.merge(options)
-          
-          #Named scopes
-          named_scope :newest, :order => "created_at DESC"
-          named_scope :by_filename, :order => "local_file_name DESC"
-          named_scope :newest, :order => "created_at DESC"
-          named_scope :public, :conditions => 'is_public = true'
-          named_scope :images, :conditions => "local_content_type IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
-          named_scope :documents, :conditions => "local_content_type IN (#{(Uploader::MimeTypeGroups::WORD_TYPES + Uploader::MimeTypeGroups::EXCEL_TYPES + Uploader::MimeTypeGroups::PDF_TYPES).collect{|type| "'#{type}'"}.join(',')})" 
-          named_scope :files, :conditions => "local_content_type NOT IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
-          named_scope :recent, lambda { |*args| { :conditions => ["created_at > ?", (args.first || 7.days.ago.to_s(:db)) ]} }
-          named_scope :created_by, lambda { |*args| { :conditions => ["creator_id = ?", (args.first) ]} }
-          named_scope :pending_s3_migrations, lambda { { :conditions =>  ["remote_file_name IS NULL"], :order => 'created_at DESC' } }
-
-          @uploader_s3_no_wait = options.delete(:S3_no_wait)
-          @uploader_keep_file_local = options.delete(:keep_local_file)
-          
-          # Paperclip
-          has_attached_file :local, options[:has_attached_file].merge(:storage => :filesystem) # Override any storage settings.  This one has to be local.
-          has_attached_file :remote, options[:has_attached_file].merge(:url => ':s3_alias_url',
-                                                                       :path => options[:s3_path],
-                                                                       :storage => :s3)
-
-          belongs_to :uploadable, :polymorphic => true
-          belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
-          
-          before_save :determine_immediate_send_to_remote
-                                        
-          class_eval <<-EOV
-            
-            before_post_process :transliterate_file_name
-            before_post_process :halt_nonimage_processing unless options[:disable_halt_nonimage_processing]
-            before_create :add_width_and_height
-            
-            # prevents a user from submitting a crafted form that bypasses activation
-            attr_protected :creator_id, :uploadable_id, :uploadable_type
-          EOV
-
-          include ActiveRecord::Acts::UploaderUpload::InstanceMethods
-          extend ActiveRecord::Acts::UploaderUpload::SingletonMethods
-        end
-      end
-
-      # class methods
-      module SingletonMethods
-
-        def s3_no_wait?
-          @uploader_s3_no_wait
-        end
-        
-        def keep_local_file?
-          @uploader_keep_file_local
-        end
-        
-      end
-      
-      # All the methods available to a record that has had <tt>acts_as_uploader</tt> specified.
-      module InstanceMethods
-        
-        def file
-          local_file_name ? local : remote
-        end
-
-        def file_name
-          remote_file_name || local_file_name
-        end
-        
-        def determine_immediate_send_to_remote
-          if self.class.s3_no_wait?
-            self.remote = local.to_file # This will result in the file being sent to S3
-          end
-        end
-        
-        def send_to_remote
-          if local_file_name
-            self.remote = local.to_file
-            if self.save and remote.original_filename and remote.exists?
-              self.local = nil unless keep_local_file?
-              self.save
-            else
-              false
-            end
-          end
-        end
-        
-        def multiupload_local=(filedata)
-          filedata.content_type = MIME::Types.type_for(filedata.original_filename)[0].to_s
-          self.local = filedata
-        end
-        
-        def is_image?
-          Uploader::MimeTypeGroups::IMAGE_TYPES.include?(self.local_content_type)
-        end
-
-        def is_mp3?
-          Uploader::MimeTypeGroups::MP3_TYPES.include?(self.local_content_type)
-        end
-
-        def is_excel?
-          Uploader::MimeTypeGroups::EXCEL_TYPES.include?(self.local_content_type)
-        end
-
-        def is_pdf?
-          Uploader::MimeTypeGroups::PDF_TYPES.include?(self.local_content_type)
-        end
-
-        def is_word?
-          Uploader::MimeTypeGroups::WORD_TYPES.include?(self.local_content_type)
-        end
-
-        def is_text?
-          Uploader::MimeTypeGroups::TEXT_TYPES.include?(self.local_content_type)
-        end
-        
-        def upload_type
-          if self.is_pdf?
-            'Adobe pdf file'
-          elsif self.is_word?
-            'Word document'
-          elsif self.is_image?
-            'photo'
-          elsif self.is_mp3?
-            'mp3'
-          elsif self.is_excel?
-            'Excel document'
-          elsif self.is_text?
-            'text file'
-          else
-            'file'
-          end
-        end
-
-        def icon
-          if self.is_pdf?
-            '/images/file_icons/file_pdf.gif'
-          elsif self.is_word?
-            '/images/file_icons/file_doc.gif'
-          elsif self.is_image?
-            self.file.url(:icon)
-          elsif self.is_mp3?
-            '/images/file_icons/file_mp3.gif'
-          elsif self.is_excel?
-            '/images/file_icons/file_xls.gif'
-          elsif self.is_text?
-            '/images/file_icons/file_txt.gif'
-          else
-            '/images/file_icons/file_raw.gif'
-          end
-        end
-        
-        # Only works for images
-        def thumb
-          if self.is_image?
-            self.file.url(:thumb)
-          end
-        end
-        
-        def display_name
-          CGI::escapeHTML(self.local_file_name)
-        end
-        
-        def can_edit?(check_user)
-          return false if check_user.blank?
-          check_user == self.creator
-        end
-        
-        # Image dimension calculations
-
-        def width(style = :default)
-          return nil unless self[:width]
-          return self[:width] if style == :default
-          calculate_sizes(style.to_sym)
-          return @image_width.to_i
-        end
-
-        def height(style = :default)
-          return nil unless self[:height]
-          return self[:height] if style == :default
-          calculate_sizes(style.to_sym)
-          return @image_height.to_i
-        end
-
-        def size(style = :default)
-          return nil unless width || height
-          return "#{width}x#{height}" if style == :default
-          calculate_sizes(style.to_sym)
-          return @image_size
-        end
-
-        def max_dimension(style)
-          @max_dimension ||= Paperclip::Geometry.parse(self.local.styles[style][:geometry]).width.to_f
-        end
-
-        def image_ratio
-          @image_ratio ||= width.to_f / height.to_f
-        end
-
-        def calculate_sizes(style)
-          if image_ratio > 1
-            @image_width ||= width > max_dimension(style) ? max_dimension(style) : width
-            @image_height ||= (@image_width / image_ratio).round
-          else
-            @image_height ||= height > max_dimension(style) ? max_dimension(style) : height
-            @image_width ||= (@image_height * image_ratio).round
-          end
-          @image_size ||= "#{@image_width.to_i}x#{@image_height.to_i}"
-        end
-        
-        protected
-          def transliterate_file_name
-            extension = File.extname(local_file_name).gsub(/^\.+/, '')
-            filename = local_file_name.gsub(/\.#{extension}$/, '')
-            self.local.instance_write(:file_name, "#{transliterate(filename)}.#{transliterate(extension)}")
-          end
-          
-          def transliterate(str)
-            # Lifted from permalink_fu by Rick Olsen
-            # Escape str by transliterating to UTF-8 with Iconv,
-            # downcasing, then removing illegal characters and replacing them with ’-’
-            s = Iconv.iconv('ascii//ignore//translit', 'utf-8', str).to_s
-            s.downcase!
-            s.gsub!(/\'/, '')
-            s.gsub!(/[^A-Za-z0-9]+/, ' ')
-            s.strip!
-            s.gsub!(/\ +/, '-') # set single or multiple spaces to a single dash
-            return s
-          end
-          
-          def add_width_and_height
-            return unless self.is_image?
-            if self.local.to_file
-              geometry = Paperclip::Geometry.from_file self.local.to_file
-              self[:width] = geometry.width.to_i
-              self[:height] = geometry.height.to_i
-            end
-          end
-          
-          def halt_nonimage_processing
-            if !self.is_image? && self.local.options[:styles]
-              return false
-            end
-          end
-          
-      end 
-    end
-  end
-end

data/lib/uploader/initialize_routes.rb

@@ -1,8 +0,0 @@
-class ActionController::Routing::RouteSet
-  def load_routes_with_uploader!
-    uploader_routes = File.join(File.dirname(__FILE__), *%w[.. .. config uploader_routes.rb])
-    add_configuration_file(uploader_routes) unless configuration_files.include? uploader_routes
-    load_routes_without_uploader!
-  end
-  alias_method_chain :load_routes!, :uploader
-end

data/lib/uploader/tasks.rb

@@ -1,42 +0,0 @@
-require 'rake'
-require 'rake/tasklib'
-require 'fileutils'
-
-module Uploader
-  class Tasks < ::Rake::TaskLib
-    def initialize
-      define
-    end
-  
-    private
-    def define
-      namespace :uploader do
-        
-        task :app_env do
-          Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
-        end
-        
-        desc 'Send all uploads to S3.  (Will only send uploads from a model named Upload)'
-        task :upload_to_s3 do
-          uploads = Upload.pending_s3_migrations
-          uploads.each do |upload|
-            upload.remote = upload.local
-            upload.save!
-          end
-        end
-
-        desc "Sync required files from uploader."
-        task :sync do
-          path = File.join(File.dirname(__FILE__), *%w[.. ..])
-          daemons_path = "#{RAILS_ROOT}/lib/daemons"
-          system "rsync -ruv #{path}/public ."
-          system "rsync -ruv #{path}/db ."
-          FileUtils.mkdir_p(daemons_path) unless File.directory?(daemons_path)          
-          FileUtils.cp_r("#{path}/lib/daemons/amazonaws.rb", "#{RAILS_ROOT}/lib/daemons/amazonaws.rb")
-        end
-        
-      end
-    end
-  end
-end
-Uploader::Tasks.new

data/rails/init.rb

@@ -1,38 +0,0 @@
-begin
-  require 'paperclip'
-rescue LoadError
-  begin
-    gem 'paperclip'
-  rescue Gem::LoadError
-    puts "Please install the paperclip gem"
-  end
-end
-
-begin
-  require 'mime/types'
-rescue LoadError
-  begin
-    gem 'mime-types'
-  rescue Gem::LoadError
-    puts "Please install the mime-types gem"
-  end
-end
-
-require 'uploader'
-require 'uploader/initialize_routes'
-
-ActiveRecord::Base.class_eval { include ActiveRecord::Acts::UploaderUpload }
-ActionController::Base.send :helper, UploaderHelper
-I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
-
-config.after_initialize do
-  if defined?(Rails.application)
-    # Rails 3
-    Rails.application.config.middleware.insert_before(ActionDispatch::Session::CookieStore, Uploader::FlashSessionCookieMiddleware, Rails.application.config.session_options[:key])
-  else
-    # Rails 2
-    ActionController::Dispatcher.middleware.use Uploader::FlashSessionCookieMiddleware, ActionController::Base.session_options[:key]
-  end
-end
-
-

data/tasks/rails.rake

@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../lib/uploader')
-require File.join(File.dirname(__FILE__), '/../lib/uploader/tasks')

data/test/rails_root/Capfile

@@ -1,3 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'

data/test/rails_root/app/controllers/default_controller.rb

@@ -1,12 +0,0 @@
-class DefaultController < ApplicationController
-  
-  def index
-    @user = User.find(params[:user_id]) rescue User.new
-  end
-  
-  def uploadify
-    @user = User.find(params[:user_id]) rescue User.new
-  end
-  
-  
-end

data/test/rails_root/app/models/upload.rb

@@ -1,55 +0,0 @@
-# == Schema Information
-#
-# Table name: uploads
-#
-#  id                  :integer         not null, primary key
-#  creator_id          :integer
-#  name                :string(255)
-#  caption             :string(1000)
-#  description         :text
-#  is_public           :boolean         default(TRUE)
-#  uploadable_id       :integer
-#  uploadable_type     :string(255)
-#  width               :string(255)
-#  height              :string(255)
-#  local_file_name     :string(255)
-#  local_content_type  :string(255)
-#  local_file_size     :integer
-#  local_updated_at    :datetime
-#  remote_file_name    :string(255)
-#  remote_content_type :string(255)
-#  remote_file_size    :integer
-#  remote_updated_at   :datetime
-#  created_at          :datetime
-#  updated_at          :datetime
-#
-
-class Upload < ActiveRecord::Base
-  
-  acts_as_uploader  :enable_s3 => true,
-                    :has_attached_file => {
-                      :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-                      :path    => ":rails_root/public/system/:attachment/:id_partition/:style/:basename.:extension",
-                      :styles  => { :icon => "30x30!", 
-                                    :thumb => "100>", 
-                                    :small => "150>", 
-                                    :medium => "300>", 
-                                    :large => "660>" },
-                      :default_url => "/images/profile_default.jpg",
-                      :storage => :s3,
-                      :s3_credentials => AMAZON_S3_CREDENTIALS,
-                      :bucket => "assets.#{GlobalConfig.application_url}",
-                      :s3_host_alias => "assets.#{GlobalConfig.application_url}",
-                      :convert_options => {
-                         :all => '-quality 80'
-                       }
-                    }
-
-  validates_attachment_presence :local
-  validates_attachment_size :local, :less_than => 10.megabytes
-
-  def can_edit?(user)
-    return true
-  end
-
-end

data/test/rails_root/app/views/default/uploadify.html.erb

@@ -1,17 +0,0 @@
-<h1>Uploadify</h1>
-
-<p>
-  <a href="/">SWFUpload</a> | <a href="/default/uploadify">uploadify</a>
-</p>
-
-<p>Upload One restricted to 10 MB:
-  <%= uploadify_form(@user, true, container_prefix = '', :sizeLimit => 1310720) %>
-</p>
-
-<p>Upload restricted to images:
-  <%= uploadify_form(@user, false, container_prefix = 'a_container_with_a_long_name', :fileExt => '*.jpg', :fileDesc => 'Images') %>
-</p>
-
-<p>Upload With Custom Background Button and rollover:
-  <%= uploadify_form(@user, false, container_prefix = 'background', :buttonImg => '/images/SWFUploadButton.png', :width => 61, :height => 22, :rollover => true) %>
-</p>

data/test/rails_root/config/boot.rb

@@ -1,109 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.1.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!

data/test/rails_root/config/environment.rb

@@ -1,29 +0,0 @@
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
-
-require File.join(File.dirname(__FILE__), 'boot')
-
-# Load a global constant so the initializers can use them
-require 'ostruct'
-require 'yaml'
-
-::GlobalConfig = OpenStruct.new(YAML.load_file("#{RAILS_ROOT}/config/global_config.yml")[RAILS_ENV])
-
-class << GlobalConfig
-  def prepare_options_for_attachment_fu(options)
-    attachment_fu_options = options.symbolize_keys.merge({:storage => options['storage'].to_sym, 
-        :max_size => options['max_size'].to_i.megabytes})
-  end
-end
-
-class TestGemLocator < Rails::Plugin::Locator
-  def plugins
-    Rails::Plugin.new(File.join(File.dirname(__FILE__), *%w(.. .. ..)))
-  end 
-end
-
-Rails::Initializer.run do |config|
-  config.load_paths += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'gems', '*', 'lib'))
-  config.time_zone = 'UTC'
-  config.gem 'paperclip'
-  config.plugin_locators << TestGemLocator
-end

data/test/rails_root/config/environments/development.rb

@@ -1,19 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-config.action_view.debug_rjs                         = true
-
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
-
-HOST = "localhost"

data/test/rails_root/config/environments/production.rb

@@ -1 +0,0 @@
-HOST = "http://example.com"

data/test/rails_root/config/environments/test.rb

@@ -1,27 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = true
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
-
-# Tell ActionMailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
-
-HOST = "localhost"
-
-config.gem 'shoulda', :version => '>= 2.11.3'
-config.gem 'factory_girl', :version => '>= 1.3.2'

data/test/rails_root/config/initializers/requires.rb

@@ -1,13 +0,0 @@
-Dir[File.join(RAILS_ROOT, 'lib', 'extensions', '*.rb')].each do |f|
-  require f
-end
-
-Dir[File.join(RAILS_ROOT, 'lib', '*.rb')].each do |f|
-  require f
-end
-
-# Rails 2 doesn't like mocks
-
-Dir[File.join(RAILS_ROOT, 'test', 'mocks', RAILS_ENV, '*.rb')].each do |f|
-  require f
-end

data/test/rails_root/config/initializers/session_store.rb

@@ -1,8 +0,0 @@
-# Your secret key for verifying cookie session data integrity.
-# If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.session = {
-  :key      => GlobalConfig.session_key,
-  :secret   => GlobalConfig.session_secret
-}