papermill 0.10.4 → 0.11.0

data/README.rdoc

@@ -4,6 +4,9 @@ Asset management made easy.
 
 == Install the gem!
   
+  # Add github as a source for latest release of thoughtbot-paperclip gem who will be installed as a dependency and remove rubyforge's paperclip if needed (old 2.1.0 version)
+  $ sudo gem source -a http://gems.github.com
+  $ sudo gem uninstall paperclip
   $ sudo gem install papermill
 
 == Try the demo!

data/Rakefile

@@ -31,7 +31,7 @@ begin
     gemspec.email = "benoit.benezech@gmail.com"
     gemspec.homepage = "http://github.com/bbenezech/papermill"
     gemspec.authors = ["Benoit Bénézech"]
-    gemspec.add_dependency('paperclip', '>= 2.1.2')
+    gemspec.add_dependency('thoughtbot-paperclip', '>= 2.3.1')
     gemspec.add_dependency('mime-types', '>= 1.16')
     gemspec.add_dependency('acts_as_list', '>= 0.1.2')
   end

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.11.0

data/app/controllers/papermill_controller.rb

@@ -9,7 +9,8 @@ class PapermillController < ApplicationController
       raise if asset.nil? || params[:style] == "original"
       style = Papermill::PAPERMILL_DEFAULTS[:aliases][params[:style]] || !Papermill::PAPERMILL_DEFAULTS[:alias_only] && params[:style]
       raise unless style
-
+      style = {:geometry => style} unless style.is_a? Hash  # new Paperclip API
+      
       if asset.image?
         temp_thumbnail = Paperclip::Thumbnail.make(asset_file = asset.file, style)
         new_parent_folder_path = File.dirname(new_image_path = asset_file.path(params[:style]))

data/lib/papermill/papermill_module.rb

@@ -61,8 +61,9 @@ module Papermill
     
     :base_association_name => 'assets',
     :alias_only => false,        # set to true so that only aliases are authorized in url/path
+    # aliases name must be strings!
     :aliases => {
-      # "example" => "100x100#",
+      # 'example' => "100x100#",
     },
     # path to the root of your public directory
     :public_root => ":rails_root/public",

data/papermill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.10.4"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
@@ -73,16 +73,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<thoughtbot-paperclip>, [">= 2.3.1"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<acts_as_list>, [">= 0.1.2"])
     else
-      s.add_dependency(%q<paperclip>, [">= 2.1.2"])
+      s.add_dependency(%q<thoughtbot-paperclip>, [">= 2.3.1"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
     end
   else
-    s.add_dependency(%q<paperclip>, [">= 2.1.2"])
+    s.add_dependency(%q<thoughtbot-paperclip>, [">= 2.3.1"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -13,14 +13,14 @@ date: 2009-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: paperclip
+  name: thoughtbot-paperclip
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types