glebtv-rails-uploader 0.1.3 → 0.2.0

data/app/controllers/uploader/attachments_controller.rb

@@ -2,17 +2,21 @@
 module Uploader
   class AttachmentsController < ActionController::Metal
     include AbstractController::Callbacks
-  
+
     before_filter :find_klass
-    
+
     def create
       @asset = @klass.new(params[:asset])
       @asset.uploader_create(params, request)
       render_resourse(@asset, 201)
     end
-    
+
     def destroy
-      @asset = @klass.find(params[:id])
+      begin
+        @asset = @klass.find(params[:id])
+      rescue
+        @asset = @klass.where(guid: params[:guid])
+      end
       @asset.uploader_destroy(params, request)
       render_resourse(@asset, 200)
     end
@@ -38,7 +42,7 @@ module Uploader
       self.content_type = "application/json"
       self.response_body = '{"ok": true}'
     end
-    
+
     protected
 
 
@@ -53,20 +57,19 @@ module Uploader
         @klass = params[:klass].blank? ? nil : params[:klass].safe_constantize
         raise ActionController::RoutingError.new("Class not found #{params[:klass]}") if @klass.nil?
       end
-      
+
       def render_resourse(record, status = 200)
         if record.errors.empty?
           if record.respond_to?(:to_jq_upload)
-            render_json(record.to_jq_upload.to_json(:root => false), status)
+            render_json({'files' => Array.wrap(record.to_jq_upload)}.to_json, status)
           else
-            render_json([record].to_json(:root => false), status)
+            render_json({'files' => Array.wrap(record)}.to_json, status)
           end
-
         else
           render_json([record.errors].to_json, 422)
         end
       end
-      
+
       def render_json(body, status = 200)
         self.status = status
         self.content_type = "application/json"

data/app/views/rails_admin/main/_form_rails_uploader.haml

@@ -1,10 +1,10 @@
-= stylesheet_link_tag "uploader/application.css"
-= form.send 'uploader_field', field.method_name, field.html_attributes
-: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/rails_admin.js";
-    fjs.parentNode.appendChild(js);
+= stylesheet_link_tag "uploader/application.css"
+= form.send 'uploader_field', field.method_name, field.html_attributes
+: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/rails_admin.js";
+    fjs.parentNode.appendChild(js);
   }(document, 'script', 'uploader-jssdk'));

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

@@ -37,7 +37,6 @@
 
             $('#<%= field.id %> input[type="file"]').attr('name', 'uploader_field').bind("init.uploader", function (e) {
                 if (!$.fn.fileupload) {
-                    // not yet loaded
                     return false;
                 }
 
@@ -56,7 +55,7 @@
                 });
 
                 <% if field.exists? -%>
-                <% fv = field.values.map { |v| v.respond_to?(:to_jq_upload) ? v.to_jq_upload.first : v } %>
+                <% fv = field.values.map { |v| v.respond_to?(:to_jq_upload) ? v.to_jq_upload : v } %>
                 $(this).data("fileupload")
                         ._renderDownload(<%=raw fv.to_json(:root => false) %>)
                         .appendTo(container);

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

