papermill 1.3.3 → 1.3.4

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/app/controllers/papermill_controller.rb

@@ -1,12 +1,12 @@
 class PapermillController < ApplicationController
-  prepend_before_filter :load_asset,  :only => [ "show", "destroy", "update", "edit", "crop" ]
+  prepend_before_filter :load_asset,  :only => [ "show", "destroy", "update", "edit", "crop", "receive_from_pixlr" ]
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit", "mass_thumbnail_reset" ]
   
   skip_before_filter :verify_authenticity_token, :only => [:create] # not needed (Flash same origin policy)
   
   def show
     # first escaping is done by rails prior to route recognition, need to do a second one on MSWIN systems to get original one.
-    params[:style] = CGI::unescape(params[:style]) if RUBY_PLATFORM =~ /win/
+    params[:style] = CGI::unescape(params[:style]) if Papermill::MSWIN
     if @asset.has_valid_url_key?(params[:url_key], params[:style]) && @asset.create_thumb_file(params[:style])
       redirect_to @asset.url(params[:style])
     else
@@ -20,7 +20,7 @@ class PapermillController < ApplicationController
       PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
         asset.destroy unless asset == @asset
       end if !params[:gallery]
-      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style] }
+      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style], :targetted_geometry => params[:targetted_geometry] }
     end
   end
   
@@ -32,6 +32,12 @@ class PapermillController < ApplicationController
     render :action => "crop", :layout => false
   end
   
+  def receive_from_pixlr
+    @asset.file = params[:image]
+    @asset.destroy_thumbnails
+    render :nothing => true
+  end
+  
   def update
     @asset.create_thumb_file(params[:target], params[:papermill_asset].merge({ :geometry => "#{params[:target]}#" })) if params[:target]
     render :update do |page|

data/app/views/papermill/_asset.html.erb

@@ -1,7 +1,7 @@
 <%- dom_id = "papermill_asset_#{asset.id}" -%>
 <%- delete_link = %{<a onclick="if(confirm('#{escape_javascript t("papermill.delete-confirmation", :resource => asset.name)}')){ jQuery.ajax({async:true, beforeSend:function(request){jQuery('##{dom_id}').hide();}, dataType:'script', error:function(request){jQuery('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :resource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
 
-<div id="<%= dom_id %>" class="asset" title="<%= t("papermill.#{(thumbnail_style) ? "thumbnail-" : ""}edit-title", :resource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
+<div id="<%= dom_id %>" class="asset" title="<%= t("papermill.#{(thumbnail_style) ? "thumbnail-" : ""}edit-title", :resource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset, :targetted_geometry => targetted_geometry) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

data/app/views/papermill/crop.html.erb

@@ -22,17 +22,26 @@
   }
 </style>
 
+<% 
+  unless (@size = params[:targetted_geometry]).blank?
+    @target_w, @target_h = @size.split("x").map(&:to_i)
+    @init_x = (@asset.width - @target_w.to_i) / 2
+    @init_y = (@asset.height - @target_h.to_i) / 2
+  end
+%>
+
+
 <div class="jc_coords">
   <form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); return false;" method="post">
     <input type="hidden" value="put" name="_method"/>
     <input type="hidden" value="<%= params[:target] %>" name="target"/>
     <% fields_for :papermill_asset, @asset do |f| %>
-      <label>W <%= f.text_field :crop_w, :id => :crop_w, :size => 4, :readonly => "readonly" %></label>
-      <label>H <%= f.text_field :crop_h, :id => :crop_h, :size => 4, :readonly => "readonly" %></label>
+      <label>W: <%= f.text_field :crop_w, :id => :crop_w, :size => 4, :readonly => "readonly" %><%= " /" + @target_w.to_s if @size %></label>
+      <label>H: <%= f.text_field :crop_h, :id => :crop_h, :size => 4, :readonly => "readonly" %><%= " /" + @target_h.to_s if @size %></label>
       <%= f.hidden_field :crop_x, :id => :crop_x %>
       <%= f.hidden_field :crop_y, :id => :crop_y %>
       <%= f.submit I18n.t('papermill.save'), :class => "submit" %>
