ripta-dm-paperclip 2.5.1 → 2.6.1

data/README.markdown

@@ -1,6 +1,10 @@
 # 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.
+**Compatibility note:**
+
+* dm-paperclip v2.5.0 requires datamapper (dm-core) v1.0
+* dm-paperclip v2.5.1 requires dm-core v1.1
+* dm-paperclip v2.6.x requires dm-core v1.2; it was tested on ruby 1.9.3
 
 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.

data/lib/dm-paperclip/processor.rb

@@ -42,6 +42,7 @@ module Paperclip
   class Tempfile < ::Tempfile
     # Replaces Tempfile's +make_tmpname+ with one that honors file extensions.
     def make_tmpname(basename, n)
+      n ||= 0
       extension = File.extname(basename)
       sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n, extension)
     end

data/lib/dm-paperclip/validations.rb

@@ -10,19 +10,17 @@ module Paperclip
       # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
       # * +message+: error message to display, use :min and :max as replacements
       def validates_attachment_size(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, Paperclip::Validate::SizeValidator)
+        validators.add(Paperclip::Validate::SizeValidator, *fields)
       end
 
       # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
-      def validates_attachment_thumbnails name, options = {}
+      def validates_attachment_thumbnails(name, options = {})
         self.attachment_definitions[name][:whiny_thumbnails] = true
       end
 
       # Places ActiveRecord-style validations on the presence of a file.
       def validates_attachment_presence(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, Paperclip::Validate::RequiredFieldValidator)
+        validators.add(Paperclip::Validate::RequiredFieldValidator, *fields)
       end
 
       # Places ActiveRecord-style validations on the content type of the file assigned. The
@@ -30,18 +28,12 @@ module Paperclip
       # * +content_type+: Allowed content types.  Can be a single content type or an array.  Allows all by default.
       # * +message+: The message to display when the uploaded file has an invalid content type.
       def validates_attachment_content_type(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, Paperclip::Validate::ContentTypeValidator)
+        validators.add(Paperclip::Validate::ContentTypeValidator, *fields)
       end
 
     end
 
     class SizeValidator < DataMapper::Validate::GenericValidator #:nodoc:
-      def initialize(field_name, options={})
-        super
-        @field_name, @options = field_name, options
-      end
-
       def call(target)
         field_value = target.validation_property_value(:"#{@field_name}_file_size")
         return true if field_value.nil?
@@ -60,11 +52,6 @@ module Paperclip
     end
 
     class RequiredFieldValidator < DataMapper::Validate::GenericValidator #:nodoc:
-      def initialize(field_name, options={})
-        super
-        @field_name, @options = field_name, options
-      end
-
       def call(target)
         field_value = target.validation_property_value(@field_name)
         if field_value.nil? || field_value.original_filename.blank?
@@ -77,11 +64,6 @@ module Paperclip
     end
 
     class ContentTypeValidator < DataMapper::Validate::GenericValidator #:nodoc:
-      def initialize(field_name, options={})
-        super
-        @field_name, @options = field_name, options
-      end
-
       def call(target)
         valid_types = [@options[:content_type]].flatten
         field_value = target.validation_property_value(@field_name)
@@ -103,11 +85,6 @@ module Paperclip
     end
 
     class CopyAttachmentErrors < DataMapper::Validate::GenericValidator #:nodoc:
-      def initialize(field_name, options={})
-        super
-        @field_name, @options = field_name, options
-      end
-
       def call(target)
         field_value = target.validation_property_value(@field_name)
         unless field_value.nil? || field_value.original_filename.blank?

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.1"
+  VERSION = "2.6.1"
 
   # To configure Paperclip, put this code in an initializer, Rake task, or wherever:
   #
@@ -326,7 +326,7 @@ module Paperclip
       end
 
       if Paperclip.config.use_dm_validations
-        add_validator_to_context(opts_from_validator_args([name]), [name], Paperclip::Validate::CopyAttachmentErrors)
+        validators.add(Paperclip::Validate::CopyAttachmentErrors, name)
       end
 
     end

data/test/attachment_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.dirname(__FILE__) + '/helper'
 
 class Dummy
   # This is a dummy class

data/test/integration_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper.rb'
+require File.dirname(__FILE__) + '/helper'
 
 class IntegrationTest < Test::Unit::TestCase
   context "Many models at once" do

data/test/iostream_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.dirname(__FILE__) + '/helper'
 
 class IOStreamTest < Test::Unit::TestCase
   context "IOStream" do

data/test/paperclip_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper.rb'
+require File.dirname(__FILE__) + '/helper'
 
 class PaperclipTest < Test::Unit::TestCase
   context "A DataMapper model with an 'avatar' attachment" do

data/test/storage_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.dirname(__FILE__) + '/helper'
 require 'aws/s3'
 
 class StorageTest < Test::Unit::TestCase

metadata

@@ -1,33 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ripta-dm-paperclip
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 2.6.1
   prerelease: 
-  segments: 
-  - 2
-  - 5
-  - 1
-  version: 2.5.1
 platform: ruby
-authors: 
+authors:
 - Ken Robertson
+- Ripta Pasay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-06 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: ken@invalidlogic.com
+email:
+- ken@invalidlogic.com
+- github@r8y.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - LICENSE
 - Rakefile
@@ -49,7 +106,6 @@ 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
@@ -58,41 +114,33 @@ files:
 - test/paperclip_test.rb
 - test/storage_test.rb
 - test/thumbnail_test.rb
-has_rdoc: true
-homepage: http://invalidlogic.com/dm-paperclip/
+homepage: http://github.com/ripta/dm-paperclip
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - ImageMagick
-- data_mapper
 rubyforge_project: dm-paperclip
-rubygems_version: 1.6.2
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
-summary: File attachments as attributes for DataMapper, based on the original Paperclip by Jon Yurek at Thoughtbot
+summary: File attachments as attributes for DataMapper 1.1, based on the original
+  Paperclip by Jon Yurek at Thoughtbot; updated for ruby 1.9 and rails 3.2
 test_files: []
-
+has_rdoc: 

data/test/fixtures/s3.yml

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