@@ -3,7 +3,7 @@
 {% for (var i=0, file; file=o.files[i]; i++) { %}
   <div class="attach_item template-download" data-id="{%=file.id%}">
 		<div class="delete">
-		  <a href="/" class="del_btn" data-type="DELETE" data-url="/uploader/attachments/{%=file.id%}?klass=<%= field.klass %>"></a>
+      <a href="/" class="del_btn delete" data-type="DELETE" data-url="/uploader/attachments/{%=file.id%}?guid={%= file.guid %}&klass=<%= field.klass %>"></a>
 		</div>
 		<div class="thumbnail preview">
 		  <a href="{%=file.url%}"><img src="{%=file.thumb_url%}" title="{%=file.filename%}" rel="gallery"></a>

data/lib/uploader/asset.rb

@@ -5,7 +5,7 @@ module Uploader
     #
     #   class Asset < ActiveRecord::Base
     #     include Uploader::Asset
-    #     
+    #
     #     def uploader_create(params, request = nil)
     #       self.user = request.env['warden'].user
     #       super
@@ -29,7 +29,7 @@ module Uploader
     #
     #   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

data/lib/uploader/engine.rb

@@ -4,18 +4,18 @@ require 'uploader'
 module Uploader
   class Engine < ::Rails::Engine
     isolate_namespace Uploader
-    
+
     initializer "uploader.assets_precompile" do |app|
       app.config.assets.precompile += Uploader.assets
     end
-    
-    initializer "uploader.helpers" do    
+
+    initializer "uploader.helpers" do
       ActiveSupport.on_load :action_view do
         ActionView::Base.send(:include, Uploader::Helpers::FormTagHelper)
         ActionView::Helpers::FormBuilder.send(:include, Uploader::Helpers::FormBuilder)
       end
     end
-   
+
     initializer "uploader.hooks" do
       require "uploader/hooks/active_record" if Object.const_defined?("ActiveRecord")
       require "uploader/hooks/formtastic"    if Object.const_defined?("Formtastic")

data/lib/uploader/fileuploads.rb

@@ -3,11 +3,11 @@ module Uploader
     def self.included(base)
       base.send :extend, SingletonMethods
     end
-    
+
     module SingletonMethods
       # Join ActiveRecord object with uploaded file
       # Usage:
-      # 
+      #
       #   class Article < ActiveRecord::Base
       #     has_one :picture, :as => :assetable, :dependent => :destroy
       #
@@ -17,37 +17,38 @@ module Uploader
       #
       def fileuploads(*args)
         options = args.extract_options!
-        
+
         class_attribute :fileuploads_options, :instance_writer => false
         self.fileuploads_options = options
-        
+
         class_attribute :fileuploads_columns, :instance_writer => false
         self.fileuploads_columns = args.map(&:to_sym)
-        
+
         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 }
         end
       end
     end
-    
+
     module ClassMethods
       # Update reflection klass by guid
       def fileupload_update(record_id, guid, method)
         query = fileupload_klass(method).where(:guid => guid, :assetable_type => base_class.name.to_s)
+        record_id = Moped::BSON::ObjectId.from_string(record_id) unless record_id.class.name == "Moped::BSON::ObjectId"
         query.update_all(:assetable_id => record_id, :guid => nil)
       end
-      
+
       # Find asset by guid
       def fileupload_find(method, guid)
         klass = fileupload_klass(method)
-        klass.where(:guid => guid).first
+        klass.where(:guid => guid)
       end
-      
+
       # Find class by reflection
       def fileupload_klass(method)
         reflect_on_association(method.to_sym).klass
@@ -59,22 +60,22 @@ module Uploader
         end
       end
     end
-    
+
     module InstanceMethods
       # Generate unique key
       def fileupload_guid
         @fileupload_guid ||= Uploader.guid
       end
-      
+
       def fileupload_guid=(value)
         @fileupload_changed = true unless value.blank?
         @fileupload_guid = value.blank? ? nil : value
       end
-      
+
       def fileupload_changed?
         @fileupload_changed === true
       end
-      
+
       def fileupload_multiple?(method)
         association = self.class.reflect_on_association(method.to_sym)
         if association.respond_to?(:collection?)
@@ -83,8 +84,8 @@ module Uploader
           association.macro == :has_many
         end
       end
-      
       # Find or build new asset object
+
       def fileupload_asset(method)
         if fileuploads_columns.include?(method.to_sym)
           asset = new_record? ? self.class.fileupload_find(method, fileupload_guid) : send(method)
@@ -92,13 +93,12 @@ module Uploader
           asset
         end
       end
-      
+
       def fileuploads_columns
         self.class.fileuploads_columns
       end
-      
+
       protected
-      
         def fileuploads_update
           fileuploads_columns.each do |method|
             self.class.fileupload_update(id, fileupload_guid, method)

data/lib/uploader/helpers/field_tag.rb

@@ -3,8 +3,8 @@ module Uploader
     class FieldTag
       attr_reader :template, :object, :theme
 
-      delegate :uploader, :to => :template      
-      
+      delegate :uploader, :to => :template
+
       # Wrapper for render uploader field
       # Usage:
       #
@@ -13,12 +13,11 @@ 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")
         @value = @options.delete(:value) if @options.key?(:value)
-        
+
         @object = @options.delete(:object) if @options.key?(:object)
         @object ||= @template.instance_variable_get("@#{object_name}")
       end
@@ -27,27 +26,27 @@ module Uploader
         locals = { :field => self }.merge(locals)
         @template.render :partial => "uploader/#{@theme}/container", :locals => locals
       end
-      
+
       def id
         @id ||= @template.dom_id(@object, [method_name, 'uploader', @object.fileupload_guid].join('_'))
       end
-      
+
       def method_name
         @options[:method_name]
       end
-      
+
       def object_name
         @options[:object_name]
       end
-      
+
       def multiple?
         @object.fileupload_multiple?(method_name)
       end
-      
+
       def value
         @value ||= @object.fileupload_asset(method_name)
       end
-      
+
       def values
         if !value.nil? && value.respond_to?(:first) && value.first.respond_to?(:sort)
           Array.wrap(value).sort_by(&:sort)
@@ -55,24 +54,24 @@ module Uploader
           Array.wrap(value)
         end
       end
-      
+
       def exists?
         values.map(&:persisted?).any?
       end
-      
+
       def klass
         @klass ||= @object.class.fileupload_klass(method_name)
       end
-      
+
       def attachments_path(options = {})
         options = {
           :guid => @object.fileupload_guid, 
           :assetable_type => @object.class.base_class.name.to_s,
           :klass => klass.to_s
         }.merge(options)
-        
+
         options[:assetable_id] = @object.id if @object.persisted?
-        
+
         uploader.attachments_path(options)
       end
 
@@ -87,7 +86,7 @@ module Uploader
 
         uploader.sort_attachments_path(options)
       end
-      
+
       def input_html
         @input_html ||= {
           :"data-url" => attachments_path, 

data/lib/uploader/helpers/form_builder.rb

@@ -3,7 +3,7 @@ module Uploader
     module FormBuilder
       # Render uploader field
       # Usage:
-      #   
+      #
       #   <%= form_for @article do |f| %>
       #     <%= f.uploader_field :picture %>
       #   <%= end %>

data/lib/uploader/helpers/form_tag_helper.rb

@@ -2,7 +2,7 @@ module Uploader
   module Helpers
     module FormTagHelper
       include ActionView::Helpers::JavaScriptHelper
-      
+
       # A helper that renders file upload container
       #
       #   <%= uploader_field_tag :article, :photo %>

data/lib/uploader/hooks/formtastic.rb

@@ -7,8 +7,7 @@ class UploaderInput
 
   def to_html
     input_wrapping do
-      label_html <<
-          builder.uploader_field(method, input_html_options)
+      label_html << builder.uploader_field(method, input_html_options)
     end
   end
 end

data/lib/uploader/rails_admin/field.rb

@@ -1,28 +1,28 @@
-#require 'rails_admin/config/fields/base'
-module RailsAdmin::Config::Fields::Types
-  class Uploader < RailsAdmin::Config::Fields::Types::Text
-    RailsAdmin::Config::Fields::Types::register(:rails_uploader, self)
-
-    register_instance_option(:config) do
-      {}
-    end
-
-    register_instance_option(:partial) do
-      :form_rails_uploader
-    end
-
-    def scope_type
-      # Use association name if existent
-      if bindings[:form].object_name.scan(/.*\[(.*)_attributes\]/).nil?
-        bindings[:form].object_name
-      else
-        bindings[:form].object_name.scan(/.*\[(.*)_attributes\]/).to_s
-      end
-    end
-
-    def scope_id
-      bindings[:object].id
-    end
-
-  end
+#require 'rails_admin/config/fields/base'
+module RailsAdmin::Config::Fields::Types
+  class Uploader < RailsAdmin::Config::Fields::Types::Text
+    RailsAdmin::Config::Fields::Types::register(:rails_uploader, self)
+
+    register_instance_option(:config) do
+      {}
+    end
+
+    register_instance_option(:partial) do
+      :form_rails_uploader
+    end
+
+    def scope_type
+      # Use association name if existent
+      if bindings[:form].object_name.scan(/.*\[(.*)_attributes\]/).nil?
+        bindings[:form].object_name
+      else
+        bindings[:form].object_name.scan(/.*\[(.*)_attributes\]/).to_s
+      end
+    end
+
+    def scope_id
+      bindings[:object].id
+    end
+
+  end
 end