uploadbox 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd2d26ea7a6f565a452fd772626c1919ee846709
-  data.tar.gz: abc178d5d852c2575c452184596402737065e63e
+  metadata.gz: 605fe90f8d3f385da36ee21257ab2c4d6783b513
+  data.tar.gz: fcb1983a55e7e3c103c45271a10229e720fe35e3
 SHA512:
-  metadata.gz: d125cda1a974a2cd6ca5c5670106b4bb75f00457c69f7f5f9690e7c7a8577f2f80981bbc9a9487e952998b82d8a66ca0267b423b152b2a179a6c2f1dcb21fdac
-  data.tar.gz: 9e9eb602502dcd5d0bda6d9b5fecc73029234870ac39dc92ff4a1b0ca2a90c250e13c5a865878bee23d1f5178d57f7d14139c3509d3dd6a9597e6f6ec7809542
+  metadata.gz: 35a73a6ce9ed2127ecd4199833210d53036afe2a2989988ccca30c281545a066bbc537de43d9c67e4b2b00e6402392642d117b9532146dd870c69bf00292f584
+  data.tar.gz: 668beadd3a2ddf04cfbf1d4a88e4b499d7136c9284e5842d4d43e3539440e33b88225945659319aa1815d0f99339babcf2cc81729f003b7fe3b93a9434c58625

data/app/assets/javascripts/_image_uploader.coffee

@@ -7,13 +7,13 @@ class @ImageUploader
     @idInput = @container.find('[data-item="id"]')
     @container.find('a.btn.fileupload-exists').bind('ajax:success', @delete)
     @thumbContainer = @container.find('.fileupload-preview.thumbnail')
+
     @fileInput.fileupload
-      dataType: 'json'
-      formData: [
-        {name: @fileInput.attr('name'), value: @fileInput.val()},
-        {name: @typeInput.attr('name'), value: @typeInput.val()}
-        {name: @uploadNameInput.attr('name'), value: @uploadNameInput.val()}
-      ]
+      type: 'POST'
+      dataType: 'xml'
+      replaceFileInput: false
+      autoUpload: true
+      formData: @getFormData
       add: @add
       progress: @progress
       done: @done
@@ -23,12 +23,62 @@ class @ImageUploader
     @preview.prepend(@loader.fadeIn())
     data.submit()
 
+  getFormData: (arg) =>
+    file = @fileInput.get(0).files[0]
+    @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) =>
-    image = data.result
+    $.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]': @fileInput.data('secure-random')
+      complete: =>
+        @verifyProcessingInterval = setInterval(@verifyProcessing, 5000)
+
+  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': @fileInput.data('secure-random')
+
+      complete: (data) =>
+        if data.responseJSON.hasOwnProperty('id')
+          clearInterval(@verifyProcessingInterval)
+          @showThumb(data.responseJSON)
+        
+  delete: =>
+    @idInput.val('')
+    @container.find('.fileupload-preview.thumbnail img').detach()
+    @container.find('.fileupload').addClass('fileupload-new').removeClass('fileupload-exists')
+
+  fail: (e, data) =>
+    console.log('fail')
+
+  showThumb: (image) =>
     @loader.detach()
     @idInput.val(image.id)
     @container.find('a.btn.fileupload-exists').attr('href', image.url)
@@ -36,16 +86,11 @@ class @ImageUploader
     img = $('<img/>')
     img.attr('src', image.versions[@thumbContainer.data('version')])
     img.attr('width', @thumbContainer.data('width'))
-    img.attr('height', @thumbContainer.data('height'))
-    @container.find('.fileupload-preview.thumbnail').append(img)
+    img.attr('height', @thumbContainer.data('height')).hide()
+    @container.find('.fileupload-preview.thumbnail').append(img.fadeIn())
     @container.find('.fileupload').removeClass('fileupload-new').addClass('fileupload-exists')
 
-  delete: =>
-    @idInput.val('')
-    @container.find('.fileupload-preview.thumbnail img').detach()
-    @container.find('.fileupload').addClass('fileupload-new').removeClass('fileupload-exists')
 
 $ ->
   $('[data-component="ImageUploader"]').each (i, el) ->
     $(el).data('image_uploader', new ImageUploader($(el)))
-

data/app/assets/javascripts/cors/jquery.postmessage-transport.js

