papermill 1.2.0 → 1.3.0

data/README.rdoc

@@ -1,7 +1,5 @@
 = Papermill 
 
-
-
 * Asset management made easy, 10 minutes integration.
 * All-you-can-eat glue around Polymorphic Paperclip table, SWFUpload & JQuery. 
 * Associate any image or list of images with any model and any key. 
@@ -165,6 +163,8 @@ Copy static assets to your public directory:
   
 Create the option file config/initializers/papermill.rb
   ./script/generate papermill_initializer
+  
+Go have a look to config/initializers/papermill.rb, lots of info there.
 
 === environment.rb:
 
@@ -172,7 +172,6 @@ Create the option file config/initializers/papermill.rb
   Rails::Initializer.run do |config|
     ...
     config.gem papermill
-    config.gem "mime-types", :lib => "mime/types"  # required for windows OS
   end
 
 === In your layout:

data/Rakefile

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -32,6 +33,7 @@ begin
     gemspec.homepage = "http://github.com/bbenezech/papermill"
     gemspec.authors = ["Benoit Bénézech"]
     gemspec.add_dependency('paperclip', '>= 2.3.1.1')
+    gemspec.add_dependency('mime-types')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/TODO.txt

@@ -1,5 +1,6 @@
 Edit views :
-* use Jcrop
 * try Picnic API
 * trad errors
-* migration with/whithout url_key
+* migration with/whithout url_key
+
+Errors on asset #create (to handle Paperclip validation)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/app/controllers/papermill_controller.rb

@@ -3,6 +3,8 @@ class PapermillController < ApplicationController
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit", "mass_thumbnail_reset" ]
   
   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/
     if @asset.has_valid_url_key?(params[:url_key], params[:style]) && @asset.create_thumb_file(params[:style])
       redirect_to @asset.url(params[:style])
     else
@@ -29,10 +31,7 @@ class PapermillController < ApplicationController
   end
   
   def update
-    if params[:target]
-      @asset.create_thumb_file(params[:target], params[:papermill_asset].merge({ :geometry => "original#" }))
-    end
-    
+    @asset.create_thumb_file(params[:target], params[:papermill_asset].merge({ :geometry => "#{params[:target]}#" })) if params[:target]
     render :update do |page|
       if @asset.update_attributes(params[:papermill_asset])
         page << %{ notify("#{@asset.name}", "#{ escape_javascript t("papermill.updated", :resource => @asset.name)}", "notice"); close_popup(self);  }

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

@@ -5,7 +5,7 @@
     <% @asset.papermill_options[:editable_fields].each do |field| %>
     <% key = field.keys.first %>
       <p>
-        <%= form.label key, field[key][:label] || t("papermill.#{key}") %><br />
+        <%= form.label(key, (field[key][:label] || t("papermill.#{key}")).to_s) %><br />
         <% case field[key][:type] 
            when "text" %>
           <%= form.text_area key %>

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

@@ -1,18 +1,44 @@
 <%= image_tag(@asset.url, :id => "cropbox") %>
 
-<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| %>
-    <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
-      <%= f.hidden_field attribute, :id => attribute %>
-    <% end %>
-    <%= submit_tag I18n.t('papermill.save') %>
-  <% end -%>
-</form>
+<style type="text/css">
+  .jc_coords form {
+    -moz-background-clip:border;
+    -moz-background-inline-policy:continuous;
+    -moz-background-origin:padding;
+    background:#CCCCCC none repeat scroll 0 0;
+    border-color:#C3C3C3 #8B8B8B #8B8B8B #C3C3C3;
+    border-style:solid;
+    border-width:1px;
+    margin:0.5em 0;
+    padding:0.5em;
+  }
+  .jc_coords label {
+    font-size:12px;
+    font-weight:bold;
+    margin-right:0.5em;
+  }
+  .jc_coords .submit, .jc_coords a {
+    margin-right: 0.5em;
+  }
+</style>
+
+<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>
+      <%= 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)}')" %>
+    <% end -%>
+  </form>
+</div>
 
 <div style="margin:6px"></div>
-<%= link_to_function I18n.t("papermill.back"), "popup('#{edit_papermill_path(@asset)}')" %>
+
 
 <script type="text/javascript" charset="utf-8">
   jQuery(function() {
@@ -29,5 +55,13 @@
     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)); 
+  });
+  
 </script>

data/lib/papermill.rb

@@ -1,11 +1,17 @@
-#require "digest/sha2"
+require "rbconfig"
+begin
+  require "mime/types"
+  MIME_TYPE_LOADED = true
+rescue
+  MIME_TYPE_LOADED = false
+end
+
 I18n.load_path = [File.join(File.dirname(__FILE__), "../config/locales/papermill.yml")] + I18n.load_path
 require 'papermill/extensions'
 require 'papermill/flash_session_cookie_middleware.rb'
 
 Object.send :include, PapermillObjectExtensions
 Hash.send :include, PapermillHashExtensions
-File.send :include, PapermillFileExtensions
 String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
 Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) rescue NameError
 

data/lib/papermill/extensions.rb

@@ -21,16 +21,6 @@ module PapermillObjectExtensions
   end
 end
 
-module PapermillFileExtensions
-  def get_content_type
-    begin
-      MIME::Types.type_for(self.original_filename).to_s
-    rescue NameError
-      `file --mime -br #{self.path}`.strip.split(";").first
-    end
-  end
-end
-
 module PapermillFormtasticExtensions
   def image_upload_input(method, options)
     self.label(method, options_for_label(options)) +

data/lib/papermill/papermill.rb

@@ -8,6 +8,8 @@ module Papermill
     @options ||= BASE_OPTIONS.deep_merge(defined?(OPTIONS) ? OPTIONS : {})
   end
   
+  MSWIN = (Config::CONFIG['host_os'] =~ /mswin|mingw/)
+  
   def self.compute_paperclip_path
     path = []
     path << (options[:use_id_partition] ? ":id_partition" : ":id")

data/lib/papermill/papermill_asset.rb

@@ -5,8 +5,8 @@ class PapermillAsset < ActiveRecord::Base
   
   has_attached_file :file, 
     :processors => [:papermill_paperclip_processor],
-    :url => "/#{Papermill::options[:papermill_url_prefix]}/#{Papermill::compute_paperclip_path.gsub(':style', ':escaped_style')}",
-    :path => "#{Papermill::options[:public_root]}/#{Papermill::options[:papermill_path_prefix]}/#{Papermill::compute_paperclip_path}"
+    :url => "#{Papermill::options[:papermill_url_prefix]}/#{Papermill::compute_paperclip_path.gsub(':style', ':escape_style_in_url')}",
+    :path => "#{Papermill::options[:papermill_path_prefix]}/#{Papermill::compute_paperclip_path.gsub(':style', ':escape_style_in_path')}"
   
   before_post_process :set_file_name
   
@@ -21,14 +21,25 @@ class PapermillAsset < ActiveRecord::Base
     attachment.instance.compute_url_key((style || "original").to_s)
   end
 
-  Paperclip.interpolates :escaped_style do |attachment, style|
-    CGI::escape((style || "original").to_s)
+  Paperclip.interpolates :escape_style_in_url do |attachment, style|
+    # double escaping needed for windows (complains about '< > " | / \' ), to match escaped filesystem from front webserver pov
+    s = (style || "original").to_s
+    Papermill::MSWIN ? CGI::escape(CGI::escape(s)) : CGI::escape(s)
   end
   
+  Paperclip.interpolates :escape_style_in_path do |attachment, style|
+    s = (style || "original").to_s
+    Papermill::MSWIN ? CGI::escape(s) : s
+  end
+
   attr_accessor :crop_h, :crop_w, :crop_x, :crop_y
   
   def Filedata=(data)
-    data.content_type = data.get_content_type # SWFUpload content-type fix
+    if !Papermill::MSWIN && !(mime = `file --mime -br #{File.new(data).path}`).blank? && !mime.starts_with?("cannot open")
+      data.content_type = mime.strip.split(";").first
+    elsif MIME_TYPE_LOADED && (mime = MIME::Types.type_for(data.original_filename))
+      data.content_type = mime.first.simplified
+    end
     self.file = data
   end
   

data/lib/papermill/papermill_initializer.rb

@@ -32,8 +32,8 @@ module Papermill
       # :form_helper_elements => [:upload_button, :container, :dashboard],
     
       # Dashboard elements
-      # You can remove/change order of HTML elements.
-      # :dashboard => [:mass_edit, :mass_thumbnail_reset, :mass_delete ],
+      # 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"],
@@ -170,9 +170,9 @@ module Papermill
       #  :url_key_salt => "change-me-to-your-favorite-pet-name",
       #  :url_key_generator => Proc.new { |style, asset| Digest::SHA512.hexdigest("#{style}#{asset.id}#{Papermill::options[:url_key_salt]}")[0..10] },
 
-      # added to :public_root as the root folder for all papermill assets (system is a default for static assets with capistrano)
-      #  :papermill_url_prefix => "system/papermill",
+      # added before path/url. Your front webserver will need to be able to find your assets
       #  :papermill_path_prefix => ":rails_root/public/system/papermill",
+      #  :papermill_url_prefix => "/system/papermill",
       
       # you can set it to false if you don't plan to have too many assets. (dangerous)
       #  :use_id_partition => true,

data/lib/papermill/papermill_options.rb

@@ -4,7 +4,7 @@ module Papermill
     :inline_css => true,
     :images_only => false,
     :form_helper_elements => [:upload_button, :container, :dashboard],
-    :dashboard => [:mass_edit, :mass_thumbnail_reset, :mass_delete],
+    :dashboard => [:mass_edit, :mass_delete],
     :mass_editable_fields => ["title", "copyright", "description"],
     :editable_fields => [
       {:title =>       {:type => "string"}}, 
@@ -54,7 +54,7 @@ module Papermill
     :url_key_salt => "change-me-please",
     :url_key_generator => Proc.new { |style, asset| Digest::SHA512.hexdigest("#{style}#{asset.id}#{Papermill::options[:url_key_salt]}")[0..10] },
     :use_id_partition => true,
-    :papermill_url_prefix => "system/papermill",
+    :papermill_url_prefix => "/system/papermill",
     :papermill_path_prefix => ":rails_root/public/system/papermill",
   }
 end

data/lib/papermill/papermill_paperclip_processor.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Paperclip
 
   # Handles thumbnailing images that are uploaded.

data/test/papermill_test.rb

@@ -113,7 +113,6 @@ class PapermillTest < Test::Unit::TestCase
   end
     
   def test_content_type
-    assert_equal @file.get_content_type, "image/png"
     assert_equal @asset1.content_type, "image/png"
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2009-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Paperclip Swfupload UploadHelper wrapper
 email: benoit.benezech@gmail.com
 executables: []