paperclip-aws 1.3.2 → 1.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/lib/paperclip-aws.rb +3 -4
  3. data/paperclip-aws.gemspec +1 -1
  4. data/test/debug.log +52 -0
  5. metadata +10 -10
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.2
1
+ 1.3.3
data/lib/paperclip-aws.rb CHANGED
@@ -64,16 +64,15 @@ module Paperclip
64
64
  :action => :read
65
65
  })
66
66
  secure = ( self.choose_protocol(style, options) == 'https' )
67
- url = @s3.buckets[@s3_bucket].objects[path(style).gsub(%r{^/}, "")].url_for(options[:action], { :secure => secure, :expires => options[:expires] }).to_s
67
+ return @s3.buckets[@s3_bucket].objects[path(style).gsub(%r{^/}, "")].url_for(options[:action], { :secure => secure, :expires => options[:expires] }).to_s
68
68
  else
69
69
  if @s3_host_alias.present?
70
70
  url = "#{choose_protocol(style, options)}://#{@s3_host_alias}/#{path(style).gsub(%r{^/}, "")}"
71
71
  else
72
72
  url = "#{choose_protocol(style, options)}://#{@s3_endpoint}/#{@s3_bucket}/#{path(style).gsub(%r{^/}, "")}"
73
73
  end
74
- end
75
-
76
- return URI.escape(url)
74
+ return URI.escape(url)
75
+ end
77
76
  end
78
77
 
79
78
  def bucket_name
data/paperclip-aws.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{paperclip-aws}
8
- s.version = "1.3.2"
8
+ s.version = "1.3.3"
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"]
data/test/debug.log CHANGED
@@ -1948,3 +1948,55 @@ D, [2011-11-13T17:13:34.128222 #47434] DEBUG -- :  (0.3ms) D
1948
1948
  D, [2011-11-13T17:13:34.129005 #47434] DEBUG -- :  (0.2ms) 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))
1949
1949
  D, [2011-11-13T17:13:34.148267 #47434] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1950
1950
  D, [2011-11-13T17:13:34.149415 #47434] DEBUG -- :  (0.6ms) 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))
1951
+ D, [2011-11-14T00:55:18.733868 #53187] DEBUG -- :  (0.7ms) select sqlite_version(*)
1952
+ D, [2011-11-14T00:55:18.781748 #53187] DEBUG -- :  (0.5ms) 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))
1953
+ I, [2011-11-14T00:55:19.724469 #53187] INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-qf02nk.png[0]'
1954
+ I, [2011-11-14T00:55:19.783749 #53187] INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-qf02nk.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-qf02nk20111114-53187-fhkk0v.jpg'
1955
+ D, [2011-11-14T00:55:19.957201 #53187] DEBUG -- :  (0.3ms) DROP TABLE "dummies"
1956
+ D, [2011-11-14T00:55:19.959705 #53187] DEBUG -- :  (0.7ms) 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))
1957
+ I, [2011-11-14T00:55:19.981478 #53187] INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-6qc7f9.png[0]'
1958
+ I, [2011-11-14T00:55:19.995922 #53187] INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-6qc7f9.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-6qc7f920111114-53187-yp5v3s.jpg'
1959
+ D, [2011-11-14T00:55:20.178729 #53187] DEBUG -- :  (0.3ms) DROP TABLE "dummies"
1960
+ D, [2011-11-14T00:55:20.179448 #53187] DEBUG -- :  (0.2ms) 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))
1961
+ I, [2011-11-14T00:55:20.197181 #53187] INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-1eyst55.png[0]'
1962
+ I, [2011-11-14T00:55:20.213123 #53187] INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-1eyst55.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-1eyst5520111114-53187-jmpa1b.jpg'
1963
+ D, [2011-11-14T00:55:20.369522 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
1964
+ D, [2011-11-14T00:55:20.370260 #53187] DEBUG -- :  (0.2ms) 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))
1965
+ I, [2011-11-14T00:55:20.440957 #53187] INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-3i9gln.png[0]'
1966
+ I, [2011-11-14T00:55:20.456625 #53187] INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-3i9gln.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111114-53187-3i9gln20111114-53187-at3b8m.jpg'
1967
+ D, [2011-11-14T00:55:20.623313 #53187] DEBUG -- :  (0.3ms) DROP TABLE "dummies"
1968
+ D, [2011-11-14T00:55:20.624353 #53187] DEBUG -- :  (0.2ms) 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))
1969
+ D, [2011-11-14T00:55:20.635122 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1970
+ D, [2011-11-14T00:55:20.635744 #53187] DEBUG -- :  (0.2ms) 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))
1971
+ D, [2011-11-14T00:55:20.645799 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
1972
+ D, [2011-11-14T00:55:20.646401 #53187] DEBUG -- :  (0.1ms) 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))
1973
+ D, [2011-11-14T00:55:20.656939 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1974
+ D, [2011-11-14T00:55:20.657523 #53187] DEBUG -- :  (0.2ms) 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))
1975
+ D, [2011-11-14T00:55:20.665671 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1976
+ D, [2011-11-14T00:55:20.666232 #53187] DEBUG -- :  (0.1ms) 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))
1977
+ D, [2011-11-14T00:55:20.677714 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
1978
+ D, [2011-11-14T00:55:20.678352 #53187] DEBUG -- :  (0.2ms) 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))
1979
+ D, [2011-11-14T00:55:20.703060 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1980
+ D, [2011-11-14T00:55:20.703703 #53187] DEBUG -- :  (0.2ms) 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))
1981
+ D, [2011-11-14T00:55:20.731020 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
1982
+ D, [2011-11-14T00:55:20.732214 #53187] DEBUG -- :  (0.2ms) 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))
1983
+ D, [2011-11-14T00:55:20.884636 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1984
+ D, [2011-11-14T00:55:20.885223 #53187] DEBUG -- :  (0.2ms) 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))
1985
+ D, [2011-11-14T00:55:20.901686 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1986
+ D, [2011-11-14T00:55:20.902268 #53187] DEBUG -- :  (0.2ms) 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))
1987
+ D, [2011-11-14T00:55:20.919406 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
1988
+ D, [2011-11-14T00:55:20.920552 #53187] DEBUG -- :  (0.2ms) 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))
1989
+ D, [2011-11-14T00:55:20.946549 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1990
+ D, [2011-11-14T00:55:20.947084 #53187] DEBUG -- :  (0.1ms) 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))
1991
+ D, [2011-11-14T00:55:21.002137 #53187] DEBUG -- :  (0.3ms) DROP TABLE "dummies"
1992
+ D, [2011-11-14T00:55:21.002998 #53187] DEBUG -- :  (0.2ms) 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))
1993
+ D, [2011-11-14T00:55:21.023259 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1994
+ D, [2011-11-14T00:55:21.023790 #53187] DEBUG -- :  (0.1ms) 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))
1995
+ D, [2011-11-14T00:55:21.040336 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1996
+ D, [2011-11-14T00:55:21.040936 #53187] DEBUG -- :  (0.2ms) 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))
1997
+ D, [2011-11-14T00:55:21.068931 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
1998
+ D, [2011-11-14T00:55:21.069530 #53187] DEBUG -- :  (0.2ms) 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))
1999
+ D, [2011-11-14T00:55:21.090579 #53187] DEBUG -- :  (0.1ms) DROP TABLE "dummies"
2000
+ D, [2011-11-14T00:55:21.092194 #53187] DEBUG -- :  (0.3ms) 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))
2001
+ D, [2011-11-14T00:55:21.116832 #53187] DEBUG -- :  (0.2ms) DROP TABLE "dummies"
2002
+ D, [2011-11-14T00:55:21.117867 #53187] DEBUG -- :  (0.2ms) 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))
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.2
4
+ version: 1.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-11-13 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: paperclip
16
- requirement: &70201056413340 !ruby/object:Gem::Requirement
16
+ requirement: &70095024782260 !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: *70201056413340
24
+ version_requirements: *70095024782260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: aws-sdk
27
- requirement: &70201056412460 !ruby/object:Gem::Requirement
27
+ requirement: &70095024781300 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.2.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70201056412460
35
+ version_requirements: *70095024781300
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70201056411300 !ruby/object:Gem::Requirement
38
+ requirement: &70095024744320 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70201056411300
46
+ version_requirements: *70095024744320
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: jeweler
49
- requirement: &70201056410740 !ruby/object:Gem::Requirement
49
+ requirement: &70095024742160 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: 1.6.4
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70201056410740
57
+ version_requirements: *70095024742160
58
58
  description: ! '''paperclip-aws'' is a full featured storage module that supports
59
59
  all S3 locations (US, European and Tokio) without any additional hacking.'
60
60
  email: igor.alexandrov@gmail.com
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
94
94
  version: '0'
95
95
  segments:
96
96
  - 0
97
- hash: -1559649043225939084
97
+ hash: -1208369897968883784
98
98
  required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  none: false
100
100
  requirements: