papermill 2.1.0 → 2.1.1

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/demo.txt

@@ -9,18 +9,13 @@ rake "db:migrate"
 file "app/models/article.rb", <<-END
   class Article < ActiveRecord::Base
     validates_presence_of :title
-    papermill :image_gallery, :class_name => ImageAsset, :images_only => true, :thumbnail => {:width => 75, :height => 100}
-    papermill :thumbnail, :class_name => ImageAsset, :images_only => true
+    papermill :image_gallery, :thumbnail => {:width => 75, :height => 100}, :images_only => true # only images, custom preview thumbnail size
+    papermill :thumbnail, :swfupload => { :file_types => "*.jpg;*.jpeg" } # jpg only, cherry picking
     papermill :my_assets
     papermill :my_other_asset
   end
 END
 
-file "app/models/image_asset.rb", <<-END
-  class ImageAsset < PapermillAsset
-    validates_attachment_content_type :file, :content_type => ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/gif']
-  end
-END
 
 file "app/views/articles/edit.html.erb", <<-END
 <h1>Editing article</h1>

data/lib/papermill.rb

@@ -12,6 +12,7 @@ Object.send :include, PapermillObjectExtensions
 Hash.send :include, PapermillHashExtensions
 Array.send :include, PapermillArrayExtensions
 String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
+String.send :include, HtmlSafeBackwardCompatibilityFix unless String.instance_methods.include? "html_safe"
 Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) rescue NameError
 
 require 'papermill/papermill_options.rb'

data/lib/papermill/extensions.rb

@@ -1,5 +1,11 @@
 class PapermillException < Exception; end
 
+module HtmlSafeBackwardCompatibilityFix
+  def html_safe
+    self
+  end
+end
+
 module PapermillHashExtensions
   def deep_merge(hash)
     target = dup

data/lib/papermill/form_builder.rb

@@ -94,7 +94,7 @@ module ActionView::Helpers::FormTagHelper
 	  %{<div class="papermill">
 	    #{@template.hidden_field("#{assetable_name}[papermill_#{method}_ids]", nil)}
 	    #{html[:css].to_s + html[:js].to_s + options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}
-	  </div>}
+	  </div>}.html_safe
   end
   
   
@@ -116,7 +116,7 @@ module ActionView::Helpers::FormTagHelper
         },
         upload_id: "#{ field_id }",
         upload_url: "#{ @template.escape_javascript create_url }",
-        file_types: "#{ options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : '' }",
+        file_types: "#{ options[:swfupload].delete(:file_types) || (options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : '*.*') }",
         file_queue_limit: "#{ !options[:gallery] ? '1' : '0' }",
         file_queued_handler: Papermill.file_queued,
         file_dialog_complete_handler: Papermill.file_dialog_complete,
@@ -137,7 +137,7 @@ module ActionView::Helpers::FormTagHelper
       ""
     else
       %{<script type="text/javascript">
-        $(function() {
+        jQuery(function() {
           #{outputed_js}
         });
       </script>}

data/lib/papermill/papermill_paperclip_processor.rb

@@ -29,7 +29,7 @@ module Paperclip
       if options[:watermark] || options[:geometry] =~ /\-wm/
         options[:geometry] = options[:geometry].chomp("-wm")
         @watermark_path = options[:watermark].is_a?(String) && options[:watermark] || file.instance.papermill_options[:watermark]
-        @watermark_path = "#{RAILS_ROOT}/public#{@watermark_path}" if @watermark_path.starts_with?("/")
+        @watermark_path = "#{RAILS_ROOT}/public" + @watermark_path if @watermark_path.starts_with?("/")
       end
       
       

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: paperclip
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 113
         segments: 
         - 2
         - 3
@@ -36,9 +39,11 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -142,23 +147,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper