papermill 0.14.3 → 0.16.0

data/lib/papermill/papermill_options.rb

@@ -0,0 +1,125 @@
+# Do not move or rename this file. 
+# It MUST stand in your RAILS_ROOT/config/initializer folder
+# It is explicitely early-loaded by Papermill
+# Papermill::OPTIONS constant needs to be set before PapermillAsset is loaded, and PapermillAsset cannot be lazy-loaded
+
+module Papermill
+
+  # All these options will be used as defaults. You can change them : 
+  #
+  # * here
+  #
+  # * in your association. Ex :
+  #   class Article < ActiveRecord::Base
+  #     papermill :diaporama, {
+  #       :class_name => "MyAssetClass",
+  #       :inline_css => false,
+  #       :thumbnail => {:width => 150},
+  #       ...
+  #     }
+  #   end
+  #
+  # * in your form helper call. Ex : 
+  #   form.image_upload :diaporama, :class_name => "MyAssetClass", :thumbnail => {:width => 150}, :inline_css => false
+  #
+  #
+  # FormHelper options-hash merges with papermill declaration option-hash that merges with this Papermill::OPTIONS hash
+  # Merges are recursive (for :gallery, :thumbnail and :swfupload sub-hashs)
+  
+  unless defined?(OPTIONS)
+    OPTIONS = {
+      # Associated PapermillAsset subclass
+      :class_name => "PapermillAsset",
+    
+      # Helper will generates some inline css styling. You can use it to scaffold, then copy the lines you need in your application css and set it to false.
+      :inline_css => true,
+    
+      # SwfUpload will only let the user upload images.
+      :images_only => false,
+    
+      # Dashboard is only for galleries
+      # You can remove/change order of HTML elements.
+      # See below for dashboard
+      :form_helper_elements => [:upload_button, :container, :dashboard],
+    
+      # Dashboard elements
+      # You can remove/change order of HTML elements.
+      :dashboard => [:mass_edit, :mass_delete],
+    
+      # Attributes editable at once for all assets in a gallery
+      :mass_editable_fields => ["title", "copyright", "description"],
+    
+      # FormHelper gallery options
+      # If :inline_css is true, css will be generated automatically and added through @content_for_papermill_inline_css (papermill_stylesheet_tag includes it)
+      # Great for quick admin scaffolding.
+    
+      :gallery => { 
+        # override calculated gallery width. Ex: "auto"
+        :width => nil,
+        # override calculated gallery height
+        :height => nil,
+        # Number of columns and lines in a gallery
+        :columns => 8,
+        :lines => 2,
+        # vertical/horizontal padding/margin around each thumbnails
+        :vpadding => 0,
+        :hpadding => 0,
+        :vmargin => 1,
+        :hmargin => 1,
+        # border around thumbnails
+        :border_thickness => 2
+      },
+    
+      # FormHelper thumbnail's information.
+      # Set :width OR :height to nil to use aspect_ratio value. Remember that 4/3 == 1 => Use : 4.0/3
+      # You can override computed ImageMagick transformation strings that defaults to "#{:width}x#{:height}>" by setting a value to :style
+      # Needed if you set :aliases_only to true
+
+      :thumbnail => {
+        :width => 100,
+        :height => 100, 
+        :aspect_ratio => nil, 
+        :style => nil
+      },
+    
+      # Options passed on to SWFUpload. 
+      # To remove an option when overriding, set it to nil.
+    
+      :swfupload => { 
+        :flash_url => '/papermill/swfupload.swf',
+        :button_image_url => '/papermill/images/upload-blank.png',
+        :button_width     => 61,
+        :button_height    => 22,
+        :button_text => %{<span class="button-text">#{I18n.t("papermill.upload-button-wording")}</span>},
+      	:button_text_style => %{.button-text { font-size: 12pt; font-weight: bold; }},
+        :button_text_top_padding => 4,
+      	:button_text_left_padding => 4,
+      	:debug => false,
+      	:prevent_swf_caching => true,
+        :file_size_limit_mb => 10.megabytes
+      },
+    
+      # APPLICATION WIDE PARAMETERS
+      # Do not change these in your model declaration or form helper call.
+    
+      # Default named_scope name for catch-all :papermill declaration
+      :base_association_name => :assets,
+    
+      # Set to true to require aliases in all url/path
+      # Don't forget to give an alias value to options[:thumbnail][:style] if true!
+      :alias_only => false,
+    
+      # Needed if :alias_only
+      :aliases => {
+        # 'example' => "100x100#",
+        # 'example2' => {:geometry => "100x100#"}
+      },
+    
+      # path to the root of your public directory (from NGINX/Apache pov)
+      :public_root => ":rails_root/public",
+
+      # added to :public_root as the root folder for all papermill assets
+      :papermill_prefix => "system/papermill"
+    }
+  end
+end

data/public/papermill/README

@@ -0,0 +1,13 @@
+DO NOT !!
+
+Modify files in this folder, they are generated by papermill
+
+
+DO !!
+
+Load them before your own and override them in your application.<js|css>
+
+And each time you update Papermill's gem : 
+
+cd my_rails_app
+./script/generate papermill_assets

data/public/papermill/papermill.css

@@ -13,13 +13,17 @@
 #papermill-box .left-cell {font-weight:bold; padding-right:10px; text-align:right;}
 
 .papermill { overflow:hidden; }
-.papermill a:hover { background:none; color:inherit; }
 .papermill a img { border:0px; }
 .papermill li:hover { border-color:blue; }
 .papermill li a { display:block;  }
 .papermill .progress { display:block; border:1px solid #C2E3EF; text-align:left; height:6px; }
 .papermill .progress span { background:#7BB963; height:6px; width:0; display:block; }
 
+.papermill .dashboard li { float:left; margin-right:10px; margin-top:3px; }
+.papermill .dashboard li a { float:left; padding-top:3px; padding-right:3px; padding-left:20px; }
+.papermill .dashboard li.mass_edit a { background:transparent url(images/mass-edit.png) no-repeat top left; }
+.papermill .dashboard li.mass_delete a { background:transparent url(images/mass-delete.png) no-repeat top left; }
+
 .papermill-thumb-container { position:relative; border:5px solid #EEE; padding:4px; overflow:hidden; }	
 .papermill-thumb-container li { border:0px solid transparent; min-height:25px; min-width:25px; display:block; float:left; position:relative; }
 .papermill-thumb-container li span { display:block; }
@@ -36,9 +40,11 @@
 .papermill-asset-container li .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
 .papermill-asset-container li .delete { float:left; margin-top:2px; margin-right:5px; }
 
+.papermill-thumb-container.papermill-multiple-items li { cursor:move; }
+
 .papermill-asset-container.papermill-multiple-items { padding-left:10px; border-left:5px solid #EEE; min-height:44px; }
 .papermill-asset-container.papermill-multiple-items li { cursor:row-resize; }
-.papermill-thumb-container.papermill-multiple-items li { cursor:move; }
+
 .papermill-asset-container.papermill-unique-item { padding-left:5px; min-height:22px; }
 
 /* Using formtastic? Move this to your formtastic_changes.css to make it cleaner : */

data/public/papermill/papermill.js

@@ -1,10 +1,17 @@
-popup = function(title1, title) {
-	window.open (title1, title, config='height=580, width=870, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
+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')
+}
+
+close_popup = function(source) {
+	source.close();
 }
 
 
 /*
-If you have a popup library, override popup
+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.
+
 
 * e.g. facebox : 
 
@@ -16,25 +23,32 @@ popup = function(url) {
 	})
 	return false;
 }
+close_popup = function(source) {
+	jQuery(document).trigger('close.facebox');
+}
 
 * e.g. Shadowbox : 
 
 popup = function(url) {
-	if(url) {
-		Shadowbox.open({ 
-	  	content:    url,
-	    player:     "iframe",
-			width: 			870,
-			height: 		580
-	  });
-	}
+	Shadowbox.open({ 
+  	content:    url + "?with_jquery=true",
+    player:     "iframe",
+		width: 			870,
+		height: 		580
+  });
 	return false;
 }
+
+close_popup = function(source) {
+	Shadowbox.close();
+}
+
 */
 
 notify = function(message, type) {
 	if(type != "notice") { alert(type + ": " + message) }
 }
+
 /*
 If you have a notification library, override notify
 
@@ -120,4 +134,20 @@ var Upload = {
 	file_queue_error: function(file, error_code, message) {
 		upload_error(file, error_code, message)
 	}
-}
+}
+
+modify_all = function(papermill_id) {
+	container = jQuery("#" + papermill_id)[0];
+	attribute_name = jQuery("#batch_" + papermill_id)[0].value
+	attribute_wording = jQuery("#batch_" + papermill_id + " option:selected").text();
+	value = prompt(attribute_wording + ":")
+	if(value != null) {
+		jQuery.ajax({async:true, data:jQuery(container).sortable('serialize'), dataType:'script', type:'post', url:'/papermill/mass_edit?attribute=' + attribute_name + "&value=" + value})
+	}
+}
+
+mass_delete = function(papermill_id, wording) {
+	if(confirm(wording)){ 
+    jQuery.ajax({async:true, data:jQuery('#' + papermill_id).sortable('serialize'), dataType:'script', type:'post', url:'/papermill/mass_delete'})
+  }
+}

data/test/fixtures/bad.png

@@ -0,0 +1 @@
+This is not an image.

data/test/fixtures/s3.yml

@@ -0,0 +1,8 @@
+development:
+  key: 54321
+production:
+  key: 12345
+test:
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

data/test/papermill_test.rb

@@ -4,44 +4,134 @@ require 'rubygems'
 gem 'rails'
 require 'active_record'
 require 'action_view'
-require File.join(File.dirname(__FILE__), '../init')
- 
+require 'active_support'
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/info.log")
+RAILS_ROOT = File.join( File.dirname(__FILE__), "../../../.." )
+
+
+require File.join(File.dirname(__FILE__), '../init.rb') 
+
+module Papermill
+  OPTIONS = OPTIONS.merge(
+    :aliases => {
+      'tall' => :"1000x1000",
+      :small => "100x100",
+      :hashed_style => {:geometry => "100x100"}
+    })
+end
+
+
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "test.sqlite3")
 ActiveRecord::Schema.define(:version => 1) do
-  create_table :papermill_assets do |t|
+  create_table :papermill_assets, :force => true do |t|
     t.string   :title, :file_file_name, :file_content_type, :assetable_type, :assetable_key, :type
     t.integer  :file_file_size, :position, :assetable_id
     t.timestamps
   end
   
-  create_table :articles do |t|
-    t.string :title, :type
-    t.timestamps
+  create_table :articles, :force => true do |t|
+    t.string :type
   end
 end
 
+
+
 class MyAsset < PapermillAsset
 end
 
-class ArticleGenericAssociation < ActiveRecord::Base
+class Article < ActiveRecord::Base
   def self.table_name 
     :articles
   end
-  
-  papermill :class_name => MyAsset
+  papermill 
+  papermill :my_assets, :class_name => "MyAsset"
 end
 
-class ArticleSpecificAssociations < ActiveRecord::Base
-  def self.table_name 
-    :articles
-  end
-  
-  papermill :my_assets, :class_name => MyAsset
-end
 
 class PapermillTest < Test::Unit::TestCase
-
-  def test_truth
-    assert true
+  @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")
+  
+  def initialize(*args)
+    super
+    @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+    
+    @article = Article.find 1
+    @decoy_article = Article.find 2
+    
+    @asset1 = PapermillAsset.find 1
+    @asset2 = PapermillAsset.find 2
+    @asset3 = PapermillAsset.find 3
+    @asset4 = PapermillAsset.find 4
+    @asset5 = PapermillAsset.find 5
+  end
+  
+  def test_namedscopes_for_specific_associations
+    assert_equal @article.my_assets.map(&:id), [3,4]
+    assert_equal @article.my_assets(:order => "position DESC").map(&:id), [4,3]
+    assert_equal @article.my_assets(:order => "position DESC", :limit => 1).map(&:id), [4]
+  end
+  
+  def test_namedscope_for_global_associations_and_default_order
+    assert_equal @article.assets(:asset1).map(&:id), [2,1]
+    assert_equal @article.assets(:asset1, :order => "position DESC").map(&:id), [1,2]
+    assert_equal @article.assets(:asset1, :order => "position DESC", :limit => 1).map(&:id), [1]
+  end
+  
+  def test_id_partition
+    assert_equal @asset1.id_partition, "000/000/001"
+  end
+  
+  def test_name
+    assert_equal @asset1.name, "5k.png"
+  end
+  
+  def test_width
+    assert_equal @asset1.width, 434.0
+  end
+  
+  def test_height
+    assert_equal @asset1.height, 66.0
+  end
+  
+  def test_size
+    assert_equal @asset1.size, 4456
+  end
+  
+  def test_url
+    assert_equal @asset1.url, "/system/papermill/000/000/001/original/5k.png"
+    assert_equal @asset1.url("400x300#"), "/system/papermill/000/000/001/400x300%23/5k.png"
+  end
+  
+  def test_path
+    assert_equal @asset1.path, "./test/../../../../public/system/papermill/000/000/001/original/5k.png"
+    assert_equal @asset1.path("400x300#"), "./test/../../../../public/system/papermill/000/000/001/400x300#/5k.png"
+  end
+  
+  def test_content_type
+    assert_equal @file.get_content_type, "image/png"
+    assert_equal @asset1.content_type, "image/png"
+  end
+  
+  def test_is_image
+    assert @asset1.image?
+  end
+  
+  def test_compute_style
+    assert_equal PapermillAsset.compute_style(:tall), :geometry => "1000x1000"
+    assert_equal PapermillAsset.compute_style("tall"),  :geometry => "1000x1000"
+    assert_equal PapermillAsset.compute_style(:small),  :geometry => "100x100"
+    assert_equal PapermillAsset.compute_style("small"),  :geometry => "100x100"
+    assert_equal PapermillAsset.compute_style("hashed_style"), :geometry => "100x100"
+    assert_equal PapermillAsset.compute_style("100x100"),  :geometry => "100x100"
+    assert_equal PapermillAsset.compute_style(:"100x100"),  :geometry => "100x100"
+    Papermill::options[:alias_only] = true
+    assert_equal PapermillAsset.compute_style("100x100"), false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.14.3
+  version: 0.16.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +01:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,22 +47,28 @@ files:
 - config/routes.rb
 - generators/papermill_assets/USAGE
 - generators/papermill_assets/papermill_assets_generator.rb
+- generators/papermill_initializer/USAGE
+- generators/papermill_initializer/papermill_initializer_generator.rb
 - generators/papermill_table/USAGE
 - generators/papermill_table/papermill_table_generator.rb
 - generators/papermill_table/templates/migrate/papermill_migration.rb.erb
 - init.rb
 - install.rb
 - installation-template.txt
-- lib/core_extensions.rb
+- lib/extensions.rb
 - lib/papermill.rb
 - lib/papermill/form_builder.rb
+- lib/papermill/papermill.rb
 - lib/papermill/papermill_asset.rb
 - lib/papermill/papermill_helper.rb
-- lib/papermill/papermill_module.rb
+- lib/papermill/papermill_options.rb
 - public/.DS_Store
+- public/papermill/README
 - public/papermill/images/background.png
 - public/papermill/images/container-background.jpg
 - public/papermill/images/delete.png
+- public/papermill/images/mass-delete.png
+- public/papermill/images/mass-edit.png
 - public/papermill/images/upload-blank.png
 - public/papermill/images/upload.png
 - public/papermill/papermill.css
@@ -71,6 +77,14 @@ files:
 - public/papermill/swfupload.swf
 - rails/init.rb
 - tasks/papermill_tasks.rake
+- test/fixtures/12k.png
+- test/fixtures/50x50.png
+- test/fixtures/5k.png
+- test/fixtures/bad.png
+- test/fixtures/s3.yml
+- test/fixtures/text.txt
+- test/fixtures/twopage.pdf
+- test/papermill_test.rb
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/bbenezech/papermill
@@ -96,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper