papermill 0.12.2 → 0.13.0

data/.gitignore

@@ -2,4 +2,5 @@
 log/*.log
 tmp/**/*
 config/database.yml
-db/*.sqlite3
+db/*.sqlite3
+papermill.gemspec

data/README.rdoc

@@ -58,7 +58,7 @@ See papermill_module.rb for the complete list of options.
     ...
     config.gem papermill
     
-    # You can set options that will be set application-wide :
+    # You can set application-wide options inside or before Rails::Initializer :
     module Papermill
       OPTIONS = {
         :thumbnail => {
@@ -78,6 +78,9 @@ See papermill_module.rb for the complete list of options.
     # You can use stringex's String#to_url (papermill will use its own String#to_url if none exists)
     config.gem 'stringex'
     ...
+    # You can use Mime-Type to get the correct mime type from upload - flash garbles it.. (default is a UNIX call to "file --mime")
+    # needed for Windows OS
+    config.gem "mime-types", :lib => "mime/types"
   end
     
 === In your assetable model:
@@ -116,7 +119,7 @@ See papermill_module.rb for the complete list of options.
   @assetable.assets(:my_other_asset).first.try(:url)
 
 Also see http://github.com/bbenezech/papermill/raw/master/installation-template.txt
-Have a look at the API here http://rdoc.info/projects/BBenezech/papermill
+Have a look at the API here http://rdoc.info/projects/bbenezech/papermill
 
 === Translations:
 
@@ -126,8 +129,7 @@ Copy config/locales/papermill.yml to your root config/locale folder to modify an
 
 == Word of caution:
 
-Beta. Wait for gem 1.0.0 for the production ready thing.
-This is xNIX only (system("rm ...")).
+Beta. Wait for gem 1.0.0 for the production ready thing. But since gem 0.12.2, things should go smoothly.
 Rails 2.3
 
 

data/Rakefile

@@ -32,8 +32,6 @@ begin
     gemspec.homepage = "http://github.com/bbenezech/papermill"
     gemspec.authors = ["Benoit Bénézech"]
     gemspec.add_dependency('thoughtbot-paperclip', '>= 2.3.1')
-    gemspec.add_dependency('mime-types', '>= 1.16')
-    gemspec.add_dependency('acts_as_list', '>= 0.1.2')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/TODO.txt

@@ -1,7 +1,6 @@
 * non-regression tests
-* use aliases in form helpers
-* doc&test about crop
-* better CSS for edit
-* reorganize edit with forms
+Edit views :
+* better CSS 
+* use forms
 * use Jcrop
-* use Picnic API
+* try Picnic API

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.13.0

data/app/controllers/papermill_controller.rb

@@ -1,24 +1,25 @@
 class PapermillController < ApplicationController
+  # Create is protected because of the Ajax same origin policy. 
+  # Yet SwfUpload doesn't send the right header for request.xhr? to be true and thus failed to disable verify_authenticity_token automatically.
+  skip_before_filter :verify_authenticity_token, :only => [:create]
   
-  skip_before_filter :verify_authenticity_token
-
   def show
-      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
-      style = {:geometry => style} unless style.is_a? Hash  # new Paperclip API
-      
-      if asset.image?
-        temp_thumbnail = Paperclip::Thumbnail.make(asset_file = asset.file, style)
-        new_parent_folder_path = File.dirname(new_image_path = asset_file.path(params[:style]))
-        FileUtils.mkdir_p new_parent_folder_path unless File.exists? new_parent_folder_path
-        FileUtils.cp temp_thumbnail.path, new_image_path
-        redirect_to asset.url(params[:style])
-      else
-        redirect_to asset.url
-      end
+    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
+    style = {:geometry => style} unless style.is_a? Hash  # new Paperclip API
+    
+    if asset.image?
+      temp_thumbnail = Paperclip::Thumbnail.make(asset_file = asset.file, style)
+      new_parent_folder_path = File.dirname(new_image_path = asset_file.path(params[:style]))
+      FileUtils.mkdir_p new_parent_folder_path unless File.exists? new_parent_folder_path
+      FileUtils.cp temp_thumbnail.path, new_image_path
+      redirect_to asset.url(params[:style])
+    else
+      redirect_to asset.url
+    end
   end
 
   def destroy
@@ -58,6 +59,7 @@ class PapermillController < ApplicationController
       @old_asset = asset_class.find(:first, :conditions => params.reject{|k, v| !["assetable_key", "assetable_type", "assetable_id"].include?(k)})
     end
     @asset = asset_class.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["swfupload_file"]).include?(k)})
+    @asset.position = asset_class.find(:first, :conditions => params.reject{|k, v| !["assetable_key", "assetable_type", "assetable_id"].include?(k)}, :order => "position DESC" ).try(:position).to_i + 1
     
     if @asset.save
       @old_asset.destroy 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 I18n.t("delete-confirmation", :scope => :papermill, :resource => asset.name)}')){ $.ajax({async:true, beforeSend:function(request){$('##{dom_id}').hide();}, dataType:'script', error:function(request){$('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("delete", :scope => "papermill", :ressource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
 
-<li id="<%= dom_id %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>" title="<%= t("#{thumbnail_style ? "thumbnail-" : ""}edit-title", :scope => "papermill", :ressource => asset.name) %>">
+<li id="<%= dom_id %>" title="<%= t("#{thumbnail_style ? "thumbnail-" : ""}edit-title", :scope => "papermill", :ressource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

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

@@ -1 +1 @@
-<%= link_to(raw_asset.name, edit_papermill_url(raw_asset), :class => "name") -%>
+<%= link_to(raw_asset.name, edit_papermill_url(raw_asset), :class => "name", :onClick => "popup(jQuery(this).attr('rel')); return false;", :rel => edit_papermill_url(raw_asset)) -%>

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

@@ -3,4 +3,4 @@
 <% else %>
   <span class="name" title="<%= thumbnail_asset.name %>"><%= truncate(thumbnail_asset.name, :length => 15) %></span>
   <span class="infos"><%= thumbnail_asset.content_type.join('/') %></span>
-<% end %>
+<% end %>

data/config/locales/papermill.yml

@@ -4,8 +4,8 @@ en:
     updated: "'{{ressource}}' updated"
     not-deleted: "'{{ressource}}' could not be deleted"
     not-found: "Asset #{{ressource}} not found"
-    edit-title: "Double-click to edit '{{ressource}}'"
-    thumbnail-edit-title: "Click to edit '{{ressource}}'"
+    edit-title: "Click to edit '{{ressource}}'"
+    thumbnail-edit-title: "Double-click to edit '{{ressource}}'"
     upload-button-wording: "Upload..."
     delete: "Remove {{ressource}}"
     delete-confirmation: "Delete '{{resource}}'?"
@@ -35,8 +35,8 @@ fr:
     updated: "{{ressource}} mis(e) à jour"
     not-deleted: "{{ressource}} n'a pas pu être supprimée"
     not-found: "Asset #{{ressource}} non trouvé"
-    edit-title: "Double-cliquer pour éditer '{{ressource}}'"
-    thumbnail-edit-title: "Cliquer pour éditer '{{ressource}}'"
+    edit-title: "Cliquer pour éditer '{{ressource}}'"
+    thumbnail-edit-title: "Double-cliquer pour éditer '{{ressource}}'"
     upload-button-wording: "Charger.."
     delete: "Supprimer {{ressource}}"
     delete-confirmation: "Êtes-vous sûr de vouloir supprimer '{{resource}}' ?"

data/lib/core_extensions.rb

@@ -1,6 +1,6 @@
 class PapermillException < Exception; end
 
-module HashExtensions
+module PapermillHashExtensions
   def deep_merge(hash)
     target = dup
     hash.keys.each do |key|
@@ -13,19 +13,29 @@ module HashExtensions
     target
   end
 end
-module StringExtensions
+module PapermillStringExtensions
   def simple_sql_sanitizer
     gsub(/\\/, '\&\&').gsub(/'/, "''")
   end
 end
-module StringToUrlNotFound
+module PapermillStringToUrlNotFound
   def to_url
     gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "").downcase
   end
 end
-module ObjectExtensions
+module PapermillObjectExtensions
   # Nil if empty.
   def nie
     self.blank? ? nil : self
   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

data/lib/papermill.rb

@@ -1,9 +1,10 @@
 I18n.load_path = [File.join(File.dirname(__FILE__), "../config/locales/papermill.yml")] + I18n.load_path
 require 'core_extensions'
-Object.send :include, ObjectExtensions
-Hash.send :include, HashExtensions
-String.send :include, StringExtensions
-String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
+Object.send :include, PapermillObjectExtensions
+Hash.send :include, PapermillHashExtensions
+File.send :include, PapermillFileExtensions
+String.send :include, PapermillStringExtensions
+String.send :include, PapermillStringToUrlNotFound unless String.instance_methods.include? "to_url"
 require 'papermill/papermill_module'
 require 'papermill/papermill_asset'
 require 'papermill/form_builder'

data/lib/papermill/form_builder.rb

@@ -66,6 +66,7 @@ module ActionView::Helpers::FormTagHelper
     html = []
     
     asset_class = options[:class_name] && options[:class_name].to_s.constantize || association && association[:class] || PapermillAsset
+    
     url_options = {
       :controller => "/papermill", 
       :action => "create", 

data/lib/papermill/papermill_asset.rb

@@ -1,24 +1,20 @@
 require 'paperclip'
-require 'mime/types'
-require 'acts_as_list'
 
 class PapermillAsset < ActiveRecord::Base
-  acts_as_list :scope => 'assetable_key'
-  
   belongs_to :assetable, :polymorphic => true
   before_destroy :destroy_files
 
-  Paperclip.interpolates(:escaped_basename) do |attachment, style|
+  Paperclip.interpolates :escaped_basename do |attachment, style|
     Paperclip::Interpolations[:basename].call(attachment, style).to_url
   end
   
-  has_attached_file :file,
+  has_attached_file :file, 
     :path => "#{Papermill::PAPERMILL_DEFAULTS[:public_root]}/#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}",
     :url => "/#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}"
   validates_attachment_presence :file
 
   def swfupload_file=(data)
-    data.content_type = MIME::Types.type_for(data.original_filename).to_s
+    data.content_type = data.get_content_type
     self.file = data
   end
   
@@ -55,7 +51,7 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def destroy_files
-    system "rm -rf #{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/"
+    FileUtils.rm_r "#{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/"
     true
   end
 end

data/public/papermill/papermill.css

@@ -31,7 +31,7 @@
 .papermill-asset-container {  border:1px solid #EEE; padding:3px; }
 .papermill-asset-container li { display:block; height:22px; }
 .papermill-asset-container .swfupload .name { margin-left:21px; }
-.papermill-asset-container .name { float:left; }
+.papermill-asset-container .name { float:left; margin-top:5px; }
 .papermill-asset-container .status { margin-left:5px; float:left; }
 .papermill-asset-container .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
 .papermill-asset-container .delete { float:left; margin-top:2px; margin-right:5px; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +02:00
+date: 2009-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,26 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.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: "1.16"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: acts_as_list
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
 description: Paperclip Swfupload UploadHelper wrapper
 email: benoit.benezech@gmail.com
 executables: []