paperclip_database_storage 3.0.2 → 3.0.3

data/app/controllers/paperclip_database_storage/attachments_controller.rb

@@ -1,12 +1,11 @@
 class PaperclipDatabaseStorage::AttachmentsController < ApplicationController
   def get_attachment
     conditions = {}
-    conditions[:attached_type] = params[:class].singularize.camelize if params[:class]
+    conditions[:attached_type] = params[:class].singularize.camelize(:upper) if params[:class]
     conditions[:attached_id] = params[:id] if params[:id]
     conditions[:attached_id] ||= params[:id_partition].gsub(/\//, '').to_i if params[:id_partition]
     conditions[:attachment_name] = params[:attachment].singularize if params[:attachment]
     conditions[:style] = params[:style] if params[:style]
-    
 
     attachments = PaperclipDatabaseStorage::Attachment.where(conditions)
 
@@ -14,6 +13,9 @@ class PaperclipDatabaseStorage::AttachmentsController < ApplicationController
     raise ActionController::RoutingError.new('Too many images found. Check your route definition') if attachments.length > 1
 
     attachment = attachments.first
-    send_data attachment.file_data, :type => attachment.content_type, :disposition => attachment.content_type.strip =~ /^image/ ? 'inline' : 'attachment'
+    send_data attachment.file_data,
+      :type => attachment.content_type,
+      :disposition => (attachment.content_type.strip =~ /^image/ ? 'inline' : 'attachment'),
+      :filename => (params[:filename] || attachment.attached.send(attachment.attached.attachment_definitions.select { |k, v| v[:storage] == :database }.keys.first).original_filename)
   end
 end

data/config/routes.rb

@@ -21,6 +21,6 @@ Rails.application.routes.prepend do
 
   # Generate the default route, if necessary
   if must_create_default_route
-    get Paperclip::Attachment.default_options[:url].gsub(/:id_partition/, '*id_partition') => 'paperclip_database_storage/attachments#get_attachment', :as => :default_pds
+    get Paperclip::Attachment.default_options[:url].gsub(/:id_partition/, '*id_partition').gsub(/:filename/, '*filename') => 'paperclip_database_storage/attachments#get_attachment', :as => :default_pds
   end
-end
+end

data/lib/paperclip_database_storage/storage/database.rb

@@ -23,8 +23,8 @@ module Paperclip
 
       def get_attachment(style)
         return PaperclipDatabaseStorage::Attachment.find(:first, :conditions => {
-          :style => style, 
-          :attached_type => self.instance.class.name, 
+          :style => style,
+          :attached_type => self.instance.class.name,
           :attached_id => self.instance.id,
           :attachment_name => self.get_attachment_definitions.keys.first
         })
@@ -32,9 +32,9 @@ module Paperclip
 
       def get_attachment_definitions
         attachment_definitions = self.instance.class.attachment_definitions
-        
+
         if attachment_definitions.select { |k,v| v[:storage] == :database }.count > 1
-          raise Exception.new('paperclip-database does not support more than one attachment per model')
+          raise Exception.new('paperclip-database-storage does not support more than one attachment per model')
         end
 
         return attachment_definitions

data/lib/paperclip_database_storage/version.rb

@@ -1,3 +1,3 @@
 module PaperclipDatabaseStorage
-  VERSION = "3.0.2" unless defined? PaperclipDatabaseStorage::VERSION
+  VERSION = "3.0.3" unless defined? PaperclipDatabaseStorage::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database_storage
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors: