effective_assets 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2f6e9448d7ceb98d50ce57605ae119d6d40abb
-  data.tar.gz: 5ebb60c0d881774dddfdf1a2d5ebfa94672a45ee
+  metadata.gz: 683799595ae295b197a44f02b02a769932610fcc
+  data.tar.gz: 28505119bba096a4952d6ddff8331dde8420bc6a
 SHA512:
-  metadata.gz: 13ce5f85047b1d97bfb41fd7ef46151d07412506540da02a629347f63c37b4513015b0d0006c0cbefab271c91a19495fc671a9d6dbdd04d13fd385c2d6de7186
-  data.tar.gz: ccf7a1afaf23b2ad8b71943ab057471af39b75851d1c5a24193e534b1c15bf0e9a6129f2864f24584354c17b9654f6755b2da17a4bdf7a96dc88dc08808419dd
+  metadata.gz: b8d0188295ccac3909e171064047f844ec53f841f9139a8739adcd2288482a01b595c34b355418b567771a45354d46ce68a4b3311452f2bb282901a44b34ce24
+  data.tar.gz: a0902359371838357880728816d299a6fb23225cff4ef62ad456582e437ed20bf6dabf6c585374628c63e972666940e4d5ebde7c253c265cefe87517217a1482

data/app/models/effective/asset.rb

@@ -140,7 +140,7 @@ module Effective
     end
 
     def authenticated_url(version = nil, expire_in = 60.minutes)
-      data.fog_authenticated_url_expiration = expire_in
+      data.aws_authenticated_url_expiration = expire_in
       version.present? ? data.send(version).file.authenticated_url : data.file.authenticated_url
     end
 
@@ -172,19 +172,17 @@ module Effective
       title
     end
 
-    def reprocess!
+    def process!
       begin
-        Rails.logger.info "Reprocessing ##{id}..."
-        print "Reprocessing ##{id}..."
-
-        raise 'must be processed first before reprocessed' unless processed?
+        Rails.logger.info "Processing ##{id}..."
+        print "Processing ##{id}..."
 
         data.cache_stored_file!
         data.retrieve_from_cache!(data.cache_name)
         data.recreate_versions!
         save!
 
-        Rails.logger.info "Successfully reprocessed ##{id}"
+        Rails.logger.info "Successfully processed ##{id}"
         print "success"; puts ''
         true
       rescue => e
@@ -193,6 +191,7 @@ module Effective
         false
       end
     end
+    alias_method :reprocess!, :process!
 
     protected
 

data/app/uploaders/effective_assets_uploader.rb

@@ -1,6 +1,5 @@
 class EffectiveAssetsUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
-  storage :fog
 
   def store_dir
     "#{EffectiveAssets.aws_path.chomp('/')}/#{model.id.to_i}"
@@ -12,16 +11,16 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
     @versions_info ||= calculate_versions_info
   end
 
-  def fog_public
+  def aws_public
     model.aws_acl == 'public-read' rescue true
   end
 
-  def fog_authenticated_url_expiration
-    @fog_authenticated_url_expiration || 10.minutes
+  def aws_authenticated_url_expiration
+    @aws_authenticated_url_expiration || 10.minutes
   end
 
-  def fog_authenticated_url_expiration=(expires_in)
-    @fog_authenticated_url_expiration = expires_in
+  def aws_authenticated_url_expiration=(expires_in)
+    @aws_authenticated_url_expiration = expires_in
   end
 
   protected

data/app/views/asset_box_input/_uploader.html.haml

@@ -5,7 +5,7 @@
   - if drop_files
     %p= drop_files_help_text
 
-  %span.btn.btn-secondary.fileinput-button
+  %span.btn.btn-default.fileinput-button
     %i.glyphicon.glyphicon-upload
     %span= btn_label
     - if limit > 1

data/lib/effective_assets.rb

@@ -1,5 +1,5 @@
 require "effective_assets/engine"
-require 'carrierwave'
+require 'carrierwave-aws'
 require 'delayed_job_active_record'
 require 'migrant'     # Required for rspec to run properly
 require 'jquery-fileupload-rails'
@@ -45,16 +45,22 @@ module EffectiveAssets
   def self.configure_carrierwave
     if (@carrierwave_configured != true) && EffectiveAssets.uploader.present? && EffectiveAssets.aws_bucket.present?
       CarrierWave.configure do |config|
-        config.fog_credentials = {
-          :provider               => 'AWS',
-          :aws_access_key_id      => EffectiveAssets.aws_access_key_id,
-          :aws_secret_access_key  => EffectiveAssets.aws_secret_access_key,
-          :region                 => EffectiveAssets.aws_region.presence || 'us-east-1'
-        }
-        config.fog_directory  = EffectiveAssets.aws_bucket
-        config.fog_public     = EffectiveAssets.aws_acl.to_s.include?('public')
-        config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
+        config.storage        = :aws
+        config.aws_bucket     = EffectiveAssets.aws_bucket
+        config.aws_acl        = EffectiveAssets.aws_acl.presence || 'public-read'
         config.cache_dir      = "#{Rails.root}/tmp/uploads" # For heroku
+
+        config.aws_credentials = {
+          :access_key_id      => EffectiveAssets.aws_access_key_id,
+          :secret_access_key  => EffectiveAssets.aws_secret_access_key,
+          :region             => EffectiveAssets.aws_region.presence || 'us-east-1'
+        }
+
+        config.aws_attributes = {
+          :cache_control => 'max-age=315576000',
+          :expires => 1.year.from_now.httpdate
+        }
+
       end
 
       @carrierwave_configured = true

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.4.9'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: carrierwave-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.20.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement