uploader 3.0.0 → 3.0.1

data/README.rdoc

@@ -36,7 +36,7 @@ Uploader.configure do |config|
   # These are the settings that will be passed to Paperclip:
   config.has_attached_file_options = {
     :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-    :path    => ":rails_root/public/system/:attachment/:id_partition/:style/:basename.:extension",
+    :path    => ":rails_test/public/system/:attachment/:id_partition/:style/:basename.:extension",
     :styles  => { :icon => "30x30!", 
                   :thumb => "100>", 
                   :small => "150>", 

data/Rakefile

@@ -8,8 +8,8 @@ task :default => :test
 desc 'Test the uploader gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
-  t.libs << 'test/rails_root/test'
-  t.pattern = 'test/rails_root/test/**/*_test.rb'
+  t.libs << 'test/rails_test/test'
+  t.pattern = 'test/rails_test/test/**/*_test.rb'
   t.verbose = true
 end
 
@@ -37,7 +37,7 @@ begin
     gemspec.homepage = "http://github.com/jbasdf/uploader"
     gemspec.description = "Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip"
     gemspec.authors = ["Justin Ball", "Joel Duffin", "David South"]
-    gemspec.files.include %w( test/rails_root/db/schema.rb )
+    gemspec.files.include %w( test/rails_test/db/schema.rb )
     gemspec.rubyforge_project = 'uploader'
     gemspec.add_dependency "mime-types"
     gemspec.add_dependency "rack"

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/uploader/config.rb

@@ -7,7 +7,7 @@
 #     config.keep_local_file = true
 #     config.has_attached_file_options = {
 #       :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-#       :path    => ":rails_root/public/system/:attachment/:id_partition/:style/:basename.:extension",
+#       :path    => ":rails_test/public/system/:attachment/:id_partition/:style/:basename.:extension",
 #       :styles  => { :icon => "30x30!", 
 #                     :thumb => "100>", 
 #                     :small => "150>", 
@@ -49,7 +49,7 @@ module Uploader
       @disable_halt_nonimage_processing = false
       @has_attached_file_options = {
         :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-        :path    => ":rails_root/public/system/:attachment/:id_partition/:style/:basename.:extension",
+        :path    => ":rails_test/public/system/:attachment/:id_partition/:style/:basename.:extension",
         :styles  => { :icon => "30x30!", 
                       :thumb => "100>", 
                       :small => "150>", 

data/lib/uploader/engine.rb

@@ -4,6 +4,10 @@ require 'rails'
 module Uploader
   class Engine < ::Rails::Engine
 
+    def muck_name
+      'uploader'
+    end
+    
     initializer "uploader.add_middleware" do |app|
       app.middleware.insert_before(ActionDispatch::Session::CookieStore, 
                                    Uploader::FlashSessionCookieMiddleware, 

data/test/rails_test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/jbasdf/projects/uploader
   specs:
-    uploader (2.0.2)
+    uploader (3.0.0)
       aws-s3
       mime-types
       paperclip

data/test/rails_test/Rakefile

@@ -3,5 +3,7 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
 
 RailsTest::Application.load_tasks

data/test/rails_test/config/application.rb

@@ -6,10 +6,6 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-require 'ostruct'
-require 'yaml'
-::GlobalConfig = OpenStruct.new(YAML.load_file(File.expand_path('../global_config.yml', __FILE__))[Rails.env])
-
 module RailsTest
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

data/test/rails_test/db/schema.rb

@@ -0,0 +1,47 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20090602041838) do
+
+  create_table "uploads", :force => true do |t|
+    t.integer  "creator_id"
+    t.string   "name"
+    t.string   "caption",             :limit => 1000
+    t.text     "description"
+    t.boolean  "is_public",                           :default => true
+    t.integer  "uploadable_id"
+    t.string   "uploadable_type"
+    t.string   "width"
+    t.string   "height"
+    t.string   "local_file_name"
+    t.string   "local_content_type"
+    t.integer  "local_file_size"
+    t.datetime "local_updated_at"
+    t.string   "remote_file_name"
+    t.string   "remote_content_type"
+    t.integer  "remote_file_size"
+    t.datetime "remote_updated_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "uploads", ["creator_id"], :name => "index_uploads_on_creator_id"
+  add_index "uploads", ["local_content_type"], :name => "index_uploads_on_local_content_type"
+  add_index "uploads", ["uploadable_id"], :name => "index_uploads_on_uploadable_id"
+  add_index "uploads", ["uploadable_type"], :name => "index_uploads_on_uploadable_type"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/rails_test/test/functional/uploads_controller_test.rb

@@ -91,13 +91,26 @@ class UploadsControllerTest < ActionController::TestCase
     end
   end
   context 'on POST to :multiupload' do
-    setup do
-      post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param }
+    context 'js' do
+      setup do
+        post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'js' }
+      end
+      should respond_with :success
+      should "add an upload" do
+        assert_difference "Upload.count", 1 do
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'js' }
+        end
+      end
     end
-    should respond_with :success
-    should "add an upload" do
-      assert_difference "Upload.count", 1 do
-        post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param }
+    context 'json' do
+      setup do
+        post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'json' }
+      end
+      should respond_with :success
+      should "add an upload" do
+        assert_difference "Upload.count", 1 do
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'json' }
+        end
       end
     end
   end

data/test/rails_test/test/unit/user_test.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UserTest < ActiveSupport::TestCase
+
+  context "user" do
+        
+    context 'user instance' do
+      setup do
+        @user = Factory(:user)
+      end
+      
+      should have_many :uploads
+
+      should 'be able to upload' do
+        assert @user.can_upload?(@user)
+      end
+
+      should 'not have methods from uploader mixin' do
+        assert !defined?(User.is_public)
+        assert !defined?(@user.is_image?)
+      end
+ 
+    end
+
+  end
+end

data/uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin", "David South"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-09-16}
   s.description = %q{Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -174,7 +174,6 @@ Gem::Specification.new do |s|
      "test/rails_test/config/environments/development.rb",
      "test/rails_test/config/environments/production.rb",
      "test/rails_test/config/environments/test.rb",
-     "test/rails_test/config/global_config.yml",
      "test/rails_test/config/initializers/backtrace_silencers.rb",
      "test/rails_test/config/initializers/inflections.rb",
      "test/rails_test/config/initializers/mime_types.rb",
@@ -186,6 +185,7 @@ Gem::Specification.new do |s|
      "test/rails_test/db/.keep",
      "test/rails_test/db/migrate/20090517040220_create_uploads.rb",
      "test/rails_test/db/migrate/20090602041838_create_users.rb",
+     "test/rails_test/db/schema.rb",
      "test/rails_test/db/seeds.rb",
      "test/rails_test/doc/README_FOR_APP",
      "test/rails_test/features/step_definitions/webrat_steps.rb",
@@ -292,7 +292,7 @@ Gem::Specification.new do |s|
      "test/rails_test/test/test_helper.rb",
      "test/rails_test/test/unit/.keep",
      "test/rails_test/test/unit/upload_test.rb",
-     "test/rails_test/vendor/plugins/.gitkeep",
+     "test/rails_test/test/unit/user_test.rb",
      "uninstall.rb",
      "uploader.gemspec"
   ]
@@ -333,7 +333,8 @@ Gem::Specification.new do |s|
      "test/rails_test/test/performance/browsing_test.rb",
      "test/rails_test/test/shoulda_macros/paperclip.rb",
      "test/rails_test/test/test_helper.rb",
-     "test/rails_test/test/unit/upload_test.rb"
+     "test/rails_test/test/unit/upload_test.rb",
+     "test/rails_test/test/unit/user_test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uploader
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -06:00
+date: 2010-09-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -243,7 +243,6 @@ files:
 - test/rails_test/config/environments/development.rb
 - test/rails_test/config/environments/production.rb
 - test/rails_test/config/environments/test.rb
-- test/rails_test/config/global_config.yml
 - test/rails_test/config/initializers/backtrace_silencers.rb
 - test/rails_test/config/initializers/inflections.rb
 - test/rails_test/config/initializers/mime_types.rb
@@ -255,6 +254,7 @@ files:
 - test/rails_test/db/.keep
 - test/rails_test/db/migrate/20090517040220_create_uploads.rb
 - test/rails_test/db/migrate/20090602041838_create_users.rb
+- test/rails_test/db/schema.rb
 - test/rails_test/db/seeds.rb
 - test/rails_test/doc/README_FOR_APP
 - test/rails_test/features/step_definitions/webrat_steps.rb
@@ -361,7 +361,7 @@ files:
 - test/rails_test/test/test_helper.rb
 - test/rails_test/test/unit/.keep
 - test/rails_test/test/unit/upload_test.rb
-- test/rails_test/vendor/plugins/.gitkeep
+- test/rails_test/test/unit/user_test.rb
 - uninstall.rb
 - uploader.gemspec
 has_rdoc: true
@@ -430,3 +430,4 @@ test_files:
 - test/rails_test/test/shoulda_macros/paperclip.rb
 - test/rails_test/test/test_helper.rb
 - test/rails_test/test/unit/upload_test.rb
+- test/rails_test/test/unit/user_test.rb

data/test/rails_test/config/global_config.yml

@@ -1,18 +0,0 @@
-#The account plugin needs to be configured.  The following values may be used to customize the account
-
-default: &DEFAULT
-
-  application_url: localhost:3000
-  
-  # session key information
-  session_key: _uploader_session
-  session_secret: ea55c4d5e105735fdfb1caec46711b3dd14ec976d0ba95b4c0f575cb046cc358bce7a335ee36eb29253fb680ef8b838d871f6baeff48220fee8e9e42ab84774b
-
-production:
-  <<: *DEFAULT
-  
-development:
-  <<: *DEFAULT
-  
-test:
-  <<: *DEFAULT