papermill 0.16.3 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.16.3
+1.0.0

data/app/controllers/papermill_controller.rb

@@ -36,7 +36,7 @@ class PapermillController < ApplicationController
   end
   
   def edit
-    render :action => "edit", :layout => (params[:layout] || false)
+    render :action => "edit"
   end
   
   def create

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

@@ -13,5 +13,4 @@
     <% end %>
     <%= submit_tag t('papermill.save') %>
   <% end %>
-</form>
-<%= javascript_include_tag("http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js") if params[:with_jquery] %>
+</form>

data/config/locales/papermill.yml

@@ -11,7 +11,7 @@ en:
     delete-confirmation: "Delete '{{resource}}'?"
     SWFUPLOAD_PENDING: "Pending..."
     SWFUPLOAD_LOADING: "Loading..."
-    SWFUPLOAD_ERROR: "Something happened while loading" # + " <file_name> (<swfupload error message> [<error code>])"
+    SWFUPLOAD_ERROR: "File is too big, of unauthorized type, or an error occured on the server."
     file_type: "{{type.capitalize}} file"
     name: "Name"
     content_type: "Content-type"
@@ -44,7 +44,7 @@ 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: "Fichier trop gros, type de fichier non autorisé ou erreur serveur."
     file_type: "Fichier {{type}}"
     name: "Nom"
     content_type: "Content-type"

data/lib/papermill/papermill_asset.rb

@@ -19,8 +19,8 @@ class PapermillAsset < ActiveRecord::Base
   default_scope :order => 'position'
   
   def Filedata=(data)
+    data.content_type = data.get_content_type # SWFUpload content-type fix
     self.file = data
-    self.file_content_type = data.get_content_type
   end
   
   def Filename=(name)
@@ -90,7 +90,7 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def self.cleanup
-    PapermillAsset.all(:conditions => ["id < 0 AND created_at < ?", DateTime.now.yesterday]).each &:destroy
+    self.all(:conditions => ["id < 0 AND created_at < ?", DateTime.now.yesterday]).each &:destroy
   end
   
   private

data/public/papermill/papermill.js

@@ -1,5 +1,5 @@
 popup = function(url) {
-	window.open (url + "?with_jquery=true", "Papermill", config='height=580, width=870, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
+	window.open (url, "Papermill", config='height=580, width=870, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
 }
 
 close_popup = function(source) {
@@ -8,10 +8,7 @@ close_popup = function(source) {
 
 
 /*
-If you have a popup library, OVERRIDE popup and close_popup in your application.js
-You'll need jQuery loaded, so specify with_jquery=true if you load edit in an iframe or a true popup.
-You can specify a layout as well, with layout=application in your URL.
-
+If you have a popup library, override popup and close_popup in your application.js
 
 * e.g. facebox : 
 
@@ -31,7 +28,7 @@ close_popup = function(source) {
 
 popup = function(url) {
 	Shadowbox.open({ 
-  	content:    url + "?with_jquery=true",
+  	content:    url-,
     player:     "iframe",
 		width: 			870,
 		height: 		580

data/test/papermill_test.rb

@@ -52,11 +52,11 @@ class PapermillTest < Test::Unit::TestCase
   @article = Article.create!
   @decoy_article = Article.create!
   @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
-  PapermillAsset.create!(:Filedata => @file, :assetable => @article, :assetable_key => "asset1", :position => 2)
-  PapermillAsset.create!(:Filedata => @file, :assetable => @article, :assetable_key => "asset1", :position => 1)
-  MyAsset.create!(:Filedata => @file, :assetable => @article, :assetable_key => "my_assets")
-  MyAsset.create!(:Filedata => @file, :assetable => @article, :assetable_key => "my_assets")
-  MyAsset.create!(:Filedata => @file, :assetable => @decoy_article, :assetable_key => "my_assets")
+  PapermillAsset.create!(:file => @file, :assetable => @article, :assetable_key => "asset1", :position => 2)
+  PapermillAsset.create!(:file => @file, :assetable => @article, :assetable_key => "asset1", :position => 1)
+  MyAsset.create!(:file => @file, :assetable => @article, :assetable_key => "my_assets")
+  MyAsset.create!(:file => @file, :assetable => @article, :assetable_key => "my_assets")
+  MyAsset.create!(:file => @file, :assetable => @decoy_article, :assetable_key => "my_assets")
   
   def initialize(*args)
     super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.16.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"