glebtv-rails-uploader 0.0.8 → 0.1.1

data/README.md

@@ -25,6 +25,9 @@ a little howto for mongoid / carrierwave:
       # DO NOT add this!
       # belongs_to :post
 
+      # optional built-in sorting for rails_admin
+      field :sort, type: Integer
+
       # field name must be 'data'
       mount_uploader :data, CoverUploader
 
@@ -50,6 +53,9 @@ a little howto for mongoid / carrierwave:
     # models/post.rb
     class Post
       include Mongoid::Document
+
+      field :fileupload_guid, type: String
+
       include Uploader::Fileuploads
       has_one :cover, as: :assetable
       fileuploads :cover
@@ -60,16 +66,6 @@ a little howto for mongoid / carrierwave:
 
 ```ruby
 class Album
-  # optional built-in sorting for rails_admin
-  def sort_assets!(order)
-    pos = 0
-    order.each do |pic_id|
-        pic = self.pictures.find(pic_id)
-        pic.sort = (pos+=1)
-        pic.save!
-    end
-  end
-
   has_many :pictures, as: :assetable, dependent: :destroy
   fileuploads :pictures
 
@@ -78,6 +74,7 @@ class Album
   rails_admin do
     edit do
       ...
+      field :fileupload_guid, :hidden # this is needed or else rails_admin sanitizes it away
       field :pictures, :rails_uploader
     end
   end
@@ -110,6 +107,7 @@ end
     rails_admin do
         edit do
           ...
+          field :fileupload_guid, :hidden # this is needed or else rails_admin sanitizes it away
           field :pictures, :rails_uploader
         end
     end

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

@@ -5,9 +5,7 @@
 //= require uploader/jquery.fileupload
 //= require uploader/jquery.fileupload-ui
 
-$('.uploader-dnd-area input[type=file]').trigger("init.uploader");
-
-$('.uploader-files').each(function() {
+$(document).off('init.sort').on('init.sort', '.uploader-files', function() {
     var $t = $(this);
     $t.sortable({
         update: function(event, ui) {
@@ -22,4 +20,6 @@ $('.uploader-files').each(function() {
             })
         }
     })
-});
+});
+
+$('.uploader-dnd-area input[type=file]').trigger("init.uploader");

data/app/controllers/uploader/attachments_controller.rb

@@ -19,10 +19,19 @@ module Uploader
 
     def sort
       @model = params[:assetable_type].safe_constantize
-      @object = @model.find(params[:assetable_id])
 
-      if @object.respond_to?(:sort_assets!)
-        @object.sort_assets!(params[:sort].split('|'))
+      sort = params[:sort].split('|')
+      if params[:assetable_id].blank?
+        @finder = @klass.where(guid: params[:guid])
+      else
+        @finder = @klass.where(assetable_id: params[:assetable_id])
+      end
+
+      @finder.each do |asset|
+        if asset.respond_to?(:sort=)
+          asset.sort = sort.index(asset.id.to_s)
+          asset.save!
+        end
       end
 
       self.status = 200

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

@@ -60,6 +60,7 @@
                 $(this).data("fileupload")
                         ._renderDownload(<%=raw fv.to_json(:root => false) %>)
                         .appendTo(container);
+                container.trigger('init.sort');
                 <% end -%>
             }).trigger("init.uploader");
         });

data/lib/file_size_validator.rb

@@ -1,4 +1,4 @@
-# lib/file_size_validator.rb
+# file_size_validator.rb
 # Based on: https://gist.github.com/795665
 
 class FileSizeValidator < ActiveModel::EachValidator

data/lib/uploader/asset.rb

@@ -15,7 +15,7 @@ module Uploader
     def uploader_create(params, request = nil)
       self.guid = params[:guid]
       self.assetable_type = params[:assetable_type]
-      if self.class.respond_to?(:collection)
+      if self.class.respond_to?(:collection) && !params[:assetable_id].blank?
         self.assetable_id = Moped::BSON::ObjectId.from_string(params[:assetable_id])
       else
         self.assetable_id = params[:assetable_id]

data/lib/uploader/fileuploads.rb

@@ -27,7 +27,7 @@ module Uploader
         unless self.is_a?(ClassMethods)
           include InstanceMethods
           extend ClassMethods
-          
+
           after_save :fileuploads_update, :if => :fileupload_changed?
           
           fileuploads_columns.each { |asset| accepts_nested_attributes_for asset, :allow_destroy => true }

data/lib/uploader/helpers/field_tag.rb

@@ -49,7 +49,7 @@ module Uploader
       end
       
       def values
-        if value.first.respond_to?(:sort)
+        if !value.nil? && value.first.respond_to?(:sort)
           Array.wrap(value).sort_by(&:sort)
         else
           Array.wrap(value)

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.0.8".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: