papermill 0.10.0 → 0.10.1

data/README.rdoc

@@ -45,42 +45,45 @@ See papermill_module.rb for the complete list of options.
 
 === Then in environment.rb:
 
-  config.gem papermill
   
-=== You can also modify a couple of default options that will be available application-wide :
-  
-  Papermill::OPTIONS = {
-    :thumbnail => {
-      :width => 150,
-      :height => 100
-    },
-    :aliases => {
-      :big => "500x500>"
-      :small => "100x100>"
-    },
-    :public_root => ":rails_root/public",         # already a default
-    :papermill_prefix => "system/papermill"       # already a default
-  }
-  # see lib/papermill/papermill_module.rb for more options.
+  ...
   
+  Rails::Initializer.run do |config|
+    ...
+    config.gem papermill
+    
+    # You can set options that will be set application-wide :
+    module Papermill
+      OPTIONS = {
+        :thumbnail => {
+          :width => 150,
+          :height => 100
+        },
+        :aliases => {
+          :big => "500x500>"
+          :small => "100x100>"
+        },
+        :public_root => ":rails_root/public",         # already a default
+        :papermill_prefix => "system/papermill"       # already a default
+      }
+    end
+    # see lib/papermill/papermill_module.rb
+    ...
+  end
+    
 === In your assetable model:
   
   # You can set a catch-all papermill association : 
   papermill :class_name => MyAssetClass
   
   # or create an association for the specific :my_gallery key
-  papermill :my_gallery_assets,
-    :class_name => MyGalleryAsset,
-    :thumbnail => {
-        :width => 90,
-        :height => 30
-    }
+  papermill :my_gallery_assets, :class_name => MyGalleryAsset
 
 === In your layout:
 
   <%= papermill_stylesheet_tag %>
   <%= papermill_javascript_tag :with_jquery => "no_conflict" %>
-  # you won't need :with_jquery if you have already loaded it.
+  # you won't need :with_jquery if you have it already.
   
 === In your edit form: 
 
@@ -103,7 +106,7 @@ See papermill_module.rb for the complete list of options.
   # equivalent to:
   @assetable.assets(:my_other_asset).first.try(:url)
 
-Also see http://github.com/bbenezech/papermill/raw/master/installation-template.txt for more precises installation steps.
+Also see http://github.com/bbenezech/papermill/raw/master/installation-template.txt
 Have a look at the API here http://rdoc.info/projects/BBenezech/papermill
 
 === Translations:

data/Rakefile

@@ -33,7 +33,6 @@ begin
     gemspec.authors = ["Benoit Bénézech"]
     gemspec.add_dependency('paperclip', '>= 2.1.2')
     gemspec.add_dependency('mime-types', '>= 1.16')
-    gemspec.add_dependency('stringex', '>= 1.0.0')
     gemspec.add_dependency('acts_as_list', '>= 0.1.2')
   end
 rescue LoadError

data/TODO.txt

@@ -1,3 +1,2 @@
 * non-regression tests
 * two migrations => assets & DB
-* auto-download of last release of JS dependencies (swfupload.js, his flash, and jQuery)

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

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

@@ -10,8 +10,8 @@
       <p><%= I18n.t("content_type", :scope => 'papermill') %><span><%= @asset.content_type.join('/') %></span></p>
       <p><%= I18n.t("size", :scope => 'papermill') %><span><%= number_to_human_size(@asset.size.to_i) %></span></p>
       <% if @asset.image? %>
-        <p><%= I18n.t("width", :scope => 'papermill') %><span><%= @asset.width %>px</span></p>
-        <p><%= I18n.t("height", :scope => 'papermill') %><span><%= @asset.height %>px</span></p>
+        <p><%= I18n.t("width", :scope => 'papermill') %><span><%= @asset.width.to_i %>px</span></p>
+        <p><%= I18n.t("height", :scope => 'papermill') %><span><%= @asset.height.to_i %>px</span></p>
       <% end %>
       <p><%= I18n.t("created_at", :scope => 'papermill') %><span><%= I18n.l(@asset.created_at) %></span></p>
       <p><%= I18n.t("updated_at", :scope => 'papermill') %><span><%= I18n.l(@asset.updated_at) %></span></p>

data/lib/core_extensions.rb

@@ -18,10 +18,14 @@ module StringExtensions
     gsub(/\\/, '\&\&').gsub(/'/, "''")
   end
 end
-
+module StringToUrlNotFound
+  def to_url
+    gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "")
+  end
+end
 module ObjectExtensions
   # Nil if empty.
   def nie
     self.blank? ? nil : self
   end
-end
+end

data/lib/papermill.rb

@@ -2,9 +2,7 @@ require 'core_extensions'
 Object.send :include, ObjectExtensions
 Hash.send :include, HashExtensions
 String.send :include, StringExtensions
-
-I18n.load_path = [File.join(File.dirname(__FILE__), "../config/locales/papermill.yml")] + I18n.load_path
-
+String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
 require 'papermill/papermill_module'
 require 'papermill/papermill_asset'
 require 'papermill/form_builder'

data/lib/papermill/form_builder.rb

@@ -89,7 +89,7 @@ module ActionView::Helpers::FormTagHelper
     conditions.merge!({:assetable_key => key.to_s}) if key
     collection = asset_class.find(:all, :conditions => conditions, :order => "position")
     
-    html << %{<div style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
+    html << %{<div id="#{id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
     html << @template.content_tag(:ul, :id => id, :class => "papermill #{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
       @template.render :partial => "papermill/asset", :collection => collection, :locals => { :thumbnail_style => (options[:thumbnail] && options[:thumbnail][:style]) }
     }

data/lib/papermill/papermill_asset.rb

@@ -1,4 +1,3 @@
-require 'stringex'
 require 'paperclip'
 require 'mime/types'
 require 'acts_as_list'

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.10.0"
+  s.version = "0.10.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-24}
+  s.date = %q{2009-09-29}
   s.description = %q{Paperclip Swfupload UploadHelper wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -74,18 +74,15 @@ Gem::Specification.new do |s|
     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<mime-types>, [">= 1.16"])
-      s.add_runtime_dependency(%q<stringex>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<acts_as_list>, [">= 0.1.2"])
     else
       s.add_dependency(%q<paperclip>, [">= 2.1.2"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
-      s.add_dependency(%q<stringex>, [">= 1.0.0"])
       s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
     end
   else
     s.add_dependency(%q<paperclip>, [">= 2.1.2"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
-    s.add_dependency(%q<stringex>, [">= 1.0.0"])
     s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 +02:00
+date: 2009-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.16"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: stringex
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
   type: :runtime