uploadbox 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a773cd441b95b22294bdd947ffe1bb636bec7e2c
-  data.tar.gz: 450426b4ca359fde89277d12b6edb862179f3c20
+  metadata.gz: b14b3a91e04db2760f426eff8cb487bf999b2625
+  data.tar.gz: 8b3d1c63566a298ca49e67e7560d1953ded27d5b
 SHA512:
-  metadata.gz: d7a82f04b033d92f1298c38ba9e0a0233136747b2a37a13713919bc3f5b3ff2a2e2929d4c8a4fa47b77d08600dcacd9e4c28fcbdc236a4b790f2fd7ce01cd967
-  data.tar.gz: 217a1ba65fd177a1faa3b0a34aea30946334e834720ec6c5230536e1716fd4394391d936bf8c014c8afa5e3195871553a2aa839861c89639a64a820ee88820c5
+  metadata.gz: aab6b6bd767354eb9e9ac395360fc8ff2227de136febc4b6ab776647a70fc353a41c6d014f68f3c0c90e5c3e75a9cd07db321ab4fac9efc237da3c4a623b0231
+  data.tar.gz: 86522a625c4bf37beefcc5dbeb6985e4278e6aa138b5c5b6171058605c8cb9e348f38d5d428fcfff7f1c993bd52610049f64675b8669153c7c0996e416bf8b4d

data/app/helpers/uploadbox/img_helper.rb

@@ -9,7 +9,7 @@ module Uploadbox
       Base64.encode64(
         OpenSSL::HMAC.digest(
           OpenSSL::Digest::Digest.new('sha1'),
-          ENV['S3_SECRET'],
+          CarrierWave::Uploader::Base.fog_credentials[:aws_access_key_id],
           s3_policy
         )
       ).gsub("\n", "")
@@ -31,7 +31,7 @@ module Uploadbox
             ["starts-with", "$key", 'uploads/'],
             ["content-length-range", 0, 500.megabytes],
             ["starts-with","$content-type",""],
-            {bucket: ENV['S3_BUCKET']},
+            {bucket: CarrierWave::Uploader::Base.fog_directory},
             {acl: 'public-read'}
           ]
         }

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

@@ -15,10 +15,10 @@
             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="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/" 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="AWSAccessKeyId" value="#{CarrierWave::Uploader::Base.fog_credentials[:aws_access_key_id]}"
             input type="hidden" name="acl" value="public-read"
             input type="hidden" name="key"
 
@@ -47,10 +47,10 @@
               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="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/" 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="AWSAccessKeyId" value="#{CarrierWave::Uploader::Base.fog_credentials[:aws_access_key_id]}"
               input type="hidden" name="acl" value="public-read"
               input type="hidden" name="key"
 

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

@@ -20,10 +20,10 @@
           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="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}" 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']}"
+          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}/"
 

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

@@ -6,19 +6,19 @@ if Rails.env.production?
   REDIS = Redis.connect(url: ENV["REDISCLOUD_URL"])
   Resque.redis = REDIS
   Resque.after_fork = Proc.new { ActiveRecord::Base.establish_connection }
+end
 
-  CarrierWave.configure do |config|
-    config.storage = :fog
+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']
-    }
+  config.fog_credentials = {
+    provider:               'AWS',
+    aws_access_key_id:      ENV['S3_KEY'],
+    aws_secret_access_key:  ENV['S3_SECRET']
+  }
 
-    config.fog_directory  = ENV['S3_BUCKET']
-    config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
-  end
+  config.fog_directory  = ENV['S3_BUCKET']
+  config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
 end
 
 if Rails.env.test?

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails