paperclip-aws 1.3.0 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +6 -4
- data/Gemfile.lock +8 -4
- data/README.md +2 -0
- data/Rakefile +1 -9
- data/VERSION +1 -1
- data/lib/paperclip-aws.rb +1 -1
- data/paperclip-aws.gemspec +7 -9
- data/test/aws_storage_test.rb +52 -0
- data/test/database.yml +3 -0
- data/test/debug.log +63 -0
- data/test/helper.rb +77 -0
- metadata +15 -33
data/Gemfile
CHANGED
@@ -2,11 +2,13 @@ source "http://rubygems.org"
|
|
2
2
|
gem 'paperclip', '>=2.4.0'
|
3
3
|
gem 'aws-sdk', '>=1.2.0'
|
4
4
|
|
5
|
-
# Add dependencies to develop your gem here.
|
6
|
-
# Include everything needed to run rake, tests, features, etc.
|
7
5
|
group :development do
|
8
|
-
gem "shoulda", ">= 0"
|
9
6
|
gem "bundler", "~> 1.0.0"
|
10
7
|
gem "jeweler", "~> 1.6.4"
|
11
|
-
|
8
|
+
end
|
9
|
+
|
10
|
+
group :test do
|
11
|
+
gem "sqlite3"
|
12
|
+
gem 'shoulda-context'
|
13
|
+
gem "mocha"
|
12
14
|
end
|
data/Gemfile.lock
CHANGED
@@ -30,7 +30,10 @@ GEM
|
|
30
30
|
git (>= 1.2.5)
|
31
31
|
rake
|
32
32
|
json (1.6.1)
|
33
|
+
metaclass (0.0.1)
|
33
34
|
mime-types (1.17.2)
|
35
|
+
mocha (0.10.0)
|
36
|
+
metaclass (~> 0.0.1)
|
34
37
|
multi_json (1.0.3)
|
35
38
|
multi_xml (0.4.1)
|
36
39
|
nokogiri (1.5.0)
|
@@ -40,8 +43,8 @@ GEM
|
|
40
43
|
cocaine (>= 0.0.2)
|
41
44
|
mime-types
|
42
45
|
rake (0.9.2)
|
43
|
-
|
44
|
-
|
46
|
+
shoulda-context (1.0.0)
|
47
|
+
sqlite3 (1.3.4)
|
45
48
|
tzinfo (0.3.31)
|
46
49
|
uuidtools (2.1.2)
|
47
50
|
|
@@ -52,6 +55,7 @@ DEPENDENCIES
|
|
52
55
|
aws-sdk (>= 1.2.0)
|
53
56
|
bundler (~> 1.0.0)
|
54
57
|
jeweler (~> 1.6.4)
|
58
|
+
mocha
|
55
59
|
paperclip (>= 2.4.0)
|
56
|
-
|
57
|
-
|
60
|
+
shoulda-context
|
61
|
+
sqlite3
|
data/README.md
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
[![Build Status](https://secure.travis-ci.org/igor-alexandrov/paperclip-aws.png)](http://travis-ci.org/[YOUR_GITHUB_USERNAME]/[YOUR_PROJECT_NAME])
|
2
|
+
|
1
3
|
# Storage module to official 'aws-sdk' gem for Amazon S3 #
|
2
4
|
|
3
5
|
'paperclip-aws' is a full featured storage module that supports all S3 locations (American, European and Japanese) without any additional hacking.
|
data/Rakefile
CHANGED
@@ -28,18 +28,10 @@ Jeweler::RubygemsDotOrgTasks.new
|
|
28
28
|
require 'rake/testtask'
|
29
29
|
Rake::TestTask.new(:test) do |test|
|
30
30
|
test.libs << 'lib' << 'test'
|
31
|
-
test.pattern = 'test
|
31
|
+
test.pattern = 'test/**/*_test.rb'
|
32
32
|
test.verbose = true
|
33
33
|
end
|
34
34
|
|
35
|
-
require 'rcov/rcovtask'
|
36
|
-
Rcov::RcovTask.new do |test|
|
37
|
-
test.libs << 'test'
|
38
|
-
test.pattern = 'test/**/test_*.rb'
|
39
|
-
test.verbose = true
|
40
|
-
test.rcov_opts << '--exclude "gems/*"'
|
41
|
-
end
|
42
|
-
|
43
35
|
task :default => :test
|
44
36
|
|
45
37
|
require 'rake/rdoctask'
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.3.
|
1
|
+
1.3.1
|
data/lib/paperclip-aws.rb
CHANGED
@@ -137,7 +137,7 @@ module Paperclip
|
|
137
137
|
:acl => @s3_permissions[:style.to_sym] || @s3_permissions[:default],
|
138
138
|
:storage_class => @s3_storage_class.to_sym,
|
139
139
|
:content_type => file.content_type,
|
140
|
-
:server_side_encryption => @s3_sse
|
140
|
+
:server_side_encryption => @s3_sse
|
141
141
|
)
|
142
142
|
rescue AWS::S3::Errors::NoSuchBucket => e
|
143
143
|
create_bucket
|
data/paperclip-aws.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{paperclip-aws}
|
8
|
-
s.version = "1.3.
|
8
|
+
s.version = "1.3.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Igor Alexandrov"]
|
12
|
-
s.date = %q{2011-11-
|
12
|
+
s.date = %q{2011-11-12}
|
13
13
|
s.description = %q{'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking.}
|
14
14
|
s.email = %q{igor.alexandrov@gmail.com}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -25,7 +25,11 @@ Gem::Specification.new do |s|
|
|
25
25
|
"Rakefile",
|
26
26
|
"VERSION",
|
27
27
|
"lib/paperclip-aws.rb",
|
28
|
-
"paperclip-aws.gemspec"
|
28
|
+
"paperclip-aws.gemspec",
|
29
|
+
"test/aws_storage_test.rb",
|
30
|
+
"test/database.yml",
|
31
|
+
"test/debug.log",
|
32
|
+
"test/helper.rb"
|
29
33
|
]
|
30
34
|
s.homepage = %q{http://github.com/igor-alexandrov/paperclip-aws}
|
31
35
|
s.licenses = ["MIT"]
|
@@ -39,25 +43,19 @@ Gem::Specification.new do |s|
|
|
39
43
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
40
44
|
s.add_runtime_dependency(%q<paperclip>, [">= 2.4.0"])
|
41
45
|
s.add_runtime_dependency(%q<aws-sdk>, [">= 1.2.0"])
|
42
|
-
s.add_development_dependency(%q<shoulda>, [">= 0"])
|
43
46
|
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
|
44
47
|
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
|
45
|
-
s.add_development_dependency(%q<rcov>, [">= 0"])
|
46
48
|
else
|
47
49
|
s.add_dependency(%q<paperclip>, [">= 2.4.0"])
|
48
50
|
s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
|
49
|
-
s.add_dependency(%q<shoulda>, [">= 0"])
|
50
51
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
51
52
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
52
|
-
s.add_dependency(%q<rcov>, [">= 0"])
|
53
53
|
end
|
54
54
|
else
|
55
55
|
s.add_dependency(%q<paperclip>, [">= 2.4.0"])
|
56
56
|
s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
|
57
|
-
s.add_dependency(%q<shoulda>, [">= 0"])
|
58
57
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
59
58
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
60
|
-
s.add_dependency(%q<rcov>, [">= 0"])
|
61
59
|
end
|
62
60
|
end
|
63
61
|
|
@@ -0,0 +1,52 @@
|
|
1
|
+
require './test/helper'
|
2
|
+
|
3
|
+
class AwsStorageTest < Test::Unit::TestCase
|
4
|
+
def rails_env(env)
|
5
|
+
silence_warnings do
|
6
|
+
Object.const_set(:Rails, stub('Rails', :env => env))
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
context "Parsing S3 credentials" do
|
11
|
+
setup do
|
12
|
+
@proxy_settings = {:host => "127.0.0.1", :port => 8888, :user => "foo", :password => "bar"}
|
13
|
+
Rails.stubs(:const_defined?)
|
14
|
+
rebuild_model :storage => :aws,
|
15
|
+
:bucket => "testing",
|
16
|
+
:http_proxy => @proxy_settings,
|
17
|
+
:s3_credentials => {
|
18
|
+
:access_key_id => "ACCESS_KEY_ID",
|
19
|
+
:secret_access_key => "SECRET_ACCESS_KEY"
|
20
|
+
}
|
21
|
+
|
22
|
+
@dummy = Dummy.new
|
23
|
+
@avatar = @dummy.avatar
|
24
|
+
end
|
25
|
+
|
26
|
+
should "get the correct credentials when RAILS_ENV is production" do
|
27
|
+
rails_env("production")
|
28
|
+
|
29
|
+
assert_equal(
|
30
|
+
{ :access_key_id => "12345" },
|
31
|
+
@avatar.parse_credentials(
|
32
|
+
:production => { :access_key_id => '12345' },
|
33
|
+
:development => { :access_key_id => '54321' }
|
34
|
+
)
|
35
|
+
)
|
36
|
+
end
|
37
|
+
|
38
|
+
should "get the correct credentials when RAILS_ENV is development" do
|
39
|
+
rails_env("development")
|
40
|
+
|
41
|
+
assert_equal(
|
42
|
+
{ :access_key_id => "54321" },
|
43
|
+
@avatar.parse_credentials(
|
44
|
+
:production => { :access_key_id => '12345' },
|
45
|
+
:development => { :access_key_id => '54321' }
|
46
|
+
)
|
47
|
+
)
|
48
|
+
|
49
|
+
end
|
50
|
+
|
51
|
+
end
|
52
|
+
end
|
data/test/database.yml
ADDED
data/test/debug.log
ADDED
@@ -0,0 +1,63 @@
|
|
1
|
+
# Logfile created on 2011-11-12 19:28:19 +0400 by logger.rb/25413
|
2
|
+
D, [2011-11-12T20:02:26.484258 #40515] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
3
|
+
D, [2011-11-12T20:02:26.485445 #40515] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
4
|
+
D, [2011-11-12T20:03:26.074040 #40529] DEBUG -- : [1m[36m (0.4ms)[0m [1mselect sqlite_version(*)[0m
|
5
|
+
D, [2011-11-12T20:03:26.075277 #40529] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
6
|
+
D, [2011-11-12T20:04:08.897166 #40543] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
7
|
+
D, [2011-11-12T20:04:08.898471 #40543] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
8
|
+
D, [2011-11-12T20:06:23.301153 #40572] DEBUG -- : [1m[36m (0.4ms)[0m [1mselect sqlite_version(*)[0m
|
9
|
+
D, [2011-11-12T20:06:23.305432 #40572] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
10
|
+
D, [2011-11-12T20:09:15.001946 #40607] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
11
|
+
D, [2011-11-12T20:09:15.003154 #40607] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
12
|
+
D, [2011-11-12T20:09:32.905134 #40619] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
13
|
+
D, [2011-11-12T20:09:32.907352 #40619] DEBUG -- : [1m[35m (1.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
14
|
+
D, [2011-11-12T20:09:55.062532 #40632] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
15
|
+
D, [2011-11-12T20:09:55.063860 #40632] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
16
|
+
D, [2011-11-12T20:10:22.997788 #40657] DEBUG -- : [1m[36m (0.4ms)[0m [1mselect sqlite_version(*)[0m
|
17
|
+
D, [2011-11-12T20:10:23.002247 #40657] DEBUG -- : [1m[35m (2.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
18
|
+
D, [2011-11-12T20:10:34.390259 #40670] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
19
|
+
D, [2011-11-12T20:10:34.391487 #40670] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
20
|
+
D, [2011-11-12T20:10:46.446075 #40681] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
21
|
+
D, [2011-11-12T20:10:46.447561 #40681] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
22
|
+
D, [2011-11-12T20:12:59.086745 #40700] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
23
|
+
D, [2011-11-12T20:12:59.087957 #40700] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
24
|
+
D, [2011-11-12T20:54:14.084896 #40940] DEBUG -- : [1m[36m (0.5ms)[0m [1mselect sqlite_version(*)[0m
|
25
|
+
D, [2011-11-12T20:54:14.086291 #40940] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
26
|
+
D, [2011-11-12T21:31:35.787140 #41167] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
27
|
+
D, [2011-11-12T21:31:35.789862 #41167] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
28
|
+
D, [2011-11-12T21:33:23.962724 #41185] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
29
|
+
D, [2011-11-12T21:33:23.964105 #41185] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
30
|
+
D, [2011-11-12T21:34:39.419519 #41200] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
31
|
+
D, [2011-11-12T21:34:39.420868 #41200] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
32
|
+
D, [2011-11-12T21:34:56.140131 #41213] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
33
|
+
D, [2011-11-12T21:34:56.141382 #41213] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
34
|
+
D, [2011-11-12T21:35:50.680401 #41227] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
35
|
+
D, [2011-11-12T21:35:50.681564 #41227] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
36
|
+
D, [2011-11-12T21:37:06.639397 #41244] DEBUG -- : [1m[36m (0.7ms)[0m [1mselect sqlite_version(*)[0m
|
37
|
+
D, [2011-11-12T21:37:06.640704 #41244] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
38
|
+
D, [2011-11-12T21:37:17.887144 #41255] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
39
|
+
D, [2011-11-12T21:37:17.888922 #41255] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
40
|
+
D, [2011-11-12T21:37:30.631160 #41267] DEBUG -- : [1m[36m (0.6ms)[0m [1mselect sqlite_version(*)[0m
|
41
|
+
D, [2011-11-12T21:37:30.632643 #41267] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
42
|
+
D, [2011-11-12T23:28:13.074928 #41810] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
43
|
+
D, [2011-11-12T23:28:13.082355 #41810] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
44
|
+
D, [2011-11-12T23:28:42.427358 #41823] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
45
|
+
D, [2011-11-12T23:28:42.428589 #41823] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
46
|
+
D, [2011-11-12T23:29:17.376127 #41838] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
47
|
+
D, [2011-11-12T23:29:17.377345 #41838] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
48
|
+
D, [2011-11-12T23:34:31.158834 #41889] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
49
|
+
D, [2011-11-12T23:34:31.160038 #41889] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
50
|
+
D, [2011-11-12T23:37:23.994236 #41924] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
51
|
+
D, [2011-11-12T23:37:23.998533 #41924] DEBUG -- : [1m[35m (3.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
52
|
+
D, [2011-11-12T23:39:11.665461 #41941] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
53
|
+
D, [2011-11-12T23:39:11.666608 #41941] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
54
|
+
D, [2011-11-12T23:39:36.731861 #41954] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
55
|
+
D, [2011-11-12T23:39:36.733112 #41954] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
56
|
+
D, [2011-11-13T01:15:43.149647 #42454] DEBUG -- : [1m[36m (0.3ms)[0m [1mselect sqlite_version(*)[0m
|
57
|
+
D, [2011-11-13T01:15:43.152773 #42454] DEBUG -- : [1m[35m (0.3ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
58
|
+
D, [2011-11-13T01:15:44.246835 #42454] DEBUG -- : [1m[36m (0.1ms)[0m [1mDROP TABLE "dummies"[0m
|
59
|
+
D, [2011-11-13T01:15:44.247373 #42454] DEBUG -- : [1m[35m (0.1ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
60
|
+
D, [2011-11-13T01:16:15.135664 #42466] DEBUG -- : [1m[36m (0.4ms)[0m [1mselect sqlite_version(*)[0m
|
61
|
+
D, [2011-11-13T01:16:15.137064 #42466] DEBUG -- : [1m[35m (0.4ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
62
|
+
D, [2011-11-13T01:16:15.950354 #42466] DEBUG -- : [1m[36m (0.1ms)[0m [1mDROP TABLE "dummies"[0m
|
63
|
+
D, [2011-11-13T01:16:15.951127 #42466] DEBUG -- : [1m[35m (0.2ms)[0m CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255))
|
data/test/helper.rb
ADDED
@@ -0,0 +1,77 @@
|
|
1
|
+
require 'rubygems'
|
2
|
+
require 'test/unit'
|
3
|
+
require 'mocha'
|
4
|
+
require 'shoulda-context'
|
5
|
+
|
6
|
+
require 'active_record'
|
7
|
+
require 'logger'
|
8
|
+
require 'sqlite3'
|
9
|
+
require 'paperclip'
|
10
|
+
require 'paperclip-aws'
|
11
|
+
|
12
|
+
ROOT = File.join(File.dirname(__FILE__), '..')
|
13
|
+
RAILS_ROOT = ROOT
|
14
|
+
$LOAD_PATH << File.join(ROOT, 'lib')
|
15
|
+
|
16
|
+
def silence_warnings
|
17
|
+
old_verbose, $VERBOSE = $VERBOSE, nil
|
18
|
+
yield
|
19
|
+
ensure
|
20
|
+
$VERBOSE = old_verbose
|
21
|
+
end
|
22
|
+
|
23
|
+
class Test::Unit::TestCase
|
24
|
+
def setup
|
25
|
+
silence_warnings do
|
26
|
+
Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
|
32
|
+
FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
|
33
|
+
config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
|
34
|
+
ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
|
35
|
+
ActiveRecord::Base.establish_connection(config['test'])
|
36
|
+
Paperclip.logger = ActiveRecord::Base.logger
|
37
|
+
|
38
|
+
# def reset_dummy(options = {})
|
39
|
+
# reset_dummy(options)
|
40
|
+
# Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
|
41
|
+
# end
|
42
|
+
def rebuild_model options = {}
|
43
|
+
ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|
|
44
|
+
table.column :title, :string
|
45
|
+
table.column :other, :string
|
46
|
+
table.column :avatar_file_name, :string
|
47
|
+
table.column :avatar_content_type, :string
|
48
|
+
table.column :avatar_file_size, :integer
|
49
|
+
table.column :avatar_updated_at, :datetime
|
50
|
+
table.column :avatar_fingerprint, :string
|
51
|
+
end
|
52
|
+
reset_class('Dummy', options)
|
53
|
+
end
|
54
|
+
|
55
|
+
def reset_class(class_name, options)
|
56
|
+
ActiveRecord::Base.send(:include, Paperclip::Glue)
|
57
|
+
Object.send(:remove_const, class_name) rescue nil
|
58
|
+
klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
|
59
|
+
klass.class_eval do
|
60
|
+
include Paperclip::Glue
|
61
|
+
has_attached_file :avatar, options
|
62
|
+
end
|
63
|
+
klass.reset_column_information
|
64
|
+
klass
|
65
|
+
end
|
66
|
+
|
67
|
+
# def rebuild_class options = {}
|
68
|
+
# ActiveRecord::Base.send(:include, Paperclip::Glue)
|
69
|
+
# Object.send(:remove_const, "Dummy") rescue nil
|
70
|
+
# Object.const_set("Dummy", Class.new(ActiveRecord::Base))
|
71
|
+
# Paperclip.reset_duplicate_clash_check!
|
72
|
+
# Dummy.class_eval do
|
73
|
+
# include Paperclip::Glue
|
74
|
+
# has_attached_file :avatar, options
|
75
|
+
# end
|
76
|
+
# Dummy.reset_column_information
|
77
|
+
# end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: paperclip-aws
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-11-
|
12
|
+
date: 2011-11-12 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: paperclip
|
16
|
-
requirement: &
|
16
|
+
requirement: &70188528166160 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 2.4.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70188528166160
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: aws-sdk
|
27
|
-
requirement: &
|
27
|
+
requirement: &70188528165540 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,21 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.2.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
36
|
-
- !ruby/object:Gem::Dependency
|
37
|
-
name: shoulda
|
38
|
-
requirement: &70175096884900 !ruby/object:Gem::Requirement
|
39
|
-
none: false
|
40
|
-
requirements:
|
41
|
-
- - ! '>='
|
42
|
-
- !ruby/object:Gem::Version
|
43
|
-
version: '0'
|
44
|
-
type: :development
|
45
|
-
prerelease: false
|
46
|
-
version_requirements: *70175096884900
|
35
|
+
version_requirements: *70188528165540
|
47
36
|
- !ruby/object:Gem::Dependency
|
48
37
|
name: bundler
|
49
|
-
requirement: &
|
38
|
+
requirement: &70188528164900 !ruby/object:Gem::Requirement
|
50
39
|
none: false
|
51
40
|
requirements:
|
52
41
|
- - ~>
|
@@ -54,10 +43,10 @@ dependencies:
|
|
54
43
|
version: 1.0.0
|
55
44
|
type: :development
|
56
45
|
prerelease: false
|
57
|
-
version_requirements: *
|
46
|
+
version_requirements: *70188528164900
|
58
47
|
- !ruby/object:Gem::Dependency
|
59
48
|
name: jeweler
|
60
|
-
requirement: &
|
49
|
+
requirement: &70188528164300 !ruby/object:Gem::Requirement
|
61
50
|
none: false
|
62
51
|
requirements:
|
63
52
|
- - ~>
|
@@ -65,18 +54,7 @@ dependencies:
|
|
65
54
|
version: 1.6.4
|
66
55
|
type: :development
|
67
56
|
prerelease: false
|
68
|
-
version_requirements: *
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: rcov
|
71
|
-
requirement: &70175096880660 !ruby/object:Gem::Requirement
|
72
|
-
none: false
|
73
|
-
requirements:
|
74
|
-
- - ! '>='
|
75
|
-
- !ruby/object:Gem::Version
|
76
|
-
version: '0'
|
77
|
-
type: :development
|
78
|
-
prerelease: false
|
79
|
-
version_requirements: *70175096880660
|
57
|
+
version_requirements: *70188528164300
|
80
58
|
description: ! '''paperclip-aws'' is a full featured storage module that supports
|
81
59
|
all S3 locations (US, European and Tokio) without any additional hacking.'
|
82
60
|
email: igor.alexandrov@gmail.com
|
@@ -95,6 +73,10 @@ files:
|
|
95
73
|
- VERSION
|
96
74
|
- lib/paperclip-aws.rb
|
97
75
|
- paperclip-aws.gemspec
|
76
|
+
- test/aws_storage_test.rb
|
77
|
+
- test/database.yml
|
78
|
+
- test/debug.log
|
79
|
+
- test/helper.rb
|
98
80
|
homepage: http://github.com/igor-alexandrov/paperclip-aws
|
99
81
|
licenses:
|
100
82
|
- MIT
|
@@ -110,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
110
92
|
version: '0'
|
111
93
|
segments:
|
112
94
|
- 0
|
113
|
-
hash:
|
95
|
+
hash: 1539503514915059301
|
114
96
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
115
97
|
none: false
|
116
98
|
requirements:
|