activeadmin-dropzone 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74480bcea1a316b00f4b781c897db8ae2d634437
-  data.tar.gz: f96b7231b674a67d5a49dc08eed023f24f5103f6
+  metadata.gz: 79023d46a4a0bd3ac710587deeeb8aeeeb1a35f7
+  data.tar.gz: e6751d2a887c04f89711d514f7ef5fbd9af57d4c
 SHA512:
-  metadata.gz: 58682aa89a27c13bf4ed1f19874e31425ca4adc35b9b464955bd9660c726d0bf50a47eb51b3e51540ca089512585d42363842567e97fc10129222e6b331071a0
-  data.tar.gz: 25d7736c92bc3e4f47ec30649577fee5e0026d62534d5c4cac91f4a3f267abbc2017509f6f2f5b9c77d5c2326f9a306baa2b14964ca4b2e60f67c1c290a01db7
+  metadata.gz: 08cf6b8bcbd6ca7cb758909e0fbe3abc2d2f0d11d32fbaf8696cb55cf9784aa992640fb046a02a2bf6a5ffff45dc3b98fb8e1e8df208a31fbba9b5d8d10f2f1b
+  data.tar.gz: 244efdb55a81efa871450bc96930d98eef45e8ce326cf349c1828cd214339a3b1dd5c88ad7c1c28b7650dba61115487a152b14a215b3444c055f7dcc8190404a

data/README.md

