papermill 1.4.1 → 1.4.2

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/app/controllers/papermill_controller.rb

@@ -36,7 +36,7 @@ class PapermillController < ApplicationController
     @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
     if @asset.save
       @old_asset.destroy if @old_asset
-      output = render_to_string(:partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style], :targetted_geometry => params[:targetted_geometry] })
+      output = render_to_string(:partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style], :targetted_size => params[:targetted_size] })
       render :update do |page|
         page << %{ jQuery('##{params[:Fileid]}').replaceWith('#{escape_javascript output}'); }
         page << %{ jQuery('#papermill_asset_#{@old_asset.id}').remove() } if @old_asset 

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,  dataType:'script', 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, :targetted_geometry => targetted_geometry) %>">
+<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_size => targetted_size) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

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

@@ -23,7 +23,7 @@
 </style>
 
 <% 
-  unless (@size = params[:targetted_geometry]).blank?
+  unless (@size = params[:targetted_size]).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
@@ -41,7 +41,7 @@
       <%= 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, :targetted_geometry => params[:targetted_geometry])}')" %>
+      <%= link_to_function I18n.t("papermill.back"), "popup('#{edit_papermill_path(@asset, :targetted_size => params[:targetted_size])}')" %>
     <% end -%>
   </form>
 </div>

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

@@ -2,10 +2,10 @@
   <div id="left">
     <% if @asset.image? %>
     
-    <%# 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 => %{$.facebox( $('<iframe src="#{crop_papermill_path(@asset, :target => "original", :targetted_size => params[:targetted_size])}" />')); 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)) %>
+      <%= image_tag(@asset.url("400x400>"), :onDblClick => "popup('#{crop_papermill_path(@asset, :target => "original", :targetted_size => params[:targetted_size])}'); return false;", :title => I18n.t("papermill.crop", :resource => @asset.name)) %>
       
       
       <%# 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" %>

data/generators/papermill_initializer/papermill_initializer.rb

@@ -101,11 +101,11 @@ module Papermill
       #  :style => nil
       },
       
-      # If you plan to use the original images in one place in one specific size, you can pass targetted_geometry, 
+      # If you plan to use the original images in one place in one specific size, you can pass targetted_size, 
       # 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,
+      # :targetted_size => nil,
       
       # Options passed on to SWFUpload. 
       # To remove an option when overriding, set it to nil.

data/lib/papermill/form_builder.rb

@@ -41,8 +41,8 @@ module ActionView::Helpers::FormTagHelper
       key = options[:assetable].to_s
       options[:assetable] = nil
     end
-    
-    assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
+
+    assetable = @object || options[:object] || options[:assetable] || @template.instance_variable_get("@#{@object_name}")
     
     raise PapermillException.new("Your form instance object is not @#{@object_name}, and therefor cannot be found. \nPlease provide your object name in your form_for initialization. \nform_for :my_object_name, @my_object_name, :url => { :action => 'create'/'update'}") if @object_name && !assetable
     
@@ -68,7 +68,7 @@ module ActionView::Helpers::FormTagHelper
     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 => computed_style, :targetted_geometry => options[:targetted_geometry] }
+      @template.render :partial => "papermill/asset", :collection => PapermillAsset.all(:conditions => conditions), :locals => { :thumbnail_style => computed_style, :targetted_size => options[:targetted_size] }
     end
     
     if options[:gallery]
@@ -94,7 +94,7 @@ module ActionView::Helpers::FormTagHelper
     create_url_options = { 
       :escape => false, :controller => "/papermill", :action => "create", 
       :asset_class => (options[:class_name] || PapermillAsset).to_s,
-      :gallery => !!options[:gallery], :thumbnail_style => computed_style, :targetted_geometry => options[:targetted_geometry]
+      :gallery => !!options[:gallery], :thumbnail_style => computed_style, :targetted_size => options[:targetted_size]
     }
     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_options.rb

@@ -12,7 +12,7 @@ module Papermill
       {:copyright =>   {:type => "string"}},
       {:description => {:type => "text"  }}
     ],
-    :targetted_geometry => nil,
+    :targetted_size => nil,
     :gallery => { 
       :width => nil,
       :height => nil,

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,29 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: paperclip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 1
+        - 1
         version: 2.3.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Paperclip Swfupload UploadHelper wrapper
 email: benoit.benezech@gmail.com
 executables: []
@@ -131,18 +143,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper