tb_media 1.2.1 → 1.3.2

data/app/controllers/admin/media_picker_controller.rb

@@ -1,42 +1,34 @@
 class Admin::MediaPickerController < Admin::ApplicationController
 
-  include RespondsToParent
-
   layout false
   respond_to :html
 
   def index
-    @media = SpudMedia.order('attachment_file_name asc').paginate(:page => params[:page], :per_page => 30)
+    @media = SpudMedia.order('attachment_file_name asc').paginate(page: params[:page], per_page: 30)
     respond_with @media do |format|
-      format.html{
+      format.html do
         if params[:only_list]
-          render :partial => 'media', :collection => @media
+          render partial: 'media', collection: @media
         else
           render 'index'
         end
-      }
+      end
     end
   end
 
   def create
     @media = SpudMedia.new(media_params)
     if @media.save
-      if request.xhr?
-        render 'create', :status => 200
-      else
-        respond_to_parent do
-          render 'create.js', :status => 200
-        end
-      end
+      render 'create', status: :ok
     else
-      render :text => @media.errors.full_messages.first, :status => 422
+      render text: @media.errors.full_messages.first, status: :unprocessable_entity
     end
   end
 
-private
+  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

@@ -1,82 +1,75 @@
 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
-    },
-    :url => Spud::Media.storage_url,
-    :styles => lambda { |attachment| attachment.instance.dynamic_styles }
-
-  validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
+  has_attached_file :attachment,
+    storage: Spud::Media.paperclip_storage,
+    s3_credentials: Spud::Media.s3_credentials,
+    s3_permissions: 'public-read',
+    path: Spud::Media.storage_path,
+    url: Spud::Media.storage_url,
+    styles: ->(attachment) { attachment.instance.dynamic_styles }
+
+  validates :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, numericality: { allow_nil: true }
 
   extend ActionView::Helpers::NumberHelper
 
   validates_attachment :attachment,
-    :presence => true,
-    :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}
+    presence: true,
+    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 { |_p| Spud::Media.max_upload_size.positive? }
     }
 
   before_create :rename_file
-  #after_create :validate_permissions
-  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
   end
 
   def image_from_type
+    if is_image?
+      return attachment_url(:small)
+
+    elsif attachment_content_type.blank?
+      return 'admin/files_thumbs/dat_thumb.png'
+
+    elsif attachment_content_type =~ /jpeg|jpg/
+      return 'admin/files_thumbs/jpg_thumb.png'
+
+    elsif attachment_content_type =~ /png/
+      return 'admin/files_thumbs/png_thumb.png'
+
+    elsif attachment_content_type =~ /zip|tar|tar\.gz|gz/
+      return 'admin/files_thumbs/zip_thumb.png'
+
+    elsif attachment_content_type =~ /xls|xlsx/
+      return 'admin/files_thumbs/xls_thumb.png'
+
+    elsif attachment_content_type =~ /doc|docx/
+      return 'admin/files_thumbs/doc_thumb.png'
 
-    if self.is_image?
-      return self.attachment_url(:small)
-
-    elsif self.attachment_content_type.blank?
-    	return "admin/files_thumbs/dat_thumb.png"
-    
-    elsif self.attachment_content_type.match(/jpeg|jpg/)
-    	return "admin/files_thumbs/jpg_thumb.png"
-    
-    elsif self.attachment_content_type.match(/png/)
-    	return "admin/files_thumbs/png_thumb.png"
-    
-    elsif self.attachment_content_type.match(/zip|tar|tar\.gz|gz/)
-    	return "admin/files_thumbs/zip_thumb.png"
-    
-    elsif self.attachment_content_type.match(/xls|xlsx/)
-    	return "admin/files_thumbs/xls_thumb.png"
-    
-    elsif self.attachment_content_type.match(/doc|docx/)
-    	return "admin/files_thumbs/doc_thumb.png"
-    
-    elsif self.attachment_content_type.match(/ppt|pptx/)
-    	return "admin/files_thumbs/ppt_thumb.png"
-    
-    elsif self.attachment_content_type.match(/txt|text/)
-    	return "admin/files_thumbs/txt_thumb.png"
-    
-    elsif self.attachment_content_type.match(/pdf|ps/)
-    	return "admin/files_thumbs/pdf_thumb.png"
-    
-    elsif self.attachment_content_type.match(/mp3|wav|aac/)
-    	return "admin/files_thumbs/mp3_thumb.png"
+    elsif attachment_content_type =~ /ppt|pptx/
+      return 'admin/files_thumbs/ppt_thumb.png'
+
+    elsif attachment_content_type =~ /txt|text/
+      return 'admin/files_thumbs/txt_thumb.png'
+
+    elsif attachment_content_type =~ /pdf|ps/
+      return 'admin/files_thumbs/pdf_thumb.png'
+
+    elsif attachment_content_type =~ /mp3|wav|aac/
+      return 'admin/files_thumbs/mp3_thumb.png'
     end