@@ -0,0 +1,56 @@
+# activeadmin-dropzone
+
+Easy to use integration of drag&drop files upload via [dropzone.js](http://www.dropzonejs.com) for [ActiveAdmin](http://www.activeadmin.info).
+
+## Requirements
+
+* [ActiveAdmin](http://www.activeadmin.info);
+* [Paperclip](https://github.com/thoughtbot/paperclip) gem;
+* ActiveRecord;
+* Separate models for file's container and files.
+
+## Install
+
+Add line to your Gemfile:
+
+    gem 'activeadmin-dropzone', '~> 0.2.1'
+
+Add `dropzone` to your file container's class: 
+
+    class Post
+        dropzone :images
+    end
+
+Add `dropzone_item` to your file's class:
+
+    class Image
+        dropzone_item
+    end
+
+Add `input` to your ActiveAdmin form:
+
+    f.input :images, as: :dropzone
+ 
+## Configuration
+
+You can customize columns used for upload by passing `Hash` to the `dropzone_item` method. Here are the default values:
+
+    dropzone_item title: :title, 
+                  position: :position, 
+                  data: :data, 
+                  file_size: :file_size, 
+                  url: :url
+
+## Contributing to activeadmin-dropzone
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2014 Maxim Gladkov. See LICENSE.txt for
+further details.

data/Rakefile

@@ -15,10 +15,10 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "activeadmin-dropzone"
-  gem.homepage = "http://github.com/maximgladkov/activeadmin-dropzone"
+  gem.homepage = "http://maximgladkov.com/blog/activeadmin-dropzone-gem"
   gem.license = "MIT"
-  gem.summary = %Q{Gem adds support of dropzone.js for ActiveAdmin}
-  gem.email = "maksim.gladkov@gmail.com"
+  gem.summary = %Q{Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin}
+  gem.email = "contact@maximgladkov.com"
   gem.authors = ["Maxim Gladkov"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.1

data/activeadmin-dropzone.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = "activeadmin-dropzone"
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maxim Gladkov"]
-  s.date = "2014-01-14"
-  s.email = "maksim.gladkov@gmail.com"
+  s.date = "2014-02-25"
+  s.email = "contact@maximgladkov.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".DS_Store",
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "activeadmin-dropzone.gemspec",
@@ -36,18 +36,21 @@ Gem::Specification.new do |s|
     "app/helpers/active_admin/views_helper.rb",
     "app/inputs/dropzone_input.rb",
     "app/views/application/_dropzone.html.erb",
+    "config/locales/en.yml",
+    "config/locales/ru.yml",
     "config/routes.rb",
+    "lib/.DS_Store",
     "lib/activeadmin-dropzone.rb",
     "lib/activeadmin-dropzone/active_record/dropzone.rb",
     "lib/activeadmin-dropzone/engine.rb",
     "test/helper.rb",
     "test/test_activeadmin-dropzone.rb"
   ]
-  s.homepage = "http://github.com/maximgladkov/activeadmin-dropzone"
+  s.homepage = "http://maximgladkov.com/blog/activeadmin-dropzone-gem"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.0.3"
-  s.summary = "Gem adds support of dropzone.js for ActiveAdmin"
+  s.summary = "Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/app/assets/stylesheets/activeadmin-dropzone.css.scss

@@ -1,6 +1,9 @@
 //= require dropzone
 
 .dropzone {
+  margin: 10px 20px; 
+  border: 1px solid #ccc;
+
   a {
     text-decoration: none;
     font-size: 13px;
@@ -26,6 +29,13 @@
   }
 }
 
+.dropzone-hint {
+  margin: 0 0 0 20px; 
+  font-size: 0.95em; 
+  font-style: italic; 
+  color: #666;
+}
+
 .sortable-placeholder {
   position: relative;
   display: inline-block;

data/app/controllers/dropzone_controller.rb

@@ -3,7 +3,8 @@ class DropzoneController < ApplicationController
   def upload
     dropzone_class = params[:dropzone_class].constantize
     dropzone_object = dropzone_class.new
-    dropzone_object.send "#{ dropzone_class.dropzone_field }=", params[:file]
+    dropzone_object.send "#{ dropzone_class.dropzone_field(:type) }=", params[:dropzonable_class] if dropzone_class.dropzone_field?(:type)
+    dropzone_object.send "#{ dropzone_class.dropzone_field(:data) }=", params[:file]
 
     if dropzone_object.save
       render json: dropzone_object.to_json

data/app/helpers/active_admin/views_helper.rb

@@ -1,11 +1,18 @@
 module ActiveAdmin::ViewsHelper
 
   def render_mock_dropzone_files(dropzone_objects)
-    unless dropzone_objects.empty?
-      dropzone_objects.map do |dropzone_object|
-        "{ id: #{ dropzone_object.id }, name: '#{ dropzone_object.send dropzone_object.class.dropzone_title_field }', size: #{ dropzone_object.send dropzone_object.class.dropzone_file_size_field }, url: '#{ dropzone_object.send dropzone_object.class.dropzone_url_field }' }"
-      end.join(', ').html_safe
-    end
+    dropzone_objects.map do |dropzone_object|
+      { 
+        id: dropzone_object.id, 
+        name: dropzone_object.send(dropzone_object.class.dropzone_field(:title)),
+        size: dropzone_object.send(dropzone_object.class.dropzone_field(:file_size)), 
+        url: dropzone_object.send(dropzone_object.class.dropzone_field(:url))
+      }
+    end.map do |hash|
+      hash.map{ |(k, v)| "#{ k }: '#{ v }'" }.join(',')
+    end.map do |string|
+      "{#{ string }}"
+    end.join(', ').html_safe
   end
   
 end

data/app/views/application/_dropzone.html.erb

@@ -1,38 +1,39 @@
-<div id="dropzone_<%= method %>_<%= cycle(*(1..999).to_a, name: method) %>" class="dropzone" style="margin: 10px 20px; border: 1px solid #ccc">
-  <span class="notice">Перетащите сюда файлы или нажмите для загрузки</span>
-  <input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][-1]" value="" />
+<div id="dropzone_<%= method %>_<%= cycle(*(1..999).to_a, name: method) %>" class="dropzone">
+  <span class="notice"><%=t 'dropzone.drag_or_click' %></span>
+  <%= hidden_field_tag "#{ object.class.model_name.singular }[#{ method }_attributes][-1]", "" %>
   <% object.send(method).each_with_index do |dropzone_object, index| %>
-    <input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][<%= dropzone_object.id %>][<%= object.class.dropzone_title_field %>]" value="<%= dropzone_object.send(object.class.dropzone_title_field) %>" />
+    <%= hidden_field_tag "#{ object.class.model_name.singular }[#{ method }_attributes][#{ dropzone_object.id }][#{ object.class.send("dropzone_#{ method }_field", :title) }]", dropzone_object.send(object.class.send("dropzone_#{ method }_field", :title)) %>
   <% end %>
 </div>
 
 <% unless options[:hint].blank? %>
-  <p class="inline-hints" style="margin: 0 0 0 20px; font-size: 0.95em; font-style: italic; color: #666;"><%= options[:hint] %></p>
+  <p class="inline-hints dropzone-hint"><%= options[:hint] %></p>
 <% end %>
 
 <script>
   (function() {
-    var mockFiles = [<%= render_mock_dropzone_files(object.send(method)) %>];
     Dropzone.autoDiscover = false;
+
+    var mockFiles = [<%= render_mock_dropzone_files(object.send(method)) %>];
     var dropzone_id = "#dropzone_<%= method %>_<%= current_cycle(method) %>"; 
     var dropzone = new Dropzone(dropzone_id, { 
-      url: '<%= upload_dropzone_path(dropzone_class: method.to_s.classify) %>',
+      url: '<%= upload_dropzone_path(dropzonable_class: object.class, dropzone_class: object.class.send("dropzone_#{ method }_class")) %>',
       addRemoveLinks: true,
-      dictCancelUpload: 'Отменить',
-      dictRemoveFile: 'Удалить',
+      dictCancelUpload: '<%=t "dropzone.cancel" %>',
+      dictRemoveFile: '<%=t "dropzone.remove" %>',
       maxFiles: <%= defined?(max_files) ? '1' : 'null' %>,
       sending: function(file, xhr, formData) {
         xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').prop('content'));
       },
       success: function(file, data) {
-        $(dropzone_id).append('<input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][' + data.id + '][<%= object.class.dropzone_title_field %>]" value="" />');
+        $(dropzone_id).append('<input type="hidden" name="<%= object.class.model_name.singular %>[<%= method %>_attributes][' + data.id + '][<%= object.class.send("dropzone_#{ method }_field", :title) %>]" value="" />');
         $(file.previewElement).attr('data-id', data.id);
         $(file.previewElement).attr('data-url', data.url);
         return file.previewElement.classList.add("dz-success");
       },
       removedfile: function(file) {
-        $(dropzone_id + ' input[name="<%= object.class.to_s.downcase %>[images_attributes][' + file.id + '][<%= object.class.dropzone_title_field %>]"]').remove();
-        $(dropzone_id + ' input[name="<%= object.class.to_s.downcase %>[images_attributes][' + file.id + '][<%= object.class.dropzone_position_field %>]"]').remove();
+        $(dropzone_id + ' input[name="<%= object.class.model_name.singular %>[images_attributes][' + file.id + '][<%= object.class.send("dropzone_#{ method }_field", :title) %>]"]').remove();
+        $(dropzone_id + ' input[name="<%= object.class.model_name.singular %>[images_attributes][' + file.id + '][<%= object.class.send("dropzone_#{ method }_field", :position) %>]"]').remove();
         $(file.previewElement).remove();
         $(dropzone_id).sortable('refresh');
       }
@@ -48,8 +49,9 @@
         $(file.previewElement).attr('data-id', file.id);
 
       $(file.previewElement).find('.dz-filename, img').on('click', function() {
-        var input = $(dropzone_id + ' input[name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][' + file.id + '][<%= object.class.dropzone_title_field %>]"]');
-        var title = prompt("Название изображения: ", $(file.previewElement).find('.dz-filename span').text());
+        var id = $(this).parents('.dz-preview:first').attr('data-id');
+        var input = $(dropzone_id + ' input[name="<%= object.class.model_name.singular %>[<%= method %>_attributes][' + id + '][<%= object.class.send("dropzone_#{ method }_field", :title) %>]"]');
+        var title = prompt("<%=t 'dropzone.title' %>: ", $(file.previewElement).find('.dz-filename span').text());
         $(file.previewElement).find('.dz-filename span').text(title);
         input.val(title);
       });
@@ -59,7 +61,7 @@
       var position = 0;
       $(dropzone_id + ' .dz-preview').each(function() {
         var id = $(this).attr('data-id');
-        $(dropzone_id).append('<input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][' + id + '][<%= object.class.dropzone_position_field %>]" value="' + (position++) + '" />');
+        $(dropzone_id).append('<input type="hidden" name="<%= object.class.model_name.singular %>[<%= method %>_attributes][' + id + '][<%= object.class.send("dropzone_#{ method }_field", :position) %>]" value="' + (position++) + '" />');
       });
     };
 
@@ -76,7 +78,7 @@
 
     $('form').submit(function(e) {
       if (dropzone.getQueuedFiles().length > 0 || dropzone.getUploadingFiles().length > 0) {
-        if (confirm("Некоторые файлы еще не загрузились на сервер. Вы действительно хотите сохранить без них?") == true) {
+        if (confirm("<%=t 'dropzone.are_you_sure' %>") == true) {
           generate_dropzone_position_elements();
         } else {
           e.preventDefault();

data/config/locales/en.yml

@@ -0,0 +1,7 @@
+en:
+  dropzone:
+    drag_or_click: 'Drag files here or click to upload'
+    cancel: 'Cancel'
+    remove: 'Remove'
+    title: 'Title'
+    are_you_sure: 'Several images have not been uploaded to the server yet. Are you sure to submit form without these images?'

data/config/locales/ru.yml

@@ -0,0 +1,7 @@
+ru:
+  dropzone:
+    drag_or_click: 'Перетащите сюда файлы или нажмите для загрузки'
+    cancel: 'Отменить'
+    remove: 'Удалить'
+    title: 'Название'
+    are_you_sure: 'Некоторые файлы еще не загрузились на сервер. Вы действительно хотите сохранить без них?'

data/config/routes.rb

@@ -1,5 +1,8 @@
-Rails.application.routes.prepend do
-  
-  post '/dropzone/upload' => 'dropzone#upload', as: :upload_dropzone
+# temporary fix double route error
+unless defined?(Rails.application.routes.url_helpers.upload_dropzone_path)
+  Rails.application.routes.draw do
+    
+    post '/dropzone/upload' => 'dropzone#upload', as: :upload_dropzone
 
+  end
 end

data/lib/activeadmin-dropzone/active_record/dropzone.rb

@@ -2,42 +2,78 @@ module Activeadmin
   module Dropzone
     extend ActiveSupport::Concern
 
-    included do
-    end
-
     module ClassMethods
       def dropzone(association_name)
         class_eval %Q(
+          def self.dropzone_#{ association_name }_class
+            self.reflect_on_association(:#{ association_name }).class_name.constantize
+          end
+
           def #{ association_name }_attributes=(attributes)
-            reflection = self.class.reflect_on_association(:#{ association_name })
+            original_collection = self.#{ association_name }.to_a
+
+            ActiveRecord::Base.transaction do
+              self.#{ association_name } = self.class.dropzone_#{ association_name }_class.find(attributes.select{ |id, hash| !id.blank? and id != '-1' }.map{ |id, hash| id.to_i })
+
+              self.#{ association_name }.each do |dropzone_object|
+                attribute = attributes[dropzone_object.id.to_s]
+                changes = {}
+
+                title_field = self.class.dropzone_#{ association_name }_class.dropzone_field(:title)
+                if dropzone_object.respond_to?(title_field) and dropzone_object.send(title_field) != attribute['title']
+                  changes[title_field] = attribute['title']
+                end
+
+                position_field = self.class.dropzone_#{ association_name }_class.dropzone_field(:position)
+                if dropzone_object.respond_to?(position_field) and dropzone_object.send(position_field) != attribute['position'].to_i
+                  changes[position_field] = attribute['position']
+                end
 
-            p "self.class.reflect_on_association(:#{ association_name })"
+                unless changes.empty?
+                  dropzone_object.update_attributes changes
+                end
+              end
 
-            self.#{ association_name } = reflection.class_name.constantize.find(attributes.select{ |id, hash| !id.blank? and id != '-1' }.map{ |id, hash| id.to_i })
+              self.update_attribute :#{ association_name }_count, self.#{ association_name }.size if self.respond_to?(:#{ association_name }_count)
 
-            self.#{ association_name }.each do |dropzone_object|
-              if dropzone_object.title != attributes[dropzone_object.id.to_s]['title'] or dropzone_object.position != attributes[dropzone_object.id.to_s]['position'].to_i
-                dropzone_object.update_attributes title: attributes[dropzone_object.id.to_s]['title'], position: attributes[dropzone_object.id.to_s]['position']
+              (original_collection - self.#{ association_name }).each do |object|
+                object.destroy
               end
             end
+          end
+
+          def self.dropzone_#{ association_name }_field(key)
+            dropzone_#{ association_name }_class.dropzone_field(key)
+          end
 
-            self.update_attribute :#{ association_name }_count, self.#{ association_name }.size
+          def self.dropzone_#{ association_name }_field?(key)
+            dropzone_#{ association_name }_class.dropzone_field?(key)
           end
         )
+      end
+
+      def dropzone_item(options = {})
+        options = {
+          title: :title,
+          position: :position,
+          data: :data,
+          file_size: :data_file_size,
+          url: :data_url
+        }.deep_merge(options)
 
-        class_eval do
-          def self.dropzone_title_field
-            :title
+        class_eval %Q(
+          def self.dropzone_field(key)
+            #{ options }[key.to_sym]
           end
 
-          def self.dropzone_position_field
-            :position
+          def self.dropzone_field?(key)
+            #{ options }.keys.include? key.to_sym
           end
 
-          def self.dropzone_field
-            :image
+          def #{ options[:data] }_url
+            #{ options[:data] }.url
           end
-        end
+        )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-dropzone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Maxim Gladkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: maksim.gladkov@gmail.com
+email: contact@maximgladkov.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .DS_Store
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - activeadmin-dropzone.gemspec
@@ -66,13 +66,16 @@ files:
 - app/helpers/active_admin/views_helper.rb
 - app/inputs/dropzone_input.rb
 - app/views/application/_dropzone.html.erb
+- config/locales/en.yml
+- config/locales/ru.yml
 - config/routes.rb
+- lib/.DS_Store
 - lib/activeadmin-dropzone.rb
 - lib/activeadmin-dropzone/active_record/dropzone.rb
 - lib/activeadmin-dropzone/engine.rb
 - test/helper.rb
 - test/test_activeadmin-dropzone.rb
-homepage: http://github.com/maximgladkov/activeadmin-dropzone
+homepage: http://maximgladkov.com/blog/activeadmin-dropzone-gem
 licenses:
 - MIT
 metadata: {}
@@ -95,5 +98,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Gem adds support of dropzone.js for ActiveAdmin
+summary: Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin
 test_files: []

data/README.rdoc

@@ -1,19 +0,0 @@
-= activeadmin-dropzone
-
-Description goes here.
-
-== Contributing to activeadmin-dropzone
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 Maxim Gladkov. See LICENSE.txt for
-further details.
-