activeadmin-dropzone 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cecd5350e0a24214218aad6c35c3c7e688d1ca5
-  data.tar.gz: 38562077681a03035bb98229f13c0d667a636c83
+  metadata.gz: 515d53c280b8e2ae88248fea2765d1e47792d37b
+  data.tar.gz: 2aa5965e7c0231db4cf195104b68af9bda933091
 SHA512:
-  metadata.gz: 26c87560fe30233e6acdf29a17a161697bfbbec323a1315f52a4258b16ce7c090413b9d9c58b19a8e54e71e1acb30611dfa9f556fc6aaa4293a763a9e877d84e
-  data.tar.gz: 9071bd820f10f9b20a3883e100837d05da9ab81a2299a776eb764375bb8680c6861681b5130ceb9856a7ffea73bb92ad61485c38d025076a03c38d2a767c3e29
+  metadata.gz: 51104d1b49343e3b84767a81fcc5ee1f2118015f1cb892d87afe77a1555092c6964027814bc358e37bdf9392de0f10e868cae1e99d6752af44a000f2e270e995
+  data.tar.gz: 518fc7c8c483bef2716185ced2552ccbde461d1662477eb6e53f83f5f4786adbd1e97426420d5035fe717a20b525ef9b2e5f17993bd7c65322be62e6d5ce6a65

data/README.rdoc

@@ -0,0 +1,19 @@
+= 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.
+

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://maximgladkov.com/blog/activeadmin-dropzone-gem"
+  gem.homepage = "http://github.com/maximgladkov/activeadmin-dropzone"
   gem.license = "MIT"
-  gem.summary = %Q{Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin}
-  gem.email = "contact@maximgladkov.com"
+  gem.summary = %Q{Gem adds support of dropzone.js for ActiveAdmin}
+  gem.email = "maksim.gladkov@gmail.com"
   gem.authors = ["Maxim Gladkov"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/activeadmin-dropzone.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = "activeadmin-dropzone"
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maxim Gladkov"]
-  s.date = "2014-02-25"
-  s.email = "contact@maximgladkov.com"
+  s.date = "2013-12-23"
+  s.email = "maksim.gladkov@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md"
+    "README.rdoc"
   ]
   s.files = [
     ".DS_Store",
@@ -21,13 +21,15 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.md",
+    "README.rdoc",
     "Rakefile",
     "VERSION",
     "activeadmin-dropzone.gemspec",
-    "app/.DS_Store",
     "app/assets/.DS_Store",
-    "app/assets/images/.DS_Store",
+    "app/assets/images/hamburger-retina.gif",
+    "app/assets/images/hamburger.gif",
+    "app/assets/images/spritemap.png",
+    "app/assets/images/spritemap@2x.png",
     "app/assets/javascripts/activeadmin-dropzone.js",
     "app/assets/javascripts/dropzone.js",
     "app/assets/stylesheets/activeadmin-dropzone.css.scss",
@@ -36,21 +38,18 @@ 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://maximgladkov.com/blog/activeadmin-dropzone-gem"
+  s.homepage = "http://github.com/maximgladkov/activeadmin-dropzone"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.0.3"
-  s.summary = "Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin"
+  s.summary = "Gem adds support of dropzone.js for ActiveAdmin"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

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

@@ -1,9 +1,6 @@
 //= require dropzone
 
 .dropzone {
-  margin: 10px 20px; 
-  border: 1px solid #ccc;
-
   a {
     text-decoration: none;
     font-size: 13px;
@@ -29,13 +26,6 @@
   }
 }
 
-.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,8 +3,7 @@ class DropzoneController < ApplicationController
   def upload
     dropzone_class = params[:dropzone_class].constantize
     dropzone_object = dropzone_class.new
-    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]
+    dropzone_object.send "#{ dropzone_class.dropzone_field }=", params[:file]
 
     if dropzone_object.save
       render json: dropzone_object.to_json

data/app/helpers/active_admin/views_helper.rb

@@ -1,18 +1,11 @@
 module ActiveAdmin::ViewsHelper
 
   def render_mock_dropzone_files(dropzone_objects)
-    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
+    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
   end
   
 end

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

@@ -1,39 +1,38 @@
-<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]", "" %>
+<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="" />
   <% object.send(method).each_with_index do |dropzone_object, index| %>
-    <%= 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)) %>
+    <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) %>" />
   <% end %>
 </div>
 
 <% unless options[:hint].blank? %>
-  <p class="inline-hints dropzone-hint"><%= options[:hint] %></p>
+  <p class="inline-hints" style="margin: 0 0 0 20px; font-size: 0.95em; font-style: italic; color: #666;"><%= options[:hint] %></p>
 <% end %>
 
 <script>
   (function() {
-    Dropzone.autoDiscover = false;
-
     var mockFiles = [<%= render_mock_dropzone_files(object.send(method)) %>];
+    Dropzone.autoDiscover = false;
     var dropzone_id = "#dropzone_<%= method %>_<%= current_cycle(method) %>"; 
     var dropzone = new Dropzone(dropzone_id, { 
-      url: '<%= upload_dropzone_path(dropzonable_class: object.class, dropzone_class: object.class.send("dropzone_#{ method }_class")) %>',
+      url: '<%= upload_dropzone_path(dropzone_class: method.to_s.classify) %>',
       addRemoveLinks: true,
-      dictCancelUpload: '<%=t "dropzone.cancel" %>',
-      dictRemoveFile: '<%=t "dropzone.remove" %>',
+      dictCancelUpload: 'Отменить',
+      dictRemoveFile: 'Удалить',
       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.model_name.singular %>[<%= method %>_attributes][' + data.id + '][<%= object.class.send("dropzone_#{ method }_field", :title) %>]" value="" />');
+        $(dropzone_id).append('<input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][' + data.id + '][<%= object.class.dropzone_title_field %>]" 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.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();
+        $(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();
         $(file.previewElement).remove();
         $(dropzone_id).sortable('refresh');
       }
@@ -49,9 +48,8 @@
         $(file.previewElement).attr('data-id', file.id);
 
       $(file.previewElement).find('.dz-filename, img').on('click', function() {
-        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());
+        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());
         $(file.previewElement).find('.dz-filename span').text(title);
         input.val(title);
       });
@@ -61,7 +59,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.model_name.singular %>[<%= method %>_attributes][' + id + '][<%= object.class.send("dropzone_#{ method }_field", :position) %>]" value="' + (position++) + '" />');
+        $(dropzone_id).append('<input type="hidden" name="<%= object.class.to_s.downcase %>[<%= method %>_attributes][' + id + '][<%= object.class.dropzone_position_field %>]" value="' + (position++) + '" />');
       });
     };
 
@@ -78,7 +76,7 @@
 
     $('form').submit(function(e) {
       if (dropzone.getQueuedFiles().length > 0 || dropzone.getUploadingFiles().length > 0) {
-        if (confirm("<%=t 'dropzone.are_you_sure' %>") == true) {
+        if (confirm("Некоторые файлы еще не загрузились на сервер. Вы действительно хотите сохранить без них?") == true) {
           generate_dropzone_position_elements();
         } else {
           e.preventDefault();

data/config/routes.rb

@@ -1,8 +1,5 @@
-# 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
+Rails.application.routes.draw do
+  
+  post '/dropzone/upload' => 'dropzone#upload', as: :upload_dropzone
 
-  end
 end

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

@@ -2,78 +2,42 @@ 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)
-            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
+            reflection = self.class.reflect_on_association(:#{ association_name })
 
-                unless changes.empty?
-                  dropzone_object.update_attributes changes
-                end
-              end
+            p "self.class.reflect_on_association(:#{ association_name })"
 
-              self.update_attribute :#{ association_name }_count, self.#{ association_name }.size if self.respond_to?(:#{ association_name }_count)
+            self.#{ association_name } = reflection.class_name.constantize.find(attributes.select{ |id, hash| !id.blank? and id != '-1' }.map{ |id, hash| id.to_i })
 
-              (original_collection - self.#{ association_name }).each do |object|
-                object.destroy
+            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']
               end
             end
-          end
-
-          def self.dropzone_#{ association_name }_field(key)
-            dropzone_#{ association_name }_class.dropzone_field(key)
-          end
 
-          def self.dropzone_#{ association_name }_field?(key)
-            dropzone_#{ association_name }_class.dropzone_field?(key)
+            self.update_attribute :#{ association_name }_count, self.#{ association_name }.size
           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 %Q(
-          def self.dropzone_field(key)
-            #{ options }[key.to_sym]
+        class_eval do
+          def self.dropzone_title_field
+            :title
           end
 
-          def self.dropzone_field?(key)
-            #{ options }.keys.include? key.to_sym
+          def self.dropzone_position_field
+            :position
           end
 
-          def #{ options[:data] }_url
-            #{ options[:data] }.url
+          def self.dropzone_field
+            :image
           end
-        )
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-dropzone
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Maxim Gladkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -39,25 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: contact@maximgladkov.com
+email: maksim.gladkov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.md
+- README.rdoc
 files:
 - .DS_Store
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.md
+- README.rdoc
 - Rakefile
 - VERSION
 - activeadmin-dropzone.gemspec
-- app/.DS_Store
 - app/assets/.DS_Store
-- app/assets/images/.DS_Store
+- app/assets/images/hamburger-retina.gif
+- app/assets/images/hamburger.gif
+- app/assets/images/spritemap.png
+- app/assets/images/spritemap@2x.png
 - app/assets/javascripts/activeadmin-dropzone.js
 - app/assets/javascripts/dropzone.js
 - app/assets/stylesheets/activeadmin-dropzone.css.scss
@@ -66,16 +68,13 @@ 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://maximgladkov.com/blog/activeadmin-dropzone-gem
+homepage: http://github.com/maximgladkov/activeadmin-dropzone
 licenses:
 - MIT
 metadata: {}
@@ -98,5 +97,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Easy to use integration of drag&drop files upload via dropzone.js for ActiveAdmin
+summary: Gem adds support of dropzone.js for ActiveAdmin
 test_files: []

data/README.md

@@ -1,56 +0,0 @@
-# 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.0.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/config/locales/en.yml

@@ -1,7 +0,0 @@
-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

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