uploadbox 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3cbfed4974a811cdaa9bc00700fdb1cc8d57e0
-  data.tar.gz: 5f080cd8e8be770faf1ae1310568158ae8884a4f
+  metadata.gz: 93240b0280249b35b89cd367932e1b2de5e6cce9
+  data.tar.gz: e94a982a1aeb55497b4825a2ff89be06037d2914
 SHA512:
-  metadata.gz: bd6b3534fb34c79dd511e3c1fbd12b0865df99e938197d21083dbf44b974218e8d3eb1b8b967d0a48cc9aee992663830796ac4e23701842dbc099331d41838da
-  data.tar.gz: b03253560ed00d6b9f1c6000912c63c4a2d125acded190bfdec3fa20cc647a66b602f8f912920c942a87b3a84b61e357fa757e0c28be2b50d922b392abec20e3
+  metadata.gz: 0c1221c95ae558e91ac8699db2ea603bdfb46b5b85a77aea927b58733ebaa52c66a7a621872ade40572d6f988d08998c8e92f370499d9f50c214b29443447649
+  data.tar.gz: 2386b4127cedfc97a72c7ec8133748fddb14ebcbb88f921a73f36bd3218d13f88dfdc6774482631f5aecc9d36e09fb303b899df23bc5ad152d699d68a95383bf

data/app/assets/font/fontello.svg

@@ -7,6 +7,7 @@
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
 <glyph glyph-name="picture-1" unicode="&#xe800;" d="m357 529q0-45-31-76t-76-32t-76 32t-31 76t31 75t76 32t76-32t31-75z m572-215v-250h-786v107l178 179l90-89l285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 7-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
+<glyph glyph-name="plus-1" unicode="&#xe802;" d="m786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q22 0 38-16t16-38z" horiz-adv-x="785.7" />
 </font>
 </defs>
 </svg>

data/app/assets/javascripts/_gallery_uploader.coffee

@@ -0,0 +1,64 @@
+class @GalleryUploader
+  constructor: (@container) ->    
+    @previews = {}
+
+    @container.find('input[type="file"]:first').show().fileupload
+      type: 'POST'
+      dataType: 'xml'
+      replaceFileInput: false   
+      autoUpload: true
+      formData: @getFormData
+      dropZone: @container
+      pasteZone: @container
+      add: @add
+      progress: @progress
+      done: @done
+      fail: @fail
+
+  add: (e, data) =>
+    if @loader
+      @loader.detach()
+    
+    if @verifyProcessingInterval
+      clearInterval(@verifyProcessingInterval)
+
+    if data.files[0].type.match /gif|jpe?g|png/
+      @clone = @container.find('[data-container="uploader"]:first').clone()
+      @container.append(@clone)
+      previewInstanceName = Manager.getInstanceName('UploaderPreview')
+      preview = new UploaderPreview(@clone, data.files[0])
+      @clone.data(previewInstanceName, preview)
+      @previews[preview.id()] = preview
+      data.context = preview.id()
+
+      @container.closest('form').find('[type=submit]').attr("disabled", true)
+      data.submit()
+
+  getFormData: =>
+    preview = @nextPreview()
+    filePath = "uploads/#{preview.id()}/" + preview.file.name
+    preview.filePath = filePath
+    [
+      { name: 'key', value: filePath },
+      { name: 'acl', value: @container.find('input[name="acl"]').val()  },
+      { name: 'Content-Type', value: preview.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: preview.file }
+    ]
+
+  progress: (e, data) =>
+    @previews[data.context].progress(data)
+
+  done: (e, data) =>
+    @previews[data.context].done(data)
+
+  fail: (e, data) =>
+    @previews[data.context].fail(data)
+
+  nextPreview: =>
+    @currentIndex ||= 0
+    key = Object.keys(@previews)[@currentIndex] 
+    @currentIndex++
+    @previews[key]

data/app/assets/javascripts/_manager.coffee

@@ -0,0 +1,18 @@
+class @Manager
+  @getInstanceName: (className) ->
+    className.charAt(0).toLowerCase() + className.slice(1)
+
+  @init = (container) ->
+    classNames = container.data('component').split(' ')
+
+    for className in classNames
+      try
+        instance = new (eval(className))(container)
+        instanceName = Manager.getInstanceName(className)
+        container.data(instanceName, instance)
+      catch error
+        try
+          console.warn "#{className} component not found"
+
+$(document).ready ->
+  $('[data-component]').each (i, el) -> Manager.init($(el))

data/app/assets/javascripts/_uploader_preview.coffee

@@ -0,0 +1,134 @@
+class @UploaderPreview
+  constructor: (@container, @file) ->
+    @loader = $('<div class="progress progress-striped active"><div class="bar" style="width: 0%;"></div></div>').hide()
+
+    @startLoader() if @isUploadStarting()
+      
+    @container.find('a.btn.fileupload-exists').bind('ajax:success', @delete)
+
+    @container.find('input[type="file"]:first').show().fileupload
+      type: 'POST'
+      dataType: 'xml'
+      replaceFileInput: false   
+      autoUpload: true
+      formData: @getFormData
+      dropZone: @container
+      pasteZone: @container
+      add: @add
+      progress: @progress
+      done: @done
+      fail: @fail
+
+    @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"]')
+    @thumbContainer = @container.find('.fileupload-preview.thumbnail')
+
+  startLoader: =>
+    @container.prepend(@loader.fadeIn())
+    @container.find('.fileupload').removeClass('processing').addClass('uploading')
+
+
+  add: (e, data) =>
+    @file = data.files[0]
+
+    if @loader
+      @loader.detach()
+    
+    if @verifyProcessingInterval
+      clearInterval(@verifyProcessingInterval)
+
+    if @file.type.match /gif|jpe?g|png/
+      data.context = @id()
+      @startLoader()
+      @container.closest('form').find('[type=submit]').attr("disabled", true)
+      data.submit()
+
+  getFormData: =>
+    @filePath = "uploads/#{@id()}/" + @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 }
+    ]
+
+  
+  isUploadStarting: =>
+    @container.find('.fileupload').hasClass('fileupload-new')
+
+  id: =>
+    @_id ||= uuid.v4()
+
+  progress: (data) =>
+    progress = parseInt(data.loaded / data.total * 100, 10)
+    @loader.find('.bar').css({width: progress + '%'})
+
+  done: (data) =>
+    @container.find('.fileupload').removeClass('uploading').addClass('processing')
+    $.ajax
+      type: 'POST'
+      url: @fileInput.data('callback-url')
+      data: 
+        'image[remote_file_url]': @fileInput.data('url') + @filePath
+        'image[imageable_type]': @typeInput.val()
+        'image[upload_name]': @uploadNameInput.val()
+        'image[secure_random]': @id()
+      
+      complete: =>
+        @verifyProcessingInterval = setInterval(@verifyProcessing, 5000)
+      
+      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:
+        'name': filename
+        'imageable_type': @typeInput.val()
+        'upload_name': @uploadNameInput.val()
+        'secure_random': @id()
+
+      complete: (data) =>
+        if data.responseJSON.hasOwnProperty('id')
+          clearInterval(@verifyProcessingInterval)
+          @showThumb(data.responseJSON)
+      
+      error: =>
+        @loader.detach()
+        @container.detach()
+
+  showThumb: (image) =>
+    @loader.detach()
+    @idInput.val(image.id)
+    @container.find('a.btn.fileupload-exists').attr('href', image.url)
+    @thumbContainer.find('img').detach()
+    img = $('<img/>')
+    img.attr('src', image.versions[@thumbContainer.data('version')])
+    img.attr('width', @thumbContainer.data('width'))
+    img.attr('height', @thumbContainer.data('height')).hide()
+    @container.find('.fileupload-preview.thumbnail').append(img.fadeIn())
+    @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)
+
+  fail: =>
+    @loader.detach()
+    @container.detach()
+
+  delete: =>
+    @idInput.val('')
+    @container.detach()
+

data/app/assets/javascripts/_uuid.js

@@ -0,0 +1,245 @@
+//     uuid.js
+//
+//     Copyright (c) 2010-2012 Robert Kieffer
+//     MIT License - http://opensource.org/licenses/mit-license.php
+
+(function() {
+  var _global = this;
+
+  // Unique ID creation requires a high quality random # generator.  We feature
+  // detect to determine the best RNG source, normalizing to a function that
+  // returns 128-bits of randomness, since that's what's usually required
+  var _rng;
+
+  // Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
+  //
+  // Moderately fast, high quality
+  if (typeof(_global.require) == 'function') {
+    try {
+      var _rb = _global.require('crypto').randomBytes;
+      _rng = _rb && function() {return _rb(16);};
+    } catch(e) {}
+  }
+
+  if (!_rng && _global.crypto && crypto.getRandomValues) {
+    // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
+    //
+    // Moderately fast, high quality
+    var _rnds8 = new Uint8Array(16);
+    _rng = function whatwgRNG() {
+      crypto.getRandomValues(_rnds8);
+      return _rnds8;
+    };
+  }
+
+  if (!_rng) {
+    // Math.random()-based (RNG)
+    //
+    // If all else fails, use Math.random().  It's fast, but is of unspecified
+    // quality.
+    var  _rnds = new Array(16);
+    _rng = function() {
+      for (var i = 0, r; i < 16; i++) {
+        if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
+        _rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
+      }
+
+      return _rnds;
+    };
+  }
+
+  // Buffer class to use
+  var BufferClass = typeof(_global.Buffer) == 'function' ? _global.Buffer : Array;
+
+  // Maps for number <-> hex string conversion
+  var _byteToHex = [];
+  var _hexToByte = {};
+  for (var i = 0; i < 256; i++) {
+    _byteToHex[i] = (i + 0x100).toString(16).substr(1);
+    _hexToByte[_byteToHex[i]] = i;
+  }
+
+  // **`parse()` - Parse a UUID into it's component bytes**
+  function parse(s, buf, offset) {
+    var i = (buf && offset) || 0, ii = 0;
+
+    buf = buf || [];
+    s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
+      if (ii < 16) { // Don't overflow!
+        buf[i + ii++] = _hexToByte[oct];
+      }
+    });
+
+    // Zero out remaining bytes if string was short
+    while (ii < 16) {
+      buf[i + ii++] = 0;
+    }
+
+    return buf;
+  }
+
+  // **`unparse()` - Convert UUID byte array (ala parse()) into a string**
+  function unparse(buf, offset) {
+    var i = offset || 0, bth = _byteToHex;
+    return  bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] + '-' +
+            bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]] +
+            bth[buf[i++]] + bth[buf[i++]];
+  }
+
+  // **`v1()` - Generate time-based UUID**
+  //
+  // Inspired by https://github.com/LiosK/UUID.js
+  // and http://docs.python.org/library/uuid.html
+
+  // random #'s we need to init node and clockseq
+  var _seedBytes = _rng();
+
+  // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+  var _nodeId = [
+    _seedBytes[0] | 0x01,
+    _seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
+  ];
+
+  // Per 4.2.2, randomize (14 bit) clockseq
+  var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
+
+  // Previous uuid creation time
+  var _lastMSecs = 0, _lastNSecs = 0;
+
+  // See https://github.com/broofa/node-uuid for API details
+  function v1(options, buf, offset) {
+    var i = buf && offset || 0;
+    var b = buf || [];
+
+    options = options || {};
+
+    var clockseq = options.clockseq != null ? options.clockseq : _clockseq;
+
+    // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+    // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+    // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+    // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+    var msecs = options.msecs != null ? options.msecs : new Date().getTime();
+
+    // Per 4.2.1.2, use count of uuid's generated during the current clock
+    // cycle to simulate higher resolution clock
+    var nsecs = options.nsecs != null ? options.nsecs : _lastNSecs + 1;
+
+    // Time since last uuid creation (in msecs)
+    var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
+
+    // Per 4.2.1.2, Bump clockseq on clock regression
+    if (dt < 0 && options.clockseq == null) {
+      clockseq = clockseq + 1 & 0x3fff;
+    }
+
+    // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+    // time interval
+    if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
+      nsecs = 0;
+    }
+
+    // Per 4.2.1.2 Throw error if too many uuids are requested
+    if (nsecs >= 10000) {
+      throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
+    }
+
+    _lastMSecs = msecs;
+    _lastNSecs = nsecs;
+    _clockseq = clockseq;
+
+    // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+    msecs += 12219292800000;
+
+    // `time_low`
+    var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+    b[i++] = tl >>> 24 & 0xff;
+    b[i++] = tl >>> 16 & 0xff;
+    b[i++] = tl >>> 8 & 0xff;
+    b[i++] = tl & 0xff;
+
+    // `time_mid`
+    var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
+    b[i++] = tmh >>> 8 & 0xff;
+    b[i++] = tmh & 0xff;
+
+    // `time_high_and_version`
+    b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+    b[i++] = tmh >>> 16 & 0xff;
+
+    // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+    b[i++] = clockseq >>> 8 | 0x80;
+
+    // `clock_seq_low`
+    b[i++] = clockseq & 0xff;
+
+    // `node`
+    var node = options.node || _nodeId;
+    for (var n = 0; n < 6; n++) {
+      b[i + n] = node[n];
+    }
+
+    return buf ? buf : unparse(b);
+  }
+
+  // **`v4()` - Generate random UUID**
+
+  // See https://github.com/broofa/node-uuid for API details
+  function v4(options, buf, offset) {
+    // Deprecated - 'format' argument, as supported in v1.2
+    var i = buf && offset || 0;
+
+    if (typeof(options) == 'string') {
+      buf = options == 'binary' ? new BufferClass(16) : null;
+      options = null;
+    }
+    options = options || {};
+
+    var rnds = options.random || (options.rng || _rng)();
+
+    // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+    rnds[6] = (rnds[6] & 0x0f) | 0x40;
+    rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+    // Copy bytes to buffer, if provided
+    if (buf) {
+      for (var ii = 0; ii < 16; ii++) {
+        buf[i + ii] = rnds[ii];
+      }
+    }
+
+    return buf || unparse(rnds);
+  }
+
+  // Export public API
+  var uuid = v4;
+  uuid.v1 = v1;
+  uuid.v4 = v4;
+  uuid.parse = parse;
+  uuid.unparse = unparse;
+  uuid.BufferClass = BufferClass;
+
+  if (typeof define === 'function' && define.amd) {
+    // Publish as AMD module
+    define(function() {return uuid;});
+  } else if (typeof(module) != 'undefined' && module.exports) {
+    // Publish as node.js module
+    module.exports = uuid;
+  } else {
+    // Publish as global (in browsers)
+    var _previousRoot = _global.uuid;
+
+    // **`noConflict()` - (browser only) to reset global 'uuid' var**
+    uuid.noConflict = function() {
+      _global.uuid = _previousRoot;
+      return uuid;
+    };
+
+    _global.uuid = uuid;
+  }
+}).call(this);

data/app/assets/javascripts/uploadbox.coffee

@@ -2,5 +2,9 @@
 #= require jquery.iframe-transport
 #= require cors/jquery.postmessage-transport
 #= require cors/jquery.xdr-transport
+#= require _uuid
 #= require jquery.fileupload
 #= require _image_uploader
+#= require _uploader_preview
+#= require _gallery_uploader
+#= require _manager

data/app/assets/stylesheets/{fontello.scss → fontello.css}

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'fontello';
-  src: url('fontello.eot?99792958');
-  src: url('fontello.eot?99792958#iefix') format('embedded-opentype'),
-       url('fontello.woff?99792958') format('woff'),
-       url('fontello.ttf?99792958') format('truetype'),
-       url('fontello.svg?99792958#fontello') format('svg');
+  src: url('fontello.eot?18809145');
+  src: url('fontello.eot?18809145#iefix') format('embedded-opentype'),
+       url('fontello.woff?18809145') format('woff'),
+       url('fontello.ttf?18809145') format('truetype'),
+       url('fontello.svg?18809145#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?99792958#fontello') format('svg');
+    src: url('../font/fontello.svg?18809145#fontello') format('svg');
   }
 }
 */
@@ -50,4 +50,5 @@
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
  
-.icon-picture-1:before { content: '\e800'; } /* '' */
+.icon-picture-1:before { content: '\e800'; } /* '' */
+.icon-plus-1:before { content: '\e802'; } /* '' */

data/app/assets/stylesheets/uploadbox.sass

@@ -3,7 +3,6 @@
 
 .uploadbox-image-uploader
   position: relative
-  padding-bottom: 30px
 
   .btn
     background-color: #f7f7f7
@@ -15,18 +14,17 @@
     .btn
       border: 1px solid darken(#f7f7f7, 20%)
 
-    .icon-picture-1
+    .icon
       opacity: .5
 
   .fileupload-exists
-    .icon-picture-1
+    .icon
       display: none
 
-  .icon-picture-1
+  .icon
     position: absolute
     top: 0
     left: 0
-    font-size: 40px
     width: 100%
     height: 100%
     opacity: .3

data/app/views/uploadbox/images/_uploads_many.slim

@@ -0,0 +1,61 @@
+= form.fields_for :image do
+  div data-component="GalleryUploader"
+    .uploadbox-image-uploader.uploads-many data-container="uploader" style="width: #{width}px; height: #{height}px;"
+      - if namespace
+        input name="[#{resource.class.name.underscore}][#{namespace}]#{upload_name}[]" data-item="id" type="hidden"
+      - else
+        input name="[#{resource.class.name.underscore}]#{upload_name}[]" data-item="id" type="hidden"
+
+      .fileupload data-provides="fileupload" class="fileupload-new"
+        .fileupload-preview.thumbnail data-version="#{version}" data-width="#{width}" data-height="#{height}" style="width: #{width}px; height: #{height}px;"
+
+        .fileupload-actions
+          span.btn.btn-file style="width: #{width}px; height: #{height}px;"
+            span.fileupload-new = choose_label
+            span.fileupload-exists = update_label
+            i.icon.icon-plus-1 style="line-height: #{height}px; font-size: #{(width * 0.4).to_i}px"
+
+            input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" accept="image/png image/x-png, image/gif, image/jpeg" style="display: none; width: #{width}px; height: #{height}px;" multiple="true"
+            input type="hidden" name="policy" value="#{s3_policy}"
+            input type="hidden" name="signature" value="#{s3_signature}"
+            input type="hidden" name="AWSAccessKeyId" value="#{ENV['S3_KEY']}"
+            input type="hidden" name="acl" value="public-read"
+            input type="hidden" name="key"
+
+            input type="hidden" name="image[imageable_type]" value="#{resource.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
+
+    - for image in resource.send(upload_name)
+      .uploadbox-image-uploader.uploads-many data-component="UploaderPreview" data-container="uploader" style="width: #{width}px; height: #{height}px;"
+        - if namespace
+          input name="[#{resource.class.name.underscore}][#{namespace}]#{upload_name}[]" data-item="id" type="hidden" value="#{image.id}"
+        - else
+          input name="[#{resource.class.name.underscore}]#{upload_name}[]" data-item="id" type="hidden" value="#{image.id}"
+
+        .fileupload data-provides="fileupload" class="fileupload-exists"
+          .fileupload-preview.thumbnail data-version="#{version}" data-width="#{width}" data-height="#{height}" style="width: #{width}px; height: #{height}px;"
+            = img image.send(version)
+
+          .fileupload-actions
+            span.btn.btn-file style="width: #{width}px; height: #{height}px;"
+              span.fileupload-new = choose_label
+              span.fileupload-exists = update_label
+              i.icon.icon-plus-1 style="line-height: #{height}px; font-size: #{(width * 0.4).to_i}px"
+
+              input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" accept="image/png image/x-png, image/gif, image/jpeg" style="display: none; width: #{width}px; height: #{height}px;" multiple="true"
+              input type="hidden" name="policy" value="#{s3_policy}"
+              input type="hidden" name="signature" value="#{s3_signature}"
+              input type="hidden" name="AWSAccessKeyId" value="#{ENV['S3_KEY']}"
+              input type="hidden" name="acl" value="public-read"
+              input type="hidden" name="key"
+
+              input type="hidden" name="image[imageable_type]" value="#{resource.class}"
+              input type="hidden" name="image[upload_name]" value="#{upload_name}"
+            - if removable
+              = link_to destroy_label, uploadbox.image_path(image), class: 'btn fileupload-exists', remote: true, method: :delete
+

data/app/views/uploadbox/images/{_uploader.html.slim → _uploads_one.slim}

@@ -1,10 +1,11 @@
 = form.fields_for :image do
   - secure_random = SecureRandom.uuid
-  .uploadbox-image-uploader data-component="ImageUploader" style="width: #{width}px; height: #{height}px;"
+  .uploadbox-image-uploader.uploads-one data-component="ImageUploader" style="width: #{width}px; height: #{height}px;"
     - if namespace
-      input name="[#{namespace}]#{upload_name}_id" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
+      input name="[#{resource.class.name.underscore}][#{namespace}]#{upload_name}" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
     - else
-      input name="#{upload_name}_id" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
+      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}?") or default) ? 'exists' : 'new'}"
       .fileupload-preview.thumbnail data-version="#{version}" data-width="#{width}" data-height="#{height}" style="width: #{width}px; height: #{height}px;"
         - if resource.send("#{upload_name}?")
@@ -16,8 +17,10 @@
         span.btn.btn-file style="width: #{width}px; height: #{height}px;"
           span.fileupload-new = choose_label
           span.fileupload-exists = update_label
-          i.icon-picture-1 style="line-height: #{height}px"
-          input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" data-secure-random="#{secure_random}" accept="image/x-png, image/gif, image/jpeg" style="display: none; width: #{width}px; height: #{height}px;"
+          i.icon.icon-picture-1 style="line-height: #{height}px; font-size: #{(width * 0.4).to_i}px"
+
+
+          input type="file" name="image[file]" data-callback-url="#{uploadbox.images_path}" data-find-url="#{uploadbox.find_images_path(format: :json)}" data-url="https://#{ENV['S3_BUCKET']}.s3.amazonaws.com/" data-secure-random="#{secure_random}" accept="image/png image/x-png, image/gif, image/jpeg" style="display: none; width: #{width}px; height: #{height}px;"
           input type="hidden" name="policy" value="#{s3_policy}"
           input type="hidden" name="signature" value="#{s3_signature}"
           input type="hidden" name="AWSAccessKeyId" value="#{ENV['S3_KEY']}"

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = './spec/dummy'

data/lib/uploadbox/engine.rb

@@ -28,7 +28,7 @@ module Uploadbox
 end
 
 class ActionView::Helpers::FormBuilder
-  def uploader(upload_name, options={})
+  def uploads_one(upload_name, options={})
     upload_model_class = "Uploadbox::#{@object.class.to_s + upload_name.to_s.camelize}".constantize
     options.reverse_merge!(preview: upload_model_class.versions.keys.first,
                            namespace: false,
@@ -37,7 +37,32 @@ class ActionView::Helpers::FormBuilder
                            choose_label: 'Escolher',
                            destroy_label: '×'.html_safe)
     dimensions = upload_model_class.versions[options[:preview]]
-    @template.render partial: 'uploadbox/images/uploader', locals: {
+    @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]
+    }
+  end
+
+  def uploads_many(upload_name, options={})
+    upload_model_class = "Uploadbox::#{@object.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_many', locals: {
       upload_name: upload_name,
       resource: @object,
       form: self,
@@ -54,4 +79,4 @@ class ActionView::Helpers::FormBuilder
   end
 end
 
-require 'uploadbox/image_uploader'
+require 'uploadbox/image_uploader'

data/lib/uploadbox/image_uploader.rb

@@ -23,6 +23,7 @@ module Uploadbox
         upload and upload.file?
       end
 
+      # @post.picture
       define_method(upload_name) do
         upload = send("#{upload_name}_upload")
 
@@ -48,22 +49,15 @@ module Uploadbox
         end
       end
 
-      # @post.attach_picture
-      define_method("attach_#{upload_name}") do |upload_id|
-        if upload_id.present?
-          self.send("attach_#{upload_name}!", upload_id)
-        end
+      # @post.picture=(id)
+      define_method("#{upload_name}=") do |upload_id|
+        self.send("#{upload_name}_upload=", upload_class.find(upload_id))
       end
 
       # @post.remote_picture_url=('http://exemple.com/image.jpg')
       define_method("remote_#{upload_name}_url=") do |url|
         upload = Uploadbox.const_get(upload_class_name).create!(remote_file_url: url)
-        self.send("#{upload_name}=", upload)
-      end
-
-      # @post.attach_picture!
-      define_method("attach_#{upload_name}!") do |upload_id|
-        self.send("#{upload_name}=", upload_class.find(upload_id))
+        self.send("#{upload_name}_upload=", upload)
       end
 
       # Post.update_picture_versions!
@@ -80,6 +74,94 @@ module Uploadbox
         options[:removable]
       end
 
+      upload_class.instance_eval do
+        delegate *upload_versions.keys, to: :file
+
+        default_scope -> { where(imageable_type: imageable_type).where(upload_name: upload_name.to_s) }
+
+        # Uploabox::PostPictureUploader < UploadBox::ImgProcessing < CarrierWave
+        dynamic_uploader = Class.new(Uploadbox::ImageProcessingUploader)
+        Uploadbox.const_set(self.name.demodulize + 'Uploader', dynamic_uploader)
+        dynamic_uploader.class_eval do
+          upload_versions.each do |version_name, dimensions|
+            if options[:retina]
+              dimensions = dimensions.map{ |d| d * 2 }
+            end
+
+            version version_name do
+              process resize_to_fill: dimensions
+              process quality: quality = options[:quality]
+            end
+
+            def dimensions
+              model.class.versions[version_name]
+            end
+
+            def width
+              dimensions[0]
+            end
+
+            def height
+              dimensions[1]
+            end
+          end
+        end
+        mount_uploader :file, dynamic_uploader
+
+      end
+
+      has_one "#{upload_name}_upload".to_sym, as: :imageable, 
+                                              class_name: "Uploadbox::#{self.to_s + upload_name.to_s.camelize}", 
+                                              autosave: true
+      accepts_nested_attributes_for "#{upload_name}_upload".to_sym
+    end
+
+
+    def uploads_many(upload_name, options={})
+      default_options = {
+        default: false,
+        placeholder: false,
+        removable: true,
+        retina: Uploadbox.retina,
+        quality: Uploadbox.retina ? (Uploadbox.retina_quality || 40) : (Uploadbox.image_quality || 80)
+      }
+      options = options.reverse_merge(default_options)
+      upload_versions = options.select{ |key| default_options.keys.exclude? key }
+      options = options.select{ |key| default_options.keys.include? key }
+
+      imageable_type = self.to_s
+      upload_class_name = imageable_type + upload_name.to_s.camelize
+      upload_class = Class.new(Image)
+      Uploadbox.const_set(upload_class_name, upload_class)
+
+      # @post.images?
+      define_method("#{upload_name}?") do 
+        upload = send(upload_name)
+        upload and upload.any?
+      end
+
+      # @post.images=([id, id])
+      define_method("#{upload_name}=") do |ids|
+        self.send(upload_name).send('replace', [])
+        for id in ids.select(&:present?)
+          self.send(upload_name).send('<<', upload_class.find(id))
+        end
+      end
+
+      # Post.update_images_versions!
+      self.define_singleton_method "update_#{upload_name}_versions!" do
+        Uploadbox.const_get(upload_class_name).find_each{|upload| upload.file.recreate_versions!}
+      end
+
+      # Uploadbox::PostImages < Image
+      upload_class.define_singleton_method :versions do
+        upload_versions
+      end
+
+      upload_class.define_singleton_method :removable? do
+        options[:removable]
+      end
+
       upload_class.instance_eval do
         delegate *upload_versions.keys, to: :file
 
@@ -115,7 +197,7 @@ module Uploadbox
         mount_uploader :file, dynamic_uploader
       end
 
-      has_one "#{upload_name}_upload".to_sym, as: :imageable, dependent: :destroy, class_name: "Uploadbox::#{self.to_s + upload_name.to_s.camelize}"
+      has_many upload_name, as: :imageable, class_name: "Uploadbox::#{self.to_s + upload_name.to_s.camelize}"
     end
 
   end

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -347,6 +347,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: dotenv-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Uploadbox makes easy to manage files in your Rails application.
 email:
 - julio@startae.com.br
@@ -359,7 +387,11 @@ files:
 - app/assets/font/fontello.svg
 - app/assets/font/fontello.ttf
 - app/assets/font/fontello.woff
+- app/assets/javascripts/_gallery_uploader.coffee
 - app/assets/javascripts/_image_uploader.coffee
+- app/assets/javascripts/_manager.coffee
+- app/assets/javascripts/_uploader_preview.coffee
+- app/assets/javascripts/_uuid.js
 - app/assets/javascripts/cors/jquery.postmessage-transport.js
 - app/assets/javascripts/cors/jquery.xdr-transport.js
 - app/assets/javascripts/jquery.fileupload.js
@@ -367,7 +399,7 @@ files:
 - app/assets/javascripts/jquery.ui.widget.js
 - app/assets/javascripts/uploadbox.coffee
 - app/assets/stylesheets/bootstrap/_progress.css
-- app/assets/stylesheets/fontello.scss
+- app/assets/stylesheets/fontello.css
 - app/assets/stylesheets/uploadbox.sass
 - app/controllers/uploadbox/application_controller.rb
 - app/controllers/uploadbox/images_controller.rb
@@ -377,9 +409,11 @@ files:
 - app/models/image.rb
 - app/uploaders/uploadbox/image_processing_uploader.rb
 - app/views/layouts/uploadbox/application.html.erb
-- app/views/uploadbox/images/_uploader.html.slim
+- app/views/uploadbox/images/_uploads_many.slim
+- app/views/uploadbox/images/_uploads_one.slim
 - app/views/uploadbox/images/find.json.jbuilder
 - config/routes.rb
+- config/spring.rb
 - lib/form_builder.rb
 - lib/generators/uploadbox/image/image_generator.rb
 - lib/generators/uploadbox/image/templates/initializers/uploadbox.rb