papermill 0.9.0 → 0.10.0

data/TODO.txt

@@ -1 +1,3 @@
 * non-regression tests
+* two migrations => assets & DB
+* auto-download of last release of JS dependencies (swfupload.js, his flash, and jQuery)

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/app/controllers/papermill_controller.rb

@@ -58,7 +58,7 @@ class PapermillController < ApplicationController
     params[:assetable_key]  = params[:assetable_key].try :to_s
     params[:swfupload_file] = params.delete(:Filedata)
     unless params[:gallery]
-      @old_asset = asset_class.find(:first, :conditions => params.reject{|k, v| ![:assetable_key, :assetable_type, :assetable_id].include?(k)})
+      @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)})
     

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

@@ -1,5 +1,5 @@
 <%- 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="/images/papermill/delete.png" alt="delete"/></a>} %>
+<%- 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) %>">
 	<%= delete_link %>

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

@@ -2,5 +2,5 @@
   <span class="image"><%= image_tag(thumbnail_asset.url(thumbnail_style)) %></span>
 <% else %>
   <span class="name" title="<%= thumbnail_asset.name %>"><%= truncate(thumbnail_asset.name, :length => 15) %></span>
-  <span class="infos"><%= thumbnail_asset.content_type[1] %></span>
+  <span class="infos"><%= thumbnail_asset.content_type.join('/') %></span>
 <% end %>

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

@@ -1,7 +1,7 @@
 <link href="/stylesheets/papermill.css" media="screen" rel="stylesheet" type="text/css" />
 <div id="papermill-box">
   <div id="left">
-    <%= link_to(@asset.image? ? image_tag(@asset.url("400x>")) : I18n.t("file_type", :type => @asset.content_type.join("/"), :scope => 'papermill'), @asset.url, :popup => true) %>
+    <%= link_to(@asset.image? ? image_tag(@asset.url("400x#{Papermill::PAPERMILL_DEFAULTS[:max_height]}>")) : I18n.t("file_type", :type => @asset.content_type.join("/"), :scope => 'papermill'), @asset.url, :popup => true) %>
   </div>
   <div id="right">
     <div id="read-only">

data/generators/papermill/USAGE

@@ -1,3 +1,3 @@
 script/generate papermill MyMigrationName
   
-This will create the migration table.
+This will create the migration table, copy assets to public/papermill

data/generators/papermill/papermill_generator.rb

@@ -8,6 +8,7 @@ class PapermillGenerator < Rails::Generator::NamedBase
   
   def manifest
     @migration_name = file_name.camelize
+    FileUtils.rm_rf('../../public/papermill/')
     FileUtils.cp_r(
       Dir[File.join(File.dirname(__FILE__), '../../public')],
       File.join(RAILS_ROOT),

data/lib/papermill/form_builder.rb

@@ -18,7 +18,6 @@ module ActionView::Helpers::FormTagHelper
   
   private
   def papermill_upload_tag(key, options)
-    # asset_upload_tag(:my_key)
     if key.nil? && (options[:assetable].is_a?(Symbol) || options[:assetable].is_a?(String))
       key = options[:assetable]
       options[:assetable] = nil

data/lib/papermill/papermill_helper.rb

@@ -5,10 +5,8 @@ module PapermillHelper
   # If you don't use jQuery or use some other library, call papermill_javascript_tag(:with_jquery => "no_conflict")
   # If you want to rely on this helper to load jQuery/jQueryUI and use it, call papermill_javascript_tag(:with_jquery => true)
   # If you loaded jQuery and need to load only jQueryUI, call papermill_javascript_tag(:with_jqueryui_only => true)
-  # If you changed the location of papermill.js, you'll need to set :root_folder (defaults to "javascripts")
   def papermill_javascript_tag(options = {})
     html = []
-    root_folder = options[:path] || "javascripts"
     if options[:with_jquery] || options[:with_jqueryui]
       html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"</script>} if options[:with_jquery]
       html << %{<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"</script>} if options[:with_jquery] || options[:with_jqueryui_only]
@@ -20,7 +18,7 @@ module PapermillHelper
       html << %{var #{js_constant} = "#{I18n.t(js_constant, :scope => "papermill")}";}
     end
     html << %{</script>}
-    html << javascript_include_tag("/#{root_folder}/papermill", :cache => "swfupload-papermill")
+    html << javascript_include_tag("/papermill/papermill")
     unless @content_for_papermill_inline_js.blank?
       html << '<script type="text/javascript">jQuery(document).ready(function() {'
       html << @content_for_papermill_inline_js
@@ -30,11 +28,9 @@ module PapermillHelper
   end
   
   # Sets the css tags needed for papermill.
-  # If you changed the location of papermill.css, you'll need to set :root_folder (defaults to "stylesheets")
   def papermill_stylesheet_tag(options = {})
     html = []
-    root_folder = options[:path] || "stylesheets"
-    html << stylesheet_link_tag("/#{root_folder}/papermill")
+    html << stylesheet_link_tag("/papermill/papermill")
     unless @content_for_papermill_inline_css.blank?
       html << %{<style type="text/css">}
       html << @content_for_papermill_inline_css

data/lib/papermill/papermill_module.rb

@@ -15,8 +15,6 @@ module Papermill
       :height => 100,             # Recommended if :gallery[:height] is nil
       # set :width OR :height to nil to use aspect_ratio value. Remember that 4/3 == 1 => Use : 4.0/3
       :aspect_ratio => nil,
-      :max_width  => 1000,
-      :max_height => 1000,
       # You can override computed ImageMagick transformation strings that defaults to "#{:width}x#{:height}>"
       # Note that this is required if PAPERMILL_DEFAULTS[:alias_only] is true
       :style => nil,
@@ -40,9 +38,9 @@ module Papermill
     # options passed on to SWFUpload. To remove an option when overriding, set it to nil.
     :swfupload => {
       # !!! Will only work if the swf file comes from the server to where the files are sent. (Flash same origin security policy)
-      :flash_url => '/flashs/swfupload.swf',
+      :flash_url => '/papermill/swfupload.swf',
       # You can use upload-blank.png with your own wording or upload.png with default "upload" wording (looks nicer)
-      :button_image_url => '/images/papermill/upload-blank.png',
+      :button_image_url => '/papermill/images/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.
@@ -60,6 +58,7 @@ module Papermill
     :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 or associations may depend on it)
+    
     :base_association_name => 'assets',
     :alias_only => false,        # set to true so that only aliases are authorized in url/path
     :aliases => {
@@ -68,7 +67,9 @@ module Papermill
     # path to the root of your public directory
     :public_root => ":rails_root/public",
     # added to :public_root as the root folder for all papermill items
-    :papermill_prefix => "system/papermill"
+    :papermill_prefix => "system/papermill",
+    :max_width  => 1000,
+    :max_height => 1000
   }.deep_merge( Papermill.const_defined?("OPTIONS") ? Papermill::OPTIONS : {} )
   
   PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:escaped_basename.:extension"

data/papermill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
@@ -43,16 +43,14 @@ Gem::Specification.new do |s|
      "lib/papermill/papermill_module.rb",
      "papermill.gemspec",
      "public/.DS_Store",
-     "public/flashs/swfupload.swf",
-     "public/images/.DS_Store",
-     "public/images/papermill/.DS_Store",
-     "public/images/papermill/background.png",
-     "public/images/papermill/container-background.jpg",
-     "public/images/papermill/delete.png",
-     "public/images/papermill/upload-blank.png",
-     "public/images/papermill/upload.png",
-     "public/javascripts/papermill.js",
-     "public/stylesheets/papermill.css",
+     "public/papermill/images/background.png",
+     "public/papermill/images/container-background.jpg",
+     "public/papermill/images/delete.png",
+     "public/papermill/images/upload-blank.png",
+     "public/papermill/images/upload.png",
+     "public/papermill/papermill.css",
+     "public/papermill/papermill.js",
+     "public/papermill/swfupload.swf",
      "rails/init.rb",
      "tasks/papermill_tasks.rake",
      "test/papermill_test.rb",

data/public/{stylesheets → papermill}/papermill.css

@@ -42,6 +42,6 @@
 .papermill-asset-container.papermill-unique-item { padding-left:5px; min-height:22px; }
 
 /* Need some backgrounds?
-.papermill li { background:transparent url(/images/papermill/background.png) repeat top left; }
-.papermill-thumb-container { background:transparent url(/images/papermill/container-background.jpg) repeat top left; }
+.papermill li { background:transparent url(images/background.png) repeat top left; }
+.papermill-thumb-container { background:transparent url(images/container-background.jpg) repeat top left; }
 */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -88,16 +88,14 @@ files:
 - lib/papermill/papermill_module.rb
 - papermill.gemspec
 - public/.DS_Store
-- public/flashs/swfupload.swf
-- public/images/.DS_Store
-- public/images/papermill/.DS_Store
-- public/images/papermill/background.png
-- public/images/papermill/container-background.jpg
-- public/images/papermill/delete.png
-- public/images/papermill/upload-blank.png
-- public/images/papermill/upload.png
-- public/javascripts/papermill.js
-- public/stylesheets/papermill.css
+- public/papermill/images/background.png
+- public/papermill/images/container-background.jpg
+- public/papermill/images/delete.png
+- public/papermill/images/upload-blank.png
+- public/papermill/images/upload.png
+- public/papermill/papermill.css
+- public/papermill/papermill.js
+- public/papermill/swfupload.swf
 - rails/init.rb
 - tasks/papermill_tasks.rake
 - test/papermill_test.rb