tb_media 1.2.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16f0a55ec656f1ee487ff39fcb9a93230854cf8e
-  data.tar.gz: 16f7960348f0918610608ab85079eccbe95dacd2
+SHA256:
+  metadata.gz: 04a72403b0a76aeca578363fe100b46a1e11e713adad77662be255bd3cdda1ce
+  data.tar.gz: c8cbb69eab1a051c89c27ebc3160644aa8439297d214d63613c3ded8521d3320
 SHA512:
-  metadata.gz: 4e59f606e31de84bad6bafbc05a216184da92d610734b14b6342dda668b1ae99908e259cfddf86e72e5e13edd840e6fea5d9dd31c0ec3135b59bdfd21265f68d
-  data.tar.gz: 6800dd0b04f58df98b2a203356503f5720bbe05afb55042a08b4c249d3f135bb5aa75993628016f92c62485b4e3e1a26b53ec74c59d8922b3a01c8690b6d43ef
+  metadata.gz: b058846bbff6a6d01c4d0c629c627f32eae451b79457811d7178f815b0c5bdd43cab59fbed9d9c33dfdddfe982b58e2dce4ea1d9a4511161ecfb91e7ad79f325
+  data.tar.gz: 1baa7fb56ec845c4580f029dd24a8f5a53e77ca0a957ceeeba2e3b11cd87fcfcf8dd046b454691ba5d777711a77d8582dae28b66864611df9a3e5107e3da3d42

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -32,6 +32,6 @@ begin
   load 'jasmine/tasks/jasmine.rake'
 rescue LoadError
   task :jasmine do
-    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+    abort 'Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine'
   end
 end

data/Readme.markdown

@@ -21,35 +21,19 @@ TB Media is an engine for managing documents and other miscellaneous media files
 TB Media accepts the following configuration options:
 
     Spud::Media.configure do |config|
-  
+
         # s3 storage requires the 'aws-sdk' gem. defaults to filesystem
         config.paperclip_storage = :s3
         config.s3_credentials = "#{Rails.root}/config/s3.yml"
 
-        # see below for notes on 'storage_path_protected'
         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
-
-Spud Media allows for individual files to be marked as protected. How this is actually implemented depends on whether you are using the local file system or Amazon S3 for file storage.
-
 ### Filesystem
 
-Unprotected files are stored under `/public/system/spud_media` and are accessed directly by the web server. No further configuration is required, though you may customize the storage location if desired using `config.storage_path`.
-
-Protected files are moved to `public/system/spud_media_protected`. Note that the public-facing download URL should __not__ reflect the `protected` storage path. Instead the user will hit the same URL as before, but this time their request will hit the `show` action of the `ProtectedMedia` controller. 
-
-__It is up to the individual developer to make sure that the protected storage path is not accessible by the public.__ You may choose to protect this folder via server configurations, or you can move the folder out of the document root using `config.storage_path_protected`.
-
-### Amazon S3
-
-Files marked as unprotected will be uploaded to Amazon using the `public_read` ACL. These files are accessed directly - ie, calling `@media.attachment_url` will link directly to Amazon.
-
-Files marked as protected are uploaded using the `private` ACL. In this case, calling `@media.attachment_url` will return a local URL that hits the show action of our `ProtectedMedia` controller. Once we have verified the user is logged in we generate a secure URL and redirect the user to it. The generated URL is good for 10 minutes. 
+Files are stored under `/public/system/spud_media` and are accessed directly by the web server. No further configuration is required, though you may customize the storage location if desired using `config.storage_path`.
 
 Testing
 -----------------
@@ -57,7 +41,7 @@ Testing
 TB uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
-   
+
     	rake db:create
 		rake db:migrate
 

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

@@ -1,5 +1,4 @@
 //= require jcrop/js/jquery.Jcrop
-//= require admin/media/plugin
 //= require_self
 
 spud.admin.media = new function(){
@@ -163,4 +162,5 @@ spud.admin.media = new function(){
       return false;
     }
   };
-};
+
+};

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

@@ -1,3 +1,7 @@
+/*
+* NOTE: This plugin is deprecated and should not be used until/unless it is upgraded to support TinyMCE v5
+*/
+
 //= require jquery
 //= require jquery_ujs
 //= require_self
@@ -107,15 +111,14 @@ spud.admin.mediapicker = new function(){
     $('.spud_media_picker_details_name').text(element.attr('data-name'));
     $('.spud_media_picker_details_size').text(element.attr('data-size'));
     $('.spud_media_picker_details_lastmod').text(element.attr('data-lastmod'));
-    $('.spud_media_picker_details_protected').text(element.attr('data-protected'));
     $('.spud_media_picker_details').show();
   };
-  
+
   self.clickedCancel = function(e){
     e.preventDefault();
     parent.tinyMCE.activeEditor.windowManager.close();
   };
-  
+
   self.clickedUseSelected = function(e){
     e.preventDefault();
     var $selected = $('.spud_media_picker_item_selected');
@@ -127,7 +130,7 @@ spud.admin.mediapicker = new function(){
     };
     self.goToTab('#spud_media_picker_tab_advanced');
   };
-  
+
   self.submittedUpload = function(e){
     if(!$('#spud_media_attachment').val()){
       window.alert("Please select a file.");
@@ -307,4 +310,4 @@ spud.admin.mediapicker = new function(){
       self.clickedInsert(e);
     }
   };
-};
+};

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

@@ -1,3 +1,7 @@
+/*
+* NOTE: This plugin is deprecated and should not be used until/unless it is upgraded to support TinyMCE v5
+*/
+
 /**
  * editor_plugin_src.js
  *
@@ -10,92 +14,93 @@
 
 (function() {
 
-  // Tell spud about our plugin and button
-  spud.admin.editor.registerPlugin('spud_media_picker');
-  spud.admin.editor.registerButton('spud_media_picker');
+  $("html").on("tb:tinymce-loaded", function(){
+       // Tell spud about our plugin and button
+      spud.admin.editor.registerPlugin('spud_media_picker');
+      spud.admin.editor.registerButton('spud_media_picker');
+      tinymce.create('tinymce.plugins.SpudMediaPicker', {
+      /**
+       * Initializes the plugin, this will be executed after the plugin has been created.
+       * This call is done before the editor instance has finished it's initialization so use the onInit event
+       * of the editor instance to intercept that event.
+       *
+       * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+       * @param {string} url Absolute URL to where the plugin is located.
+       */
+      init : function(ed, url) {
+        // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+        ed.addCommand('spudMediaShowPicker', function(){
+          ed.windowManager.open({
+            title: 'Media Picker',
+            file: '/admin/media_picker',
+            width: 450 + parseInt(ed.getLang('example.delta_width', 0), 10),
+            height: 300 + parseInt(ed.getLang('example.delta_height', 0), 10),
+            inline: 1,
+            resizable: false,
+            popup_css: false, // prevent tinymce from injecting some default css into our dialog box
+            close_previous: true, // close any previously opened dialogs
+            scrollbars: false
+          });
+        });
 
-  tinymce.create('tinymce.plugins.SpudMediaPicker', {
-    /**
-     * Initializes the plugin, this will be executed after the plugin has been created.
-     * This call is done before the editor instance has finished it's initialization so use the onInit event
-     * of the editor instance to intercept that event.
-     *
-     * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
-     * @param {string} url Absolute URL to where the plugin is located.
-     */
-    init : function(ed, url) {
-      // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
-      ed.addCommand('spudMediaShowPicker', function(){
-        ed.windowManager.open({
-          title: 'Media Picker',
-          file: '/admin/media_picker',
-          width: 450 + parseInt(ed.getLang('example.delta_width', 0), 10),
-          height: 300 + parseInt(ed.getLang('example.delta_height', 0), 10),
-          inline: 1,
-          resizable: false,
-          popup_css: false, // prevent tinymce from injecting some default css into our dialog box
-          close_previous: true, // close any previously opened dialogs
-          scrollbars: false
+        // Register picker button
+        ed.addButton('spud_media_picker', {
+          title: 'Insert Media',
+          cmd: 'spudMediaShowPicker',
+          image: '<%= asset_path('admin/media_tiny.png') %>',
+          stateSelector: 'img:not([data-mce-object],[data-mce-placeholder])'
         });
-      });
 
-      // Register picker button
-      ed.addButton('spud_media_picker', {
-        title: 'Insert Media',
-        cmd: 'spudMediaShowPicker',
-        image: '<%= asset_path('admin/media_tiny.png') %>',
-        stateSelector: 'img:not([data-mce-object],[data-mce-placeholder])'
-      });
+        ed.addCommand('spudMediaInsertSelected', function(ui, data){
+          if(data.type == 'img'){
+            var img = ed.dom.createHTML('img', {
+              src: data.url,
+              title: data.title,
+              alt: data.alt,
+              style: data.style,
+              width: data.width,
+              height: data.height
+            });
+            ed.execCommand('mceInsertContent', false, img);
+          }
+          else{
+            var link = ed.dom.createHTML('a', {
+              href: data.url,
+              target: data.target
+            }, data.text);
+            ed.execCommand('mceInsertContent', false, link);
+          }
+        });
 
-      ed.addCommand('spudMediaInsertSelected', function(ui, data){
-        if(data.type == 'img'){
-          var img = ed.dom.createHTML('img', {
-            src: data.url,
-            title: data.title,
-            alt: data.alt,
-            style: data.style,
-            width: data.width,
-            height: data.height
-          });
-          ed.execCommand('mceInsertContent', false, img);
-        }
-        else{
-          var link = ed.dom.createHTML('a', {
-            href: data.url,
-            target: data.target
-          }, data.text);
-          ed.execCommand('mceInsertContent', false, link);
-        }
-      });
+        /*
+        * Add a node change handler, selects the button in the UI when a image is selected
+        * @param {tinymce.Editor} ed Editor
+        * @param {tinymce.ControlManager} cm
+        * @param {node} n
+        */
+        // ed.onNodeChange.add(function(ed, cm, n) {
+        //   cm.setActive('spud_media_picker', n.nodeName == 'IMG');
+        // });
+      },
 
-      /*
-      * Add a node change handler, selects the button in the UI when a image is selected
-      * @param {tinymce.Editor} ed Editor
-      * @param {tinymce.ControlManager} cm
-      * @param {node} n
-      */
-      // ed.onNodeChange.add(function(ed, cm, n) {
-      //   cm.setActive('spud_media_picker', n.nodeName == 'IMG');
-      // });
-    },
+      /**
+       * Returns information about the plugin as a name/value array.
+       * The current keys are longname, author, authorurl, infourl and version.
+       *
+       * @return {Object} Name/value array containing information about the plugin.
+       */
+      getInfo: function(){
+        return {
+          longname : 'TB Media',
+          author : 'Westlake Design',
+          authorurl : 'http://www.westlakedesign.com',
+          infourl : 'https://bitbucket.org/westlakedesign/tb_media',
+          version : "1.0"
+        };
+      }
+    });
 
-    /**
-     * Returns information about the plugin as a name/value array.
-     * The current keys are longname, author, authorurl, infourl and version.
-     *
-     * @return {Object} Name/value array containing information about the plugin.
-     */
-    getInfo: function(){
-      return {
-        longname : 'TB Media',
-        author : 'Westlake Design',
-        authorurl : 'http://www.westlakedesign.com',
-        infourl : 'https://bitbucket.org/westlakedesign/tb_media',
-        version : "1.0"
-      };
-    }
+    // Register plugin
+    tinymce.PluginManager.add('spud_media_picker', tinymce.plugins.SpudMediaPicker);
   });
-
-  // Register plugin
-  tinymce.PluginManager.add('spud_media_picker', tinymce.plugins.SpudMediaPicker);
 })();

data/app/assets/stylesheets/admin/media/application.css.scss

@@ -54,17 +54,6 @@ img.size-50-thumb {
   border-top-right-radius: 8px;
   border-top-left-radius: 8px;
   background-image: linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
-  background-image: -o-linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
-  background-image: -moz-linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
-  background-image: -webkit-linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
-  background-image: -ms-linear-gradient(bottom, rgb(204,204,204) 33%, rgb(230,230,230) 66%);
-  background-image: -webkit-gradient(
-    linear,
-    left bottom,
-    left top,
-    color-stop(0.33, rgb(204,204,204)),
-    color-stop(0.66, rgb(230,230,230))
-  );
   clear: both;
 }
 #spud_media_cropper_toolbar form{
@@ -100,4 +89,4 @@ user-select: none;
 a[id^="spud_media_cropper_resize_"]:active{
   position: relative;
   top: 1px;
-}
+}

data/app/controllers/admin/media_controller.rb

@@ -1,72 +1,65 @@
 class Admin::MediaController < Admin::ApplicationController
-	layout 'admin/detail'
-	add_breadcrumb "Media", :admin_media_path
-	belongs_to_spud_app :media
-	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access]
-	
-	def index
-		@media = SpudMedia.order("created_at DESC").paginate :page => params[:page]
-		respond_with @media
-	end
+  layout 'admin/detail'
+  add_breadcrumb 'Media', :admin_media_path
+  belongs_to_app :media
+  before_action :load_media, only: [:edit, :update, :show, :destroy, :set_private]
 
-	def new
-		@page_name = "New Media"
-		add_breadcrumb "New", :new_admin_medium_path
-		@media = SpudMedia.new
-		respond_with @media
-	end
+  def index
+    @media = SpudMedia.order('created_at DESC').paginate(page: params[:page])
+    respond_with @media
+  end
 
-	def create
-		@page_name = "New Media"
-		add_breadcrumb "New", :new_admin_medium_path
-		@media = SpudMedia.new(media_params)
-		location = admin_media_path
-		if @media.save
-			flash[:notice] = "File uploaded successfully" 
-			if @media.is_image?
-				location = edit_admin_medium_path(@media.id)
-			end
-		end
-		respond_with @media, :location => location
-	end
+  def new
+    @page_name = 'New Media'
+    add_breadcrumb 'New', :new_admin_medium_path
+    @media = SpudMedia.new
+    respond_with @media
+  end
 
-	def edit
-		if !@media.is_image?
-			flash[:error] = "Unable to edit #{@media.attachment_file_name}"
-			redirect_to admin_media_path
-		end
-	end
+  def create
+    @page_name = 'New Media'
+    add_breadcrumb 'New', :new_admin_medium_path
+    @media = SpudMedia.new(media_params)
+    location = admin_media_path
+    if @media.save
+      flash[:notice] = 'File uploaded successfully'
+      location = edit_admin_medium_path(@media.id) if @media.is_image?
+    end
+    respond_with @media, location: location
+  end
 
-	def update
-		if @media.update_attributes(media_params)
-			@media.attachment.reprocess!
-		end
-		respond_with @media, :location => admin_media_path
-	end
+  def edit
+    unless @media.is_image?
+      flash[:error] = "Unable to edit #{@media.attachment_file_name}"
+      redirect_to admin_media_path
+    end
+  end
 
-	def destroy
-		flash[:notice] = "File successfully destroyed" if @media.destroy
-		respond_with @media, :location => admin_media_path
-	end
+  def update
+    @media.attachment.reprocess! if @media.update(media_params)
+    respond_with @media, location: admin_media_path
+  end
 
-	def set_access
-		is_protected = params[:protected] || false
-		@media.update_attribute(:is_protected, is_protected)
-		respond_with @media, :location => admin_media_path
-	end
+  def destroy
+    flash[:notice] = 'File successfully destroyed' if @media.destroy
+    respond_with @media, location: admin_media_path
+  end
 
-private
-	def load_media
-		@media = SpudMedia.where(:id => params[:id]).first
-		if @media.blank?
-			flash[:error] = "Media Asset not found!"
-			redirect_to admin_media_path() and return
-		end
-		
-	end
+  private
 
-	def media_params
-		params.require(:spud_media).permit(:attachment_content_type,:attachment_file_name,:attachment_file_size,:attachment, :is_protected, :crop_x, :crop_y, :crop_w, :crop_h, :crop_s)
-	end
+  def load_media
+    @media = SpudMedia.where(id: params[:id]).first
+    if @media.blank?
+      flash[:error] = 'Media Asset not found!'
+      redirect_to(admin_media_path()) && return
+    end
+  end
+
+  def media_params
+    params.require(:spud_media).permit(
+      :attachment_content_type, :attachment_file_name,
+      :attachment_file_size, :attachment,
+      :crop_x, :crop_y, :crop_w, :crop_h, :crop_s)
+  end
 
 end