uploader 0.1.14 → 0.1.15

data/README.rdoc

@@ -55,6 +55,9 @@ We recommend creating a model called upload.rb.  acts_as_uploader accepts all va
     # only allow images:
     # validates_attachment_content_type :file, :content_type => ['image/jpeg', 'image/pjpeg', 'image/jpg']
     
+    # limit uploads to 10 MB
+    # validates_attachment_size :local, :less_than => 10.megabytes
+    
     # The following method is implemented in 'acts_as_uploader'.  This is the method destroy will check to see if
     # the user has permission to delete the object.  Add additional logic as needed or if the existing logic
     # looks fine then feel free to delete this comment and the can_edit? method.
@@ -319,5 +322,10 @@ The following jQuery code will do an ajax delete for you
   }
 
 
+=== Testing
+If you intend to develop code and wish to run the tests you may do so using rake test.  However, note that you will need to install the gem first using
+rake install since the embedded test application will use the gem that is install and not the current code from the project.  This is a limitation
+I attempted to overcome using a special initializer in rails_root/config/initializers/uploader.rb but I didn't have any success getting it working.
+
 
 Copyright (c) 2009 Justin Ball, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/active_record/acts/uploader_upload.rb

@@ -27,21 +27,17 @@ module ActiveRecord
           named_scope :files, :conditions => "local_content_type NOT IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
           named_scope :since, lambda { |*args| { :conditions => ["created_at > ?", (args.first || 7.days.ago.to_s(:db)) ]} }
           named_scope :pending_s3_migration, lambda { { :conditions =>  ["remote_file_name IS NULL AND created_at <= ?", 20.minutes.ago.to_s(:db)], :order => 'created_at DESC' } }
-          
+
           # Paperclip
           has_attached_file :local, options[:has_attached_file].merge(:storage => :filesystem) # Override any storage settings.  This one has to be local.
-          if options[:enable_s3] == true
-            has_attached_file :remote, options[:has_attached_file].merge(:url => ':s3_alias_url',
-                                                                         :path => options[:s3_path],
-                                                                         :storage => :s3)
-          end
-
+          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'
                                         
           class_eval <<-EOV
-            validates_attachment_size :local, :less_than => 10.megabytes
             
             before_post_process :transliterate_file_name
             before_create :add_width_and_height

data/rdoc/created.rid

@@ -1 +1 @@
-Tue, 02 Jun 2009 14:35:39 -0600
+Thu, 04 Jun 2009 14:32:21 -0600

data/rdoc/files/lib/uploader_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Jun 01 22:33:20 -0600 2009</td>
+      <td>Thu Jun 04 14:21:29 -0600 2009</td>
     </tr>
     </table>
   </div>
@@ -73,11 +73,10 @@
       <h3 class="section-bar">Required files</h3>
 
       <div class="name-list">
+      active_record/acts/uploader_upload&nbsp;&nbsp;
       uploader/exceptions&nbsp;&nbsp;
       uploader/mime_type_groups&nbsp;&nbsp;
       uploader/middleware/flash_session_cookie_middleware&nbsp;&nbsp;
-      thoughtbot-paperclip&nbsp;&nbsp;
-      mime/types&nbsp;&nbsp;
       </div>
     </div>
 

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

@@ -1,6 +1,6 @@
 class Upload < ActiveRecord::Base
-
-  acts_as_uploader  :enable_s3 => false,
+  
+  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",
@@ -20,9 +20,10 @@ class Upload < ActiveRecord::Base
                     }
 
   validates_attachment_presence :local
+  validates_attachment_size :local, :less_than => 10.megabytes
 
   def can_edit?(user)
     return true
   end
-  
+
 end

data/test/rails_root/config/environment.rb

@@ -19,4 +19,5 @@ Rails::Initializer.run do |config|
   config.load_paths += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'gems', '*', 'lib'))
   config.time_zone = 'UTC'
   config.gem 'thoughtbot-paperclip',  :version => '~> 2.2.2', :lib => 'paperclip', :source => 'http://gems.github.com'
+  config.gem 'uploader'
 end

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

@@ -1,11 +1,11 @@
 # This simulates loading the uploader gem, but without relying on vendor/gems
 
-path = File.join(File.dirname(__FILE__), *%w(.. .. .. ..))
-lib_path = File.join(path, "lib")
-app_path = File.join(path, "app")
-
-require File.join(app_path, 'helpers', 'uploader_helper')
-
-$LOAD_PATH.unshift(lib_path)
-$LOAD_PATH.unshift(app_path)
-load File.join(path, 'rails', 'init.rb')
+# path = File.join(File.dirname(__FILE__), *%w(.. .. .. ..))
+# lib_path = File.join(path, "lib")
+# app_path = File.join(path, "app")
+# 
+# require File.join(app_path, 'helpers', 'uploader_helper')
+# 
+# $LOAD_PATH.unshift(lib_path)
+# $LOAD_PATH.unshift(app_path)
+# load File.join(path, 'rails', 'init.rb')

data/test/rails_root/test/shoulda_macros/paperclip.rb

@@ -0,0 +1,68 @@
+require 'paperclip/matchers'
+
+module Paperclip
+  # =Paperclip Shoulda Macros
+  #
+  # These macros are intended for use with shoulda, and will be included into
+  # your tests automatically. All of the macros use the standard shoulda
+  # assumption that the name of the test is based on the name of the model
+  # you're testing (that is, UserTest is the test for the User model), and
+  # will load that class for testing purposes.
+  module Shoulda
+    include Matchers
+    # This will test whether you have defined your attachment correctly by
+    # checking for all the required fields exist after the definition of the
+    # attachment.
+    def should_have_attached_file name
+      klass   = self.name.gsub(/Test$/, '').constantize
+      matcher = have_attached_file name
+      should matcher.description do
+        assert_accepts(matcher, klass)
+      end
+    end
+
+    # Tests for validations on the presence of the attachment.
+    def should_validate_attachment_presence name
+      klass   = self.name.gsub(/Test$/, '').constantize
+      matcher = validate_attachment_presence name
+      should matcher.description do
+        assert_accepts(matcher, klass)
+      end
+    end
+
+    # Tests that you have content_type validations specified. There are two
+    # options, :valid and :invalid. Both accept an array of strings. The
+    # strings should be a list of content types which will pass and fail
+    # validation, respectively.
+    def should_validate_attachment_content_type name, options = {}
+      klass   = self.name.gsub(/Test$/, '').constantize
+      valid   = [options[:valid]].flatten
+      invalid = [options[:invalid]].flatten
+      matcher = validate_attachment_content_type(name).allowing(valid).rejecting(invalid)
+      should matcher.description do
+        assert_accepts(matcher, klass)
+      end
+    end
+
+    # Tests to ensure that you have file size validations turned on. You
+    # can pass the same options to this that you can to 
+    # validate_attachment_file_size - :less_than, :greater_than, and :in.
+    # :less_than checks that a file is less than a certain size, :greater_than
+    # checks that a file is more than a certain size, and :in takes a Range or
+    # Array which specifies the lower and upper limits of the file size.
+    def should_validate_attachment_size name, options = {}
+      klass   = self.name.gsub(/Test$/, '').constantize
+      min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
+      max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
+      range   = (min..max)
+      matcher = validate_attachment_size(name).in(range)
+      should matcher.description do
+        assert_accepts(matcher, klass)
+      end
+    end
+  end
+end
+
+class Test::Unit::TestCase #:nodoc:
+ extend  Paperclip::Shoulda
+end

data/test/rails_root/test/test_helper.rb

@@ -9,6 +9,7 @@ require 'ruby-debug'
 require 'mocha'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
+require File.join(File.dirname(__FILE__), 'shoulda_macros', 'paperclip')
 class ActiveSupport::TestCase
   
   VALID_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'public/images/rails.png'), 'image/png')

data/test/rails_root/test/unit/upload_test.rb

@@ -1,5 +1,48 @@
 require 'test_helper'
 
-class UploaderTest < ActiveSupport::TestCase
+class UploadTest < ActiveSupport::TestCase
 
-end
+  context 'upload instance' do
+
+    should_belong_to :uploadable
+    should_belong_to :creator
+    
+    should_have_attached_file :local
+    should_have_attached_file :remote
+    should_not_allow_mass_assignment_of :creator_id, :uploadable_id, :uploadable_type
+    should_validate_attachment_size :local, :less_than => 10.megabytes
+
+    should 'use id_partitioning' do
+      upload = Upload.new
+      upload.stubs(:id).returns(12345)
+      upload.local = VALID_FILE
+      assert_equal "#{RAILS_ROOT}/public/system/locals/000/012/345/original/rails.png", upload.local.path
+      assert_equal '/system/locals/000/012/345/original/rails.png', upload.local.url(:original, false)
+    end
+
+    should 'transliterate the filename' do
+      upload = Upload.new
+      file = fixture_file %Q{IT'sUPPERCASE!AND WeIRD.JPG}
+      upload.local = file
+      assert_equal 'it-suppercase-and-weird.jpg', upload.local.original_filename
+      file.close
+    end
+ 
+  end
+
+  # Named scopes
+  should_have_named_scope :newest_first
+  should_have_named_scope :alphabetic
+  should_have_named_scope :recent
+  should_have_named_scope :public
+  should_have_named_scope :images
+  should_have_named_scope :documents
+  should_have_named_scope :files
+  should_have_named_scope :since
+  should_have_named_scope :pending_s3_migration
+  
+  private
+    def fixture_file(name)
+      File.new(File.join(RAILS_ROOT, 'test', 'fixtures', 'files', name), 'rb')
+    end
+end

data/uploader.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "David South"]
@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
      "locales/zh-CN.yml",
      "locales/zh-TW.yml",
      "locales/zh.yml",
-     "pkg/uploader-0.1.13.gem",
      "public/images/SWFUploadButton.png",
      "public/images/file_icons/excel.gif",
      "public/images/file_icons/file.gif",
@@ -223,11 +222,13 @@ Gem::Specification.new do |s|
      "test/rails_root/script/runner",
      "test/rails_root/script/server",
      "test/rails_root/test/factories.rb",
+     "test/rails_root/test/fixtures/files/5k.png",
      "test/rails_root/test/functional/.keep",
      "test/rails_root/test/functional/uploads_controller_test.rb",
      "test/rails_root/test/integration/.keep",
      "test/rails_root/test/mocks/development/.keep",
      "test/rails_root/test/mocks/test/.keep",
+     "test/rails_root/test/shoulda_macros/paperclip.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/upload_test.rb",
@@ -267,6 +268,7 @@ Gem::Specification.new do |s|
      "test/rails_root/script/create_project.rb",
      "test/rails_root/test/factories.rb",
      "test/rails_root/test/functional/uploads_controller_test.rb",
+     "test/rails_root/test/shoulda_macros/paperclip.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/upload_test.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uploader
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Justin Ball
@@ -93,7 +93,6 @@ files:
 - locales/zh-CN.yml
 - locales/zh-TW.yml
 - locales/zh.yml
-- pkg/uploader-0.1.13.gem
 - public/images/SWFUploadButton.png
 - public/images/file_icons/excel.gif
 - public/images/file_icons/file.gif
@@ -250,11 +249,13 @@ files:
 - test/rails_root/script/runner
 - test/rails_root/script/server
 - test/rails_root/test/factories.rb
+- test/rails_root/test/fixtures/files/5k.png
 - test/rails_root/test/functional/.keep
 - test/rails_root/test/functional/uploads_controller_test.rb
 - test/rails_root/test/integration/.keep
 - test/rails_root/test/mocks/development/.keep
 - test/rails_root/test/mocks/test/.keep
+- test/rails_root/test/shoulda_macros/paperclip.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/upload_test.rb
@@ -312,5 +313,6 @@ test_files:
 - test/rails_root/script/create_project.rb
 - test/rails_root/test/factories.rb
 - test/rails_root/test/functional/uploads_controller_test.rb
+- test/rails_root/test/shoulda_macros/paperclip.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/upload_test.rb