-      <%= link_to_function I18n.t("papermill.back"), "popup('#{edit_papermill_path(@asset)}')" %>
+      <%= link_to_function I18n.t("papermill.back"), "popup('#{edit_papermill_path(@asset, :targetted_geometry => params[:targetted_geometry])}')" %>
     <% end -%>
   </form>
 </div>
@@ -41,27 +50,31 @@
 
 
 <script type="text/javascript" charset="utf-8">
+
   jQuery(function() {
     jQuery('#cropbox').Jcrop({
-      onChange: update_crop,
-      onSelect: update_crop
-      //setSelect: [0, 0, 100, 100]
-      //aspectRatio: 1
+      <% unless @size %>
+        setSelect: [0,0,100,100]
+      <% else %>
+        setSelect: <%= %{[#{@init_x}, #{@init_y}, #{@target_w + @init_x}, #{@target_h + @init_y}]} %>
+      <% end -%>
+      ,onChange: update_crop
+      ,onSelect: update_crop
+     <%= ",aspectRatio: #{@target_w} / #{@target_h}" unless @size.blank?  %>
     });
   });
-
+  
   function update_crop(coords) {
     jQuery("#crop_x").val(coords.x);
     jQuery("#crop_y").val(coords.y);
     jQuery("#crop_w").val(coords.w);
     jQuery("#crop_h").val(coords.h);
-    
   };
   
   /* browser don't know about windows content size when loading facebox if image not in cache, fixing facebox left */
   jQuery(document).bind('reveal.facebox', function() { 
     jQuery(document).unbind('reveal.facebox'); /* clear self (one-shot binding) */
-    jQuery('#facebox').css('left', jQuery(window).width() / 2 - (<%= @asset.width %> / 2)); 
+    jQuery('#facebox').css('left', (jQuery(window).width() - <%= @asset.width %>) / 2); 
   });
   
 </script>

data/app/views/papermill/edit.html.erb

@@ -1,12 +1,21 @@
 <div id="papermill-box">
   <div id="left">
     <% if @asset.image? %>
-      <%# link_to image_tag(@asset.url("400x400>")), @asset.url, :popup => true %>
-      <%= image_tag(@asset.url("400x400>"), :onDblClick => "popup('#{crop_papermill_path(@asset, :target => "original")}'); return false;", :title => I18n.t("papermill.thumbnail-edit-title", :resource => @asset.name)) %>
+    
+    <%# image_tag(@asset.url("400x400>"), :onDblClick => %{$.facebox( $('<iframe src="#{crop_papermill_path(@asset, :target => "original", :targetted_geometry => params[:targetted_geometry])}" />')); return false;}, :title => I18n.t("papermill.crop", :resource => @asset.name)) %>
+    
+    
+      <%= image_tag(@asset.url("400x400>"), :onDblClick => "popup('#{crop_papermill_path(@asset, :target => "original", :targetted_geometry => params[:targetted_geometry])}'); return false;", :title => I18n.t("papermill.crop", :resource => @asset.name)) %>
+      
+      
+      <%# @test = "webonrails.com/wp-content/uploads/2008/11/hosting-rails-app-and-wordpress-on-same-domainas-folder-instead-of-subdomain-webonrails_1225783508773.png" %>
+      <%# link_to I18n.t("papermill.edit-with-pixlr", :resource => @asset.name), "http://www.pixlr.com/editor/?image=http://#{@test || request.env["HTTP_HOST"] + @asset.url}&target=http://#{receive_from_pixlr_papermill_path(@asset)}&method=POST", :target => "_blank" %>
       <div style="clear:both;"></div>
     <% else %>
       <%= link_to t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true %>
     <% end -%>
+    
+    
   </div>
   <div id="right">
     <div id="read-only">

data/config/locales/papermill.yml

@@ -4,6 +4,8 @@ en:
     updated: "'{{resource}}' updated"
     not-found: "'#{{resource}}' not found"
     edit-title: "Click to edit '{{resource}}'"
+    crop: "Double-click to crop '{{resource}}'"
+    edit-with-pixlr: "Edit '{{resource}}' online @ pixlr.com"
     thumbnail-edit-title: "Double-click to edit '{{resource}}'"
     upload-button-wording: "Upload..."
     delete: "Remove {{resource}}"
@@ -37,6 +39,8 @@ fr:
     updated: "'{{resource}}' modifiés(s)"
     not-found: "'{{resource}}' non trouvé"
     edit-title: "Cliquer pour éditer '{{resource}}'"
+    crop: "Double-cliquer pour retailler '{{resource}}'"
+    edit-with-pixlr: "Éditer '{{resource}}' en-ligne sur pixlr.com"
     thumbnail-edit-title: "Double-cliquer pour éditer '{{resource}}'"
     upload-button-wording: "Charger.."
     delete: "Supprimer {{resource}}"

data/config/routes.rb

@@ -1,4 +1,4 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :papermill, :collection => { :sort => :post, :mass_edit => :post, :mass_delete => :post, :mass_thumbnail_reset => :post }, :member => { :crop => :get }
+  map.resources :papermill, :collection => { :sort => :post, :mass_edit => :post, :mass_delete => :post, :mass_thumbnail_reset => :post }, :member => { :crop => :get, :receive_from_pixlr => :post }
   map.connect "#{Papermill::options[:papermill_url_prefix]}/#{Papermill::compute_paperclip_path.gsub(":id_partition", ":id0/:id1/:id2")}", :controller => "papermill", :action => "show", :requirements => { :style => /.*/ }
 end

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

@@ -24,7 +24,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     end
     
     change_table :papermill_assets do |t|
-      t.index [:assetable_type, :assetable_id, :assetable_key, :position], { :name => "papermill_index" }
+      t.index [:assetable_id, :assetable_type, :assetable_key, :position], { :name => "papermill_index" }
       t.index [:assetable_key, :position]  # for non assetable assets
     end
   end

data/lib/papermill/form_builder.rb

@@ -50,23 +50,25 @@ module ActionView::Helpers::FormTagHelper
     assetable_type = assetable && assetable.class.base_class.name || nil
     
     options = PapermillAsset.papermill_options(assetable && assetable.class.name, key).deep_merge(options)
+    
     dom_id = "papermill_#{assetable_type}_#{assetable_id}_#{key}"
     
     if ot = options[:thumbnail]
       w = ot[:width]  || ot[:height] && ot[:aspect_ratio] && (ot[:height] * ot[:aspect_ratio]).to_i || nil
       h = ot[:height] || ot[:width]  && ot[:aspect_ratio] && (ot[:width]  / ot[:aspect_ratio]).to_i || nil
-      ot[:style] ||= (w || h) && "#{w}x#{h}>" || "original"
+      
+      computed_style = ot[:style] || (w || h) && "#{w}x#{h}>" || "original"
       set_papermill_inline_css(dom_id, w, h, options)
     end
 
-    set_papermill_inline_js(dom_id, compute_papermill_create_url(assetable_id, assetable_type, key, options), options)
+    set_papermill_inline_js(dom_id, compute_papermill_create_url(assetable_id, assetable_type, key, computed_style, options), options)
 
     html = {}
     html[:upload_button] = %{<div id="#{dom_id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{dom_id}" class="swf_button"></span></div>}
     html[:container] = @template.content_tag(:div, :id => dom_id, :class => "papermill-#{key.to_s} #{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") do
       conditions = {:assetable_type => assetable_type, :assetable_id => assetable_id}
       conditions.merge!({:assetable_key => key.to_s}) if key
-      @template.render :partial => "papermill/asset", :collection => PapermillAsset.all(:conditions => conditions), :locals => { :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style] }
+      @template.render :partial => "papermill/asset", :collection => PapermillAsset.all(:conditions => conditions), :locals => { :thumbnail_style => computed_style, :targetted_geometry => options[:targetted_geometry] }
     end
     
     if options[:gallery]
@@ -88,11 +90,11 @@ module ActionView::Helpers::FormTagHelper
   end
   
   
-  def compute_papermill_create_url(assetable_id, assetable_type, key, options)
+  def compute_papermill_create_url(assetable_id, assetable_type, key, computed_style, options)
     create_url_options = { 
       :escape => false, :controller => "/papermill", :action => "create", 
       :asset_class => (options[:class_name] || PapermillAsset).to_s,
-      :gallery => !!options[:gallery], :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style]
+      :gallery => !!options[:gallery], :thumbnail_style => computed_style, :targetted_geometry => options[:targetted_geometry]
     }
     create_url_options.merge!({ :assetable_id => assetable_id, :assetable_type => assetable_type }) if assetable_id
     create_url_options.merge!({ :assetable_key => key }) if key

