BBenezech-papermill 0.4.0 → 0.4.1

data/README.rdoc

@@ -1,12 +1,32 @@
 = Papermill
 
-Asset management made easy.. Painfully easy. 
-Try the demo to see for yourself.
+Asset management made easy.. Painfully easy.
 
-See papermill_module.rb for a complete list of available options.
-These options can be application wide, for a class, or set at the last moment for the helper. 
+== Try the demo to get the idea: 
+  
+  rails -m http://gist.github.com/177714.txt papermill-example
+  
+== Papermill comes in 2 flavors:
+
+=== Generic catch-all declaration
+
+  papermill {my_option_hash}                             # in your papermilled assetable model
+  assets_upload(:my_key, {optional_option_hash})         # form helper call
+  @assetable.papermill_assets(:key => :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, {optional_option_hash})  # form helper call
+  @assetable.my_association                              # data access in your view
 
-You'll need something like this in your environment.rb
+In both case, you can specify a PapermillAsset subclass to use with :class_name => MyPapermillAssetSubclass in the option hash
+
+See papermill_module.rb for the complete list of options.
+
+== Installation
+
+=== You'll need something like this in your environment.rb:
   
   config.gem 'rsl-stringex', :lib => 'stringex', :source => 'http://gems.github.com'
   config.gem 'paperclip'
@@ -15,66 +35,64 @@ You'll need something like this in your environment.rb
   config.gem 'ryanb-acts-as-list', :lib => 'acts_as_list', :source => 'http://gems.github.com'
   config.gem 'BBenezech-papermill', :lib => 'papermill', :source => 'http://gems.github.com'
 
-Then install the whole thing:
+=== Then you can the whole thing:
   
-  sudo gem install ryanb-acts-as-list -s http://gems.github.com
-  sudo gem install paperclip
-  sudo rake gems:install # will install the others gem. You need to install paperclip & acts_as_list first, because of a dependency mayhem.
-  ./script/generate papermill PapermillMigration # will also copy a couple of static assets
-  rake db:migrate
+  $ sudo gem install ryanb-acts-as-list -s http://gems.github.com
+  $ sudo gem install paperclip
+  $ sudo rake gems:install
+  # will install the others gem.
+  # You need to install paperclip & acts_as_list first, because of a dependency mayhem.
+  # Next version of gem will use gem dependencies
+  $ ./script/generate papermill PapermillMigration
+  # will generate a migration named PapermillMigration and copy a couple of static assets
+  $ rake db:migrate
   
-In your assetable model:
-
-  papermill :assets
+=== In your assetable model:
+  
+  # You can set a catch-all papermill association : 
+  papermill {:class_name => Asset}
   
-In your layout:
+  # or create an association for the specific :my_gallery key
+  papermill :my_gallery, {
+    :class_name => GalleryAsset,
+    :thumbnail => {
+        :width => 90,
+        :height => 30
+    }
+  }
+
+=== In your layout:
 
   <%= papermill_stylesheet_tag %>
-  <%= papermill_javascript_tag :with_jquery => true %>
-  # you don't need :with_jquery if it is already loaded, obviously.
+  <%= papermill_javascript_tag :with_jquery => "no_conflict" %>
+  # you won't need :with_jquery if you use it already, obviously.
   
-In your edit form: 
+=== In your edit form: 
 
-  f.images_upload(:my_image_gallery)
-  f.image_upload(:header_image)
+  f.images_upload(:my_gallery)     # use specific papermill :my_gallery declaration
+  f.assets_upload(:my_assets)      # use catch-all
+  f.asset_upload(:my_other_asset)  # use catch-all
   
-Finally, in your views:
+=== Access them with:
   
