tb_media 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc0309950dd0662db95deac6e9a0f08edfdca74
-  data.tar.gz: e73bb5b6b3fc9d73b32e463aa5daa7126c22e5be
+  metadata.gz: d20e9297b2866aad42576b7f895f7d881430b431
+  data.tar.gz: 7d1fa6cdb9389e466b7e89e213a9b7c1cfd07fe3
 SHA512:
-  metadata.gz: 98907bd05bc636950472f88228825915c329e667e93dfaf09da6c174cf78d55688d8015cf790de2896ec55f770337ffacae89cd23075288ff3fb6af1209eeb2a
-  data.tar.gz: 5a82b6e155dd05278dbae5cc1229baf022ef38b4372c3b35b1729e61a02570ae9045dab1cae3d0d0b105c181e875b47732350465e866050235ace4e56973e377
+  metadata.gz: 1e7b4ac0a50b4922fa74b96a6b409dd9b1396b29d18b64e1da9cb3efe3fc81aa067923cda5f8b3f6658544146c843f4aedd3dbfdd009b1045dcd2ce00215938f
+  data.tar.gz: 5e847b6379638b6bb6b6a877ab8f40a091615e059784fafc944af4361ee4b6fa94e434fc5622f5914c98e219b7e3d30f5721dca83fe25b1d86d94bd4e7448934

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

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/picker.js

@@ -107,15 +107,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 +126,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 +306,4 @@ spud.admin.mediapicker = new function(){
       self.clickedInsert(e);
     }
   };
-};
+};

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

@@ -2,10 +2,10 @@ class Admin::MediaController < Admin::ApplicationController
   layout 'admin/detail'
   add_breadcrumb 'Media', :admin_media_path
   belongs_to_app :media
-  before_action :load_media, only: [:edit, :update, :show, :destroy, :set_private, :set_access]
+  before_action :load_media, only: [:edit, :update, :show, :destroy, :set_private]
 
   def index
-    @media = SpudMedia.order('created_at DESC').paginate page: params[:page]
+    @media = SpudMedia.order('created_at DESC').paginate(page: params[:page])
     respond_with @media
   end
 
@@ -36,7 +36,7 @@ class Admin::MediaController < Admin::ApplicationController
   end
 
   def update
-    @media.attachment.reprocess! if @media.update_attributes(media_params)
+    @media.attachment.reprocess! if @media.update(media_params)
     respond_with @media, location: admin_media_path
   end
 
@@ -45,12 +45,6 @@ class Admin::MediaController < Admin::ApplicationController
     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
-
   private
 
   def load_media
@@ -62,7 +56,10 @@ class Admin::MediaController < Admin::ApplicationController
   end
 
   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)
+    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

data/app/controllers/admin/media_picker_controller.rb

@@ -34,7 +34,7 @@ class Admin::MediaPickerController < Admin::ApplicationController
   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)
+    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

data/app/models/spud_media.rb

@@ -3,12 +3,8 @@ 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'
-    },
-    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
-    },
+    s3_permissions: 'public-read',
+    path: Spud::Media.storage_path,
     url: Spud::Media.storage_url,
     styles: ->(attachment) { attachment.instance.dynamic_styles }
 
@@ -26,10 +22,9 @@ class SpudMedia < ActiveRecord::Base
     }
 
   before_create :rename_file
-  before_update :validate_permissions
 
   def rename_file
-    # remove periods and other unsafe characters from file name to make routing easier
+    # 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
     attachment.instance_write :file_name, filename + extension
@@ -104,56 +99,20 @@ class SpudMedia < ActiveRecord::Base
       end
     end
     return styles
- end
+  end
 
-  # if you are using S3, attachment.url will automatically point to the S3 url
-  # protected files need to hit the rails middle-man first
- # this method will provide the correct url for either case
   def attachment_url(style = nil)
     # defaults to cropped style if that style exists, otherwise use original
-    style = is_image? ? 'cropped' : 'original' unless style
-    if Spud::Media.paperclip_storage == :s3 && is_protected
-      return Paperclip::Interpolations.interpolate(Spud::Media.config.storage_url, attachment, style)
-    else
-      return attachment.url(style)
-    end
+    style ||= is_image? ? 'cropped' : 'original'
+    return attachment.url(style)
   end
 
-  # If is_protected has changed, we need to make sure we are setting the appropriate permissions
- # This means either moving the file in the filesystem or setting the appropriate ACL in S3
-  def validate_permissions
-    if Spud::Media.config.paperclip_storage == :filesystem
-      validate_permissions_filesystem
-    elsif Spud::Media.config.paperclip_storage == :s3
-      validate_permissions_s3
-    end
-  end
-
-  private
-
-  def validate_permissions_filesystem
-    if is_protected
-      old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original')
-      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')
-    end
-    new_base_dir = File.dirname(File.dirname(new_path))
-    old_base_dir = File.dirname(File.dirname(old_path))
-    FileUtils.mv(old_base_dir, new_base_dir) if File.directory?(old_base_dir)
-  end
-
-  def validate_permissions_s3
-    if is_protected
-      attachment.s3_object(:original).acl = :private
-      attachment.s3_object(:cropped).acl = :private if attachment.s3_object(:cropped).exists?
-      attachment.s3_object(:small).acl = :private if attachment.s3_object(:small).exists?
-    else
-      attachment.s3_object(:original).acl = :public_read
-      attachment.s3_object(:cropped).acl = :public_read if attachment.s3_object(:cropped).exists?
-      attachment.s3_object(:small).acl = :public_read if attachment.s3_object(:small).exists?
-    end
+  def is_protected
+    ActiveSupport::Deprecation.warn(
+      'SpudMedia#is_protected is deprecated and will soon be removed',
+      caller
+    )
+    false
   end
 
 end

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

@@ -9,27 +9,19 @@
 				<% @media.each do |media| %>
 					<tr>
 						<td>
-							<% if media.is_protected && media.is_image? %>
-								<img src="<%= media.image_from_type %>" class="size-50-thumb" />
-							<% else %>
-								<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
-							<% end %>
+							<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
 							<%= link_to media.attachment_file_name, media.attachment_url %>
 						</td>
 						<td class="table-actions">
 							<% if media.is_image? %>
 								<%= link_to 'Crop', edit_admin_medium_path(media.id), :class => 'btn btn-sm btn-default' %>
 							<% end %>
-							<% if media.is_protected %>
-								<%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn btn-sm btn-default' %>
-							<% else %>
-								<%= link_to 'Public', set_access_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn btn-sm btn-default' %>
-							<% end %>
-							<%= link_to "Remove", admin_medium_path(media), :method => :delete, :class => 'btn btn-sm btn-danger', :data => {:confirm => "Are you sure you want to remove this file?"} %>
+							<%= link_to 'Remove', admin_medium_path(media), :method => :delete, :class => 'btn btn-sm btn-danger', :data => {:confirm => "Are you sure you want to remove this file?"} %>
 						</td>
 					</tr>
 				<% end %>
 			</tbody>
 		</table>
-	</div>	
+	</div>
+	<%= will_paginate @media, :renderer => BootstrapPagination::Rails %>
 <% end %>

data/app/views/admin/media/new.html.erb

@@ -1,6 +1,5 @@
 <%=form_for @media, :url => admin_media_path, :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal", :multipart => true} do |f|%>
   <%= tb_form_error_header(@media) %>
   <%= f.tb_file_field :attachment %>
-  <%= f.tb_check_box :is_protected %>
   <%= f.tb_save_buttons('File', admin_media_path) %>
 <% end %>

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

@@ -4,14 +4,9 @@
   '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-protected' => (media.is_protected ? 'Yes' : 'No') do %>
+  'data-lastmod' => media.attachment_updated_at.blank? == false ? media.attachment_updated_at.strftime("%l:%M %p, %D") : '' do %>
   <span class="spud_media_picker_item_thumb">
-    <% if media.is_protected && media.is_image? %>
-      <img src="<%= media.image_from_type %>"/>
-    <% else %>
-      <%= image_tag(media.image_from_type) %>
-    <% end %>
+    <%= image_tag(media.image_from_type) %>
   </span>
   <span class="spud_media_picker_item_filename">
     <%= media.attachment_file_name %>

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

@@ -40,7 +40,6 @@
           <li>File Name: <span class="spud_media_picker_details_name"></span></li>
           <li>File Size: <span class="spud_media_picker_details_size"></span></li>
           <li>Last Modified: <span class="spud_media_picker_details_lastmod"></span></li>
-          <li>Protected: <span class="spud_media_picker_details_protected"></span></li>
         </ul>
       </div>
       <div class="spud_media_picker_buttons">
@@ -104,4 +103,4 @@
   </script>
 
 </body>
-</html>
+</html>

data/config/locales/en.yml

@@ -6,4 +6,3 @@ en:
     attributes:
       spud_media:
         attachment: 'File Upload'
-        is_protected: 'Protected File'

data/config/routes.rb

@@ -1,11 +1,6 @@
 Rails.application.routes.draw do
-
-	namespace :admin do
-		resources :media do
-      put 'set_access', :on => :member
-    end
+  namespace :admin do
+    resources :media
     resources :media_picker, :only => [:index, :create]
-	end
-
-  get Spud::Media.config.storage_url => 'protected_media#show', :as => 'protected_media'
+  end
 end

data/db/migrate/20120101194256_create_spud_media.rb

@@ -1,4 +1,4 @@
-class CreateSpudMedia < ActiveRecord::Migration
+class CreateSpudMedia < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_media do |t|
       t.string :attachment_content_type
@@ -8,4 +8,4 @@ class CreateSpudMedia < ActiveRecord::Migration
       t.timestamps
     end
   end
-end
+end

data/db/migrate/20120501203325_add_protected_to_spud_media.rb

@@ -1,6 +1,5 @@
-class AddProtectedToSpudMedia < ActiveRecord::Migration
+class AddProtectedToSpudMedia < ActiveRecord::Migration[4.2]
   def change
-    add_column :spud_media, :is_protected, :boolean, :default => false
     add_column :spud_media, :attachment_updated_at, :datetime
   end
 end

data/db/migrate/20120508132153_add_cropping_to_spud_media.rb

@@ -1,4 +1,4 @@
-class AddCroppingToSpudMedia < ActiveRecord::Migration
+class AddCroppingToSpudMedia < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_media, :crop_x, :int, :default => 0
     add_column :spud_media, :crop_y, :int, :default => 0

data/lib/spud_media/configuration.rb

@@ -2,11 +2,10 @@ module Spud
   module Media
     include ActiveSupport::Configurable
     require 'active_support/core_ext/numeric/bytes'
-    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_path_protected, :storage_url, :max_upload_size
+    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :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

data/lib/spud_media/engine.rb

@@ -10,9 +10,9 @@ module Spud
         config.assets.precompile += ['admin/files_thumbs/*']
         config.assets.precompile += ['admin/media_thumb.png']
         config.assets.precompile += ['admin/media/picker.js']
-        Spud::Core.append_admin_javascripts('admin/media/application')
-        Spud::Core.append_admin_stylesheets('admin/media/application')
-        Spud::Core.configure do |config|
+        TbCore.append_admin_javascripts('admin/media/application')
+        TbCore.append_admin_stylesheets('admin/media/application')
+        TbCore.configure do |config|
           config.admin_applications += [{ name: 'Media', thumbnail: 'admin/media_thumb.png', url: '/admin/media', order: 3, retina: true }]
         end
       end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Media
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

data/spec/controllers/admin/media_controller_spec.rb

@@ -12,9 +12,9 @@ describe Admin::MediaController, type: :controller do
 
   describe 'index' do
     it 'index page should return all media in descending order by create_at' do