data/lib/papermill/papermill.rb

@@ -29,9 +29,8 @@ module Papermill
       (@papermill_associations ||= {}).merge!( assoc_name => Papermill::options.deep_merge(local_options) )
       
       include Papermill::InstanceMethods
-      before_destroy :destroy_assets
       after_create :rebase_assets
-      has_many :papermill_assets, :as => "Assetable", :dependent => :destroy
+      has_many :papermill_assets, :as => "assetable", :dependent => :destroy
 
       [assoc_name, Papermill::options[:base_association_name].to_sym].uniq.each do |assoc|
         define_method assoc do |*options|
@@ -63,10 +62,6 @@ module Papermill
     
     private
     
-    def destroy_assets
-      papermill_assets.each &:destroy
-    end
-    
     def rebase_assets
       PapermillAsset.all(:conditions => { :assetable_id => self.timestamp, :assetable_type => self.class.base_class.name }).each do |asset|
         asset.created_at < 2.hours.ago ? asset.destroy : asset.update_attribute(:assetable_id, self.id)

data/lib/papermill/papermill_asset.rb

@@ -13,7 +13,7 @@ class PapermillAsset < ActiveRecord::Base
   validates_attachment_presence :file
   
   belongs_to :assetable, :polymorphic => true
-  default_scope :order => 'assetable_type, assetable_id, assetable_key, position'
+  default_scope :order => 'position'
   
   named_scope :key, lambda { |assetable_key| { :conditions => ['assetable_key = ?', assetable_key.to_s] }}
   

data/lib/papermill/papermill_initializer.rb

@@ -9,37 +9,47 @@ module Papermill
   
     OPTIONS = {
       
-      #@@@@@@@@@@@@@@@@@@@ papermill association parameters @@@@@@@@@@@@@@@@@@@@@@@
+      
+      #@@@@@@@@@@@@@@ Papermill association parameters @@@@@@@@@@@@@@@@@@
       
       # You can override these parameters here, or in your papermill associations definition.
       
-      # Associated PapermillAsset subclass (must be STI subclass of PapermillAsset)
+      # Associated PapermillAsset subclass (must be an STI subclass of PapermillAsset)
       # :class_name => "PapermillAsset",
       
+      
+      
+      
       #@@@@@@@@@@@@@@@@@@@ form-helper parameters @@@@@@@@@@@@@@@@@@@@@@@
       
       # You can override all these parameters here, or in your papermill associations definition, or in form-helper calls.
       
       # Helper can generates inline css styling that adapt to your gallery/images placeholder. You can use it to scaffold, then copy the lines you need in your application css and set it to false.
+      
       # :inline_css => true,
     
       # SwfUpload will only let the user upload images. 
+      
       # :images_only => false,
     
       # Dashboard is only for galleries
       # You can remove/change order of HTML elements.
       # See below for dashboard
+      
       # :form_helper_elements => [:upload_button, :container, :dashboard],
     
       # Dashboard elements
       # You can remove/change order of HTML elements. You can add :mass_thumbnail_reset to add a link to reset all thumbnails, although you shouldn't need it.
+      
       # :dashboard => [:mass_edit, :mass_delete ],
     
       # Attributes editable at once for all assets in a gallery
+      
       # :mass_editable_fields => ["title", "copyright", "description"],
       
       # Attributes you can edit in the form. You can use :type (string or text) and :label (any string)
       # if you have more complex needs, you should override app/views/papermill/_form.html.erb in your application.
+      
       # :editable_fields => [
       #   {:title =>       {:type => "string"}}, 
       #   {:alt =>         {:type => "string"}}, 
@@ -52,19 +62,29 @@ module Papermill
       # Great for quick admin scaffolding.
     
       :gallery => { 
+        
       # override calculated gallery width. Ex: "auto"
+      
       #  :width => nil,
+      
       # override calculated gallery height
+      
       #  :height => nil,
+      
       # Number of columns and lines in a gallery
+      
       #  :columns => 8,
       #  :lines => 2,
+      
       # vertical/horizontal padding/margin around each thumbnails
+      
       #  :vpadding => 0,
       #  :hpadding => 0,
       #  :vmargin => 1,
       #  :hmargin => 1,
+      
       # border around thumbnails
+      
       #  :border_thickness => 2
       },
     
@@ -74,12 +94,19 @@ module Papermill
       # Needed if you set :aliases_only to true
 
       :thumbnail => {
+        
       #  :width => 100,
       #  :height => 100, 
       #  :aspect_ratio => nil, 
       #  :style => nil
       },
-    
+      
+      # If you plan to use the original images in one place in one specific size, you can pass targetted_geometry, 
+      # to incitate the user to crop the image himself (double-click on the image when editing) with the right parameters, 
+      # instead of letting ImageMagick do his magick bluntly at render-time.
+      
+      # :targetted_geometry => nil,
+      
       # Options passed on to SWFUpload. 
       # To remove an option when overriding, set it to nil.
     
@@ -97,24 +124,26 @@ module Papermill
       #  :file_size_limit => "'10 MB'"
       },
     
