papermill 0.8.0 → 0.9.0

data/Rakefile

@@ -29,7 +29,7 @@ begin
     gemspec.summary = "Paperclip Swfupload UploadHelper wrapper"
     gemspec.description = "Paperclip Swfupload UploadHelper wrapper"
     gemspec.email = "benoit.benezech@gmail.com"
-    gemspec.homepage = "http://github.com/BBenezech/papermill"
+    gemspec.homepage = "http://github.com/bbenezech/papermill"
     gemspec.authors = ["Benoit Bénézech"]
     gemspec.add_dependency('paperclip', '>= 2.1.2')
     gemspec.add_dependency('mime-types', '>= 1.16')

data/TODO.txt

@@ -1,2 +1 @@
 * non-regression tests
-* check for necessity for requires over gemspec dependencies

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/app/controllers/papermill_controller.rb

@@ -39,7 +39,7 @@ class PapermillController < ApplicationController
   def update
     @asset = PapermillAsset.find_by_id(params[:id])
     render :update do |page|
-      if @asset && @asset.update(params)
+      if @asset && @asset.update_attributes(params[:papermill_asset])
         page << %{ notify("#{t("updated", :ressource => @asset.name, :scope => "papermill")}", "notice") }
       else
         page << %{ notify("#{@asset && @asset.errors.full_messages.to_sentence || t("not-found", :ressource => params[:id].to_s, :scope => "papermill")}", "warning") }
@@ -53,7 +53,9 @@ class PapermillController < ApplicationController
   
   def create
     asset_class = params[:asset_class].constantize
-    params[:assetable_type] = params[:assetable_type].camelize if params[:assetable_type]
+    params[:assetable_id]   = params[:assetable_id].try :to_i
+    params[:assetable_type] = params[:assetable_type].try :camelize
+    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)})

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

@@ -1,5 +1,39 @@
-<% if @asset.image? %>
-  <%= image_tag @asset.url %>
-<% else %>
-  <%= @asset.url %>
-<% end %>
+<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) %>
+  </div>
+  <div id="right">
+    <div id="read-only">
+      <h3><%= I18n.t("read-only", :scope => 'papermill') %></h3>
+      <p><%= I18n.t("name", :scope => 'papermill') %><span><%= @asset.name %></span></p>
+      <p><%= I18n.t("content_type", :scope => 'papermill') %><span><%= @asset.content_type.join('/') %></span></p>
+      <p><%= I18n.t("size", :scope => 'papermill') %><span><%= number_to_human_size(@asset.size.to_i) %></span></p>
+      <% if @asset.image? %>
+        <p><%= I18n.t("width", :scope => 'papermill') %><span><%= @asset.width %>px</span></p>
+        <p><%= I18n.t("height", :scope => 'papermill') %><span><%= @asset.height %>px</span></p>
+      <% end %>
+      <p><%= I18n.t("created_at", :scope => 'papermill') %><span><%= I18n.l(@asset.created_at) %></span></p>
+      <p><%= I18n.t("updated_at", :scope => 'papermill') %><span><%= I18n.l(@asset.updated_at) %></span></p>
+      <p><%= I18n.t("class_name", :scope => 'papermill') %><span><%= @asset.class.name.underscore.humanize %></span></p>
+      <% if assetable = @asset.assetable %>
+        <p onclick="jQuery('#parent-box').toggle(); jQuery('#parent-box-more').toggle(); return false;"><%= I18n.t("parent", :scope => 'papermill') %><span id="parent-box-more">...</span></p>
+        <span style="display:none;" id="parent-box"><%= debug assetable.to_yaml %></span>
+      <% end %>
+    </div>
+    <div id="read-write">
+      <h3><%= I18n.t("modifiable_fields", :scope => 'papermill') %></h3>
+      <% remote_form_for :papermill_asset, @asset, :url => papermill_path(@asset), :html => { :method => :put, :class => "edit_asset" } do |f| %>
+        <%= f.label :title, I18n.t("title", :scope => 'papermill') %>
+        <%= f.text_field :title, :class => "text_field" %>
+        <%= f.label :copyright, I18n.t("copyright", :scope => 'papermill') %>
+        <%= f.text_field :copyright, :class => "text_field" %>
+        <%= f.label :description, I18n.t("description", :scope => 'papermill') %>
+        <%= f.text_area :description %>
+        <div><%= submit_tag I18n.t('save', :scope => 'papermill') %></div>
+      <% end %>
+    </div>
+  </div>
+  <div style="clear:both;"></div>
+  <p id="footer"><%= I18n.t("location", :scope => 'papermill') +  @asset.url %></p>
+</div>

data/config/locales/papermill.yml

@@ -1,6 +1,6 @@
 en:
   papermill: 
-    not-processed: "Error/ressource not processed"
+    not-processed: "Error/resource not processed"
     updated: "{{ressource}} updated"
     not-deleted: "{{ressource}} could not be deleted"
     not-found: "Asset #{{ressource}} not found"
@@ -12,10 +12,27 @@ en:
     SWFUPLOAD_PENDING: "Pending..."
     SWFUPLOAD_LOADING: "Loading..."
     SWFUPLOAD_ERROR: "Something happened while loading" # + " <file_name> (<swfupload error message> [<error code>])"
