tb_media 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fbe6cf7d2b36b60603ad2a3a5d99aba8c9aaba1
-  data.tar.gz: a935cadae7ae9a15b471cc150a70ba334519a48d
+  metadata.gz: e003b647c6daf3a4154d9f4be103bbd7c0967c4b
+  data.tar.gz: 0ca6e7cec76779943f3d0285c634fc4b7e0e5871
 SHA512:
-  metadata.gz: 98ef3de0fbe5db1c3abbfddefe5e9a85f5dda2babb09b0e475b120d35bef5cb256d9ed880e8c8efdf1d58bcc17af758a5923aef606dfd8bc1603d3fbd147c19b
-  data.tar.gz: 75aa870cc470dc4ef8d1bbb64ccb140402977a20378e749719be411dad6c59832cc13905d9bacc4d12e34afa514645f3b8f5bdd37fd70c62f897393bb6db40f1
+  metadata.gz: 6131013a9382913db5263624078d7b242371fb2d5d4ebe6392401f07fff197099aca03597facf7e387bc90ef66e80d00ef74a5879de258ffc0c4bc6a118370b7
+  data.tar.gz: 2fd6a6e22a8de93cd57a555e6526d243657d8230a6a3a06503d5538b1998e01106a5d756865816c5c8473735f96dab31b3ab2b3b5e645b45b582f51063a87068

data/Readme.markdown

@@ -30,6 +30,7 @@ TB Media accepts the following configuration options:
         config.storage_path = "public/system/spud_media/:id/:style/:basename.:extension"
         config.storage_path_protected = "public/system/spud_media_protected/:id/:style/:basename.:extension"
         config.storage_url = "/system/spud_media/:id/:style/:basename.:extension"
+        config.max_upload_size = 15.megabytes
     end
 
 ## File Protection

data/app/assets/javascripts/admin/media/picker.js

@@ -136,16 +136,29 @@ spud.admin.mediapicker = new function(){
 
   this.onFileUploadProgress = function(e){
     var percent = Math.round(e.loaded * 100 / e.total);
+    self.setProgressBarPrecent(percent);
+  };
+
+  this.onFileUploadComplete = function(e){
+    if(e.target.status == 200){
+      var html = e.target.response;
+      self.onLegacyUploadComplete(html);
+    }
+    else{
+      window.alert('Error: ' + e.target.responseText);
+      self.setProgressBarPrecent(0);
+    }
+  };
+
+  this.setProgressBarPrecent = function(percent){
     var progress = $('.spud_media_picker_upload_progress');
     progress.find('.bar').css({width: percent + '%'});
     if(percent == 100){
       progress.addClass('progress-success');
     }
-  };
-
-  this.onFileUploadComplete = function(e){
-    var html = e.target.response;
-    self.onLegacyUploadComplete(html);
+    else{
+      progress.removeClass('progress-success');
+    }
   };
 
   this.onFileUploadError = function(e){
@@ -166,11 +179,9 @@ spud.admin.mediapicker = new function(){
   };
 
   this.resetUploadForm = function(){
-    // reset twitter bootstrap "loading" button state
-    $('.spud_media_picker_tab_upload_submit').button('reset');
     $('#spud_media_attachment').val('');
     $('.spud_media_picker_upload_progress').hide();
-    $('.spud_media_picker_upload_progress .bar').css({width:0});
+    self.setProgressBarPrecent(0);
   };
 
   this.activatedAdvancedTab = function(){

data/app/controllers/admin/media_picker_controller.rb

@@ -29,7 +29,7 @@ class Admin::MediaPickerController < Admin::ApplicationController
         end
       end
     else
-      render nil, :status => 422
+      render :text => @media.errors.full_messages.first, :status => 422
     end
   end
 

data/app/models/spud_media.rb

@@ -14,9 +14,16 @@ class SpudMedia < ActiveRecord::Base
 
   validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
 
+  extend ActionView::Helpers::NumberHelper
+
   validates_attachment :attachment,
     :presence => true,
-    :content_type => {:content_type => Spud::Media::CONTENT_TYPES}
+    :content_type => {:content_type => Spud::Media::CONTENT_TYPES},
+    :size => {
+      :less_than => Spud::Media.max_upload_size,
+      :message => "size cannot exceed " + number_to_human_size(Spud::Media.max_upload_size), 
+      :if => Proc.new{|p| Spud::Media.max_upload_size > 0}
+    }
 
   before_create :rename_file
   #after_create :validate_permissions
@@ -93,7 +100,9 @@ class SpudMedia < ActiveRecord::Base
     if is_image? #|| is_pdf?
       styles[:small] = '50'
       if has_custom_crop?
-        styles[:cropped] = {:geometry => '', :convert_options => "-resize #{crop_s}% -crop #{crop_w}x#{crop_h}+#{crop_x}+#{crop_y}"}
+        styles[:cropped] = {:geometry => '', :convert_options => "-strip -resize #{crop_s}% -crop #{crop_w}x#{crop_h}+#{crop_x}+#{crop_y}"}
+      else
+        styles[:cropped] = {:geometry => '1280x1280>', :format => :jpg, :convert_options => '-strip -quality 85', :source_file_options => '-density 72'}
       end
     end
     return styles
@@ -105,7 +114,7 @@ class SpudMedia < ActiveRecord::Base
   def attachment_url(style=nil)
     # defaults to cropped style if that style exists, otherwise use original
     if !style
-      style = (is_image? && has_custom_crop?) ? 'cropped' : 'original'
+      style = (is_image?) ? 'cropped' : 'original'
     end
     if Spud::Media.paperclip_storage == :s3 && is_protected
       return Paperclip::Interpolations.interpolate(Spud::Media.config.storage_url, attachment, style)

data/app/views/admin/media_picker/_media.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag :div, :class => 'spud_media_picker_item',
   'data-id' => media.id,
   'data-type' => (media.is_image? ? 'img' : 'file'),
-  'data-url' => media.attachment.url,
+  'data-url' => media.attachment_url,
   'data-name' => media.attachment_file_name,
   'data-size' => media.attachment_file_size,
   'data-lastmod' => media.attachment_updated_at.blank? == false ? media.attachment_updated_at.strftime("%l:%M %p, %D") : '',

data/lib/spud_media/configuration.rb

@@ -1,11 +1,13 @@
 module Spud
   module Media
     include ActiveSupport::Configurable
-    config_accessor :paperclip_storage,:s3_credentials,:storage_path,:storage_path_protected,:storage_url
+    require 'active_support/core_ext/numeric/bytes'
+    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_path_protected, :storage_url, :max_upload_size
     self.paperclip_storage = :filesystem
     self.s3_credentials = "#{Rails.root}/config/s3.yml"
     self.storage_path = ":rails_root/public/system/spud_media/:id/:style/:basename.:extension"
     self.storage_path_protected = ":rails_root/public/system/spud_media_protected/:id/:style/:basename.:extension"
     self.storage_url = "/system/spud_media/:id/:style/:basename.:extension"
+    self.max_upload_size = 15.megabytes
   end
 end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.0.6"
+		VERSION = "1.0.8"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement