ripta-dm-paperclip 2.5.0.2 → 2.5.1

data/README.markdown

@@ -0,0 +1,118 @@
+# DataMapper Paperclip
+
+**Compatibility note:** dm-paperclip 2.5.0 requires datamapper (dm-core) 1.0, while dm-paperclip 2.5.1 requires dm-core 1.1.
+
+dm-paperclip is a port of Thoughtbot's Paperclip plugin to work with DataMapper. This plugin is fully compatible with
+the original ActiveRecord-oriented Paperclip.  You could take an existing ActiveRecord database and use it with DataMapper.
+The module also includes updates validation handling and automatic including of the necessary 'property' fields into
+your model.
+
+To use it within your models, you need to ensure the three database fields are included.  They are `{name}_file_name`,
+`{name}_content_type`, and `{name}_file_size`.  The first two are strings, the final column (file size) is an integer. So
+if your user model has an avatar field, then you would add `avatar_file_name`, `avatar_content_type`, and `avatar_file_size`.
+
+As with the original Paperclip plugin, it allows processing of thumbnails at the time the record is saved though _ImageMagick_.
+It processes the thumbnails through the command-line applications instead of using _RMagick_.
+
+See the documentation for the `has_attached_file` method for options.
+
+## Code
+
+The code dm-paperclip is available at Github:
+
+    git clone git://github.com/krobertson/dm-paperclip.git
+
+It is regularly updated to keep in sync with the latest from Thoughtbot.
+
+Releases are tagged within the repository and versioned the same as the original model.  You can also get the latest release
+packaged as a gem through Rubyforge:
+
+    sudo gem install dm-paperclip
+
+## Usage
+
+In your model:
+
+    class User
+      include DataMapper::Resource
+      include Paperclip::Resource
+      property :id, Serial
+      property :username, String
+      has_attached_file :avatar,
+                        :styles => { :medium => "300x300>",
+                                     :thumb => "100x100>" }
+    end
+
+You will need to add an initializer to configure Paperclip.  If on Rails, can add a config/initializers/paperclip.rb, on Merb
+can use config/init.rb and add it to the Merb::BootLoader.after_app_loads section.  Can also use environment configs, rackup
+file, Rake task, wherever.
+
+    Paperclip.configure do |config|
+      config.root               = Rails.root # the application root to anchor relative urls (defaults to Dir.pwd)
+      config.env                = Rails.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
+      config.use_dm_validations = true       # validate attachment sizes and such, defaults to false
+      config.processors_path    = 'lib/pc'   # relative path to look for processors, defaults to 'lib/paperclip_processors'
+    end
+
+Your database will need to add four columns, `avatar_file_name` (varchar), `avatar_content_type` (varchar), and
+`avatar_file_size` (integer), and `avatar_updated_at` (datetime).  You can either add these manually, auto-
+migrate, or use the following migration:
+
+    migration( 1, :add_user_paperclip_fields ) do
+    up do
+        modify_table :users do
+          add_column :avatar_file_name, "varchar(255)"
+          add_column :avatar_content_type, "varchar(255)"
+          add_column :avatar_file_size, "integer"
+          add_column :avatar_updated_at, "datetime"
+        end
+      end
+      down do
+        modify_table :users do
+          drop_columns :avatar_file_name, :avatar_content_type, :avatar_file_size, :avatar_updated_at
+        end
+      end
+    end
+
+In your edit and new views:
+
+    <% form_for @user, { :action => url(:user), :multipart => true } do %>
+      <%= file_field :name => 'avatar' %>
+    <% end %>
+
+In your controller:
+
+    def create
+      ...
+      @user.avatar = params[:avatar]
+    end
+
+In your show view:
+
+    <%= image_tag @user.avatar.url %>
+    <%= image_tag @user.avatar.url(:medium) %>
+    <%= image_tag @user.avatar.url(:thumb) %>
+
+The following validations are available:
+
+    validates_attachment_presence :avatar
+    validates_attachment_content_type :avatar, :content_type => "image/png"
+    validates_attachment_size :avatar, :in => 1..10240
+    validates_attachment_thumbnails :avatar
+
+In order to use validations, you must have loaded the 'dm-validations' gem into your app
+(available as a part of dm-more).  If the gem isn't loaded before DM-Paperclip is loaded,
+the validation methods will be excluded.  You will also need to include DataMapper::Validate
+into your mode:
+
+    class User
+      include DataMapper::Resource
+      include DataMapper::Validate
+      include Paperclip::Resource
+      property :id, Serial
+      property :username, String
+      has_attached_file :avatar,
+                        :styles => { :medium => "300x300>",
+                                     :thumb => "100x100>" }
+      validates_attachment_size :avatar, :in => 1..5120
+    end

data/Rakefile

@@ -34,7 +34,7 @@ Rake::RDocTask.new(:doc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = 'DM-Paperclip'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.markdown')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
  
@@ -63,7 +63,7 @@ spec = Gem::Specification.new do |s|
   s.homepage          = "http://invalidlogic.com/dm-paperclip/"
   s.platform          = Gem::Platform::RUBY
   s.summary           = "File attachments as attributes for DataMapper, based on the original Paperclip by Jon Yurek at Thoughtbot"
-  s.files             = FileList["README.rdoc",
+  s.files             = FileList["README.markdown",
                                  "LICENSE",
                                  "Rakefile",
                                  "init.rb",
@@ -72,7 +72,7 @@ spec = Gem::Specification.new do |s|
   s.test_files        = FileList["test/**/test_*.rb"].to_a
   s.rubyforge_project = "dm-paperclip"
   s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README.rdoc"]
+  s.extra_rdoc_files  = ["README.markdown"]
   s.rdoc_options << '--line-numbers' << '--inline-source'
   s.requirements << "ImageMagick"
   s.requirements << "data_mapper"

data/lib/dm-paperclip/attachment.rb

@@ -77,7 +77,7 @@ module Paperclip
       return nil if uploaded_file.nil?
 
       if uploaded_file.respond_to?(:[])
-        uploaded_file = uploaded_file.to_mash
+        # uploaded_file = uploaded_file.to_mash
         
         @queued_for_write[:original]   = uploaded_file['tempfile']
         instance_write(:file_name,       uploaded_file['filename'].strip.gsub(/[^\w\d\.\-]+/, '_'))
@@ -85,7 +85,7 @@ module Paperclip
         instance_write(:file_size,       uploaded_file['size'] ? uploaded_file['size'].to_i : uploaded_file['tempfile'].size.to_i)
         instance_write(:updated_at,      Time.now)
       else
-        @queued_for_write[:original]   = uploaded_file.tempfile
+        @queued_for_write[:original]   = uploaded_file.to_tempfile
         instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'))
         instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
         instance_write(:file_size,       uploaded_file.size.to_i)

data/lib/dm-paperclip/storage.rb

@@ -172,15 +172,15 @@ module Paperclip
       end
 
       def parse_credentials creds
-        creds = find_credentials(creds).to_mash.stringify_keys!
+        creds = find_credentials(creds).to_hash.stringify_keys
         if defined? Merb && Merb.respond_to?(:env)
-          (creds[Merb.env] || creds).symbolize_keys
+          (creds[Merb.env.to_s] || creds).symbolize_keys
         elsif defined? RAILS_ENV
-          (creds[RAILS_ENV] || creds).symbolize_keys
+          (creds[RAILS_ENV.to_s] || creds).symbolize_keys
         elsif defined? Rails && Rails.respond_to(:env)
-          (creds[Rails.env] || creds).symbolize_keys
+          (creds[Rails.env.to_s] || creds).symbolize_keys
         elsif defined? RACK_ENV
-          (creds[RACK_ENV] || creds).symbolize_keys
+          (creds[RACK_ENV.to_s] || creds).symbolize_keys
         else
           creds.symbolize_keys
         end

data/lib/dm-paperclip/validations.rb

@@ -51,9 +51,9 @@ module Paperclip
         return true if @options[:in].include? field_value.to_i
 
         error_message ||= @options[:message] unless @options[:message].nil?
-        error_message ||= "%s must be less than %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:less_than]) unless @options[:less_than].nil?
-        error_message ||= "%s must be greater than %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:greater_than]) unless @options[:greater_than].nil?
-        error_message ||= "%s must be between %s and %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:in].first, @options[:in].last)
+        error_message ||= sprintf("%s must be less than %s bytes", @field_name.to_s.humanize, @options[:less_than]) unless @options[:less_than].nil?
+        error_message ||= sprintf("%s must be greater than %s bytes", @field_name.to_s.humanize, @options[:greater_than]) unless @options[:greater_than].nil?
+        error_message ||= sprintf("%s must be between %s and %s bytes", @field_name.to_s.humanize, @options[:in].first, @options[:in].last)
         add_error(target, error_message , @field_name)
         return false
       end
@@ -68,7 +68,7 @@ module Paperclip
       def call(target)
         field_value = target.validation_property_value(@field_name)
         if field_value.nil? || field_value.original_filename.blank?
-          error_message = @options[:message] || "%s must be set".t(ActiveSupport::Inflector.humanize(@field_name))
+          error_message = @options[:message] || sprintf("%s must be set", @field_name.to_s.humanize)
           add_error(target, error_message , @field_name)
           return false
         end
@@ -91,7 +91,7 @@ module Paperclip
             content_type = target.validation_property_value(:"#{@field_name}_content_type")
             unless valid_types.any?{|t| t === content_type }
               error_message ||= @options[:message] unless @options[:message].nil?
-              error_message ||= "%s's content type of '%s' is not a valid content type".t(ActiveSupport::Inflector.humanize(@field_name), content_type)
+              error_message ||= sprintf("%s's content type of '%s' is not a valid content type", @field_name.to_s.humanize, content_type)
               add_error(target, error_message , @field_name)
               return false
             end

data/lib/dm-paperclip.rb

@@ -43,7 +43,7 @@ require 'dm-paperclip/attachment'
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.5.0.1"
+  VERSION = "2.5.1"
 
   # To configure Paperclip, put this code in an initializer, Rake task, or wherever:
   #
@@ -170,7 +170,7 @@ module Paperclip
     end
 
     def processor name #:nodoc:
-      name = name.to_s.camel_case
+      name = name.to_s.camelize
       processor = Paperclip.const_get(name)
       unless processor.ancestors.include?(Paperclip::Processor)
         raise PaperclipError.new("[paperclip] Processor #{name} was not found")

data/test/fixtures/s3.yml

@@ -0,0 +1,8 @@
+development:
+  key: 54321
+production:
+  key: 12345
+test:
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

data/test/helper.rb

@@ -8,7 +8,11 @@ require 'shoulda'
 require 'mocha'
 require 'tempfile'
 
-require 'extlib'
+if ENV['EXTLIB']
+  require 'extlib'
+else
+  require 'active_support/all'
+end
 require 'dm-core'
 require 'dm-validations'
 require 'dm-migrations'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ripta-dm-paperclip
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  - 2
-  version: 2.5.0.2
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ken Robertson
@@ -16,69 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -05:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
+dependencies: []
+
 description: 
 email: ken@invalidlogic.com
 executables: []
@@ -86,9 +26,9 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.markdown
 files: 
-- README.rdoc
+- README.markdown
 - LICENSE
 - Rakefile
 - init.rb
@@ -109,6 +49,7 @@ files:
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
 - test/fixtures/bad.png
+- test/fixtures/s3.yml
 - test/fixtures/text.txt
 - test/geometry_test.rb
 - test/helper.rb
@@ -118,7 +59,7 @@ files:
 - test/storage_test.rb
 - test/thumbnail_test.rb
 has_rdoc: true
-homepage: http://github.com/krobertson/dm-paperclip
+homepage: http://invalidlogic.com/dm-paperclip/
 licenses: []
 
 post_install_message: 
@@ -147,8 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - ImageMagick
+- data_mapper
 rubyforge_project: dm-paperclip
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for DataMapper, based on the original Paperclip by Jon Yurek at Thoughtbot

data/README.rdoc

@@ -1,116 +0,0 @@
-=DataMapper Paperclip
-
-DM-Paperclip is a port of Thoughtbot's Paperclip plugin to work with DataMapper.  This plugin is fully compatible with
-the original ActiveRecord-oriented Paperclip.  You could take an existing ActiveRecord database and use it with DataMapper.
-The module also includes updates validation handling and automatic including of the necessary 'property' fields into
-your model.
-
-To use it within your models, you need to ensure the three database fields are included.  They are {name}_file_name,
-{name}_content_type, and {name}_file_size.  The first two are strings, the final _file_size column is an integer. So
-if your user model has an avatar field, then you would add avatar_file_name, avatar_content_type, and avatar_file_size.
-
-As with the original Paperclip plugin, it allows processing of thumbnails at the time the record is saved though ImageMagick.
-It processes the thumbnails through the command-line applications instead of using RMagick.
-
-See the documentation for the +has_attached_file+ method for options.
-
-==Code
-
-The code DM-Paperclip is available at Github:
-
-  git clone git://github.com/krobertson/dm-paperclip.git
-
-It is regularly updated to keep in sync with the latest from Thoughtbot.
-
-Releases are tagged within the repository and versioned the same as the original model.  You can also get the latest release
-packaged as a gem through Rubyforge:
-
-  sudo gem install dm-paperclip
-
-==Usage
-
-In your model:
-
-  class User
-    include DataMapper::Resource
-    include Paperclip::Resource
-    property :id, Serial
-    property :username, String
-    has_attached_file :avatar,
-                      :styles => { :medium => "300x300>",
-                                   :thumb => "100x100>" }
-  end
-
-You will need to add an initializer to configure Paperclip.  If on Rails, can add a config/initializers/paperclip.rb, on Merb
-can use config/init.rb and add it to the Merb::BootLoader.after_app_loads section.  Can also use environment configs, rackup
-file, Rake task, wherever.
-
-  Paperclip.configure do |config|
-    config.root               = Rails.root # the application root to anchor relative urls (defaults to Dir.pwd)
-    config.env                = Rails.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
-    config.use_dm_validations = true       # validate attachment sizes and such, defaults to false
-    config.processors_path    = 'lib/pc'   # relative path to look for processors, defaults to 'lib/paperclip_processors'
-  end
-
-Your database will need to add four columns, avatar_file_name (varchar), avatar_content_type (varchar), and
-avatar_file_size (integer), and avatar_updated_at (datetime).  You can either add these manually, auto-
-migrate, or use the following migration:
-
-  migration( 1, :add_user_paperclip_fields ) do
-  up do
-      modify_table :users do
-        add_column :avatar_file_name, "varchar(255)"
-        add_column :avatar_content_type, "varchar(255)"
-        add_column :avatar_file_size, "integer"
-        add_column :avatar_updated_at, "datetime"
-      end
-    end
-    down do
-      modify_table :users do
-        drop_columns :avatar_file_name, :avatar_content_type, :avatar_file_size, :avatar_updated_at
-      end
-    end
-  end
-
-In your edit and new views:
-
-  <% form_for @user, { :action => url(:user), :multipart => true } do %>
-    <%= file_field :name => 'avatar' %>
-  <% end %>
-
-In your controller:
-
-  def create
-    ...
-    @user.avatar = params[:avatar]
-  end
-
-In your show view:
-
-  <%= image_tag @user.avatar.url %>
-  <%= image_tag @user.avatar.url(:medium) %>
-  <%= image_tag @user.avatar.url(:thumb) %>
-
-The following validations are available:
-
-  validates_attachment_presence :avatar
-  validates_attachment_content_type :avatar, :content_type => "image/png"
-  validates_attachment_size :avatar, :in => 1..10240
-  validates_attachment_thumbnails :avatar
-
-In order to use validations, you must have loaded the 'dm-validations' gem into your app
-(available as a part of dm-more).  If the gem isn't loaded before DM-Paperclip is loaded,
-the validation methods will be excluded.  You will also need to include DataMapper::Validate
-into your mode:
-
-  class User
-    include DataMapper::Resource
-    include DataMapper::Validate
-    include Paperclip::Resource
-    property :id, Serial
-    property :username, String
-    has_attached_file :avatar,
-                      :styles => { :medium => "300x300>",
-                                   :thumb => "100x100>" }
-    validates_attachment_size :avatar, :in => 1..5120
-  end