papermill 1.1.2 → 1.1.3

data/lib/papermill/papermill.rb

@@ -6,7 +6,7 @@ module Papermill
   end
   
   def self.options
-    defined?(OPTIONS) ? OPTIONS : {}
+    @options ||= BASE_OPTIONS.deep_merge(defined?(OPTIONS) ? OPTIONS : {})
   end
   
 

data/lib/papermill/papermill_asset.rb

@@ -17,6 +17,8 @@ class PapermillAsset < ActiveRecord::Base
   
   named_scope :key, lambda { |assetable_key| { :conditions => ['assetable_key = ?', assetable_key.to_s] }}
   
+  attr_accessor :crop_h, :crop_w, :crop_x, :crop_y
+  
   def Filedata=(data)
     data.content_type = data.get_content_type # SWFUpload content-type fix
     self.file = data

data/lib/papermill/papermill_helper.rb

@@ -3,23 +3,19 @@
 module PapermillHelper
   
   # Sets all the javascript needed for papermill.
-  # If you already loaded jQuery and JQueryUI, call papermill_javascript_tag
-  # 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 jQuery and JQueryUI (with Sortable included) are already loaded, call papermill_javascript_tag
+  # If you don't use jQuery at all or use some other library, call papermill_javascript_tag(:with_jquery => "no_conflict")
+  # If you want to rely on this helper to load jQuery and use it, call papermill_javascript_tag(:with_jquery => true)
+  # If jQuery is loaded, load only jQueryUI-Sortable with papermill_javascript_tag(:with_jqueryui_only => true)
   def papermill_javascript_tag(options = {})
     html = []
-    if options[:with_jquery] || options[:with_jqueryui_only]
-      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript"></script>} if options[:with_jquery]
-      html << %{<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>} if options[:with_jquery] || options[:with_jqueryui_only]
-      html << %{<script type="text/javascript">jQuery.noConflict();</script>} if options[:with_jquery].to_s == "no_conflict"
-    end
     html << %{<script type="text/javascript">}
-    ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING"].each do |js_constant|
-      html << %{var #{js_constant} = "#{t("papermill.#{js_constant}")}";}
+      ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING"].each do |js_constant|
+      html << %{var #{escape_javascript js_constant} = "#{t("papermill.#{escape_javascript js_constant}")}";}
     end
     html << %{</script>}
-    html << javascript_include_tag("/papermill/papermill", "/papermill/swfupload")
+    html << javascript_include_tag([options[:with_jquery] && "/papermill/jquery-1.3.2.min.js", (options[:with_jquery] || options[:with_jqueryui_only]) && "/papermill/jquery-ui-1.7.2.custom.min.js", "/facebox/facebox.js", "/jgrowl/jquery.jgrowl_minimized.js", "/papermill/jquery.Jcrop.min.js", "/papermill/swfupload.js", "/papermill/papermill.js"].compact, :cache => "papermill")
+    html << %{<script type="text/javascript">jQuery.noConflict();</script>} if options[:with_jquery].to_s == "no_conflict"
     unless @content_for_papermill_inline_js.blank?
       html << '<script type="text/javascript">'
       html << '//<![CDATA['
@@ -35,7 +31,7 @@ module PapermillHelper
   # Sets the css tags needed for papermill.
   def papermill_stylesheet_tag(options = {})
     html = []
-    html << stylesheet_link_tag("/papermill/papermill")
+    html << stylesheet_link_tag("/facebox/facebox.css", "/jgrowl/jquery.jgrowl.css", "/papermill/jquery.Jcrop.css", "/papermill/papermill.css", :cache => "papermill")
     unless @content_for_papermill_inline_css.blank?
       html << %{<style type="text/css">}
       html << @content_for_papermill_inline_css

data/lib/papermill/papermill_initializer.rb

@@ -0,0 +1,132 @@
+# DO NOT MOVE OR RENAME THIS FILE. 
+# It must stand in your RAILS_ROOT/config/initializer folder and be named papermill.rb, because it is explicitely early-loaded by Papermill.
+module Papermill
+
+  # All the options here already are papermill defaults. You can set 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 model papermill declaration option-hash, that merges with this Papermill::OPTIONS, that merge with Papermill::DEFAULT_OPTIONS hash.
+  # Don't freak-out, there's a 99% chance that it is exactly what you expect it to do.
+  # 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"],
+      
+      # Attributes you can edit in the form. You can use :type and :label
+      # :editable_fields => [
+      #   {:title =>       {:type => "string"}}, 
+      #   {:alt =>         {:type => "string"}}, 
+      #   {:copyright =>   {:type => "string"}},
+      #   {:description => {:type => "text"  }}, 
+      # ],
+    
+      # 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 => "10 MB"
+      },
+    
+      # 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/lib/papermill/papermill_options.rb

@@ -1,133 +1,51 @@
-# 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 the options setted here will be used as defaults. You can set 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"],
-      
-      # Attributes you can edit in the form. You can use :type and :label
-      :editable_fields => [
-        {:title =>       {:type => "string"}}, 
-        {:alt =>         {:type => "string"}}, 
-        {:copyright =>   {:type => "string"}},
-        {:description => {:type => "text"  }}, 
-      ],
-    
-      # 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 => "10 MB"
-      },
-    
-      # 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
+  BASE_OPTIONS = {
+    :class_name => "PapermillAsset",
+    :inline_css => true,
+    :form_helper_elements => [:upload_button, :container, :dashboard],
+    :dashboard => [:mass_edit, :mass_delete],
+    :mass_editable_fields => ["title", "copyright", "description"],
+    :editable_fields => [
+      {:title =>       {:type => "string"}}, 
+      {:alt =>         {:type => "string"}}, 
+      {:copyright =>   {:type => "string"}},
+      {:description => {:type => "text"  }}
+    ],
+    :gallery => { 
+      :width => nil,
+      :height => nil,
+      :columns => 8,
+      :lines => 2,
+      :vpadding => 0,
+      :hpadding => 0,
+      :vmargin => 1,
+      :hmargin => 1,
+      :border_thickness => 2
+    },
+    :thumbnail => {
+      :width => 100,
+      :height => 100, 
+      :aspect_ratio => nil, 
+      :style => 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 => "10 MB"
+    },
+    :images_only => false,
+    :base_association_name => :assets,
+    :alias_only => false,
+    :aliases => {},
+    :public_root => ":rails_root/public",
+    :papermill_prefix => "system/papermill"
+  }
 end

data/lib/papermill/papermill_paperclip_processor.rb

@@ -3,7 +3,7 @@ module Paperclip
   # Handles thumbnailing images that are uploaded.
   class PapermillPaperclipProcessor < Thumbnail
     
-    attr_reader :crop_h, :crop_w, :crop_x, :crop_y, :copyright
+    attr_accessor :crop_h, :crop_w, :crop_x, :crop_y, :copyright
     
     def initialize(file, options = {}, attachment = nil)
       @crop_h, @crop_w, @crop_x, @crop_y = options[:crop_h], options[:crop_w], options[:crop_x], options[:crop_y]

data/public/facebox/README.txt

@@ -0,0 +1,4 @@
+Please visit http://famspam.com/facebox/ or open index.html in your favorite browser.
+
+Need help?  Join our Google Groups mailing list:
+  http://groups.google.com/group/facebox/

data/public/facebox/facebox.css

@@ -0,0 +1,95 @@
+#facebox .b {
+  background:url(/facebox/b.png);
+}
+
+#facebox .tl {
+  background:url(/facebox/tl.png);
+}
+
+#facebox .tr {
+  background:url(/facebox/tr.png);
+}
+
+#facebox .bl {
+  background:url(/facebox/bl.png);
+}
+
+#facebox .br {
+  background:url(/facebox/br.png);
+}
+
+#facebox {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  text-align: left;
+}
+
+#facebox .popup {
+  position: relative;
+}
+
+#facebox table {
+  border-collapse: collapse;
+}
+
+#facebox td {
+  border-bottom: 0;
+  padding: 0;
+}
+
+#facebox .body {
+  padding: 10px;
+  background: #fff;
+  width: 370px;
+}
+
+#facebox .loading {
+  text-align: center;
+}
+
+#facebox .image {
+  text-align: center;
+}
+
+#facebox img {
+  border: 0;
+  margin: 0;
+}
+
+#facebox .footer {
+  border-top: 1px solid #DDDDDD;
+  padding-top: 5px;
+  margin-top: 10px;
+  text-align: right;
+}
+
+#facebox .tl, #facebox .tr, #facebox .bl, #facebox .br {
+  height: 10px;
+  width: 10px;
+  overflow: hidden;
+  padding: 0;
+}
+
+#facebox_overlay {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  height:100%;
+  width:100%;
+}
+
+.facebox_hide {
+  z-index:-100;
+}
+
+.facebox_overlayBG {
+  background-color: #000;
+  z-index: 99;
+}
+
+* html #facebox_overlay { /* ie6 hack */
+  position: absolute;
+  height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}