BBenezech-papermill 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/app/controllers/papermill_controller.rb

@@ -4,7 +4,8 @@ class PapermillController < ApplicationController
 
   def show
     begin
-      asset = PapermillAsset.find(params[:id])
+      complete_id = (params[:id0] + params[:id1] + params[:id2]).to_i
+      asset = PapermillAsset.find(complete_id)
       raise if asset.nil? || params[:style] == "original"
       style = Papermill::PAPERMILL_DEFAULTS[:aliases][params[:style]] || !Papermill::PAPERMILL_DEFAULTS[:alias_only] && params[:style]
       raise unless style

data/config/routes.rb

@@ -1,4 +1,4 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :papermill, :collection => { :sort => :post }
-  map.connect "#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}", :controller => "papermill", :action => "show"
+  map.connect "#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING.gsub(":id_partition", ":id0/:id1/:id2")}", :controller => "papermill", :action => "show"
 end

data/lib/papermill/papermill_asset.rb

@@ -9,18 +9,6 @@ class PapermillAsset < ActiveRecord::Base
   
   named_scope :key, lambda { |key| { :conditions => { :assetable_key => key } } }
   
-  Paperclip::Attachment.interpolations[:assetable_type] = proc do |attachment, style|
-    attachment.instance.assetable_type.underscore.pluralize
-  end
-  
-  Paperclip::Attachment.interpolations[:assetable_id] = proc do |attachment, style|
-    attachment.instance.assetable_id
-  end
-  
-  Paperclip::Attachment.interpolations[:assetable_key] = proc do |attachment, style|
-    attachment.instance.assetable_key.to_url
-  end
-  
   Paperclip::Attachment.interpolations[:escaped_basename] = proc do |attachment, style|
     Paperclip::Attachment.interpolations[:basename].call(attachment, style).to_url
   end
@@ -38,6 +26,10 @@ class PapermillAsset < ActiveRecord::Base
     self.file = data
   end
   
+  def id_partition
+    ("%09d" % self.id).scan(/\d{3}/).join("/")
+  end
+  
   def name
     file_file_name
   end
@@ -51,20 +43,20 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def content_type
-    file_content_type.split("/") if file_content_type
+    file_content_type && file_content_type.split("/")
   end
   
   def image?
-    content_type.first == "image" && content_type[1]
+    content_type && content_type.first == "image" && content_type[1]
   end
   
   def interpolated_path(with = {}, up_to = nil)
-    Papermill::papermill_interpolated_path({":id" => self.id, ":assetable_id" => self.assetable_id, ":assetable_type" => self.assetable_type.underscore.pluralize}.merge(with), up_to)
+    Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}.merge(with), up_to)
   end
   
   # before_filter
   def destroy_files
-    system "rm -rf #{self.interpolated_path({}, ':id')}/" if image?
+    system "rm -rf #{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/" if image?
     true
   end
 end

data/lib/papermill/papermill_module.rb

@@ -45,7 +45,7 @@ module Papermill
       :button_image_url => '/images/papermill/upload-blank.png',
       :button_width     => 61,
       :button_height    => 22,
-      # Wording and CSS processed through an Adobe Flash styler. Result is so-so. Feel free to put a CSS button overlayed directly on the SWF button. See swfupload website.
+      # Wording and CSS processed through an Adobe Flash styler. Result is terrible. Feel free to put a CSS button overlayed directly on the SWF button. See swfupload website.
       :button_text => %{<span class="button-text">#{I18n.t("upload-button-wording", :scope => :papermill)}</span>},
     	:button_text_style => %{.button-text { color: red; font-size: 12pt; font-weight: bold; }},
     	:button_disabled => "false",
@@ -56,7 +56,7 @@ module Papermill
       # See swfupload.js for details.
     },
     :images_only => false,                    # set to true to forbid upload of anything else than images
-    :file_size_limit_mb => 10,                # file max size, MegaBytes
+    :file_size_limit_mb => 10,                # file max size
     :button_after_container => false,         # set to true to move the upload button below the container
     
     # DO NOT CHANGE THESE IN YOUR CLASSES. Only application wide (routes depend on it..)
@@ -67,12 +67,12 @@ module Papermill
     # path to the root of your public directory
     :public_root => ":rails_root/public",
     # added to :public_root as the root folder for all papermill items
-    :papermill_prefix => "papermill"
+    :papermill_prefix => "system/papermill"
   }.deep_merge( Papermill.const_defined?("OPTIONS") ? Papermill::OPTIONS : {} )
   
 
-  PAPERCLIP_INTERPOLATION_STRING = ":assetable_type/:assetable_id/:id/:style/:escaped_basename.:extension"
-    
+  PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:escaped_basename.:extension"
+  
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -114,7 +114,6 @@ module Papermill
       @papermill_associations.merge!({assoc => {:class => asset_class}})
       @papermill_options = Papermill::PAPERMILL_DEFAULTS.deep_merge(options)
       before_destroy :destroy_assets
-      after_destroy :remove_papermill_folder
       after_create :rebase_assets
       # reinventing the wheel because ActiveRecord chokes on :finder_sql with associations
       # TODO Clean the mess
@@ -151,24 +150,15 @@ module Papermill
       @timestamp ||= "-#{(Time.now.to_f * 1000).to_i.to_s[4..-1]}"
     end
   
-    def interpolated_path(with = {}, up_to = nil)
-      Papermill::papermill_interpolated_path({
-        ":assetable_type" => self.class.sti_name.underscore.pluralize,
-        ":assetable_id" => self.id
-      }.merge(with), up_to)
-    end
-      
     private
     
     def destroy_assets
       PapermillAsset.find(:all, :conditions => {:assetable_id => self.id, :assetable_type => self.class.sti_name}).each do |asset|
         asset.destroy
       end
-      true
     end
     
     def rebase_assets
-      return true unless timestamp
       PapermillAsset.find(:all, :conditions => {:assetable_id => self.timestamp, :assetable_type => self.class.sti_name}).each do |asset|
         if asset.created_at < 2.hours.ago
           asset.destroy
@@ -176,13 +166,7 @@ module Papermill
           asset.update_attribute(:assetable_id, self.id)
         end
       end
-      system "mv #{interpolated_path({':assetable_id' => timestamp}, ':assetable_id')}/ #{interpolated_path({}, ':assetable_id')}/"
-      true
-    end
-
-    def remove_papermill_folder
-      system "rm -rf #{interpolated_path({}, ':assetable_id')}/"
-      true
     end
+    
   end
 end

data/papermill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]

data/test/papermill_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class PapermillTest < ActiveSupport::TestCase
   # Replace this with your real tests.
+
   test "the truth" do
     assert true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BBenezech-papermill
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -63,6 +63,7 @@ files:
 - uninstall.rb
 has_rdoc: false
 homepage: http://github.com/BBenezech/papermill
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Paperclip wrapper