rails-uploader 0.1.0 → 0.1.2

data/README.md

@@ -75,6 +75,29 @@ Find asset by foreign key or guid:
 @user.fileupload_asset(:picture)
 ```
 
+### Mongoid
+
+No parent asset model is required, one only has to `include Uploader::Asset::Mongoid` into the
+model that should act like an asset:
+
+``` ruby
+class Picture
+  include Mongoid::Document
+  include Uploader::Asset::Mongoid
+
+  belongs_to :user
+end
+
+class User
+  include Mongoid::Document
+  include Uploader::Fileuploads
+
+  has_one :picture, :as => :assetable
+
+  fileuploads :picture
+end
+```
+
 ### Include assets
 
 Javascripts:
@@ -113,6 +136,16 @@ or FormBuilder:
 <%= f.input :pictures, :as => :uploader, :input_html => {:sortable => true} %>
 ```
 
+#### Confirming deletions
+
+This is only working in Formtastic and FormBuilder:
+
+``` ruby
+# formtastic
+<%= f.input :picture, :as => :uploader, :confirm_delete => true %>
+# the i18n lookup key would be en.formtastic.delete_confirmations.picture
+```
+
 ## Contributing
 
 1. Fork it

data/app/assets/javascripts/uploader/application.js

@@ -1,9 +1,8 @@
+//= require uploader/jquery.ui.widget
 //= require uploader/locales/en
 //= require uploader/tmpl.min
 //= require uploader/load-image.min
-//= require uploader/jquery.ui.widget
 //= require uploader/jquery.iframe-transport
 //= require uploader/jquery.fileupload
 //= require uploader/jquery.fileupload-ui
-//= require uploader/init
 

data/app/views/uploader/default/_container.html.erb

@@ -4,21 +4,20 @@
   <div class="uploader-files"></div>
   
 	<div class="uploader-dnd-hints">  
-	  <button class="uploader-button gray fileinput-button">
+	  <span class="uploader-button gray fileinput-button">
       <span><%= I18n.t('uploader.button') %></span>
       <%= fields_for field.object do |f| -%>
 	      <%= f.fields_for field.method_name, field.klass.new do |m| -%>
           <%= m.file_field(:data, field.input_html) %>
 	      <% end -%>
 	    <% end -%>
-    </button>
+    </span>
     
 	  <div class="uploader-dnd-hint">
 		  <%= I18n.t('uploader.or') %><span><%= I18n.t('uploader.drop') %></span>
 	  </div>
 	</div>
 	
-	<%= render :partial => "uploader/#{field.theme}/init", :locals => {:field => field} %>
 	<%= render :partial => "uploader/#{field.theme}/upload", :locals => {:field => field} %>
   <%= render :partial => "uploader/#{field.theme}/download", :locals => {:field => field} %>
   <%= render :partial => "uploader/#{field.theme}/sortable", :locals => {:field => field} if field.sortable? %>
@@ -28,7 +27,7 @@
       var uploader, container;
       container = $("#<%= field.id %> div.uploader-files");
       
-      $('#<%= field.id %> input[type="file"]').bind("init.uploader", function(e){
+      $('#<%= field.id %> input[type="file"]').each(function(){
         $(this).fileupload({
           dataType: 'json',
           dropZone: $("#<%= field.id %>"),

data/config/locales/en.yml

@@ -3,3 +3,4 @@ en:
     button: "Choose file"
     drop: "Drag&Drop files here"
     or: "or"
+    confirm_delete: "Are you sure?"

data/lib/uploader/asset.rb

@@ -1,42 +1,85 @@
 module Uploader
   module Asset
-    # Save asset
-    # Usage:
-    #
-    #   class Asset < ActiveRecord::Base
-    #     include Uploader::Asset
-    #     
-    #     def uploader_create(params, request = nil)
-    #       self.user = request.env['warden'].user
-    #       super
-    #     end
-    #   end
-    #
-    def uploader_create(params, request = nil)
-      self.guid = params[:guid]
-      self.assetable_type = params[:assetable_type]
-      self.assetable_id = params[:assetable_id]
-      save
+    def self.included(base)
+      base.send(:include, Uploader::Asset::AssetProcessor)
     end
-    
-    # Destroy asset
-    # Usage (cancan example):
-    #
-    #   class Asset < ActiveRecord::Base
-    #     include Uploader::Asset
-    #     
-    #     def uploader_destroy(params, request = nil)
-    #       ability = Ability.new(request.env['warden'].user)
-    #       if ability.can? :delete, self
-    #         super
-    #       else
-    #         errors.add(:id, :access_denied)
-    #       end
-    #     end
-    #   end
-    #
-    def uploader_destroy(params, request)
-      destroy
+
+    module Mongoid
+      def self.included(base)
+        base.send(:include, Uploader::Asset::AssetProcessor)
+
+        base.instance_eval do
+          field :guid, type: String
+        end
+      end
+
+      def as_json(options = {})
+        json_data = super
+        json_data['filename'] = File.basename(data.path)
+        json_data['size'] = data.file.size
+        json_data['id'] = json_data['_id']
+
+        if data.respond_to?(:thumb)
+          json_data['thumb_url'] = data.thumb.url
+        end
+
+        json_data
+      end
+
+      def assetable_id_format(assetable_id)
+        Moped::BSON::ObjectId.from_string(assetable_id)
+      end
+
+      class << self
+        def include_root_in_json
+          false
+        end
+      end
+    end
+
+    module AssetProcessor
+      # Save asset
+      # Usage:
+      #
+      #   class Asset < ActiveRecord::Base
+      #     include Uploader::Asset
+      #     
+      #     def uploader_create(params, request = nil)
+      #       self.user = request.env['warden'].user
+      #       super
+      #     end
+      #   end
+      #
+      def uploader_create(params, request = nil)
+        self.guid = params[:guid]
+        self.assetable_type = params[:assetable_type]
+        self.assetable_id = assetable_id_format(params[:assetable_id]) if params[:assetable_id]
+        save
+      end
+      
+      # Destroy asset
+      # Usage (cancan example):
+      #
+      #   class Asset < ActiveRecord::Base
+      #     include Uploader::Asset
+      #     
+      #     def uploader_destroy(params, request = nil)
+      #       ability = Ability.new(request.env['warden'].user)
+      #       if ability.can? :delete, self
+      #         super
+      #       else
+      #         errors.add(:id, :access_denied)
+      #       end
+      #     end
+      #   end
+      #
+      def uploader_destroy(params, request)
+        destroy
+      end
+    end
+
+    def assetable_id_format(assetable_id)
+      assetable_id
     end
   end
 end

data/lib/uploader/fileuploads.rb

@@ -3,7 +3,17 @@ module Uploader
     def self.included(base)
       base.send :extend, SingletonMethods
     end
-    
+
+    module Mongoid
+      def self.included(base)
+        base.send :include, Uploader::Fileuploads
+      end
+
+      def self.include_root_in_json
+        false
+      end
+    end
+
     module SingletonMethods
       # Join ActiveRecord object with uploaded file
       # Usage:
@@ -77,7 +87,11 @@ module Uploader
       
       def fileupload_multiple?(method)
         association = self.class.reflect_on_association(method.to_sym)
-        !!(association && association.collection?)
+
+        # many? for Mongoid, :collection? for AR
+        method = association.respond_to?(:many?) ? :many? : :collection?
+
+        !!(association && association.send(method))
       end
       
       # Find or build new asset object

data/lib/uploader/helpers/field_tag.rb

@@ -13,7 +13,7 @@ module Uploader
       #
       def initialize(object_name, method_name, template, options = {}) #:nodoc:
         options = { :object_name => object_name, :method_name => method_name }.merge(options)
-        
+
         @template, @options = template, options.dup
         
         @theme = (@options.delete(:theme) || "default")

data/lib/uploader/hooks/formtastic.rb

@@ -9,4 +9,11 @@ class UploaderInput
       builder.uploader_field(method, input_html_options)
     end
   end
+
+  def input_html_options
+    data = super
+    data[:confirm_delete] = options[:confirm_delete]
+    data[:confirm_message] = localized_string(method, method, :delete_confirmation) || I18n.t('uploader.confirm_delete')
+    data
+  end
 end

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

data/spec/factories/articles.rb

@@ -6,3 +6,4 @@ FactoryGirl.define do
     content "MyText"
   end
 end
+

data/spec/mongoid.yml

@@ -0,0 +1,17 @@
+# Tell Mongoid which environment this configuration is for.
+test:
+  # This starts the session configuration settings. You may have as
+  # many sessions as you like, but you must have at least 1 named
+  # 'default'.
+  sessions:
+    # Define the default session.
+    default:
+      # A session can have any number of hosts. Usually 1 for a single
+      # server setup, and at least 3 for a replica set. Hosts must be
+      # an array of host:port pairs. This session is single server.
+      hosts:
+        - localhost:27017
+      # Define the default database name.
+      database: rails_uploader_test
+  options:
+    include_root_in_json: false

data/spec/mongoid_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+class MongoidArticle
+  include Mongoid::Document
+  include Uploader::Fileuploads
+
+  has_one :mongoid_picture, :as => :assetable
+
+  fileuploads :mongoid_picture
+end
+
+class MongoidPicture
+  include Mongoid::Document
+  include Uploader::Asset::Mongoid
+
+  belongs_to :assetable, polymorphic: true
+end
+
+describe Uploader::Asset::Mongoid do
+  before do
+    @guid = 'guid'
+    @picture = MongoidPicture.create!(:guid => @guid, :assetable_type => 'MongoidArticle')
+  end
+
+  it 'should find asset by guid' do
+    asset = MongoidArticle.fileupload_find("mongoid_picture", @picture.guid)
+    asset.should == @picture
+  end
+
+  it "should update asset target_id by guid" do
+    MongoidArticle.fileupload_update(1000, @picture.guid, :mongoid_picture)
+    @picture.reload
+    @picture.assetable_id.should == 1000
+    @picture.guid.should be_nil
+  end
+
+  after do
+    MongoidPicture.destroy_all
+  end
+end

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ end
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+# Mongoid
+require 'mongoid'
+Mongoid.load!('spec/mongoid.yml')
+
 RSpec.configure do |config|
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers
@@ -39,14 +43,17 @@ RSpec.configure do |config|
   config.mock_with :rspec
   
   config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner[:active_record].strategy = :truncation
+    DatabaseCleaner[:mongoid].strategy = :truncation
   end
 
   config.before(:all) do
-    DatabaseCleaner.start
+    DatabaseCleaner[:active_record].start
+    DatabaseCleaner[:mongoid].start
   end
 
   config.after(:all) do
-    DatabaseCleaner.clean
+    DatabaseCleaner[:active_record].clean
+    DatabaseCleaner[:mongoid].clean
   end
 end

data/vendor/assets/javascripts/uploader/jquery.fileupload-fp.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload File Processing Plugin 1.2.1
+ * jQuery File Upload File Processing Plugin 1.2.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
@@ -62,9 +62,13 @@
             // fileupload widget (via file input selection, drag & drop or add
             // API call). See the basic file upload widget for more information:
             add: function (e, data) {
-                $(this).fileupload('process', data).done(function () {
-                    data.submit();
-                });
+                if (data.autoUpload || (data.autoUpload !== false &&
+                        ($(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload')).options.autoUpload)) {
+                    $(this).fileupload('process', data).done(function () {
+                        data.submit();
+                    });
+                }
             }
         },
 

data/vendor/assets/javascripts/uploader/jquery.fileupload-ui.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload User Interface Plugin 7.3
+ * jQuery File Upload User Interface Plugin 7.4.4
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -263,7 +263,7 @@
             // Callback for upload progress events:
             progress: function (e, data) {
                 if (data.context) {
-                    var progress = parseInt(data.loaded / data.total * 100, 10);
+                    var progress = Math.floor(data.loaded / data.total * 100);
                     data.context.find('.progress')
                         .attr('aria-valuenow', progress)
                         .find('.bar').css(
@@ -275,7 +275,7 @@
             // Callback for global upload progress events:
             progressall: function (e, data) {
                 var $this = $(this),
-                    progress = parseInt(data.loaded / data.total * 100, 10),
+                    progress = Math.floor(data.loaded / data.total * 100),
                     globalProgressNode = $this.find('.fileupload-progress'),
                     extendedProgressNode = globalProgressNode
                         .find('.progress-extended');
@@ -328,15 +328,16 @@
                 var that = $(this).data('blueimp-fileupload') ||
                         $(this).data('fileupload');
                 if (data.url) {
-                    $.ajax(data);
-                    that._adjustMaxNumberOfFiles(1);
+                    $.ajax(data).done(function () {
+                        that._transition(data.context).done(
+                            function () {
+                                $(this).remove();
+                                that._adjustMaxNumberOfFiles(1);
+                                that._trigger('destroyed', e, data);
+                            }
+                        );
+                    });
                 }
-                that._transition(data.context).done(
-                    function () {
-                        $(this).remove();
-                        that._trigger('destroyed', e, data);
-                    }
-                );
             }
         },
 
@@ -422,7 +423,7 @@
 
         _formatTime: function (seconds) {
             var date = new Date(seconds * 1000),
-                days = parseInt(seconds / 86400, 10);
+                days = Math.floor(seconds / 86400);
             days = days ? days + 'd ' : '';
             return days +
                 ('0' + date.getUTCHours()).slice(-2) + ':' +
@@ -519,6 +520,12 @@
                         // so we have to resolve manually:
                         dfd.resolveWith(node);
                     }
+                    node.on('remove', function () {
+                        // If the element is removed before the
+                        // transition finishes, transition events are
+                        // not triggered, resolve manually:
+                        dfd.resolveWith(node);
+                    });
                 },
                 {
                     maxWidth: options.previewMaxWidth,
@@ -595,8 +602,7 @@
             var button = $(e.currentTarget);
             this._trigger('destroy', e, $.extend({
                 context: button.closest('.template-download'),
-                type: 'DELETE',
-                dataType: this.options.dataType
+                type: 'DELETE'
             }, button.data()));
         },
 
@@ -607,7 +613,7 @@
 
         _transition: function (node) {
             var dfd = $.Deferred();
-            if ($.support.transition && node.hasClass('fade')) {
+            if ($.support.transition && node.hasClass('fade') && node.is(':visible')) {
                 node.bind(
                     $.support.transition.end,
                     function (e) {
@@ -632,27 +638,28 @@
             this._on(fileUploadButtonBar.find('.start'), {
                 click: function (e) {
                     e.preventDefault();
-                    filesList.find('.start button').click();
+                    filesList.find('.start').click();
                 }
             });
             this._on(fileUploadButtonBar.find('.cancel'), {
                 click: function (e) {
                     e.preventDefault();
-                    filesList.find('.cancel button').click();
+                    filesList.find('.cancel').click();
                 }
             });
             this._on(fileUploadButtonBar.find('.delete'), {
                 click: function (e) {
                     e.preventDefault();
-                    filesList.find('.delete input:checked')
-                        .siblings('button').click();
+                    filesList.find('.toggle:checked')
+                        .closest('.template-download')
+                        .find('.delete').click();
                     fileUploadButtonBar.find('.toggle')
                         .prop('checked', false);
                 }
             });
             this._on(fileUploadButtonBar.find('.toggle'), {
                 change: function (e) {
-                    filesList.find('.delete input').prop(
+                    filesList.find('.toggle').prop(
                         'checked',
                         $(e.currentTarget).is(':checked')
                     );
@@ -662,7 +669,8 @@
 
         _destroyButtonBarEventHandlers: function () {
             this._off(
-                this.element.find('.fileupload-buttonbar button'),
+                this.element.find('.fileupload-buttonbar')
+                    .find('.start, .cancel, .delete'),
                 'click'
             );
             this._off(
@@ -674,9 +682,9 @@
         _initEventHandlers: function () {
             this._super();
             this._on(this.options.filesContainer, {
-                'click .start a': this._startHandler,
-                'click .cancel a': this._cancelHandler,
-                'click .delete a': this._deleteHandler
+                'click .start': this._startHandler,
+                'click .cancel': this._cancelHandler,
+                'click .delete': this._deleteHandler
             });
             this._initButtonBarEventHandlers();
         },

data/vendor/assets/javascripts/uploader/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.21.1
+ * jQuery File Upload Plugin 5.28.8
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -33,21 +33,6 @@
     $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
     $.support.xhrFormDataFileUpload = !!window.FormData;
 
-    // The form.elements propHook is added to filter serialized elements
-    // to not include file inputs in jQuery 1.9.0.
-    // This hooks directly into jQuery.fn.serializeArray.
-    // For more info, see http://bugs.jquery.com/ticket/13306
-    $.propHooks.elements = {
-        get: function (form) {
-            if ($.nodeName(form, 'form')) {
-                return $.grep(form.elements, function (elem) {
-                    return !$.nodeName(elem, 'input') || elem.type !== 'file';
-                });
-            }
-            return null;
-        }
-    };
-
     // The fileupload widget listens for change events on file input fields defined
     // via fileInput setting and paste or drop events of the given dropZone.
     // In addition to the default jQuery Widget methods, the fileupload widget
@@ -127,6 +112,8 @@
             progressInterval: 100,
             // Interval in milliseconds to calculate progress bitrate:
             bitrateInterval: 500,
+            // By default, uploads are started automatically when adding files:
+            autoUpload: true,
 
             // Additional form data to be sent along with the file uploads can be set
             // using this option, which accepts an array of objects with name and
@@ -151,7 +138,11 @@
             // handlers using jQuery's Deferred callbacks:
             // data.submit().done(func).fail(func).always(func);
             add: function (e, data) {
-                data.submit();
+                if (data.autoUpload || (data.autoUpload !== false &&
+                        ($(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload')).options.autoUpload)) {
+                    data.submit();
+                }
             },
 
             // Other callbacks:
@@ -224,7 +215,7 @@
         ],
 
         _BitrateTimer: function () {
-            this.timestamp = +(new Date());
+            this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
             this.loaded = 0;
             this.bitrate = 0;
             this.getBitrate = function (now, loaded, interval) {
@@ -252,7 +243,7 @@
             if ($.isArray(options.formData)) {
                 return options.formData;
             }
-            if (options.formData) {
+            if ($.type(options.formData) === 'object') {
                 formData = [];
                 $.each(options.formData, function (name, value) {
                     formData.push({name: name, value: value});
@@ -270,10 +261,35 @@
             return total;
         },
 
+        _initProgressObject: function (obj) {
+            var progress = {
+                loaded: 0,
+                total: 0,
+                bitrate: 0
+            };
+            if (obj._progress) {
+                $.extend(obj._progress, progress);
+            } else {
+                obj._progress = progress;
+            }
+        },
+
+        _initResponseObject: function (obj) {
+            var prop;
+            if (obj._response) {
+                for (prop in obj._response) {
+                    if (obj._response.hasOwnProperty(prop)) {
+                        delete obj._response[prop];
+                    }
+                }
+            } else {
+                obj._response = {};
+            }
+        },
+
         _onProgress: function (e, data) {
             if (e.lengthComputable) {
-                var now = +(new Date()),
-                    total,
+                var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
                     loaded;
                 if (data._time && data.progressInterval &&
                         (now - data._time < data.progressInterval) &&
@@ -281,16 +297,19 @@
                     return;
                 }
                 data._time = now;
-                total = data.total || this._getTotal(data.files);
-                loaded = parseInt(
-                    e.loaded / e.total * (data.chunkSize || total),
-                    10
+                loaded = Math.floor(
+                    e.loaded / e.total * (data.chunkSize || data._progress.total)
                 ) + (data.uploadedBytes || 0);
-                this._loaded += loaded - (data.loaded || data.uploadedBytes || 0);
-                data.lengthComputable = true;
-                data.loaded = loaded;
-                data.total = total;
-                data.bitrate = data._bitrateTimer.getBitrate(
+                // Add the difference from the previously loaded state
+                // to the global loaded counter:
+                this._progress.loaded += (loaded - data._progress.loaded);
+                this._progress.bitrate = this._bitrateTimer.getBitrate(
+                    now,
+                    this._progress.loaded,
+                    data.bitrateInterval
+                );
+                data._progress.loaded = data.loaded = loaded;
+                data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
                     now,
                     loaded,
                     data.bitrateInterval
@@ -301,16 +320,7 @@
                 this._trigger('progress', e, data);
                 // Trigger a global progress event for all current file uploads,
                 // including ajax calls queued for sequential file uploads:
-                this._trigger('progressall', e, {
-                    lengthComputable: true,
-                    loaded: this._loaded,
-                    total: this._total,
-                    bitrate: this._bitrateTimer.getBitrate(
-                        now,
-                        this._loaded,
-                        data.bitrateInterval
-                    )
-                });
+                this._trigger('progressall', e, this._progress);
             }
         },
 
@@ -334,8 +344,14 @@
             }
         },
 
+        _isInstanceOf: function (type, obj) {
+            // Cross-frame instanceof check
+            return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+        },
+
         _initXHRData: function (options) {
-            var formData,
+            var that = this,
+                formData,
                 file = options.files[0],
                 // Ignore non-multipart setting if not supported:
                 multipart = options.multipart || !$.support.xhrFileUpload,
@@ -370,7 +386,7 @@
                         });
                     }
                 } else {
-                    if (options.formData instanceof FormData) {
+                    if (that._isInstanceOf('FormData', options.formData)) {
                         formData = options.formData;
                     } else {
                         formData = new FormData();
@@ -384,12 +400,10 @@
                         formData.append(paramName, options.blob, file.name);
                     } else {
                         $.each(options.files, function (index, file) {
-                            // Files are also Blob instances, but some browsers
-                            // (Firefox 3.6) support the File API but not Blobs.
                             // This check allows the tests to run with
                             // dummy objects:
-                            if ((window.Blob && file instanceof Blob) ||
-                                    (window.File && file instanceof File)) {
+                            if (that._isInstanceOf('File', file) ||
+                                    that._isInstanceOf('Blob', file)) {
                                 formData.append(
                                     options.paramName[index] || paramName,
                                     file,
@@ -434,7 +448,7 @@
                     options.dataType = 'postmessage ' + (options.dataType || '');
                 }
             } else {
-                this._initIframeSettings(options, 'iframe');
+                this._initIframeSettings(options);
             }
         },
 
@@ -495,6 +509,21 @@
             return options;
         },
 
+        // jQuery 1.6 doesn't provide .state(),
+        // while jQuery 1.8+ removed .isRejected() and .isResolved():
+        _getDeferredState: function (deferred) {
+            if (deferred.state) {
+                return deferred.state();
+            }
+            if (deferred.isResolved()) {
+                return 'resolved';
+            }
+            if (deferred.isRejected()) {
+                return 'rejected';
+            }
+            return 'pending';
+        },
+
         // Maps jqXHR callbacks to the equivalent
         // methods of the given Promise object:
         _enhancePromise: function (promise) {
@@ -519,6 +548,36 @@
             return this._enhancePromise(promise);
         },
 
+        // Adds convenience methods to the callback arguments:
+        _addConvenienceMethods: function (e, data) {
+            var that = this;
+            data.submit = function () {
+                if (this.state() !== 'pending') {
+                    data.jqXHR = this.jqXHR =
+                        (that._trigger('submit', e, this) !== false) &&
+                        that._onSend(e, this);
+                }
+                return this.jqXHR || that._getXHRPromise();
+            };
+            data.abort = function () {
+                if (this.jqXHR) {
+                    return this.jqXHR.abort();
+                }
+                return that._getXHRPromise();
+            };
+            data.state = function () {
+                if (this.jqXHR) {
+                    return that._getDeferredState(this.jqXHR);
+                }
+            };
+            data.progress = function () {
+                return this._progress;
+            };
+            data.response = function () {
+                return this._response;
+            };
+        },
+
         // Parses the Range header from the server response
         // and returns the uploaded bytes:
         _getUploadedBytes: function (jqXHR) {
@@ -563,7 +622,8 @@
             // The chunk upload method:
             upload = function () {
                 // Clone the options object for each chunk upload:
-                var o = $.extend({}, options);
+                var o = $.extend({}, options),
+                    currentLoaded = o._progress.loaded;
                 o.blob = slice.call(
                     file,
                     ub,
@@ -585,10 +645,10 @@
                     .done(function (result, textStatus, jqXHR) {
                         ub = that._getUploadedBytes(jqXHR) ||
                             (ub + o.chunkSize);
-                        // Create a progress event if upload is done and no progress
-                        // event has been invoked for this chunk, or there has been
-                        // no progress event with loaded equaling total:
-                        if (!o.loaded || o.loaded < o.total) {
+                        // Create a progress event if no final progress event
+                        // with loaded equaling total has been triggered
+                        // for this chunk:
+                        if (o._progress.loaded === currentLoaded) {
                             that._onProgress($.Event('progress', {
                                 lengthComputable: true,
                                 loaded: ub - o.uploadedBytes,
@@ -640,61 +700,66 @@
                 this._trigger('start');
                 // Set timer for global bitrate progress calculation:
                 this._bitrateTimer = new this._BitrateTimer();
+                // Reset the global progress values:
+                this._progress.loaded = this._progress.total = 0;
+                this._progress.bitrate = 0;
             }
+            // Make sure the container objects for the .response() and
+            // .progress() methods on the data object are available
+            // and reset to their initial state:
+            this._initResponseObject(data);
+            this._initProgressObject(data);
+            data._progress.loaded = data.loaded = data.uploadedBytes || 0;
+            data._progress.total = data.total = this._getTotal(data.files) || 1;
+            data._progress.bitrate = data.bitrate = 0;
             this._active += 1;
             // Initialize the global progress values:
-            this._loaded += data.uploadedBytes || 0;
-            this._total += this._getTotal(data.files);
+            this._progress.loaded += data.loaded;
+            this._progress.total += data.total;
         },
 
         _onDone: function (result, textStatus, jqXHR, options) {
-            if (!this._isXHRUpload(options) || !options.loaded ||
-                    options.loaded < options.total) {
-                var total = this._getTotal(options.files) || 1;
-                // Create a progress event for each iframe load,
-                // or if there has been no progress event with
-                // loaded equaling total for XHR uploads:
+            var total = options._progress.total,
+                response = options._response;
+            if (options._progress.loaded < total) {
+                // Create a progress event if no final progress event
+                // with loaded equaling total has been triggered:
                 this._onProgress($.Event('progress', {
                     lengthComputable: true,
                     loaded: total,
                     total: total
                 }), options);
             }
-            options.result = result;
-            options.textStatus = textStatus;
-            options.jqXHR = jqXHR;
+            response.result = options.result = result;
+            response.textStatus = options.textStatus = textStatus;
+            response.jqXHR = options.jqXHR = jqXHR;
             this._trigger('done', null, options);
         },
 
         _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            options.jqXHR = jqXHR;
-            options.textStatus = textStatus;
-            options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
+            var response = options._response;
             if (options.recalculateProgress) {
                 // Remove the failed (error or abort) file upload from
                 // the global progress calculation:
-                this._loaded -= options.loaded || options.uploadedBytes || 0;
-                this._total -= options.total || this._getTotal(options.files);
+                this._progress.loaded -= options._progress.loaded;
+                this._progress.total -= options._progress.total;
             }
+            response.jqXHR = options.jqXHR = jqXHR;
+            response.textStatus = options.textStatus = textStatus;
+            response.errorThrown = options.errorThrown = errorThrown;
+            this._trigger('fail', null, options);
         },
 
         _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
             // jqXHRorResult, textStatus and jqXHRorError are added to the
             // options object via done and fail callbacks
-            this._active -= 1;
             this._trigger('always', null, options);
-            if (this._active === 0) {
-                // The stop callback is triggered when all uploads have
-                // been completed, equivalent to the global ajaxStop event:
-                this._trigger('stop');
-                // Reset the global progress values:
-                this._loaded = this._total = 0;
-                this._bitrateTimer = null;
-            }
         },
 
         _onSend: function (e, data) {
+            if (!data.submit) {
+                this._addConvenienceMethods(e, data);
+            }
             var that = this,
                 jqXHR,
                 aborted,
@@ -714,32 +779,32 @@
                     }).fail(function (jqXHR, textStatus, errorThrown) {
                         that._onFail(jqXHR, textStatus, errorThrown, options);
                     }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._sending -= 1;
                         that._onAlways(
                             jqXHRorResult,
                             textStatus,
                             jqXHRorError,
                             options
                         );
+                        that._sending -= 1;
+                        that._active -= 1;
                         if (options.limitConcurrentUploads &&
                                 options.limitConcurrentUploads > that._sending) {
                             // Start the next queued upload,
                             // that has not been aborted:
-                            var nextSlot = that._slots.shift(),
-                                isPending;
+                            var nextSlot = that._slots.shift();
                             while (nextSlot) {
-                                // jQuery 1.6 doesn't provide .state(),
-                                // while jQuery 1.8+ removed .isRejected():
-                                isPending = nextSlot.state ?
-                                        nextSlot.state() === 'pending' :
-                                        !nextSlot.isRejected();
-                                if (isPending) {
+                                if (that._getDeferredState(nextSlot) === 'pending') {
                                     nextSlot.resolve();
                                     break;
                                 }
                                 nextSlot = that._slots.shift();
                             }
                         }
+                        if (that._active === 0) {
+                            // The stop callback is triggered when all uploads have
+                            // been completed, equivalent to the global ajaxStop event:
+                            that._trigger('stop');
+                        }
                     });
                     return jqXHR;
                 };
@@ -805,12 +870,9 @@
                 var newData = $.extend({}, data);
                 newData.files = fileSet ? element : [element];
                 newData.paramName = paramNameSet[index];
-                newData.submit = function () {
-                    newData.jqXHR = this.jqXHR =
-                        (that._trigger('submit', e, this) !== false) &&
-                        that._onSend(e, this);
-                    return this.jqXHR;
-                };
+                that._initResponseObject(newData);
+                that._initProgressObject(newData);
+                that._addConvenienceMethods(e, newData);
                 result = that._trigger('add', e, newData);
                 return result;
             });
@@ -987,44 +1049,50 @@
         },
 
         _onPaste: function (e) {
-            var cbd = e.originalEvent.clipboardData,
-                items = (cbd && cbd.items) || [],
+            var items = e.originalEvent && e.originalEvent.clipboardData &&
+                    e.originalEvent.clipboardData.items,
                 data = {files: []};
-            $.each(items, function (index, item) {
-                var file = item.getAsFile && item.getAsFile();
-                if (file) {
-                    data.files.push(file);
+            if (items && items.length) {
+                $.each(items, function (index, item) {
+                    var file = item.getAsFile && item.getAsFile();
+                    if (file) {
+                        data.files.push(file);
+                    }
+                });
+                if (this._trigger('paste', e, data) === false ||
+                        this._onAdd(e, data) === false) {
+                    return false;
                 }
-            });
-            if (this._trigger('paste', e, data) === false ||
-                    this._onAdd(e, data) === false) {
-                return false;
             }
         },
 
         _onDrop: function (e) {
             var that = this,
-                dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer,
+                dataTransfer = e.dataTransfer = e.originalEvent &&
+                    e.originalEvent.dataTransfer,
                 data = {};
             if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
                 e.preventDefault();
+                this._getDroppedFiles(dataTransfer).always(function (files) {
+                    data.files = files;
+                    if (that._trigger('drop', e, data) !== false) {
+                        that._onAdd(e, data);
+                    }
+                });
             }
-            this._getDroppedFiles(dataTransfer).always(function (files) {
-                data.files = files;
-                if (that._trigger('drop', e, data) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
         },
 
         _onDragOver: function (e) {
-            var dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer;
-            if (this._trigger('dragover', e) === false) {
-                return false;
-            }
-            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1) {
-                dataTransfer.dropEffect = 'copy';
-                e.preventDefault();
+            var dataTransfer = e.dataTransfer = e.originalEvent &&
+                e.originalEvent.dataTransfer;
+            if (dataTransfer) {
+                if (this._trigger('dragover', e) === false) {
+                    return false;
+                }
+                if ($.inArray('Files', dataTransfer.types) !== -1) {
+                    dataTransfer.dropEffect = 'copy';
+                    e.preventDefault();
+                }
             }
         },
 
@@ -1084,12 +1152,23 @@
             this._initSpecialOptions();
             this._slots = [];
             this._sequence = this._getXHRPromise(true);
-            this._sending = this._active = this._loaded = this._total = 0;
+            this._sending = this._active = 0;
+            this._initProgressObject(this);
             this._initEventHandlers();
         },
 
-        _destroy: function () {
-            this._destroyEventHandlers();
+        // This method is exposed to the widget API and allows to query
+        // the number of active uploads:
+        active: function () {
+            return this._active;
+        },
+
+        // This method is exposed to the widget API and allows to query
+        // the widget upload progress.
+        // It returns an object with loaded, total and bitrate properties
+        // for the running uploads:
+        progress: function () {
+            return this._progress;
         },
 
         // This method is exposed to the widget API and allows adding files

data/vendor/assets/stylesheets/uploader/default.css

@@ -35,7 +35,7 @@
   line-height: 31px;
 }
 .uploader-button {
-	display: block;
+	display: inline-block;
 	background: #972da0;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#982da1', endColorstr='#892891'); 
 	background: -webkit-linear-gradient(left top, left bottom, #982da1, #892891); 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails HTML5 FileUpload helpers
 email: superp1987@gmail.com
 executables: []
@@ -54,10 +86,8 @@ files:
 - app/views/uploader/default/_upload.html.erb
 - app/views/uploader/default/_sortable.html.erb
 - app/views/uploader/default/_container.html.erb
-- app/views/uploader/default/_init.html.erb
 - app/views/uploader/default/_download.html.erb
 - app/assets/stylesheets/uploader/application.css
-- app/assets/javascripts/uploader/init.js
 - app/assets/javascripts/uploader/application.js
 - app/controllers/uploader/attachments_controller.rb
 - lib/uploader.rb
@@ -134,11 +164,13 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/spec_helper.rb
+- spec/mongoid_spec.rb
 - spec/uploader_spec.rb
 - spec/requests/attachments_controller_spec.rb
 - spec/factories/articles.rb
 - spec/factories/assets.rb
 - spec/factories/files/rails.png
+- spec/mongoid.yml
 - spec/fileuploads_spec.rb
 homepage: https://github.com/superp/rails-uploader
 licenses: []
@@ -160,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails-uploader
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails file upload implementation with jQuery-File-Upload
@@ -204,10 +236,11 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/spec_helper.rb
+- spec/mongoid_spec.rb
 - spec/uploader_spec.rb
 - spec/requests/attachments_controller_spec.rb
 - spec/factories/articles.rb
 - spec/factories/assets.rb
 - spec/factories/files/rails.png
+- spec/mongoid.yml
 - spec/fileuploads_spec.rb
-has_rdoc: 

data/app/assets/javascripts/uploader/init.js

@@ -1,5 +0,0 @@
-(function() {
-  $ = jQuery;
-  $('input[type="file"].uploader').trigger("init.uploader");
-}).call(this);
-

data/app/views/uploader/default/_init.html.erb

@@ -1,9 +0,0 @@
-<script type="text/javascript">
-  (function(d, s, id) {
-    var js, fjs = d.getElementsByTagName(s)[0];
-    if (d.getElementById(id)) return;
-    js = d.createElement(s); js.id = id;
-    js.src = "/assets/uploader/application.js";
-    fjs.parentNode.appendChild(js);
-  }(document, 'script', 'uploader-jssdk'));
-</script>