-      @media1 = FactoryGirl.create(:spud_media, created_at: 1.hour.ago)
-      @media2 = FactoryGirl.create(:spud_media, created_at: 2.hours.ago)
-      @media3 = FactoryGirl.create(:spud_media, created_at: 3.hours.ago)
+      @media1 = FactoryBot.create(:spud_media, created_at: 1.hour.ago)
+      @media2 = FactoryBot.create(:spud_media, created_at: 2.hours.ago)
+      @media3 = FactoryBot.create(:spud_media, created_at: 3.hours.ago)
       get :index
       @medias = assigns(:media)
       expect(@medias.count).to eq(3)
@@ -34,9 +34,8 @@ describe Admin::MediaController, type: :controller do
 
   describe 'create' do
     it "should create a new media and returned the saved object's edit page" do
-      post :create, params: { spud_media: FactoryGirl.attributes_for(:spud_media) }
       expect do
-        post :create, params: { spud_media: FactoryGirl.attributes_for(:spud_media) }
+        post :create, params: { spud_media: FactoryBot.attributes_for(:spud_media) }
       end.to change(SpudMedia, :count).by(1)
     end
   end

data/spec/models/spud_media_spec.rb

@@ -4,7 +4,7 @@ describe SpudMedia, type: :model do
 
   describe 'attachment' do
     it 'should require an attachment' do
-      media = FactoryGirl.build(:spud_media, attachment: nil)
+      media = FactoryBot.build(:spud_media, attachment: nil)
       expect(media.valid?).to eq(false)
       expect(media.errors[:attachment].length).to eq(1)
     end

data/spec/rails_helper.rb

@@ -1,13 +1,13 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
 require 'spec_helper'
 require 'rspec/rails'
 require 'rails-controller-testing'
 require 'database_cleaner'
 require 'simplecov'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'tb_core/test_helper'
 
 SimpleCov.start 'rails'

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: tb_core
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,8 +195,6 @@ files:
 - app/assets/stylesheets/admin/media/plugin.css
 - app/controllers/admin/media_controller.rb
 - app/controllers/admin/media_picker_controller.rb
-- app/controllers/protected_media_controller.rb
-- app/helpers/protected_media_helper.rb
 - app/models/spud_media.rb
 - app/views/admin/media/edit.html.erb
 - app/views/admin/media/index.html.erb
@@ -306,69 +304,69 @@ signing_key:
 specification_version: 4
 summary: TB File upload/management module
 test_files:
-- spec/controllers/admin/media_controller_spec.rb
+- spec/spec_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20130904141441_create_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20130904141442_create_spud_users.tb_core.rb
-- spec/dummy/db/migrate/20130904141443_add_time_zone_to_spud_user.tb_core.rb
-- spec/dummy/db/migrate/20130904141444_add_scope_to_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20130904141445_create_spud_user_settings.tb_core.rb
-- spec/dummy/db/migrate/20130904141446_create_spud_media.tb_media.rb
-- spec/dummy/db/migrate/20130904141447_add_protected_to_spud_media.tb_media.rb
-- spec/dummy/db/migrate/20130904141448_add_cropping_to_spud_media.tb_media.rb
-- spec/dummy/db/migrate/20151012194530_create_spud_roles.tb_core.rb
-- spec/dummy/db/migrate/20151012194531_create_spud_permissions.tb_core.rb
-- spec/dummy/db/migrate/20151012194532_create_spud_role_permissions.tb_core.rb
-- spec/dummy/db/migrate/20151012194533_drop_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20151012194534_add_requires_password_change_to_spud_users.tb_core.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
+- spec/dummy/script/rails
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/system/spud_media/1/cropped/test_img1.png
+- spec/dummy/public/404.html
 - spec/dummy/public/system/spud_media/1/original/test_img1.png
 - spec/dummy/public/system/spud_media/1/small/test_img1.png
-- spec/dummy/public/system/spud_media/2/cropped/test_img1.png
-- spec/dummy/public/system/spud_media/2/original/test_img1.png
-- spec/dummy/public/system/spud_media/2/small/test_img1.png
-- spec/dummy/public/system/spud_media/3/cropped/test_img1.png
-- spec/dummy/public/system/spud_media/3/original/test_img1.png
-- spec/dummy/public/system/spud_media/3/small/test_img1.png
-- spec/dummy/public/system/spud_media/4/cropped/test_img1.png
+- spec/dummy/public/system/spud_media/1/cropped/test_img1.png
 - spec/dummy/public/system/spud_media/4/original/test_img1.png
 - spec/dummy/public/system/spud_media/4/small/test_img1.png
-- spec/dummy/public/system/spud_media/5/cropped/test_img1.png
+- spec/dummy/public/system/spud_media/4/cropped/test_img1.png
+- spec/dummy/public/system/spud_media/3/original/test_img1.png
+- spec/dummy/public/system/spud_media/3/small/test_img1.png
+- spec/dummy/public/system/spud_media/3/cropped/test_img1.png
+- spec/dummy/public/system/spud_media/2/original/test_img1.png
+- spec/dummy/public/system/spud_media/2/small/test_img1.png
+- spec/dummy/public/system/spud_media/2/cropped/test_img1.png
 - spec/dummy/public/system/spud_media/5/original/test_img1.png
 - spec/dummy/public/system/spud_media/5/small/test_img1.png
-- spec/dummy/Rakefile
+- spec/dummy/public/system/spud_media/5/cropped/test_img1.png
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20130904141441_create_spud_admin_permissions.tb_core.rb
+- spec/dummy/db/migrate/20130904141443_add_time_zone_to_spud_user.tb_core.rb
+- spec/dummy/db/migrate/20130904141448_add_cropping_to_spud_media.tb_media.rb
+- spec/dummy/db/migrate/20130904141446_create_spud_media.tb_media.rb
+- spec/dummy/db/migrate/20151012194532_create_spud_role_permissions.tb_core.rb
+- spec/dummy/db/migrate/20130904141444_add_scope_to_spud_admin_permissions.tb_core.rb
+- spec/dummy/db/migrate/20151012194533_drop_spud_admin_permissions.tb_core.rb
+- spec/dummy/db/migrate/20151012194534_add_requires_password_change_to_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20151012194531_create_spud_permissions.tb_core.rb
+- spec/dummy/db/migrate/20130904141442_create_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20151012194530_create_spud_roles.tb_core.rb
+- spec/dummy/db/migrate/20130904141445_create_spud_user_settings.tb_core.rb
+- spec/dummy/db/migrate/20130904141447_add_protected_to_spud_media.tb_media.rb
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
-- spec/fixtures/images/test_img1.png
-- spec/javascripts/helpers/setup_env.js
-- spec/javascripts/spud/admin/media/application_spec.js
-- spec/javascripts/support/jasmine.yml
-- spec/javascripts/support/jasmine_helper.rb
 - spec/models/spud_media_spec.rb
+- spec/javascripts/support/jasmine_helper.rb
+- spec/javascripts/support/jasmine.yml
+- spec/javascripts/spud/admin/media/application_spec.js
+- spec/javascripts/helpers/setup_env.js
+- spec/fixtures/images/test_img1.png
+- spec/controllers/admin/media_controller_spec.rb
 - spec/rails_helper.rb
-- spec/spec_helper.rb

data/app/controllers/protected_media_controller.rb

@@ -1,24 +0,0 @@
-class ProtectedMediaController < Spud::ApplicationController
-
-  before_action :require_user
-
-  def show
-    @media = SpudMedia.where(id: params[:id]).first
-    if @media.blank?
-      raise Spud::NotFoundError, item: 'media'
-    else
-      if Spud::Media.config.paperclip_storage == :s3
-        secure_url = @media.attachment.s3_object(params[:style]).url_for(:read, secure: true, expires: 10.minutes)
-        redirect_to(secure_url.to_s)
-      else
-        filepath = @media.attachment.path(params[:style])
-        if !File.exist?(filepath)
-          raise Spud::NotFoundError, item: 'media'
-        else
-          send_file(filepath, disposition: 'inline')
-        end
-      end
-    end
-  end
-
-end

data/app/helpers/protected_media_helper.rb

@@ -1,3 +0,0 @@
-module ProtectedMediaHelper
-
-end