paperclip-aws 1.1.2 → 1.1.3

data/Gemfile.lock

@@ -1,16 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     arel (2.0.10)
     aws-sdk (1.1.0)
       httparty (~> 0.7)
@@ -18,7 +18,7 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     builder (2.1.2)
-    cocaine (0.1.0)
+    cocaine (0.2.0)
     crack (0.1.8)
     git (1.2.5)
     httparty (0.7.8)
@@ -37,7 +37,7 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     rake (0.9.2)
-    rcov (0.9.9)
+    rcov (0.9.10)
     shoulda (2.11.3)
     tzinfo (0.3.29)
     uuidtools (2.1.2)

data/README.md

@@ -2,8 +2,6 @@
 
 'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking.
 
-Just install in and your model is ready to be stored all over ther world.
-
 ## Features ##
   
 * supports US, European and Japanese S3 instances;

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/paperclip-aws.rb

@@ -42,6 +42,11 @@ module Paperclip
       end
               
       def url(style=default_style, options={})
+        if self.original_filename.nil? 
+          default_url = @default_url.is_a?(Proc) ? @default_url.call(self) : @default_url
+          return interpolate(default_url, style)          
+        end
+        
         if options[:expires].present? || options[:action].present?
           options.reverse_merge!({
             :expires => 60*60,

data/paperclip-aws.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paperclip-aws}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70331180818000 !ruby/object:Gem::Requirement
+  requirement: &70278361149580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331180818000
+  version_requirements: *70278361149580
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70331180816360 !ruby/object:Gem::Requirement
+  requirement: &70278361147340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331180816360
+  version_requirements: *70278361147340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70331180814720 !ruby/object:Gem::Requirement
+  requirement: &70278361145980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331180814720
+  version_requirements: *70278361145980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70331180812840 !ruby/object:Gem::Requirement
+  requirement: &70278359442060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70331180812840
+  version_requirements: *70278359442060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70331180811820 !ruby/object:Gem::Requirement
+  requirement: &70278359440820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70331180811820
+  version_requirements: *70278359440820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70331180810840 !ruby/object:Gem::Requirement
+  requirement: &70278359438220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331180810840
+  version_requirements: *70278359438220
 description: ! '''paperclip-aws'' is a full featured storage module that supports
   all S3 locations (US, European and Tokio) without any additional hacking.'
 email: igor.alexandrov@gmail.com
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3269771844765398236
+      hash: -4585726686328687021
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: