uploadbox 0.2.0.rc2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce741794130c261aef059af05192beb434d9188
-  data.tar.gz: e29fccdb4aac51e707205345245b72a36665db57
+  metadata.gz: e7bb12a0625b5f87aacfc0021316fe4b67bd1c60
+  data.tar.gz: 135c2fd550e08c6d1df330492cd578fe4290d561
 SHA512:
-  metadata.gz: 10de8ed633a20adc447a8a24d004a84480bb05390400a21bcbd61d1b8f62d294974d08a5995066407238ef756f2d1646150a56924bf210457c846f17539ae71e
-  data.tar.gz: 913db75094815ae9b645aaac352370c88ccd88fa9a50ed2dc0950f0bade6dd7bed0c49ef11f8cde1b5bfeea4f9456a9a68f8bd715f4fab9ed06e3fe15c7c7fea
+  metadata.gz: 63eff65e15bd81b2b1e16350618cbe75c37fb195933049b5554796f33c308a6668855543c87bad1089808a284eb4b3ca691ba573a994e601d2ce71f10c095d9d
+  data.tar.gz: 09ec34fd695b3fd5ee732e200f562405489cc5923b09aac9c291d286f7e90106db8a8812d9b4f26d5e1a0d8381b88f958382bedde3e0e97ae3d50ce8cfe60fec

data/app/assets/javascripts/_file_uploader.coffee

@@ -0,0 +1,135 @@
+class @FileUploader
+  constructor: (@container) ->
+    @preview = @container.find('[data-provides="fileupload"]')
+    @fileInput = @container.find('input[type="file"]')
+    @typeInput = @container.find('input[name="image[imageable_type]"]')
+    @uploadNameInput = @container.find('input[name="image[upload_name]"]')
+    @idInput = @container.find('[data-item="id"]')
+    @container.find('a.btn.fileupload-exists').bind('ajax:success', @delete)
+    @thumbContainer = @container.find('.fileupload-preview.preview')
+
+    @setupLabel()
+
+    @fileInput.show()
+
+    @fileInput.fileupload
+      type: 'POST'
+      dataType: 'xml'
+      formData: @getFormData
+      dropZone: @container
+      pasteZone: @container
+      add: @add
+      progress: @progress
+      done: @done
+
+  add: (e, data) =>
+    @file = data.files[0]
+    if @loader
+      @loader.detach()
+
+    if @verifyProcessingInterval
+      clearInterval(@verifyProcessingInterval)
+
+    @makePreview(@file)
+
+    @loader = $('<div><div class="progress progress-striped active"><div class="bar" style="width: 0%;"></div></div><div class="uploader-overlay"></div></div>').hide()
+    @loader.find('.uploader-overlay').height(@thumbContainer.data('height'))
+    @preview.prepend(@loader)
+    @loader.show()
+
+    data.submit()
+    @container.find('.fileupload').removeClass('processing').addClass('uploading')
+    @container.closest('form').find('[type=submit]').attr("disabled", true)
+
+  makePreview: (file) =>
+    @thumbContainer.html('')
+    @container.find('.fileupload-preview.preview').append($("<a data-item='filename'>#{file.name}</a>"))
+    @container.find('.fileupload').removeClass('fileupload-new').addClass('fileupload-uploading')
+
+  getFormData: (arg) =>
+    file = @file
+    @filePath = @container.find('input[name="key"]').val() + file.name
+    [
+      { name: 'key', value: @filePath },
+      { name: 'acl', value: @container.find('input[name="acl"]').val()  },
+      { name: 'Content-Type', value: file.type },
+      { name: 'AWSAccessKeyId', value: @container.find('input[name="AWSAccessKeyId"]').val() },
+      { name: 'policy', value: @container.find('input[name="policy"]').val() },
+      { name: 'signature', value: @container.find('input[name="signature"]').val() },
+      { name: "file", value: file }
+    ]
+
+  progress: (e, data) =>
+    progress = parseInt(data.loaded / data.total * 100, 10)
+    @loader.find('.bar').css({width: progress + '%'})
+
+  done: (e, data) =>
+    @container.find('.fileupload').removeClass('uploading').addClass('processing')
+    @originalFileURL = @fileInput.data('url') + @filePath
+    $.ajax
+      type: 'POST'
+      url: @fileInput.data('callback-url')
+      data:
+        'image[remote_file_url]': @originalFileURL
+        'image[imageable_type]': @typeInput.val()
+        'image[upload_name]': @uploadNameInput.val()
+        'image[secure_random]': @fileInput.data('secure-random')
+        'processed': true
+
+      complete: (data) =>
+        @verifyProcessingInterval = setInterval(@verifyProcessing, 100)
+
+      error: =>
+        @loader.detach()
+        @container.find('.fileupload').removeClass('uploading').removeClass('processing')
+        @container.closest('form').find('[type=submit]').attr("disabled", false)
+
+  verifyProcessing: =>
+    arr = @filePath.split('/')
+    filename = arr[arr.length - 1]
+    $.ajax
+      type: 'GET'
+      dataType: 'json'
+      url: @fileInput.data('find-url')
+      data:
+        image:
+          'imageable_type': @typeInput.val()
+          'upload_name': @uploadNameInput.val()
+          'secure_random': @fileInput.data('secure-random')
+
+      complete: (data) =>
+        if data.responseJSON.hasOwnProperty('id')
+          clearInterval(@verifyProcessingInterval)
+          @showThumb(data.responseJSON)
+
+      error: =>
+        @loader.detach()
+        @container.find('.fileupload').removeClass('uploading').removeClass('processing')
+        @container.closest('form').find('[type=submit]').attr("disabled", false)
+
+  delete: =>
+    @idInput.val('')
+    @container.find('.fileupload-preview.preview a').detach()
+    @container.find('.fileupload').addClass('fileupload-new').removeClass('fileupload-exists')
+
+  fail: (e, data) =>
+    @loader.detach()
+    @container.find('.fileupload').removeClass('uploading').removeClass('processing')
+    @container.closest('form').find('[type=submit]').attr("disabled", false)
+
+  showThumb: (image) =>
+    @container.trigger('uploadbox:complete', {url: @originalFileURL})
+    @loader.fadeOut =>
+      @loader.detach()
+    @idInput.val(image.id)
+    @container.find('a.btn.fileupload-exists').attr('href', image.url)
+    @container.find('[data-item="filename"]').attr('href', @originalFileURL).attr('target', '_blank')
+    @container.find('.fileupload').removeClass('fileupload-new').addClass('fileupload-exists')
+    @container.find('.fileupload').removeClass('uploading').removeClass('processing')
+    @container.closest('form').find('[type=submit]').attr("disabled", false)
+
+  setupLabel: =>
+    labels = @container.find('.fileupload-actions .fileupload-new, .fileupload-actions .fileupload-exists')
+    labels.each (index, label) ->
+      $(label).css({marginLeft: $(label).outerWidth() * -0.5, marginTop: $(label).outerHeight() * -0.5})
+

data/app/assets/javascripts/_image_uploader.coffee

@@ -77,6 +77,7 @@ class @ImageUploader
 
   done: (e, data) =>
     @container.find('.fileupload').removeClass('uploading').addClass('processing')
+    @originalFileURL = @fileInput.data('url') + @filePath
 
     $.ajax
       type: 'POST'
@@ -130,6 +131,7 @@ class @ImageUploader
     @container.closest('form').find('[type=submit]').attr("disabled", false)
 
   showThumb: (image) =>
+    @container.trigger('uploadbox:complete', {url: @originalFileURL})
     @loader.fadeOut =>
       @loader.detach()
     @idInput.val(image.id)

data/app/assets/javascripts/uploadbox.coffee

@@ -7,6 +7,7 @@
 #= require cors/jquery.xdr-transport
 #= require jquery.fileupload
 #= require _image_uploader
+#= require _file_uploader
 #= require _uploader_preview
 #= require _gallery_uploader
 #= require _show_image

data/app/assets/stylesheets/uploadbox.sass

@@ -201,4 +201,46 @@
 
   .fileupload-uploading
     .btn.fileupload-exists
-      display: none
+      display: none
+
+[data-component="FileUploader"]
+  height: 60px
+  width: 300px
+
+  .fileupload-preview.preview
+    a
+      display: block
+      text-align: left
+    a:hover
+      background: transparent
+      color: black
+
+  .fileupload-exists
+    .btn.fileupload-exists
+      display: block
+    // .fileupload-new
+    //   display: none !important
+
+  .fileupload
+    background: transparent
+
+  .fileupload-actions
+    background: transparent
+    height: 50px
+    width: 230px
+
+    .btn-file
+      background: transparent
+
+    .fileupload-new
+      width: 200px
+      display: block
+      height: 30px
+      line-height: 30px
+      position: static
+      margin-top: 0 !important
+      margin-left: 0 !important
+
+
+  .fileupload-actions
+    position: static

data/app/controllers/uploadbox/images_controller.rb

@@ -12,10 +12,12 @@ module Uploadbox
 
       upload = Uploadbox.const_get(upload_class_name).create!(attributes)
 
-      if Uploadbox.background_processing
-        Resque.enqueue(ProcessImage, {id: upload.id, upload_class_name: upload_class_name})
-      else
-        upload.process
+      unless params["processed"].present?
+        if Uploadbox.background_processing
+          Resque.enqueue(ProcessImage, {id: upload.id, upload_class_name: upload_class_name})
+        else
+          upload.process
+        end
       end
 
       render nothing: true
@@ -34,7 +36,7 @@ module Uploadbox
 
     private
       def image_params
-        params.require(:image).permit(:remote_file_url, :imageable_type, :upload_name, :secure_random)
+        params.require(:image).permit(:remote_file_url, :imageable_type, :upload_name, :secure_random, :processed)
       end
 
       def upload_class_name

data/app/models/image.rb

@@ -5,6 +5,10 @@ class Image < ActiveRecord::Base
     update(remote_file_url: original_file)
   end
 
+  def name
+    File.basename(original_file)
+  end
+
   def processing?
     file.blank?
   end

data/app/views/uploadbox/files/_uploads_one.slim

@@ -0,0 +1,44 @@
+= form.fields_for upload_name do |f|
+  / forces multipart/form-data
+  = f.file_field :temp, style: 'display: none'
+
+  / old browsers
+  - if browser.ie? and browser.version.to_i <= 9
+    - if namespace
+      input name="[#{resource.class.name.underscore}][#{namespace}]#{upload_name}" data-item="id" type="file"
+    - else
+      input name="[#{resource.class.name.underscore}]#{upload_name}" data-item="id" type="file"
+  - else
+    - secure_random = SecureRandom.uuid
+    .uploadbox-image-uploader.uploads-one data-component="FileUploader"
+      - if namespace
+        input name="[#{resource.class.name.underscore}][#{namespace}]#{upload_name}" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
+      - else
+        input name="[#{resource.class.name.underscore}]#{upload_name}" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
+
+      .fileupload data-provides="fileupload" class="fileupload-#{resource.send("#{upload_name}?") ? 'exists' : 'new'}"
+        .fileupload-preview.preview
+          - if resource.send("#{upload_name}?")
+            = link_to resource.send(upload_name).name, resource.send(upload_name).original_file
+
+        .fileupload-actions
+          span.btn.btn-file
+            span.fileupload-new = choose_label
+            span.fileupload-exists = update_label
+
+
+            input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{CarrierWave::Uploader::Base.fog_directory}.s3.amazonaws.com/" data-secure-random="#{secure_random}"
+            input type="hidden" name="policy" value="#{s3_policy}"
+            input type="hidden" name="signature" value="#{s3_signature}"
+            input type="hidden" name="AWSAccessKeyId" value="#{CarrierWave::Uploader::Base.fog_credentials[:aws_access_key_id]}"
+            input type="hidden" name="acl" value="public-read"
+            input type="hidden" name="key" value="uploads/#{secure_random}/"
+
+            input type="hidden" name="image[imageable_type]" value="#{resource.class.base_class}"
+            input type="hidden" name="image[upload_name]" value="#{upload_name}"
+          - if removable
+            - if resource.send(upload_name).present?
+              = link_to destroy_label, uploadbox.image_path(resource.send(upload_name)), class: 'btn fileupload-exists', remote: true, method: :delete
+            - else
+              = link_to destroy_label, '#', class: 'btn fileupload-exists', remote: true, method: :delete
+

data/lib/uploadbox/engine.rb

@@ -39,27 +39,47 @@ end
 class ActionView::Helpers::FormBuilder
   def uploads_one(upload_name, options={})
     upload_model_class = "Uploadbox::#{@object.class.base_class.to_s + upload_name.to_s.camelize}".constantize
-    options.reverse_merge!(preview: upload_model_class.versions.keys.first,
-                           namespace: false,
-                           default: false,
-                           update_label: 'Alterar',
-                           choose_label: 'Escolher',
-                           destroy_label: '×'.html_safe)
-    dimensions = upload_model_class.versions[options[:preview]]
-    @template.render partial: 'uploadbox/images/uploads_one', locals: {
-      upload_name: upload_name,
-      resource: @object,
-      form: self,
-      version: options[:preview],
-      width: dimensions[0],
-      height: dimensions[1],
-      namespace: options[:namespace],
-      default: options[:default],
-      removable: upload_model_class.removable?,
-      update_label: options[:update_label],
-      choose_label: options[:choose_label],
-      destroy_label: options[:destroy_label]
-    }
+
+    if upload_model_class.versions.present?
+      options.reverse_merge!(preview: upload_model_class.versions.keys.first,
+                             namespace: false,
+                             default: false,
+                             update_label: 'Alterar',
+                             choose_label: 'Escolher',
+                             destroy_label: '×'.html_safe)
+      dimensions = upload_model_class.versions[options[:preview]]
+      @template.render partial: 'uploadbox/images/uploads_one', locals: {
+        upload_name: upload_name,
+        resource: @object,
+        form: self,
+        version: options[:preview],
+        width: dimensions[0],
+        height: dimensions[1],
+        namespace: options[:namespace],
+        default: options[:default],
+        removable: upload_model_class.removable?,
+        update_label: options[:update_label],
+        choose_label: options[:choose_label],
+        destroy_label: options[:destroy_label]
+      }
+    else
+      options.reverse_merge!(namespace: false,
+                             default: false,
+                             update_label: 'Alterar',
+                             choose_label: 'Escolher',
+                             destroy_label: '×'.html_safe)
+      dimensions = upload_model_class.versions[options[:preview]]
+      @template.render partial: 'uploadbox/files/uploads_one', locals: {
+        upload_name: upload_name,
+        resource: @object,
+        form: self,
+        namespace: options[:namespace],
+        removable: upload_model_class.removable?,
+        update_label: options[:update_label],
+        choose_label: options[:choose_label],
+        destroy_label: options[:destroy_label]
+      }
+    end
   end
 
   def uploads_many(upload_name, options={})

data/lib/uploadbox/image_uploader.rb

@@ -127,6 +127,7 @@ module Uploadbox
             def original_file
               model.original_file
             end
+
           end
         end
         mount_uploader :file, dynamic_uploader

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.2.0.rc2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc2
+  version: 0.2.0
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -547,6 +547,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/_file_uploader.coffee
 - app/assets/javascripts/_gallery_uploader.coffee
 - app/assets/javascripts/_image_uploader.coffee
 - app/assets/javascripts/_manager.coffee
@@ -571,6 +572,7 @@ files:
 - app/models/image.rb
 - app/uploaders/uploadbox/image_processing_uploader.rb
 - app/views/layouts/uploadbox/application.html.erb
+- app/views/uploadbox/files/_uploads_one.slim
 - app/views/uploadbox/images/_uploads_many.slim
 - app/views/uploadbox/images/_uploads_one.slim
 - app/views/uploadbox/images/find.json.jbuilder
@@ -606,9 +608,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11