-      #@@@@@@@@@@@@@@@@@@@ thumbnails style parameters @@@@@@@@@@@@@@@@@@@@@@@
+      #@@@@@@@@@@@@@@@@@ thumbnails style parameters @@@@@@@@@@@@@@@@@@@@
       
       # You can override all these parameters here, or in your papermill associations definition, or in thumbnail styling hashes.
       
       # 1. COPYRIGHT WATERMARKING
       
-      # Activate with '©' at the end of your geometry string or pass :copyright => "my_copyright" in alias definition
+      # Activate with '©' at the end of your geometry string or pass :copyright => true|"my_copyright" in alias definition or geometry hash
       # Papermill will use, in that order of priority : 
       #  * copyright found in geometry string AFTER the @ 
-      #  * alternatively :copyright in alias/inline definition hash
+      #  * alternatively :copyright in alias/definition hash
       #  * asset's copyright column (if found)
       #  * associated :copyright definition in your Assetable association definition
-      #  * below :copyright definition
+      #  * below's :copyright definition
       
-      # Set this definition to nil if you don't want a global copyright string (likely)
-      #  :copyright => "Example Copyright",
+      # Set this definition to a default copyright name if you want one (You'll still need to postfix your geometry string with © or pass {:watermark => true} in your alias/geometry hash to use it)
+      
+      #  :copyright => nil,
+      
+      # Textilize, truncate, transform... your copyright before its ImageMagick integration
       
-      # Textilize, truncate, transform... your copyright before integration
       #  :copyright_text_transform => Proc.new {|c| c },
       
       # Watermark ImageMagick command string.
@@ -122,7 +151,7 @@ module Papermill
       #  * DO NOT change the background color!, change the bordercolor instead. (because background color adds to bordercolor I set it to totally transparent)
       #  * for both fill (=foreground color) and bordercolor (=background color), the last two octals control alpha (transparency). FF is opaque, 00 is transparent.
       #  * remove -bordercolor if you don't want any background
-      #  * +antialias to REMOVE antialiasing
+      #  * add +antialias to REMOVE antialiasing (after '-font Arial-Bold', for example)
       #  * font-size is pointsize
       #  * type 'identify -list font' to get a list of the fonts you can use (ImageMagick will default to Arial/Times if it can't find it) 
       #  * use -gravity and -geometry for positionning, -geometry +x+y is relative to -gravity's corner/zone
@@ -137,21 +166,29 @@ module Papermill
       # If you pass an image_path to :watermark, it will override below :
       
       # you can use a relative path from your public directory (see :public_root), a complete path, or an URI
+      
       #  :watermark => "/images/rails.png",
       
       # default :watermarking command for image_magick.  %s gets interpolated with above image path.
+      
       #  :watermark_im_command => %{- | composite \\( %s -resize 100% \\) - -dissolve 20% -gravity center -geometry +0+0 },
       
-      #@@@@@@@@@@@@@@@@@@@@ Application-wide parameters @@@@@@@@@@@@@@@@@@@@@@@@@
-    
+      
+      
+      #@@@@@@@@@@@@@@@@@ Application-wide parameters @@@@@@@@@@@@@@@@@@@@
+
       # Default named_scope name for catch-all :papermill declaration
+      
       #  :base_association_name => :assets,
     
-      # Set to true to require aliases in all url/path
+      # Set to true to require aliases in all url/path, disabling the 
       # Don't forget to give an alias value to options[:thumbnail][:style] if true!
+      
       #  :alias_only => false,
     
       # Needed if :alias_only
+      # Aliases are available application wide for all your assets. You can pass them instead of a geometry_string or a geometry hash
+      
       :aliases => {
       #  :mini_crop => "100x100#",
       #  :cant_touch_this => {
@@ -165,9 +202,11 @@ module Papermill
       #  e.g. if you want to protect access to non-copyrighted original files, 
       #  or don't want users to browse images by guessing the sequence of ids,
       #  an encrypted hash can be generated for each geometry string/alias and added to path/url.
+      # Use your imagination for :url_key_generator, really.
       # Please note that all previous assets paths will be lost if you add/remove or change the :url_key generation.
+      
       #  :use_url_key => false,
-      #  :url_key_salt => "change-me-to-your-favorite-pet-name",
+      #  :url_key_salt => "change-me-to-your-favorite-pet's-name",
       #  :url_key_generator => Proc.new { |style, asset| Digest::SHA512.hexdigest("#{style}#{asset.id}#{Papermill::options[:url_key_salt]}")[0..10] },
 
       # added before path/url. Your front webserver will need to be able to find your assets

data/lib/papermill/papermill_options.rb

@@ -12,6 +12,7 @@ module Papermill
       {:copyright =>   {:type => "string"}},
       {:description => {:type => "text"  }}
     ],
+    :targetted_geometry => nil,
     :gallery => { 
       :width => nil,
       :height => nil,
@@ -42,7 +43,7 @@ module Papermill
       :prevent_swf_caching => true,
       :file_size_limit => "'10 MB'"
     },
-    :copyright => "Example Copyright",
+    :copyright => nil,
     :copyright_text_transform => Proc.new {|c| c },
     :copyright_im_command => %{\\( -font Arial-Bold -pointsize 9 -fill '#FFFFFFE0' -border 3 -bordercolor '#50550080' -background '#00000000' label:' %s ' \\) -gravity South-West -geometry +0+0 -composite},
     :watermark => "/images/rails.png",

data/lib/papermill/papermill_paperclip_processor.rb

@@ -13,8 +13,16 @@ module Paperclip
       # copyright extraction
       if options[:geometry] =~ /©/ || options[:copyright]
         options[:geometry], *@copyright = options[:geometry].split("©", -1)
-        @copyright = options[:copyright] || @copyright.join("©").nie || file.instance.respond_to?(:copyright) && file.instance.copyright.nie || file.instance.papermill_options[:copyright].nie
-        @copyright = (options[:copyright_text_transform] || file.instance.papermill_options[:copyright_text_transform]).try(:call, @copyright) || @copyright if @copyright
+        
+        @copyright = (
+          (options[:copyright] != true && options[:copyright]) || 
+          @copyright.join("©").nie || 
+          file.instance.respond_to?(:copyright) && file.instance.copyright.nie || 
+          file.instance.papermill_options[:copyright].nie)
+        
+        if @copyright
+          @copyright = (options[:copyright_text_transform] || file.instance.papermill_options[:copyright_text_transform]).try(:call, @copyright) || @copyright
+        end
       end
       
       # watermark extraction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +01:00
+date: 2010-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency