simple_form_attachments 0.2.6 → 1.0.0

data/lib/assets/javascripts/simple_form_attachments/{simple_form_attachments.js.coffee → simple_form_attachments.coffee.erb}

@@ -1,33 +1,20 @@
 # https://github.com/zenorocha/jquery-boilerplate
 (($, window) ->
-
-  # ---------------------------------------------------------------------
-
   pluginName = 'simple_form_attachments'
   document = window.document
 
   defaults =
     debug: false
     sortable_options:
-      handle: '.handle'
+      handle: '.<%= SimpleFormAttachments.dom_class(:attachment, :col, :handle) %>'
       axis: 'y'
-      items: '> tr'
+      items: '> .<%= SimpleFormAttachments.dom_class(:attachment) %>'
       forcePlaceholderSize: true
-      placeholder: 'attachment-placeholder'
+      placeholder: '<%= SimpleFormAttachments.dom_class(:attachment, :placeholder) %>'
       containment: 'parent'
-      start: (event, ui) ->
-        cellCount = 0
-        $('td, th', ui.helper).each ->
-          colspan = 1
-          colspanAttr = $(this).attr('colspan')
-          if colspanAttr > 1 then colspan = colspanAttr
-          cellCount += colspan
-        ui.placeholder.html '<td colspan="#{cellCount}">&nbsp;</td>'
 
     slide_speed: 'fast'
 
-  # ---------------------------------------------------------------------
-
   class Plugin
     constructor: (@element, options) ->
       @options = $.extend {}, defaults, options
@@ -46,7 +33,7 @@
       @init_fileupload()
 
     init_sortable: () ->
-      @get_attachment_list().find('tbody').sortable(@options.sortable_options)#.disableSelection()
+      @get_attachment_list().sortable(@options.sortable_options)#.disableSelection()
 
     init_fileupload: () ->
       console.log "init jQuery.fileupload" if @options.debug
@@ -75,7 +62,7 @@
 
         add: (e, data) =>
           @set_logs(e, data) if @options.debug
-          @get_attachment_list().find('tr').remove() unless @is_multiple()
+          @get_attachment_list().find('.<%= SimpleFormAttachments.dom_class(:attachment) %>').remove() unless @is_multiple()
 
           for file in data.files
             properties = {
@@ -85,7 +72,7 @@
               thumb_url: URL.createObjectURL(file)
             }
             result = $.extend({}, file, properties)
-            $template = @get_attachment_template(result).addClass('uploading')
+            $template = @get_attachment_template(result).addClass('<%= SimpleFormAttachments.dom_class(:attachment, :is_uploading) %>')
             data.context = $template
             $template.data('data', data)
             @get_attachment_list().append($template)
@@ -94,43 +81,44 @@
 
         fail: (e, data) =>
           @set_logs(e, data) if @options.debug
-          $result = $(JSON.parse(data.jqXHR.responseText).html).addClass('has_error')
-          $result.find('td.errors').attr('colspan', '3');
-          data.context.replaceWith($result)
+          if !!data.jqXHR.responseText
+            $result = $(JSON.parse(data.jqXHR.responseText).html).addClass('<%= SimpleFormAttachments.dom_class(:attachment, :has_error) %>')
+            $result.find('.<%= SimpleFormAttachments.dom_class(:attachment, :col, :errors) %>');
+            data.context.replaceWith($result)
 
         progress: (e, data) =>
           @set_logs(e, data) if @options.debug
           progress = parseInt(data.loaded / data.total * 100, 10)
-          data.context.find('.progress.bar').width(progress+'%')
+          data.context.find('.<%= SimpleFormAttachments.dom_class(:attachment, :col, :progress, :bar) %>').width(progress+'%')
 
         done: (e, data) =>
           @set_logs(e, data) if @options.debug
           console.log data.result.html if @options.debug
-          $result = $(data.result.html).addClass('uploaded')
-          data.context.replaceWith $result
+          $result = $(data.result.html).addClass('<%= SimpleFormAttachments.dom_class(:attachment, :is_uploaded) %>')
+          data.context.replaceWith($result)
 
         stop: (e, data) =>
           @set_logs(e, data) if @options.debug
           @enable_form_submit()
 
-      @$element.on 'click', 'button.delete, button.close', (e) =>
+      @$element.on 'click', '.<%= SimpleFormAttachments.dom_class(:button, :delete) %>, .<%= SimpleFormAttachments.dom_class(:button, :close) %>', (e) =>
         e.preventDefault()
         e.stopPropagation()
-        $template = $(e.currentTarget).closest('tr')
+        $template = $(e.currentTarget).closest('.<%= SimpleFormAttachments.dom_class(:attachment) %>')
         @remove_template($template)
 
-      @$element.on 'click', 'button.cancel', (e) =>
+      @$element.on 'click', '.<%= SimpleFormAttachments.dom_class(:button, :cancel) %>', (e) =>
         e.preventDefault()
         e.stopPropagation()
-        $template = $(e.currentTarget).closest('tr')
+        $template = $(e.currentTarget).closest('.<%= SimpleFormAttachments.dom_class(:attachment) %>')
         data = $template.data('data') || {}
         @enable_form_submit()
 
-        if !data.jqXHR
+        if !!data.jqXHR
+          data.jqXHR.abort()
+        else
           data.errorThrown = 'abort'
           e.data.fileupload._trigger('fail', e, data)
-        else
-          data.jqXHR.abort()
 
         @remove_template($template)
 
@@ -148,14 +136,14 @@
 
     # ---------------------------------------------------------------------
 
-    get_attachment_list: -> @$element.find('table.attachments.list')
+    get_attachment_list: -> @$element.find('.<%= SimpleFormAttachments.dom_class(:attachment_list) %>')
     get_attachments_path: -> @$element.data('attachments-path')
     get_disabled_submit_text: -> @$element.data('disabled-submit-text')
     get_file_input: -> @$element.find('input.file')
     get_form: -> @$element.parents('form').first()
     get_form_submit: -> @get_form().find('input[type="submit"]').first()
     get_max_number_of_files: -> @$element.data('max-number-of-files')
-    get_number_of_files: -> @get_attachment_list().children('tr').not('.has_error').length
+    get_number_of_files: -> @get_attachment_list().children('.<%= SimpleFormAttachments.dom_class(:attachment) %>').not('.<%= SimpleFormAttachments.dom_class(:attachment, :has_error) %>').length
 
     get_attachment_type_input: -> @$element.find('input[name="attachment_type"]')
     get_attachment_multiple_input: -> @$element.find('input[name="attachment[multiple]"]')
@@ -172,7 +160,7 @@
     get_kb_from_bytes: (bytes) -> parseInt(parseInt(bytes)/1024)
 
     get_attachment_template: (file) =>
-      template = Handlebars.compile(@$element.find('script#attachment_template').html())
+      template = Handlebars.compile(@$element.find('script#simple_form_attachments__template').html())
       $(template(file))
 
     # ---------------------------------------------------------------------
@@ -200,7 +188,7 @@
     # ---------------------------------------------------------------------
 
     is_multiple: -> @get_file_input().attr('multiple') != undefined
-    is_sortable: -> @get_attachment_list().hasClass('sortable')
+    is_sortable: -> @get_attachment_list().hasClass('<%= SimpleFormAttachments.dom_class(:attachment_list, :is_sortable) %>')
 
   # ---------------------------------------------------------------------
 
@@ -208,11 +196,6 @@
     @each ->
       if !$.data(this, "plugin_#{pluginName}")
         $.data(@, "plugin_#{pluginName}", new Plugin(@, options))
-
-  # ---------------------------------------------------------------------
-
 )(jQuery, window)
 
-# =====================================================================
-
 $ -> $('div.simple_form_attachments').simple_form_attachments()

data/lib/assets/stylesheets/simple_form_attachments/__attachment.scss.erb

@@ -0,0 +1,8 @@
+.<%= SimpleFormAttachments.dom_class(:attachment) %> {
+  display: flex;
+  flex-direction: row;
+}
+
+.<%= SimpleFormAttachments.dom_class(:attachment, :has_error) %> {
+  color: red;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col.scss.erb

@@ -0,0 +1 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col) %> {}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__actions.scss.erb

@@ -0,0 +1,3 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :actions) %> {
+  flex: 0 0 auto;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__errors.scss.erb

@@ -0,0 +1,10 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :errors) %> {
+  flex: 1 1 auto;
+  width: 100%;
+
+  > ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__fields.scss.erb

@@ -0,0 +1,4 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :fields) %> {
+  flex: 1 1 auto;
+  width: 100%;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__file_info.scss.erb

@@ -0,0 +1,4 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :file_info) %> {
+  flex: 1 1 auto;
+  width: 100%;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__handle.scss.erb

@@ -0,0 +1,6 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :handle) %> {
+  background: gray;
+  cursor: move;
+  flex: 0 0 auto;
+  width: 1em;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__hidden.scss.erb

@@ -0,0 +1,3 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :hidden) %> {
+  display: none;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__progress.scss.erb

@@ -0,0 +1,14 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :progress) %> {
+  flex: 1 1 auto;
+  width: 100%;
+}
+
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :progress, :container) %> {
+  width: 100%;
+}
+
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :progress, :bar) %> {
+  height: 1em;
+  background-color: blue;
+  width: 0;
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment__col__thumb.scss.erb

@@ -0,0 +1,9 @@
+.<%= SimpleFormAttachments.dom_class(:attachment, :col, :thumb) %> {
+  flex: 0 0 auto;
+  width: 20%;
+
+  img {
+    display: block;
+    object-fit: contain;
+  }
+}

data/lib/assets/stylesheets/simple_form_attachments/__attachment_list.scss.erb

@@ -0,0 +1,11 @@
+.<%= SimpleFormAttachments.dom_class(:attachment_list) %> {
+  .<%= SimpleFormAttachments.dom_class(:attachment, :col, :handle) %> {
+    display: none;
+  }
+}
+
+.<%= SimpleFormAttachments.dom_class(:attachment_list, :is_sortable) %> {
+  .<%= SimpleFormAttachments.dom_class(:attachment, :col, :handle) %> {
+    display: block;
+  }
+}

data/lib/assets/stylesheets/simple_form_attachments/__button.scss.erb

@@ -0,0 +1,9 @@
+.<%= SimpleFormAttachments.dom_class(:button) %> {
+  white-space: nowrap;
+}
+
+.<%= SimpleFormAttachments.dom_class(:button, :cancel) %>,
+.<%= SimpleFormAttachments.dom_class(:button, :close) %>,
+.<%= SimpleFormAttachments.dom_class(:button, :delete) %> {
+  color: red;
+}

data/lib/assets/stylesheets/simple_form_attachments/__label.scss.erb

@@ -0,0 +1,3 @@
+.<%= SimpleFormAttachments.dom_class(:label, :choose_file) %> {
+  // custom upload label
+}

data/lib/assets/stylesheets/simple_form_attachments/simple_form_attachments.scss.erb

@@ -0,0 +1,29 @@
+.<%= SimpleFormAttachments.dom_class %> {
+  input[type="file"] {
+    margin: 0;
+    padding: 0;
+
+    // hide so that the label can be styled
+    width: .1px;
+    height: .1px;
+    opacity: 0;
+    overflow: hidden;
+    position: absolute;
+    z-index: -1;
+
+    label {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+
+  label[for="attachment_file"] {
+    .<%= SimpleFormAttachments.dom_class(:attachment, :button) %> {
+      display: none;
+    }
+  }
+
+  &.dragover {
+    background-color: yellow;
+  }
+}

data/lib/assets/stylesheets/simple_form_attachments.css

@@ -0,0 +1,4 @@
+/*
+*= require_tree .
+*= require_self
+*/

data/lib/simple_form_attachments/attachment_input.rb

@@ -37,18 +37,18 @@ module SimpleFormAttachments
     private # =============================================================
 
     def input_html_options
-      super.merge!(
+      super.merge(
         data: {
           attachments_path: options.fetch(:route, route_from_configuration),
           max_number_of_files: options.fetch(:max_number_of_files, nil),
           disabled_submit_text: I18n.t(:disabled, scope: 'simple_form_attachments.buttons'),
-          sortable: sortable?.to_s
-        }
+          sortable: sortable?
+        }.reject{ |k, v| v.nil? }
       )
     end
 
     def input_html_classes
-      super.push('simple_form_attachments')
+      super.push(SimpleFormAttachments.dom_class)
     end
 
     # ---------------------------------------------------------------------
@@ -189,7 +189,8 @@ module SimpleFormAttachments
         class: 'file'
       }
       template.label_tag('attachment[file]') do
-        template.file_field_tag('attachment[file]', input_html_options)
+        template.file_field_tag('attachment[file]', input_html_options) +
+        template.content_tag(:span, I18n.t(:choose_file, scope: 'simple_form_attachments.links', count: (multiple? ? 2 : 1)), class: SimpleFormAttachments.dom_class(:label, [:choose_file]))
       end
     end
 
@@ -228,12 +229,12 @@ module SimpleFormAttachments
     # ---------------------------------------------------------------------
 
     def attachment_list
-      table_classes = %w(attachments list)
-      table_classes << 'sortable' if sortable?
-      template.content_tag :table, class: table_classes do
+      container_classes = [SimpleFormAttachments.dom_class(:attachment_list)]
+      container_classes << SimpleFormAttachments.dom_class(:attachment_list, :is_sortable) if sortable?
+      template.content_tag :div, class: container_classes do
         @builder.simple_fields_for attribute_name do |attachment_fields|
           template.render(
-            partial: "simple_form_attachments/#{attachment_fields.object.to_partial_path}", format: :html, layout: 'layouts/simple_form_attachments/attachment_layout',
+            partial: File.join('simple_form_attachments', attachment_fields.object.to_partial_path), format: :html, layout: File.join('layouts', 'simple_form_attachments', 'attachment_layout'),
             locals: {
               attachment: attachment_fields.object,
               fields: attachment_fields,
@@ -249,8 +250,8 @@ module SimpleFormAttachments
     # ---------------------------------------------------------------------
 
     def handlebars_js_template
-      template.content_tag :script, id: 'attachment_template', type: 'text/html' do
-        template.render('simple_form_attachments/attachments/attachment.hbs.slim')
+      template.content_tag :script, id: 'simple_form_attachments__template', type: 'text/html' do
+        template.render(File.join('simple_form_attachments', 'attachments', 'attachment.hbs.slim'))
       end
     end
   end

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = '0.2.6'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/simple_form_attachments.rb

@@ -14,6 +14,18 @@ require "i18n"
 
 # ---------------------------------------------------------------------
 
+module SimpleFormAttachments
+  def self.dom_class(*args)
+    prefix, alts = args.partition { |i| !i.is_a?(Array) }
+    prefix = ['simple_form_attachments'] + prefix
+    return prefix.compact.join('__') if alts.empty?
+    alts.flatten.map do |item|
+      prefix += [item]
+      prefix.compact.join('__')
+    end
+  end
+end
+
 module SimpleForm
   class FormBuilder
     map_type :attachment, to: SimpleFormAttachments::AttachmentInput

data/simple_form_attachments.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   # ---------------------------------------------------------------------
 
   spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'mongoid', '> 4.0'
   spec.add_dependency 'simple_form', '>= 3.0.2'
 
   spec.add_dependency 'slim'
@@ -38,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-rails'
   spec.add_development_dependency 'dragonfly'
+  spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'mongoid', '~> 4.0'
 end

data/test/controllers/simple_form_attachments/upload_controller_test.rb

@@ -1,76 +1,72 @@
 require 'test_helper'
 
-require_relative '../../../app/controllers/simple_form_attachments/upload_controller'
+describe SimpleFormAttachments::UploadController do
+  before do
+    @routes = SimpleFormAttachments::Engine.routes
+  end
 
-module SimpleFormAttachments
-  describe UploadController do
-    setup do
-      @routes = SimpleFormAttachments::Engine.routes
-    end
+  let(:count) { AttachmentTest.count }
 
-    let(:count) { AttachmentTest.count }
+  # ---------------------------------------------------------------------
 
-    # ---------------------------------------------------------------------
+  describe '#create' do
+    let(:params) do
+      {
+        attachment: { body: 'foo' },
+        attachment_parent: { class: 'Parent' },
+        attachment_relation: { name: 'attachments', multiple: true },
+        attachment_type: 'AttachmentTest'
+      }
+    end
+    let(:action) { post :create, params: params }
 
-    describe '#create' do
-      let(:params) do
-        {
-          attachment: { body: 'foo' },
-          attachment_parent: { class: 'Parent' },
-          attachment_relation: { name: 'attachments', multiple: true },
-          attachment_type: 'AttachmentTest'
-        }
-      end
-      let(:action) { post :create, params }
+    it 'should succeed' do
+      action
+      must_respond_with :success
+    end
 
-      it 'should succeed' do
-        action
-        must_respond_with :success
-      end
+    it 'should create attachment of specified model' do
+      assert_difference('AttachmentTest.count') { action }
+    end
 
-      it 'should create attachment of specified model' do
-        assert_difference('AttachmentTest.count') { action }
-      end
+    it 'must mark the newly upladed attachment as temporary' do
+      action
+      assigns(:attachment).must_be :present?
+      assigns(:attachment).body.must_equal 'foo'
+      assigns(:attachment).temporary.must_equal true
+    end
 
-      it 'must mark the newly upladed attachment as temporary' do
+    describe 'returned JSON' do
+      it 'should contain template with correct locals' do
         action
-        assigns(:attachment).must_be :present?
-        assigns(:attachment).body.must_equal 'foo'
-        assigns(:attachment).temporary.must_equal true
-      end
-
-      describe 'returned JSON' do
-        it 'should contain template with correct locals' do
-          action
-          assert_template 'simple_form_attachments/_attachment_upload_template', locals: { multiple: true, parent_class: params[:attachment_parent][:class].constantize }
-        end
+        assert_template 'simple_form_attachments/_attachment_upload_template', locals: { multiple: true, parent_class: params[:attachment_parent][:class].constantize }
       end
     end
+  end
 
-    # ---------------------------------------------------------------------
+  # ---------------------------------------------------------------------
 
-    describe '#show' do
-      let(:attachment) { AttachmentTest.create! }
-      let(:params) do
-        {
-          id: attachment.id.to_s,
-          attachment_parent: { class: 'Parent' },
-          attachment_relation: { name: 'attachments', multiple: true },
-          attachment_type: 'AttachmentTest'
-        }
-      end
-      let(:action) { get :show, params }
+  describe '#show' do
+    let(:attachment) { AttachmentTest.create! }
+    let(:params) do
+      {
+        id: attachment.id.to_s,
+        attachment_parent: { class: 'Parent' },
+        attachment_relation: { name: 'attachments', multiple: true },
+        attachment_type: 'AttachmentTest'
+      }
+    end
+    let(:action) { get :show, params: params }
 
-      it 'should succeed' do
-        action
-        must_respond_with :success
-      end
+    it 'should succeed' do
+      action
+      must_respond_with :success
+    end
 
-      describe 'returned JSON' do
-        it 'should contain template with correct locals' do
-          action
-          assert_template 'simple_form_attachments/_attachment_upload_template', locals: { multiple: true, parent_class: params[:attachment_parent][:class].constantize }
-        end
+    describe 'returned JSON' do
+      it 'should contain template with correct locals' do
+        action
+        assert_template 'simple_form_attachments/_attachment_upload_template', locals: { multiple: true, parent_class: params[:attachment_parent][:class].constantize }
       end
     end
   end

data/test/dummy/Gemfile

@@ -17,6 +17,7 @@ gem 'dragonfly-mongoid_data_store'
 gem 'simple_form_attachments', path: '../../../simple_form_attachments'
 
 group :development, :test do
+  gem 'rb-readline'
   gem 'byebug'
   gem 'web-console', '~> 2.0'
   gem 'spring'