-    
-    return "admin/files_thumbs/dat_thumb.png"
+
+    return 'admin/files_thumbs/dat_thumb.png'
   end
 
   def is_image?
-    if self.attachment_content_type.match(/jpeg|jpg|png/)
+    if attachment_content_type =~ /jpeg|jpg|png/
       return true
     else
       return false
@@ -84,7 +77,7 @@ class SpudMedia < ActiveRecord::Base
   end
 
   def is_pdf?
-    if self.attachment_content_type.match(/pdf/)
+    if attachment_content_type =~ /pdf/
       return true
     else
       return false
@@ -97,69 +90,29 @@ class SpudMedia < ActiveRecord::Base
 
   def dynamic_styles
     styles = {}
-    if is_image? #|| is_pdf?
+    if is_image? # || is_pdf?
       styles[:small] = '50'
       if has_custom_crop?
-        styles[:cropped] = {:geometry => '', :convert_options => "-strip -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>', :convert_options => '-strip -quality 85', :source_file_options => '-density 72'}
+        styles[:cropped] = { geometry: '1280x1280>', convert_options: '-strip -quality 85', source_file_options: '-density 72' }
       end
     end
     return styles
   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)
+  def attachment_url(style = nil)
     # defaults to cropped style if that style exists, otherwise use original
-    if !style
-      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)
-    else
-      return attachment.url(style)
-    end
-  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))
-    if File.directory?(old_base_dir)
-      FileUtils.mv(old_base_dir, new_base_dir)
-    end
+    style ||= is_image? ? 'cropped' : 'original'
+    return attachment.url(style)
   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,8 @@
 Rails.application.routes.draw do
+  namespace :admin do
+    resources :media
 
-	namespace :admin do
-		resources :media do
-      put 'set_access', :on => :member
-    end
-    resources :media_picker, :only => [:index, :create]
-	end
-
-  get Spud::Media.config.storage_url => 'protected_media#show', :as => 'protected_media'
+    # picker plugin not currently used
+    # resources :media_picker, :only => [:index, :create]
+  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,12 +2,11 @@ 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.storage_path = ':rails_root/public/system/spud_media/: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/content_types.rb

@@ -8,7 +8,7 @@ module Spud
       'application/msword',
       'application/vnd.ms-excel',
       'application/vnd.ms-powerpoint',
-      
+
       # Documents
       'application/pdf',
       'text/html',
@@ -57,6 +57,6 @@ module Spud
       'image/vnd.adobe.photoshop',
       'application/postscript',
       'application/x-shockwave-flash'
-    ]
+    ].freeze
   end
 end

data/lib/spud_media/engine.rb

@@ -2,17 +2,25 @@ require 'tb_core'
 require 'paperclip'
 
 module Spud
-	module Media
-		 class Engine < Rails::Engine
-			engine_name :tb_media
-			initializer :admin do
-				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|
-				  config.admin_applications += [{:name => "Media", :thumbnail => "admin/media_thumb.png", :url => "/admin/media", :order => 3, :retina => true}]
-				end
-			end
-		 end
-	end
+  module Media
+    class Engine < Rails::Engine
+      engine_name :tb_media
+
+      initializer :admin do
+        config.assets.precompile += ['admin/files_thumbs/*']
+        config.assets.precompile += ['admin/media_thumb.png']
+        # config.assets.precompile += ['admin/media/picker.js'] <- Picker not currently used
+        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
+
+      initializer 'tb_media.assets' do
+        Rails.application.config.assets.precompile += ['admin/media_thumb.png']
+      end
+
+    end
+  end
 end