BBenezech-papermill 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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 terrible. 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 so-so. 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
+    :file_size_limit_mb => 10,                # file max size, MegaBytes
     :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..)
@@ -113,9 +113,8 @@ module Papermill
 
       @papermill_associations.merge!({assoc => {:class => asset_class}})
       @papermill_options = Papermill::PAPERMILL_DEFAULTS.deep_merge(options)
-      association_finder = assoc.to_s + "_finder"
-      # using finder_sql because ActiveRecord chokes with STI on polymorphic tables. (Stupidely uses class.to_s instead of class.sti_name in association, god knows when it will get fixed, but tickets seems on the way for rails 3.0)
-      has_many association_finder, :finder_sql => 'SELECT * FROM papermill_assets WHERE papermill_assets.assetable_id = #{id} AND papermill_assets.assetable_type = "#{self.class.sti_name}" AND papermill_assets.type ' + (asset_class == PapermillAsset ? "IS NULL" : %{= "#{asset_class.to_s}"}) + ' ORDER BY papermill_assets.position'
+      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
@@ -133,7 +132,7 @@ module Papermill
         asset_class.find(:all, :conditions => conditions, :order => order)
       end
 
-      after_destroy :remove_papermill_folder
+      
       class_eval <<-EOV
         include Papermill::InstanceMethods
       EOV
@@ -161,9 +160,16 @@ module Papermill
       
     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}).each do |asset|
+      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
         else 

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
-  s.date = %q{2009-08-30}
+  s.date = %q{2009-08-31}
   s.description = %q{Paperclip wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/BBenezech/papermill}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Paperclip wrapper}
   s.test_files = [
     "test/papermill_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BBenezech-papermill
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []