uploader 2.0.2 → 3.0.0

data/lib/uploader/models/upload.rb

@@ -0,0 +1,229 @@
+require 'mime/types'
+
+module Uploader
+  module Models
+    module Upload
+      extend ActiveSupport::Concern
+    
+      included do
+        
+        scope :newest, order("created_at DESC")
+        scope :by_filename, order("local_file_name DESC")
+        scope :newest, order("created_at DESC")
+        scope :is_public, where('is_public = true')
+        scope :images, where("local_content_type IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})")
+        scope :documents, where("local_content_type IN (#{(Uploader::MimeTypeGroups::WORD_TYPES + Uploader::MimeTypeGroups::EXCEL_TYPES + Uploader::MimeTypeGroups::PDF_TYPES).collect{|type| "'#{type}'"}.join(',')})")
+        scope :files, where("local_content_type NOT IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})")
+        scope :recent, lambda { |*args| where("created_at > ?", args.first || 7.days.ago.to_s(:db)) }
+        scope :created_by, lambda { |creator_id| where("creator_id = ?", creator_id) }
+        scope :pending_s3_migrations, where("remote_file_name IS NULL").order('created_at DESC')
+      
+        # Paperclip
+        has_attached_file :local, Uploader.configuration.has_attached_file_options.merge(:storage => :filesystem) # Override any storage settings.  This one has to be local.
+        has_attached_file :remote, Uploader.configuration.has_attached_file_options
+
+        belongs_to :uploadable, :polymorphic => true
+        belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+      
+        before_save :determine_immediate_send_to_remote
+        
+        before_post_process :transliterate_file_name
+        before_post_process :halt_nonimage_processing unless Uploader.configuration.disable_halt_nonimage_processing
+        before_create :add_width_and_height
+      
+        # Protect data in the model
+        attr_protected :creator_id, :uploadable_id, :uploadable_type
+      end
+
+      module ClassMethods
+      
+      end
+        
+      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 Uploader.configuration.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 Uploader.configuration.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

data/lib/uploader.rb

@@ -1,4 +1,6 @@
-require 'active_record/acts/uploader_upload'
+require 'uploader/config'
 require 'uploader/exceptions'
 require 'uploader/mime_type_groups'
-require 'uploader/middleware/flash_session_cookie_middleware'
+require 'uploader/middleware/flash_session_cookie_middleware'
+require 'uploader/models/upload'
+require 'uploader/engine'

data/test/rails_test/Gemfile

@@ -0,0 +1,21 @@
+source "http://rubygems.org"
+
+gem "rails", "3.0.0"
+gem "capybara", ">= 0.3.9"
+gem 'mysql'
+
+gem "mime-types"
+gem "rack"
+gem "paperclip"
+gem "uploader", :path => '../../'
+
+if RUBY_VERSION < '1.9'
+  gem "ruby-debug"
+end
+
+group :test do
+  gem 'shoulda'
+  gem 'factory_girl'
+  gem 'mocha'
+  gem 'redgreen'
+end

data/{Gemfile.lock → test/rails_test/Gemfile.lock}

@@ -1,3 +1,12 @@
+PATH
+  remote: /Users/jbasdf/projects/uploader
+  specs:
+    uploader (2.0.2)
+      aws-s3
+      mime-types
+      paperclip
+      rack
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -30,6 +39,10 @@ GEM
     activesupport (3.0.0)
     arel (1.0.1)
       activesupport (~> 3.0.0)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
     builder (2.1.2)
     capybara (0.3.9)
       culerity (>= 0.2.4)
@@ -53,6 +66,8 @@ GEM
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
+    mocha (0.9.8)
+      rake
     mysql (2.8.1)
     nokogiri (1.4.3.1)
     paperclip (2.3.3)
@@ -78,6 +93,7 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
+    redgreen (1.2.2)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -93,6 +109,7 @@ GEM
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    xml-simple (1.0.12)
 
 PLATFORMS
   ruby
@@ -101,9 +118,12 @@ DEPENDENCIES
   capybara (>= 0.3.9)
   factory_girl
   mime-types
+  mocha
   mysql
   paperclip
   rack
   rails (= 3.0.0)
-  ruby-debug (>= 0.10.3)
+  redgreen
+  ruby-debug
   shoulda
+  uploader!

data/test/rails_test/README

@@ -0,0 +1,256 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.find(:all)
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.com/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |   |-- images
+  |   |-- javascripts
+  |   `-- stylesheets
+  |-- script
+  |   `-- performance
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Contains subdirectories for
+  images, stylesheets, and javascripts. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.

data/test/{rails_root → rails_test}/Rakefile

@@ -1,12 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
 
-require 'uploader/tasks'
+RailsTest::Application.load_tasks

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

@@ -0,0 +1,18 @@
+class DefaultController < ApplicationController
+  
+  before_filter :make_user
+  
+  def index
+    
+  end
+  
+  def uploadify
+    
+  end
+  
+  protected
+    def make_user
+      @user = User.first || User.create
+    end
+    
+end

data/test/{rails_root → rails_test}/app/controllers/uploads_controller.rb

@@ -1,5 +1,5 @@
 class UploadsController < Uploader::UploadsController
-
+  
   def get_redirect(source)
     case source
     when :destroy_success
@@ -16,7 +16,10 @@ class UploadsController < Uploader::UploadsController
   end
   
   def get_upload_text(upload)
-    'nothing needed'
+    %Q{<div>
+      <img src="#{upload.icon}" />
+  	  <a href="#{upload.file.url}">#{upload.file_name}</a>
+  	</div>}
   end
   
 end

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

@@ -0,0 +1,38 @@
+# == 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
+  
+  include Uploader::Models::Upload
+
+  validates_attachment_presence :local
+  validates_attachment_size :local, :less_than => 10.megabytes
+
+  def can_edit?(user)
+    return true
+  end
+
+end