@@ -0,0 +1,118 @@
+/*
+ * jQuery postMessage Transport Plugin 1.1.1
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint unparam: true, nomen: true */
+/*global define, window, document */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define(['jquery'], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    var counter = 0,
+        names = [
+            'accepts',
+            'cache',
+            'contents',
+            'contentType',
+            'crossDomain',
+            'data',
+            'dataType',
+            'headers',
+            'ifModified',
+            'mimeType',
+            'password',
+            'processData',
+            'timeout',
+            'traditional',
+            'type',
+            'url',
+            'username'
+        ],
+        convert = function (p) {
+            return p;
+        };
+
+    $.ajaxSetup({
+        converters: {
+            'postmessage text': convert,
+            'postmessage json': convert,
+            'postmessage html': convert
+        }
+    });
+
+    $.ajaxTransport('postmessage', function (options) {
+        if (options.postMessage && window.postMessage) {
+            var iframe,
+                loc = $('<a>').prop('href', options.postMessage)[0],
+                target = loc.protocol + '//' + loc.host,
+                xhrUpload = options.xhr().upload;
+            return {
+                send: function (_, completeCallback) {
+                    counter += 1;
+                    var message = {
+                            id: 'postmessage-transport-' + counter
+                        },
+                        eventName = 'message.' + message.id;
+                    iframe = $(
+                        '<iframe style="display:none;" src="' +
+                            options.postMessage + '" name="' +
+                            message.id + '"></iframe>'
+                    ).bind('load', function () {
+                        $.each(names, function (i, name) {
+                            message[name] = options[name];
+                        });
+                        message.dataType = message.dataType.replace('postmessage ', '');
+                        $(window).bind(eventName, function (e) {
+                            e = e.originalEvent;
+                            var data = e.data,
+                                ev;
+                            if (e.origin === target && data.id === message.id) {
+                                if (data.type === 'progress') {
+                                    ev = document.createEvent('Event');
+                                    ev.initEvent(data.type, false, true);
+                                    $.extend(ev, data);
+                                    xhrUpload.dispatchEvent(ev);
+                                } else {
+                                    completeCallback(
+                                        data.status,
+                                        data.statusText,
+                                        {postmessage: data.result},
+                                        data.headers
+                                    );
+                                    iframe.remove();
+                                    $(window).unbind(eventName);
+                                }
+                            }
+                        });
+                        iframe[0].contentWindow.postMessage(
+                            message,
+                            target
+                        );
+                    }).appendTo(document.body);
+                },
+                abort: function () {
+                    if (iframe) {
+                        iframe.remove();
+                    }
+                }
+            };
+        }
+    });
+
+}));

data/app/assets/javascripts/cors/jquery.xdr-transport.js

@@ -0,0 +1,87 @@
+/*
+ * jQuery XDomainRequest Transport Plugin 1.1.3
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ *
+ * Based on Julian Aubourg's ajaxHooks xdr.js:
+ * https://github.com/jaubourg/ajaxHooks/
+ */
+
+/*jslint unparam: true */
+/*global define, window, XDomainRequest */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define(['jquery'], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+    if (window.XDomainRequest && !$.support.cors) {
+        $.ajaxTransport(function (s) {
+            if (s.crossDomain && s.async) {
+                if (s.timeout) {
+                    s.xdrTimeout = s.timeout;
+                    delete s.timeout;
+                }
+                var xdr;
+                return {
+                    send: function (headers, completeCallback) {
+                        var addParamChar = /\?/.test(s.url) ? '&' : '?';
+                        function callback(status, statusText, responses, responseHeaders) {
+                            xdr.onload = xdr.onerror = xdr.ontimeout = $.noop;
+                            xdr = null;
+                            completeCallback(status, statusText, responses, responseHeaders);
+                        }
+                        xdr = new XDomainRequest();
+                        // XDomainRequest only supports GET and POST:
+                        if (s.type === 'DELETE') {
+                            s.url = s.url + addParamChar + '_method=DELETE';
+                            s.type = 'POST';
+                        } else if (s.type === 'PUT') {
+                            s.url = s.url + addParamChar + '_method=PUT';
+                            s.type = 'POST';
+                        } else if (s.type === 'PATCH') {
+                            s.url = s.url + addParamChar + '_method=PATCH';
+                            s.type = 'POST';
+                        }
+                        xdr.open(s.type, s.url);
+                        xdr.onload = function () {
+                            callback(
+                                200,
+                                'OK',
+                                {text: xdr.responseText},
+                                'Content-Type: ' + xdr.contentType
+                            );
+                        };
+                        xdr.onerror = function () {
+                            callback(404, 'Not Found');
+                        };
+                        if (s.xdrTimeout) {
+                            xdr.ontimeout = function () {
+                                callback(0, 'timeout');
+                            };
+                            xdr.timeout = s.xdrTimeout;
+                        }
+                        xdr.send((s.hasContent && s.data) || null);
+                    },
+                    abort: function () {
+                        if (xdr) {
+                            xdr.onerror = $.noop();
+                            xdr.abort();
+                        }
+                    }
+                };
+            }
+        });
+    }
+}));

data/app/assets/javascripts/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.31.6
+ * jQuery File Upload Plugin 5.32.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -27,6 +27,18 @@
 }(function ($) {
     'use strict';
 
+    // Detect file input support, based on
+    // http://viljamis.com/blog/2012/file-upload-support-on-mobile/
+    $.support.fileInput = !(new RegExp(
+        // Handle devices which give false positives for the feature detection:
+        '(Android (1\\.[0156]|2\\.[01]))' +
+            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
+            '|(w(eb)?OSBrowser)|(webOS)' +
+            '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
+    ).test(window.navigator.userAgent) ||
+        // Feature detection for all other devices:
+        $('<input type="file">').prop('disabled'));
+
     // The FileReader API is not actually used, but works as feature detection,
     // as e.g. Safari supports XHR file uploads via the FormData API,
     // but not non-multipart XHR file uploads:
@@ -387,7 +399,7 @@
                 // Ignore non-multipart setting if not supported:
                 multipart = options.multipart || !$.support.xhrFileUpload,
                 paramName = options.paramName[0];
-            options.headers = options.headers || {};
+            options.headers = $.extend({}, options.headers);
             if (options.contentRange) {
                 options.headers['Content-Range'] = options.contentRange;
             }
@@ -1153,9 +1165,11 @@
                     paste: this._onPaste
                 });
             }
-            this._on(this.options.fileInput, {
-                change: this._onChange
-            });
+            if ($.support.fileInput) {
+                this._on(this.options.fileInput, {
+                    change: this._onChange
+                });
+            }
         },
 
         _destroyEventHandlers: function () {
@@ -1289,6 +1303,10 @@
                             if (aborted) {
                                 return;
                             }
+                            if (!files.length) {
+                                dfd.reject();
+                                return;
+                            }
                             data.files = files;
                             jqXHR = that._onSend(null, data).then(
                                 function (result, textStatus, jqXHR) {

data/app/assets/javascripts/uploadbox.coffee

@@ -1,4 +1,6 @@
 #= require jquery.ui.widget
 #= require jquery.iframe-transport
+#= require cors/jquery.postmessage-transport
+#= require cors/jquery.xdr-transport
 #= require jquery.fileupload
 #= require _image_uploader

data/app/controllers/uploadbox/images_controller.rb

@@ -3,7 +3,15 @@ module Uploadbox
     layout false
 
     def create
-      @image = Image.create_upload(image_params)
+      Resque.enqueue(ProcessImage, image_params)
+      render nothing: true
+    end
+
+    def find
+      params[:imageable_type].constantize # load class
+
+      upload_class_name = params[:imageable_type] + params[:upload_name].camelize
+      @image = Uploadbox.const_get(upload_class_name).find_by(secure_random: params[:secure_random], file: params[:name])
     end
 
     def destroy
@@ -12,7 +20,7 @@ module Uploadbox
 
     private
       def image_params
-        params.require(:image).permit(:file, :imageable_type, :upload_name)
+        params.require(:image).permit(:remote_file_url, :imageable_type, :upload_name, :secure_random)
       end
   end
 end

data/app/jobs/process_image.rb

@@ -0,0 +1,9 @@
+class ProcessImage
+  extend HerokuResqueAutoScale
+  
+  @queue = :process_image
+
+  def self.perform(image_params)
+    Image.create_upload(image_params)
+  end
+end

data/app/models/image.rb

@@ -2,10 +2,10 @@ class Image < ActiveRecord::Base
   belongs_to :imageable, polymorphic: true
 
   def self.create_upload(attributes)
-    attributes[:imageable_type].constantize # load class
+    attributes["imageable_type"].constantize # load class
 
-    upload_class_name = attributes[:imageable_type] + attributes[:upload_name].camelize
-    attributes.delete(:upload_name)
+    upload_class_name = attributes["imageable_type"] + attributes["upload_name"].camelize
+    attributes.delete("upload_name")
     Uploadbox.const_get(upload_class_name).create!(attributes)
   end
 end

data/app/views/uploadbox/images/_uploader.html.slim

@@ -1,4 +1,5 @@
 = form.fields_for :image do
+  - secure_random = SecureRandom.uuid
   .uploadbox-image-uploader data-component="ImageUploader"
     - if namespace
       input name="[#{namespace}]#{upload_name}_id" data-item="id" type="hidden" value="#{resource.send(upload_name).try :id}"
@@ -10,11 +11,19 @@
           = img resource.send(upload_name).send(version)
         - elsif default
           = image_tag default, width: width, height: height
+
       .fileupload-actions
         span.btn.btn-file
           span.fileupload-new = choose_label
           span.fileupload-exists = update_label
-          input type="file" data-url="#{uploadbox.images_path}" name="image[file]"
+    
+          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}"
+          input type="hidden" name="policy" value="#{policy}"
+          input type="hidden" name="signature" value="#{signature}"
+          input type="hidden" name="AWSAccessKeyId" value="#{ENV['S3_KEY']}"
+          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}"
           input type="hidden" name="image[upload_name]" value="#{upload_name}"
         - if removable

data/app/views/uploadbox/images/find.json.jbuilder

@@ -0,0 +1,9 @@
+if @image
+  json.(@image, :id)
+  json.versions do
+    @image.class.versions.keys.each do |version|
+      json.set! version, @image.send(version).url
+    end
+  end
+  json.url image_path(@image)
+end

data/config/routes.rb

@@ -1,3 +1,7 @@
+require 'resque/server'
 Uploadbox::Engine.routes.draw do
-  resources :images, only: [:create, :update, :destroy]
+  resources :images, only: [:create, :update, :destroy] do
+    get 'find', on: :collection
+  end
+  # mount Resque::Server.new, :at => "/resque"
 end

data/lib/generators/uploadbox/image/image_generator.rb

@@ -5,14 +5,13 @@ module Uploadbox
     source_root File.expand_path('../templates', __FILE__)
 
     def create_initializers
-      copy_file 'initializers/carrierwave.rb', 'config/initializers/carrierwave.rb'
       copy_file 'initializers/uploadbox.rb', 'config/initializers/uploadbox.rb'
     end
 
     def update_gitignore
       return unless File.exist?('.gitignore')
 
-      append_to_file '.gitignore', 'public/uploads'
+      append_to_file '.gitignore', "\npublic/uploads"
     end
 
     def create_migration

data/lib/generators/uploadbox/image/templates/initializers/uploadbox.rb

@@ -2,3 +2,30 @@ Uploadbox.retina         = true
 Uploadbox.retina_quality = 30
 Uploadbox.image_quality  = 70
 
+if Rails.env.production?
+  REDIS = Redis.connect url: ENV["OPENREDIS_URL"]
+  Resque.redis = REDIS
+end
+
+if Rails.env.production?
+  CarrierWave.configure do |config|
+    config.storage = :fog
+
+    config.fog_credentials = {
+      provider:               'AWS',
+      aws_access_key_id:      ENV['S3_KEY'],
+      aws_secret_access_key:  ENV['S3_SECRET'],
+      region:                 ENV['S3_REGION']
+    }
+
+    config.fog_directory  = ENV['S3_BUCKET']
+    config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
+  end
+end
+
+if Rails.env.test?
+  CarrierWave.configure do |config|
+    config.storage :file
+    config.enable_processing = false
+  end
+end

data/lib/generators/uploadbox/image/templates/migrate/create_images.rb

@@ -1,12 +1,13 @@
 class CreateImages < ActiveRecord::Migration
   def change
     create_table :images do |t|
-      t.string :file
+      t.string :file, index: true
       t.references :imageable, polymorphic: true, index: true
       t.integer :width
       t.integer :height
       t.boolean :retina, default: false
       t.string :upload_name
+      t.string :secure_random, index: true
 
       t.timestamps
     end

data/lib/heroku_resque_auto_scale.rb

@@ -0,0 +1,65 @@
+require 'heroku-api'
+
+module HerokuResqueAutoScale
+  if Rails.env.production?
+    module Scaler
+      class << self
+        @@heroku = Heroku::API.new(api_key: ENV['HEROKU_API_KEY']) 
+   
+        def workers
+          @@heroku.get_ps(ENV['HEROKU_APP']).body.count { |a| a["process"] =~ /worker/ }
+        end
+   
+        def workers=(qty)
+          @@heroku.post_ps_scale(ENV['HEROKU_APP'], 'worker', qty)
+        end
+   
+        def job_count
+          Resque.info[:pending].to_i
+        end
+      end
+    end
+   
+    def after_perform_scale_down(*args)
+      # Nothing fancy, just shut everything down if we have no jobs
+      Scaler.workers = 0 if Scaler.job_count.zero?
+    end
+   
+    def after_enqueue_scale_up(*args)
+      [
+        {
+          :workers => 1, # This many workers
+          :job_count => 1 # For this many jobs or more, until the next level
+        },
+        {
+          :workers => 2,
+          :job_count => 5
+        },
+        {
+          :workers => 3,
+          :job_count => 15
+        },
+        {
+          :workers => 4,
+          :job_count => 20
+        },
+        {
+          :workers => 5,
+          :job_count => 25
+        }
+      ].reverse_each do |scale_info|
+        # Run backwards so it gets set to the highest value first
+        # Otherwise if there were 70 jobs, it would get set to 1, then 2, then 3, etc
+   
+        # If we have a job count greater than or equal to the job limit for this scale info
+        if Scaler.job_count >= scale_info[:job_count]
+          # Set the number of workers unless they are already set to a level we want. Don't scale down here!
+          if Scaler.workers <= scale_info[:workers]
+            Scaler.workers = scale_info[:workers]
+          end
+          break # We've set or ensured that the worker count is high enough
+        end
+      end
+    end
+  end
+end

data/lib/tasks/uploadbox_tasks.rake

@@ -1,4 +1,6 @@
-# desc "Explaining what the task does"
-# task :uploadbox do
-#   # Task goes here
-# end
+require "resque/tasks"
+task "resque:setup" => :environment do
+  ENV['QUEUE'] ||= '*'
+end
+desc "Alias for resque:work (To run workers on Heroku)"
+task "jobs:work" => "resque:work"

data/lib/uploadbox/engine.rb

@@ -6,6 +6,8 @@ require 'carrierwave'
 require 'carrierwave-processing'
 require 'mini_magick'
 require 'jbuilder'
+require 'resque'
+require 'heroku_resque_auto_scale'
 
 module Uploadbox
   class Engine < ::Rails::Engine

data/lib/uploadbox/image_uploader.rb

@@ -51,17 +51,6 @@ module Uploadbox
         options[:removable]
       end
 
-      # Uploadbox::PostPicture < Image
-      # upload_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      #   def self.versions
-      #     #{upload_versions}
-      #   end
-
-      #   def self.removable?
-      #     #{options[:removable]}
-      #   end
-      # RUBY
-
       upload_class.instance_eval do
         delegate *upload_versions.keys, to: :file
 

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: heroku-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +328,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/javascripts/_image_uploader.coffee
+- app/assets/javascripts/cors/jquery.postmessage-transport.js
+- app/assets/javascripts/cors/jquery.xdr-transport.js
 - app/assets/javascripts/jquery.fileupload.js
 - app/assets/javascripts/jquery.iframe-transport.js
 - app/assets/javascripts/jquery.ui.widget.js
@@ -310,19 +340,20 @@ files:
 - app/controllers/uploadbox/images_controller.rb
 - app/helpers/uploadbox/application_helper.rb
 - app/helpers/uploadbox/img_helper.rb
+- app/jobs/process_image.rb
 - 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/create.json.jbuilder
+- app/views/uploadbox/images/find.json.jbuilder
 - config/routes.rb
 - lib/form_builder.rb
 - lib/generators/uploadbox/image/image_generator.rb
-- lib/generators/uploadbox/image/templates/initializers/carrierwave.rb
 - lib/generators/uploadbox/image/templates/initializers/uploadbox.rb
 - lib/generators/uploadbox/image/templates/migrate/create_images.rb
 - lib/generators/uploadbox/image/templates/models/image.rb
 - lib/generators/uploadbox/image/USAGE
+- lib/heroku_resque_auto_scale.rb
 - lib/tasks/uploadbox_tasks.rake
 - lib/uploadbox/engine.rb
 - lib/uploadbox/image_uploader.rb

data/app/views/uploadbox/images/create.json.jbuilder

@@ -1,7 +0,0 @@
-json.(@image, :id)
-json.versions do
-  @image.class.versions.keys.each do |version|
-    json.set! version, @image.send(version).url
-  end
-end
-json.url image_path(@image)

data/lib/generators/uploadbox/image/templates/initializers/carrierwave.rb

@@ -1,22 +0,0 @@
-if Rails.env.production?
-  CarrierWave.configure do |config|
-    config.storage = :fog
-
-    config.fog_credentials = {
-      provider:               'AWS',
-      aws_access_key_id:      ENV['S3_KEY'],
-      aws_secret_access_key:  ENV['S3_SECRET'],
-      region:                 ENV['S3_REGION']
-    }
-
-    config.fog_directory  = ENV['S3_BUCKET']
-    config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
-  end
-end
-
-if Rails.env.test?
-  CarrierWave.configure do |config|
-    config.storage :file
-    config.enable_processing = false
-  end
-end