papermill 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/generators/papermill_table/templates/migrate/papermill_migration.rb.erb

@@ -8,14 +8,14 @@ class <%= migration_name %> < ActiveRecord::Migration
       t.integer  :file_file_size
       
       # Papermill fields (required)
-      t.integer  :position
-      t.integer  :assetable_id
-      t.string   :assetable_type
-      t.string   :assetable_key
-      t.string   :type
+      t.integer  :position          # sets are ordered by position
+      t.integer  :assetable_id      # Assetable
+      t.string   :assetable_type    # Assetable
+      t.string   :assetable_key     # Assetable sets
+      t.string   :type              # STI
+      t.string   :title             # raw filename, without file extension, for your own use
       
       # Custom fields (optionnals)
-      t.string   :title
       t.string   :alt
       t.string   :copyright
       t.text     :description

data/lib/papermill/papermill.rb

@@ -1,5 +1,5 @@
 module Papermill
-  PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:escaped_basename.:extension"
+  PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:basename.:extension"
   
   def self.included(base)
     base.extend(ClassMethods)

data/lib/papermill/papermill_asset.rb

@@ -7,11 +7,7 @@ class PapermillAsset < ActiveRecord::Base
     :path => "#{Papermill::options[:public_root]}/#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}",
     :url => "/#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}"
   
-  before_post_process :set_real_file_name
-  
-  Paperclip.interpolates :escaped_basename do |attachment, style|
-    Paperclip::Interpolations[:basename].call(attachment, style).to_url
-  end
+  before_post_process :set_file_name
   
   validates_attachment_presence :file
   
@@ -95,8 +91,10 @@ class PapermillAsset < ActiveRecord::Base
   
   private
   
-  def set_real_file_name
-    self.file.instance_write(:file_name, @real_file_name) if @real_file_name
+  def set_file_name
+    return if @real_file_name.blank?
+    self.title = (basename = @real_file_name.gsub(/#{extension = File.extname(@real_file_name)}$/, ""))
+    self.file.instance_write(:file_name, "#{basename.to_url}#{extension}")
   end
   
   def set_position

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"