+    file_type: "{{type.capitalize}} file"
+    read-only: "Read-only information: "
+    modifiable_fields: "Modifiable fields: "
+    name: "Name: "
+    content_type: "Content-type: "
+    size: "File size: "
+    class_name: "Asset type: "
+    created_at: "Created at: "
+    updated_at: "Updated at: "
+    title: "Title"
+    copyright: "Copyright: "
+    description: "Description: "
+    save: "Send to server"
+    location: "File-system location: "
+    parent: "Parent object: "
+    width: "Width: "
+    height: "Height: "
 fr:
   papermill:
     not-processed: "Erreur/ressource non trouvée"
-    updated: "{{ressource}} mise à jour"
+    updated: "{{ressource}} mis(e) à jour"
     not-deleted: "{{ressource}} n'a pas pu être supprimée"
     not-found: "Asset #{{ressource}} non trouvé"
     edit-title: ""
@@ -25,4 +42,21 @@ fr:
     delete-confirmation: "Êtes-vous sûr de vouloir supprimer '{{resource}}' ?"
     SWFUPLOAD_PENDING: "En attente..."
     SWFUPLOAD_LOADING: "Chargement..."
-    SWFUPLOAD_ERROR: "Une erreur est survenue pendant le chargement de"
+    SWFUPLOAD_ERROR: "Une erreur est survenue pendant le chargement de"
+    file_type: "Fichier {{type}}"
+    read-only: "Informations en lecture seule : "
+    modifiable_fields: "Informations modifiables : "
+    name: "Nom : "
+    content_type: "Content-type : "
+    size: "Taille du fichier : "
+    class_name: "Type d'asset : "
+    created_at: "Création : "
+    updated_at: "Mise à jour : "
+    title: "Titre : "
+    copyright: "Copyright : "
+    description: "Description : "
+    save: "Envoyer"
+    location: "Emplacement du fichier : "
+    parent: "Objet parent : "
+    width: "Largeur : "
+    height: "Hauteur : "

data/lib/papermill/papermill_asset.rb

@@ -31,6 +31,14 @@ class PapermillAsset < ActiveRecord::Base
     file_file_name
   end
   
+  def width
+    image? && Paperclip::Geometry.from_file(file).width
+  end
+  
+  def height
+    image? && Paperclip::Geometry.from_file(file).height
+  end
+  
   def size
     file_file_size
   end

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
-  s.date = %q{2009-09-23}
+  s.date = %q{2009-09-24}
   s.description = %q{Paperclip Swfupload UploadHelper wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/BBenezech/papermill}
+  s.homepage = %q{http://github.com/bbenezech/papermill}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.4}

data/public/javascripts/papermill.js

@@ -1,12 +1,52 @@
 popup = function(title1, title) {
 	window.open (title1, title, config='height=700, width=600, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
 }
-// override at will
+
+
+/*
+If you have a popup library, override popup
+
+* e.g. facebox : 
+
+popup = function(url) {
+	jQuery.facebox(function() {
+	  jQuery.get(url, function(data) {
+	    jQuery.facebox(data)
+	  })
+	})
+	return false;
+}
+
+* e.g. Shadowbox : 
+
+popup = function(url) {
+	if(url) {
+		Shadowbox.open({ 
+	  	content:    url,
+	    player:     "iframe",
+			width: 			1280,
+			height: 		768
+	  });
+	}
+	return false;
+}
+*/
 
 notify = function(message, type) {
 	alert(type + ": " + message)
 }
-// You can override notify later, with your own notification system
+/*
+If you have a notification library, override notify
+
+* e.g. jGrowl : 
+
+notify = function(message, type) {
+	if(type == "notice") { jQuery.noticeAdd({ text: message, stayTime: 4000, stay: false, type: type }) }
+	if(type == "warning") {	jQuery.noticeAdd({ text: message, stayTime: 9000, stay: false, type: type }) }
+	if(type == "error") {	jQuery.noticeAdd({ text: message, stayTime: 20000, stay: false, type: type }) }
+}
+
+*/
 
 var Upload = {
 	files_queued: 0,

data/public/stylesheets/papermill.css

@@ -1,3 +1,17 @@
+#papermill-box{width:942px; margin-bottom:10px;}
+#papermill-box #left {float:left; width:400px; padding-bottom:10px;}
+#papermill-box #right {float:right; width:500px; margin-left:20px; border-left:2px solid GREY; padding-left:20px; padding-bottom:10px;}
+#papermill-box #read-only {}
+#papermill-box #read-write {margin-top:30px;}
+#papermill-box p {margin:4px;}
+#papermill-box p span{font-weight:bold;}
+#papermill-box #parent-box {display:block; border:1px solid GREY; padding: 5px; margin:5px;}
+#papermill-box h3 {}
+#papermill-box input.text_field {width:400px; margin:10px; margin-top:5px;}
+#papermill-box textarea {width:400px; height:100px; margin:10px; margin-top:5px;}
+#papermill-box label {margin-left:4px;}
+#papermill-box #footer {text-align:center; font-size:12px; padding:5px}
+
 .papermill a:hover { background:none; color:inherit; }
 .papermill a img { border:0px; }
 .papermill li:hover { border-color:blue; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 +02:00
+date: 2009-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ files:
 - test/test_helper.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/BBenezech/papermill
+homepage: http://github.com/bbenezech/papermill
 licenses: []
 
 post_install_message: