uploadbox 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605fe90f8d3f385da36ee21257ab2c4d6783b513
-  data.tar.gz: fcb1983a55e7e3c103c45271a10229e720fe35e3
+  metadata.gz: 793534702191f8ac2e654b13f87e970320effc4e
+  data.tar.gz: 27ebcf04dfdd0e5af5bf96563f6a49cbe5cf6ead
 SHA512:
-  metadata.gz: 35a73a6ce9ed2127ecd4199833210d53036afe2a2989988ccca30c281545a066bbc537de43d9c67e4b2b00e6402392642d117b9532146dd870c69bf00292f584
-  data.tar.gz: 668beadd3a2ddf04cfbf1d4a88e4b499d7136c9284e5842d4d43e3539440e33b88225945659319aa1815d0f99339babcf2cc81729f003b7fe3b93a9434c58625
+  metadata.gz: 330cf7e386cf7f18807f9b81170b3bd0efeb7bf0e2b6c6800c353e471d4dfc23ff3e6f718c9b53f3249feb8fcb83ddd75a702637271e584f1f2d8b34c10e02a8
+  data.tar.gz: c7811bc5e8d1b982f808da97d7742e7cb72843d00bdc7189f60e111d513573dc7623f4508d86a2b8e53d1a9edaee8d536e3a35161833e12143a3974c0caa7eec

data/README.md

@@ -33,9 +33,14 @@ Migrate database
 rake db:migrate
 ```
 
-Update `routes.rb`
+Create a bucket on S3 (US region)
+
+Set environmet variables
 ```
-mount Uploadbox::Engine => '/uploadbox', as: :uploadbox
+S3_KEY=AAAA123BBBB
+S3_SECRET=abc123ABcEffgee122
+S3_REGION=sa-east-1
+S3_BUCKET=uploads
 ```
 
 ## Usage
@@ -68,3 +73,16 @@ For a post with a picture:
 ```
 Post.update_picture_versions!
 ```
+
+
+## Heroku
+Set environmet variables
+```
+HEROKU_API_KEY=ab12acvc12
+HEROKU_APP=your-app-name
+```
+
+Add Redis to Go addon
+```
+heroku addons:add rediscloud:20
+```

data/app/assets/javascripts/_image_uploader.coffee

@@ -7,6 +7,8 @@ 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.show()
 
     @fileInput.fileupload
       type: 'POST'
@@ -14,17 +16,28 @@ class @ImageUploader
       replaceFileInput: false
       autoUpload: true
       formData: @getFormData
+      dropZone: @container
+      pasteZone: @container
       add: @add
       progress: @progress
       done: @done
 
   add: (e, data) =>
-    @loader = $('<div class="progress progress-striped active"><div class="bar" style="width: 0%;"></div></div>').hide()
-    @preview.prepend(@loader.fadeIn())
-    data.submit()
+    @file = data.files[0]
+
+    if @loader
+      @loader.detach()
+    
+    if @verifyProcessingInterval
+      clearInterval(@verifyProcessingInterval)
+
+    if @file.type.match /gif|jpe?g|png/
+      @loader = $('<div class="progress progress-striped active"><div class="bar" style="width: 0%;"></div></div>').hide()
+      @preview.prepend(@loader.fadeIn())
+      data.submit()
 
   getFormData: (arg) =>
-    file = @fileInput.get(0).files[0]
+    file = @file
     @filePath = @container.find('input[name="key"]').val() + file.name
     [
       { name: 'key', value: @filePath },

data/app/helpers/uploadbox/img_helper.rb

@@ -1,5 +1,20 @@
 module Uploadbox
   module ImgHelper
+    def s3_policy
+      Base64.encode64(policy_data.to_json).gsub("\n", "")
+    end
+
+
+    def s3_signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest::Digest.new('sha1'),
+          ENV['S3_SECRET'],
+          s3_policy
+        )
+      ).gsub("\n", "")
+    end
+
     def img(*args)
       upload = args[0]
       if upload.is_a? CarrierWave::Uploader::Base
@@ -8,5 +23,19 @@ module Uploadbox
         image_tag(*args)
       end
     end
+
+    private
+      def policy_data
+        {
+          expiration: 10.hours.from_now.utc.iso8601,
+          conditions: [
+            ["starts-with", "$key", 'uploads/'],
+            ["content-length-range", 0, 500.megabytes],
+            ["starts-with","$content-type",""],
+            {bucket: ENV['S3_BUCKET']},
+            {acl: 'public-read'}
+          ]
+        }
+      end
   end
 end

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

@@ -17,9 +17,9 @@
           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://#{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="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"
+          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" value="uploads/#{secure_random}/"

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

@@ -14,6 +14,14 @@ module Uploadbox
       append_to_file '.gitignore', "\npublic/uploads"
     end
 
+    def copy_procfile
+      copy_file 'Procfile', 'Procfile'
+    end
+
+    def add_route
+      route "mount Uploadbox::Engine => '/uploadbox', as: :uploadbox"
+    end
+
     def create_migration
       migration_template 'migrate/create_images.rb', 'db/migrate/create_images.rb'
     end

data/lib/generators/uploadbox/image/templates/Procfile

@@ -0,0 +1 @@
+web: bundle exec rails server -p $PORT

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

@@ -3,19 +3,17 @@ Uploadbox.retina_quality = 30
 Uploadbox.image_quality  = 70
 
 if Rails.env.production?
-  REDIS = Redis.connect url: ENV["OPENREDIS_URL"]
+  REDIS = Redis.connect(url: ENV["REDISCLOUD_URL"])
   Resque.redis = REDIS
-end
+  Resque.after_fork = Proc.new { ActiveRecord::Base.establish_connection }
 
-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']
+      aws_secret_access_key:  ENV['S3_SECRET']
     }
 
     config.fog_directory  = ENV['S3_BUCKET']

data/lib/uploadbox/image_uploader.rb

@@ -58,7 +58,7 @@ module Uploadbox
 
         # Uploabox::PostPictureUploader < UploadBox::ImgProcessing < CarrierWave
         dynamic_uploader = Class.new(Uploadbox::ImageProcessingUploader)
-        Uploadbox.const_set(self.class.to_s + upload_name.to_s.camelize + 'Uploader', dynamic_uploader)
+        Uploadbox.const_set(self.name.demodulize + 'Uploader', dynamic_uploader)
         dynamic_uploader.class_eval do
           upload_versions.each do |version_name, dimensions|
             if options[:retina]

data/lib/uploadbox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +366,7 @@ files:
 - 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/templates/Procfile
 - lib/generators/uploadbox/image/USAGE
 - lib/heroku_resque_auto_scale.rb
 - lib/tasks/uploadbox_tasks.rake