papermill 0.11.0 → 0.12.0

data/README.rdoc

@@ -21,19 +21,21 @@ Asset management made easy.
 
 === Generic catch-all declaration
 
-  papermill my_option_hash                              # in your papermilled assetable model
-  assets_upload(:my_key, my_option_hash)          # form helper call
-  @assetable.assets(:my_key)                  # data access in your view
+  papermill my_option_hash                                # in your papermilled assetable model
+  assets_upload(:my_key, my_option_hash)                  # form helper call
+  @assetable.assets(:my_key)                              # data access in your view
 
 === Association specific declaration
 
-  papermill :my_association, my_option_hash             # in your papermilled assetable model
-  assets_upload(:my_association, my_option_hash)  # form helper call
-  @assetable.my_association                             # data access in your view
+  papermill :my_association, my_option_hash               # in your papermilled assetable model
+  assets_upload(:my_association, my_option_hash)          # form helper call
+  @assetable.my_association                               # data access in your view
 
 
-In both case, you can specify a PapermillAsset subclass to use with :class_name => MyPapermillAssetSubclass in the option hash
-You can have a catch-all declaration and as many specific association as you want in your model (as long as they use different keys)
+In both case, you can specify a PapermillAsset subclass to use with :class_name => MyPapermillAssetSubclass in the option hash.
+
+You can have a catch-all declaration and as many specific association as you want in your model (as long as they use different keys).
+
 It's up to you. You can use the first one only, the second only or both.
 
 See papermill_module.rb for the complete list of options.
@@ -42,12 +44,13 @@ See papermill_module.rb for the complete list of options.
 
 === Once you've installed the gem, generate a migration and copy a couple of static assets:
 
-  # copy static assets and generate a migration
-  $ ./script/generate papermill PapermillMigration
+  # Generate  the migration and migrate:
+  $ ./script/generate papermill_table PapermillMigration
   $ rake db:migrate
-
+  # copy some needed static assets to your public directory:
+  $ ./script/generate papermill_assets
+  
 === Then in environment.rb:
-
   
   ...
   

data/TODO.txt

@@ -1,2 +1,7 @@
 * non-regression tests
-* two migrations => assets & DB
+* use aliases in form helpers
+* doc&test about crop
+* better CSS for edit
+* reorganize edit with forms
+* use Jcrop
+* use Picnic API

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/app/controllers/papermill_controller.rb

@@ -3,7 +3,6 @@ class PapermillController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   def show
-    begin
       complete_id = (params[:id0] + params[:id1] + params[:id2]).to_i
       asset = PapermillAsset.find(complete_id)
       raise if asset.nil? || params[:style] == "original"
@@ -20,9 +19,6 @@ class PapermillController < ApplicationController
       else
         redirect_to asset.url
       end
-    rescue
-      render :text => t("not-processed", :scope => "papermill"), :status => "500"
-    end
   end
 
   def destroy

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

@@ -1 +1 @@
-<%= link_to(raw_asset.name, raw_asset.url, :class => "name") -%>
+<%= link_to(raw_asset.name, edit_papermill_url(asset), :class => "name") -%>

data/config/locales/papermill.yml

@@ -5,7 +5,7 @@ en:
     not-deleted: "'{{ressource}}' could not be deleted"
     not-found: "Asset #{{ressource}} not found"
     edit-title: "Double-click to edit '{{ressource}}'"
-    thumbnail-edit-title: "Double-click to edit '{{ressource}}'"
+    thumbnail-edit-title: "Click to edit '{{ressource}}'"
     upload-button-wording: "Upload..."
     delete: "Remove {{ressource}}"
     delete-confirmation: "Delete '{{resource}}'?"
@@ -36,7 +36,7 @@ fr:
     not-deleted: "{{ressource}} n'a pas pu être supprimée"
     not-found: "Asset #{{ressource}} non trouvé"
     edit-title: "Double-cliquer pour éditer '{{ressource}}'"
-    thumbnail-edit-title: "Double-cliquer pour éditer '{{ressource}}'"
+    thumbnail-edit-title: "Cliquer pour éditer '{{ressource}}'"
     upload-button-wording: "Charger.."
     delete: "Supprimer {{ressource}}"
     delete-confirmation: "Êtes-vous sûr de vouloir supprimer '{{resource}}' ?"

data/generators/papermill_assets/USAGE

@@ -0,0 +1,4 @@
+script/generate papermill_assets
+  
+This will copy Papermill needed assets to public/papermill/
+The old public/papermill directory will be deleted if present!

data/generators/papermill_assets/papermill_assets_generator.rb

@@ -0,0 +1,15 @@
+class PapermillAssetsGenerator < Rails::Generator::Base
+  def initialize(args, options = {})
+  end
+  
+  def manifest
+    puts "Moving papermill assets to your public directory..."
+    FileUtils.rm_rf("#{File.join(RAILS_ROOT)}/public/papermill/")
+    FileUtils.cp_r(
+      Dir[File.join(File.dirname(__FILE__), '../../public')],
+      File.join(RAILS_ROOT)
+      )
+    puts "Done! Check public/papermill/ for result."
+    exit
+  end 
+end

data/generators/papermill_table/USAGE

@@ -0,0 +1,3 @@
+script/generate papermill_table PapermillMigration
+  
+This will create the Papermill table migration file!

data/generators/{papermill/papermill_generator.rb → papermill_table/papermill_table_generator.rb}

@@ -1,4 +1,4 @@
-class PapermillGenerator < Rails::Generator::NamedBase
+class PapermillTableGenerator < Rails::Generator::NamedBase
   attr_accessor :class_name, :migration_name
   
   def initialize(args, options = {})
@@ -8,7 +8,8 @@ class PapermillGenerator < Rails::Generator::NamedBase
   
   def manifest
     @migration_name = file_name.camelize
-    FileUtils.rm_rf('../../public/papermill/')
+    
+    FileUtils.rm_rf("#{File.join(RAILS_ROOT)}/public/papermill/")
     FileUtils.cp_r(
       Dir[File.join(File.dirname(__FILE__), '../../public')],
       File.join(RAILS_ROOT),

data/installation-template.txt

@@ -1,6 +1,7 @@
 gem 'papermill'
 
-generate :papermill, "PapermillMigration"
+generate :papermill_table, "PapermillMigration"
+generate :papermill_assets
 generate :scaffold, "article title:string"
 rake "db:migrate"
 

data/lib/core_extensions.rb

@@ -20,7 +20,7 @@ module StringExtensions
 end
 module StringToUrlNotFound
   def to_url
-    gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "")
+    gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "").downcase
   end
 end
 module ObjectExtensions

data/lib/papermill/papermill_asset.rb

@@ -8,8 +8,8 @@ class PapermillAsset < ActiveRecord::Base
   belongs_to :assetable, :polymorphic => true
   before_destroy :destroy_files
 
-  Paperclip::Attachment.interpolations[:escaped_basename] = proc do |attachment, style|
-    Paperclip::Attachment.interpolations[:basename].call(attachment, style).to_url
+  Paperclip.interpolates[:escaped_basename] = proc do |attachment, style|
+    Paperclip.interpolates[:basename].call(attachment, style).to_url
   end
   
   has_attached_file :file,

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.11.0"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
-  s.date = %q{2009-10-04}
+  s.date = %q{2009-10-06}
   s.description = %q{Paperclip Swfupload UploadHelper wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -29,9 +29,11 @@ Gem::Specification.new do |s|
      "app/views/papermill/edit.html.erb",
      "config/locales/papermill.yml",
      "config/routes.rb",
-     "generators/papermill/USAGE",
-     "generators/papermill/papermill_generator.rb",
-     "generators/papermill/templates/migrate/papermill_migration.rb.erb",
+     "generators/papermill_assets/USAGE",
+     "generators/papermill_assets/papermill_assets_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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 +02:00
+date: 2009-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,9 +64,11 @@ files:
 - app/views/papermill/edit.html.erb
 - config/locales/papermill.yml
 - config/routes.rb
-- generators/papermill/USAGE
-- generators/papermill/papermill_generator.rb
-- generators/papermill/templates/migrate/papermill_migration.rb.erb
+- generators/papermill_assets/USAGE
+- generators/papermill_assets/papermill_assets_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

data/generators/papermill/USAGE

@@ -1,3 +0,0 @@
-script/generate papermill MyMigrationName
-  
-This will create the migration table, copy assets to public/papermill