spud_media 0.9.5 → 0.9.6

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

@@ -1,5 +1,5 @@
 spud.admin.mediapicker = new function(){
-  
+
   var self = this;
   var supportsHtml5Upload = false;
   var selectedFile = {};
@@ -18,6 +18,7 @@ spud.admin.mediapicker = new function(){
     $('.spud_media_picker_tabs a').first().click();
     $('.spud_media_picker_tab_advanced').on('spud_media_picker_tab_activated', self.activatedAdvancedTab);
     $('.spud_media_picker_option_dimensions').on('blur', 'input', self.dimensionsChanged);
+    $('.spud_media_picker_option').on('keyup', 'input[type=text]', self.pickerOptionKeyDown);
   };
 
   self.clickedTab = function(e){
@@ -150,6 +151,7 @@ spud.admin.mediapicker = new function(){
     else{
       $('.spud_media_picker_option_target').show();
       $('.spud_media_picker_option_text').show();
+      $('.spud_media_picker_option_text input').val(tinyMCEPopup.editor.selection.getContent());
       $('.spud_media_picker_option_float').hide();
       $('.spud_media_picker_option_title').hide();
       $('.spud_media_picker_option_dimensions').hide();
@@ -162,7 +164,6 @@ spud.admin.mediapicker = new function(){
     img.onload = function(){
       _originalWidth = img.width;
       _originalHeight = img.height;
-      console.log(_originalWidth, _originalHeight);
     };
     img.src = url;
   };
@@ -201,8 +202,18 @@ spud.admin.mediapicker = new function(){
     else{
       selectedFile.target = $('select[name="spud_media_picker_option_target"]').val();
       selectedFile.text = $('input[name="spud_media_picker_option_text"]').val();
+      if(!selectedFile.text){
+        window.alert("Link Text is a required field.");
+        return;
+      }
     }
     tinyMCEPopup.editor.execCommand('spudMediaInsertSelected', false, selectedFile);
     tinyMCEPopup.close();
   };
+
+  self.pickerOptionKeyDown = function(e){
+    if(e.keyCode == 13){
+      self.clickedInsert(e);
+    }
+  };
 };

data/app/assets/javascripts/spud/admin/media/plugin.js

@@ -10,6 +10,7 @@
 
 (function() {
 
+  // Tell spud about our plugin and button
   spud.admin.editor.registerPlugin('spud_media_picker');
   spud.admin.editor.registerButton('spud_media_picker');
 

data/app/assets/libs/jcrop/js/jquery.Jcrop.js

@@ -1,6 +1,6 @@
 /**
  * jquery.Jcrop.js v0.9.10
- * jQuery Image Cropping Plugin - released under MIT License 
+ * jQuery Image Cropping Plugin - released under MIT License
  * Author: Kelly Hallman <khallman@gmail.com>
  * http://github.com/tapmodo/Jcrop
  * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
@@ -168,7 +168,7 @@
         if ((ord === 'move') && !options.allowMove) {
           return false;
         }
-        
+
         // Fix position of crop area when dragged the very first time.
         // Necessary when crop image is in a hidden element when page is loaded.
         docOffset = getPos($img);
@@ -254,7 +254,7 @@
     function newTracker() //{{{
     {
       var trk = $('<div></div>').addClass(cssClass('tracker'));
-      if ($.browser.msie) {
+      if (navigator.userAgent.match(/msie/i)) {
         trk.css({
           opacity: 0,
           backgroundColor: 'white'
@@ -267,9 +267,9 @@
     // }}}
     // Initialization {{{
     // Sanitize some options {{{
-    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
-      ie6mode = true;
-    }
+    ie6mode = ( navigator.userAgent.match(/msie/i) && navigator.userAgent.match(/6/) );
+
+
     if (typeof(obj) !== 'object') {
       obj = $(obj)[0];
     }
@@ -304,12 +304,12 @@
         $origimg.width($origimg[0].width);
         $origimg.height($origimg[0].height);
       } else {
-        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
+        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0).
         var tempImage = new Image();
         tempImage.src = $origimg[0].src;
         $origimg.width(tempImage.width);
         $origimg.height(tempImage.height);
-      } 
+      }
 
       var $img = $origimg.clone().removeAttr('id').css(img_css).show();
 
@@ -327,8 +327,8 @@
 
     var boundx = $img.width(),
         boundy = $img.height(),
-        
-        
+
+
         $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
         position: 'relative',
         backgroundColor: options.bgColor
@@ -340,24 +340,24 @@
 
     var $img2 = $('<div />'),
 
-        $img_holder = $('<div />') 
+        $img_holder = $('<div />')
         .width('100%').height('100%').css({
           zIndex: 310,
           position: 'absolute',
           overflow: 'hidden'
         }),
 
-        $hdl_holder = $('<div />') 
-        .width('100%').height('100%').css('zIndex', 320), 
+        $hdl_holder = $('<div />')
+        .width('100%').height('100%').css('zIndex', 320),
 
-        $sel = $('<div />') 
+        $sel = $('<div />')
         .css({
           position: 'absolute',
           zIndex: 600
         }).dblclick(function(){
           var c = Coords.getFixed();
           options.onDblClick.call(api,c);
-        }).insertBefore($img).append($img_holder, $hdl_holder); 
+        }).insertBefore($img).append($img_holder, $hdl_holder);
 
     if (img_mode) {
 
@@ -393,7 +393,7 @@
     // }}}
     // }}}
     // Internal Modules {{{
-    // Touch Module {{{ 
+    // Touch Module {{{
     var Touch = (function () {
       // Touch support detection function adapted (under MIT License)
       // from code by Jeffrey Sambells - http://github.com/iamamused/
@@ -529,8 +529,8 @@
         // This function could use some optimization I think...
         var aspect = options.aspectRatio,
             min_x = options.minSize[0] / xscale,
-            
-            
+
+
             //min_y = options.minSize[1]/yscale,
             max_x = options.maxSize[0] / xscale,
             max_y = options.maxSize[1] / yscale,
@@ -1049,7 +1049,7 @@
       {
         seehandles = false;
         $hdl_holder.hide();
-      } 
+      }
       //}}}
       function animMode(v) //{{{
       {
@@ -1058,13 +1058,13 @@
         } else {
           enableHandles();
         }
-      } 
+      }
       //}}}
       function done() //{{{
       {
         animMode(false);
         refresh();
-      } 
+      }
       //}}}
       // Insert draggable elements {{{
       // Insert border divs for outline
@@ -1120,7 +1120,7 @@
         done: done
       };
     }());
-    
+
     //}}}
     // Tracker Module {{{
     var Tracker = (function () {
@@ -1143,7 +1143,7 @@
             .bind('mousemove.jcrop',trackMove)
             .bind('mouseup.jcrop',trackUp);
         }
-      } 
+      }
       //}}}
       function toBack() //{{{
       {
@@ -1151,13 +1151,13 @@
           zIndex: 290
         });
         $(document).unbind('.jcrop');
-      } 
+      }
       //}}}
       function trackMove(e) //{{{
       {
         onMove(mouseAbs(e));
         return false;
-      } 
+      }
       //}}}
       function trackUp(e) //{{{
       {
@@ -1576,7 +1576,7 @@
       }
     };
 
-    if ($.browser.msie)
+    if (navigator.userAgent.match(/msie/i))
       $div.bind('selectstart', function () { return false; });
 
     $origimg.data('Jcrop', api);

data/app/controllers/spud/admin/media_controller.rb

@@ -2,8 +2,8 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 	layout 'layouts/spud/admin/detail'
 	add_breadcrumb "Media", :spud_admin_media_path
 	belongs_to_spud_app :media
-	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access]
-	
+	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access, :replace]
+
 	def index
 		@media = SpudMedia.order("created_at DESC").paginate :page => params[:page]
 		respond_with @media
@@ -22,7 +22,7 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 		@media = SpudMedia.new(params[:spud_media])
 		location = spud_admin_media_path
 		if @media.save
-			flash[:notice] = "File uploaded successfully" 
+			flash[:notice] = "File uploaded successfully"
 			if @media.is_image?
 				location = edit_spud_admin_medium_path(@media.id)
 			end
@@ -43,6 +43,9 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 		end
 	end
 
+	def replace
+	end
+
 	def update
 		if @media.update_attributes(params[:spud_media])
 			@media.attachment.reprocess!
@@ -68,6 +71,6 @@ private
 			flash[:error] = "Media Asset not found!"
 			redirect_to spud_admin_media_url() and return
 		end
-		
+
 	end
 end

data/app/models/spud_media.rb

@@ -3,10 +3,10 @@ class SpudMedia < ActiveRecord::Base
 	has_attached_file :attachment,
     :storage => Spud::Media.paperclip_storage,
     :s3_credentials => Spud::Media.s3_credentials,
-    :s3_permissions => lambda { |attachment, style| 
-      attachment.instance.is_protected ? 'private' : 'public-read' 
+    :s3_permissions => lambda { |attachment, style|
+      attachment.instance.is_protected ? 'private' : 'public-read'
     },
-    :path => Spud::Media.paperclip_storage == :s3 ? Spud::Media.storage_path : lambda { |attachment| 
+    :path => Spud::Media.paperclip_storage == :s3 ? Spud::Media.storage_path : lambda { |attachment|
       attachment.instance.is_protected ? Spud::Media.storage_path_protected : Spud::Media.storage_path
     },
     :url => Spud::Media.storage_url,
@@ -17,10 +17,15 @@ class SpudMedia < ActiveRecord::Base
   validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
 
   before_create :rename_file
+  before_update :rename_file
   #after_create :validate_permissions
   before_update :validate_permissions
 
   def rename_file
+    if self.attachment_file_name_changed? && self.attachment_file_name_was.nil? == false
+      attachment.instance_write :file_name, self.attachment_file_name_was
+      return
+    end
     # remove periods and other unsafe characters from file name to make routing easier
     extension = File.extname(attachment_file_name)
     filename = attachment_file_name.chomp(extension).parameterize
@@ -34,35 +39,35 @@ class SpudMedia < ActiveRecord::Base
 
     elsif self.attachment_content_type.blank?
     	return "spud/admin/files_thumbs/dat_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/jpeg|jpg/)
     	return "spud/admin/files_thumbs/jpg_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/png/)
     	return "spud/admin/files_thumbs/png_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/zip|tar|tar\.gz|gz/)
     	return "spud/admin/files_thumbs/zip_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/xls|xlsx/)
     	return "spud/admin/files_thumbs/xls_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/doc|docx/)
     	return "spud/admin/files_thumbs/doc_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/ppt|pptx/)
     	return "spud/admin/files_thumbs/ppt_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/txt|text/)
     	return "spud/admin/files_thumbs/txt_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/pdf|ps/)
     	return "spud/admin/files_thumbs/pdf_thumb.png"
-    
+
     elsif self.attachment_content_type.match(/mp3|wav|aac/)
     	return "spud/admin/files_thumbs/mp3_thumb.png"
     end
-    
+
     return "spud/admin/files_thumbs/dat_thumb.png"
   end
 
@@ -130,7 +135,7 @@ private
       new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
     else
       old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
-      new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original') 
+      new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original')
     end
     new_base_dir = File.dirname(File.dirname(new_path))
     old_base_dir= File.dirname(File.dirname(old_path))

data/app/views/spud/admin/media/index.html.erb

@@ -5,14 +5,14 @@
 	<div class="page_list">
 			<%@media.each do |media|%>
 				<div class="page_row">
-					
+
 				<span class="row_meta">
 					<% if media.is_protected && (media.is_image? || media.is_pdf?) %>
 						<img src="<%= media.image_from_type %>" class="size-50-thumb" />
 					<% else %>
 						<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
 					<% end %>
-					<%= link_to media.attachment.url.split("/").last, media.attachment_url %>					
+					<%= link_to media.attachment.url.split("/").last, media.attachment_url %>
 				</span>
 
 				<span class="edit_controls">
@@ -24,9 +24,10 @@
 					<% else %>
 						<%= link_to 'Public', set_access_spud_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn' %>
 					<% end %>
+					<%= link_to "Replace", replace_spud_admin_medium_path(:id => media.id), :class => "btn"%>
 					<%=link_to "Remove", spud_admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this file?"%>
 				</span>
-				
+
 				<br style="clear:both;"/>
 			</div>
 			<%end%>

data/app/views/spud/admin/media/replace.html.erb

@@ -0,0 +1,26 @@
+
+
+
+  <%=form_for @media,:url => spud_admin_medium_path(:id => @media.id),:html=>{:class=>"form-horizontal", :multipart => true, :method => :put} do |f|%>
+  <fieldset>
+	  <legend>Replace File</legend>
+
+	  <div class="control-group">
+		  <%=f.label :attachment, "Choose File",:class =>"control-label"%>
+      <div class="controls">
+  		  <%=f.file_field :attachment%>
+      </div>
+	  </div>
+
+    <div class="control-group">
+      <%= f.label :is_protected, 'Protected File', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.check_box :is_protected %>
+      </div>
+    </div>
+
+  <div class="form-actions">
+      <%=f.submit "Upload", :class=>"btn btn-primary","data-loading-text"=>"Uploading..."%> or <%=link_to "cancel",spud_admin_media_path,:class => "btn"%>
+    </div>
+  <%end%>
+

data/config/routes.rb

@@ -2,12 +2,13 @@ Rails.application.routes.draw do
 	namespace :spud do
 		namespace :admin do
 			resources :media do
-        put 'set_access', :on => :member
-      end
-      resources :media_picker, :only => [:index, :create]
+		        put 'set_access', :on => :member
+		        get 'replace', :on => :member
+			end
+			resources :media_picker, :only => [:index, :create]
 		end
 	end
 
   #get '/media/protected/:id/:style/:filename' => 'ProtectedMedia#show', :as => 'protected_media'
   get Spud::Media.config.storage_url => 'ProtectedMedia#show', :as => 'protected_media'
-end
+end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "0.9.5"
+		VERSION = "0.9.6"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_media
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,6 +238,7 @@ files:
 - app/views/spud/admin/media/edit.html.erb
 - app/views/spud/admin/media/index.html.erb
 - app/views/spud/admin/media/new.html.erb
+- app/views/spud/admin/media/replace.html.erb
 - app/views/spud/admin/media_picker/_media.html.erb
 - app/views/spud/admin/media_picker/create.html.erb
 - app/views/spud/admin/media_picker/create.js.erb
@@ -269,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1098441516915304500
+      hash: 2768522942128927229
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -278,10 +279,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1098441516915304500
+      hash: 2768522942128927229
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Spud File upload/management module