Permalink
Browse files

Merge branch 'master' of https://github.com/bunnymatic/dm-paperclip

  • Loading branch information...
2 parents 022e1b2 + 8af87f0 commit 09f35430830ac16a686f847607b04eaef51a43ab Andrew Kolesnikov committed Jul 6, 2011
View
@@ -0,0 +1,10 @@
+source :rubygems
+gem 'datamapper'
+gem 'extlib'
+
+group :test do
+ gem 'aws-s3'
+ gem "dm-sqlite-adapter"
+ gem 'shoulda'
+ gem 'mocha'
+end
View
@@ -0,0 +1,75 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ addressable (2.2.6)
+ aws-s3 (0.6.2)
+ builder
+ mime-types
+ xml-simple
+ bcrypt-ruby (2.1.4)
+ builder (3.0.0)
+ data_objects (0.10.6)
+ addressable (~> 2.1)
+ datamapper (1.1.0)
+ dm-aggregates (= 1.1.0)
+ dm-constraints (= 1.1.0)
+ dm-core (= 1.1.0)
+ dm-migrations (= 1.1.0)
+ dm-serializer (= 1.1.0)
+ dm-timestamps (= 1.1.0)
+ dm-transactions (= 1.1.0)
+ dm-types (= 1.1.0)
+ dm-validations (= 1.1.0)
+ dm-aggregates (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-constraints (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-core (1.1.0)
+ addressable (~> 2.2.4)
+ dm-do-adapter (1.1.0)
+ data_objects (~> 0.10.2)
+ dm-core (~> 1.1.0)
+ dm-migrations (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-serializer (1.1.0)
+ dm-core (~> 1.1.0)
+ fastercsv (~> 1.5.4)
+ json (~> 1.4.6)
+ dm-sqlite-adapter (1.1.0)
+ dm-do-adapter (~> 1.1.0)
+ do_sqlite3 (~> 0.10.2)
+ dm-timestamps (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-transactions (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-types (1.1.0)
+ bcrypt-ruby (~> 2.1.4)
+ dm-core (~> 1.1.0)
+ fastercsv (~> 1.5.4)
+ json (~> 1.4.6)
+ stringex (~> 1.2.0)
+ uuidtools (~> 2.1.2)
+ dm-validations (1.1.0)
+ dm-core (~> 1.1.0)
+ do_sqlite3 (0.10.6)
+ data_objects (= 0.10.6)
+ extlib (0.9.15)
+ fastercsv (1.5.4)
+ json (1.4.6)
+ mime-types (1.16)
+ mocha (0.9.12)
+ shoulda (2.11.3)
+ stringex (1.2.1)
+ uuidtools (2.1.2)
+ xml-simple (1.1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ aws-s3
+ datamapper
+ dm-sqlite-adapter
+ extlib
+ mocha
+ shoulda
@@ -2,15 +2,15 @@
Gem::Specification.new do |s|
s.name = %q{dm-paperclip}
- s.version = "2.4.1"
+ s.version = "2.4.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Ken Robertson"]
- s.date = %q{2010-04-21}
+ s.authors = ["Ken Robertson", "Mr Rogers"]
+ s.date = %q{2011-06-28}kk
s.email = %q{ken@invalidlogic.com}
s.extra_rdoc_files = ["README.rdoc"]
s.files = ["README.rdoc", "LICENSE", "Rakefile", "init.rb", "lib/dm-paperclip", "lib/dm-paperclip/attachment.rb", "lib/dm-paperclip/callback_compatability.rb", "lib/dm-paperclip/geometry.rb", "lib/dm-paperclip/interpolations.rb", "lib/dm-paperclip/iostream.rb", "lib/dm-paperclip/processor.rb", "lib/dm-paperclip/storage.rb", "lib/dm-paperclip/thumbnail.rb", "lib/dm-paperclip/upfile.rb", "lib/dm-paperclip/validations.rb", "lib/dm-paperclip.rb", "tasks/paperclip_tasks.rake", "test/attachment_test.rb", "test/fixtures", "test/fixtures/12k.png", "test/fixtures/50x50.png", "test/fixtures/5k.png", "test/fixtures/bad.png", "test/fixtures/text.txt", "test/geometry_test.rb", "test/helper.rb", "test/integration_test.rb", "test/iostream_test.rb", "test/paperclip_test.rb", "test/storage_test.rb", "test/thumbnail_test.rb"]
- s.homepage = %q{http://github.com/krobertson/dm-paperclip}
+ s.homepage = %q{http://github.com/bunnymatic/dm-paperclip}
s.rdoc_options = ["--line-numbers", "--inline-source"]
s.require_paths = ["lib"]
s.requirements = ["ImageMagick"]
@@ -43,7 +43,7 @@ class Tempfile < ::Tempfile
# Replaces Tempfile's +make_tmpname+ with one that honors file extensions.
def make_tmpname(basename, n)
extension = File.extname(basename)
- sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n, extension)
+ sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n.to_i, extension)
end
end
end
@@ -1,5 +1,4 @@
-require 'test/helper'
-
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
class Dummy
# This is a dummy class
end
@@ -2,7 +2,7 @@
require 'test/unit'
require 'shoulda'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb'))
class GeometryTest < Test::Unit::TestCase
context "Paperclip::Geometry" do
@@ -1,4 +1,4 @@
-require 'test/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
class IntegrationTest < Test::Unit::TestCase
context "Many models at once" do
@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
class IOStreamTest < Test::Unit::TestCase
include IOStream
@@ -69,4 +69,4 @@ class IOStreamTest < Test::Unit::TestCase
end
end
end
-end
+end
@@ -1,4 +1,4 @@
-require 'test/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
class PaperclipTest < Test::Unit::TestCase
context "A DataMapper model with an 'avatar' attachment" do
@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
require 'aws/s3'
class StorageTest < Test::Unit::TestCase
@@ -321,4 +321,4 @@ class StorageTest < Test::Unit::TestCase
end
end
end
-end
+end
@@ -4,8 +4,8 @@
require 'mocha'
require 'tempfile'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'thumbnail.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'thumbnail.rb'))
class ThumbnailTest < Test::Unit::TestCase

0 comments on commit 09f3543

Please sign in to comment.