-  # Some template image : 
-  <%= image_tag @article.assets(:header_image).first.url("800x>") %>
-  
-  # Some image gallery:
-  <ul>
-    <% @article.assets(:my_image_gallery).each do |image| %>
-      <li><%= link_to(image_tag(image.url("100x100>")), image.url) %></li>
-    <% end %>
-  </ul>
-
-Also see http://gist.github.com/177714.txt to get up-to-date installation steps.
-See the API here http://rdoc.info/projects/BBenezech/papermill
-
-== Word of caution:
-
-Beta.
-
-This is xNIX only (system("rm ...")).
-
-You'll need rails 2.3, since this is an engine. Anyway, copying the controller/view/routes to your project will make it work on an older version of rails.
+  @assetable.my_gallery.each{ |image| image.url("100x100") }
+  @assetable.papermill_assets(:key => :my_assets).each{ |asset| asset.url }
+  @assetable.papermill_assets(:key => :my_other_asset).first.url
 
-You'll need rails 2.2, since their are calls to I18n.t. But it shouldn't be too hard to work-around either. 
+Also see http://gist.github.com/177714.txt for more precises installation steps.
+Have a look at the API here http://rdoc.info/projects/BBenezech/papermill
 
-== Usage : 
+=== Translations:
 
-=== Demo : 
+Papermill is fully I18n-able.
+Copy config/locales/papermill.yml to your root config/locale folder to modify any wording in a any locale.
 
-You can use the custom template generator to get an example application up and running in no time. 
-  
-  rails -m http://gist.github.com/177714.txt papermill-example
 
-=== Translation:
+== Word of caution:
 
-Papermill is fully Rails 2.2 I18n-able.
+Beta. Wait for gem 1.0.0 for the production ready thing.
+This is xNIX only (system("rm ...")).
+Rails 2.3
 
-Copy config/locale/papermill.yml to your root config/locale folder to modify any wording in a any locale.
 
 Copyright (c) 2009 Benoit Bénézech, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/papermill/papermill_module.rb

@@ -107,11 +107,11 @@ module Papermill
       
       @papermill_associations ||= {}
       begin
-        asset_class = (class_name = options.delete(:class_name)).to_s.constantize || PapermillAsset
+        class_name = options.delete(:class_name)
+        asset_class = class_name && class_name.to_s.constantize || PapermillAsset
       rescue
         raise Exception.new("Papermill: can't find class #{class_name.to_s}.\n#{class_name.to_s} should be a subclass of PapermillAsset")
       end
-      assoc_name ||= asset_class.to_s.pluralize.underscore.to_sym
 
       @papermill_associations.merge!({assoc_name => {:class => asset_class, :options => Papermill::PAPERMILL_DEFAULTS.deep_merge(options)}})
       before_destroy :destroy_assets
@@ -120,14 +120,19 @@ module Papermill
       define_method assoc_name do |*options|
         klass = self.class.papermill_associations[assoc_name.to_sym][:class]
         options = options.first || {}
+        if (options.is_a?(Symbol) || options.is_a?(String))
+          key = options
+          options = {}
+        else
+          key = nil
+        end
         conditions = {
           :assetable_type => self.class.sti_name,
           :assetable_id => self.id
         }.merge(options.delete(:conditions) || {})
-        conditions.merge!({:type => klass.to_s}) unless assoc_name == PapermillAsset
-        conditions.merge!({:assetable_key => assoc_name.to_s}) if assoc_name != :papermill_assets
-        conditions.merge!({:assetable_key => options.delete(:key)}) if options.has_key?(:key)
-        conditions.merge!({:type => options[:class_name]}) if options[:class_name]
+        key ||= (assoc_name != :papermill_assets) && assoc_name.to_s
+        conditions.merge!({:assetable_key => key.to_s}) if key
+        
         hash = {
           :conditions => conditions, 
           :order => options.delete(:order) || "position ASC"

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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-09-01}
+  s.date = %q{2009-09-02}
   s.description = %q{Paperclip wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/BBenezech/papermill}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Paperclip wrapper}
   s.test_files = [
     "test/papermill_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BBenezech-papermill
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []