carrierwave-aws 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde7bde0d28fce39233eaaeec5485fa7a9373941
-  data.tar.gz: 9fea88b1818a9332022752140de2e9abb464f7f6
+  metadata.gz: 022aaea7ed4d3e117c7607e00ce672bf4f299b0d
+  data.tar.gz: 423d96993911c11c21b443f20086482af5d3072e
 SHA512:
-  metadata.gz: f99e64f9f0c911d34ccc4f4c177a5239d3b69efd65a13587cd7107d96c80cc868e38c79a97c2797d189e4c4929bb99d608f0be89cd898bc838b7f5d91d54e8d8
-  data.tar.gz: bce06c56d190d3c2f234b57fd251aa5aa5d0955dbc33a7a5f6fc12d759423804063454196f6743385ce65d7b59c46fb747987c10670ef4d46b838d8f842a9087
+  metadata.gz: d808008e5023f518b901581476e6152c13f9b484d6506c80d8accf9033159ad6e9f90e5d7ff77293a45d02068d2ccdfdbe5f4468f702a869e14b0945f0173924
+  data.tar.gz: 1fedff06ff918da9b9b808e453b726a8a1fcf3c8624bf18e880409ead4a3a7ac5ef942f01a01e6fca4b5e00259a5654dac251e0001b6d7ca17d1f0ceda2f01ee

data/HISTORY.md

@@ -1,12 +1,17 @@
-=== Version 0.2.0 2013-04-19
+## Version 0.2.1 2013-04-20
+
+* Provide a `to_file` method on AWS::File in an attempt to prevent errors when
+  re-uploading a cached file.
+
+## Version 0.2.0 2013-04-19
 
 * Update aws-sdk depdendency to 1.8.5
 * Clean up some internal storage object passing
 
-=== Version 0.1.1 2013-04-09
+## Version 0.1.1 2013-04-09
 
 * Fix storage bug when if `aws_attributes` is blank [#1]
 
-=== Version 0.1.0 2013-02-04
+## Version 0.1.0 2013-02-04
 
 * Initial release, experimental with light expectation based spec coverage.

data/lib/carrierwave/aws/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module AWS
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/carrierwave/storage/aws.rb

@@ -25,6 +25,7 @@ module CarrierWave
       end
 
       class File
+        attr_writer :content_type
         attr_reader :uploader, :connection, :path
 
         def initialize(uploader, connection, path)
@@ -41,10 +42,6 @@ module CarrierWave
           @content_type || file.content_type
         end
 
-        def content_type=(new_content_type)
-          @content_type = new_content_type
-        end
-
         def delete
           file.delete
         end
@@ -53,6 +50,16 @@ module CarrierWave
           path.split('.').last
         end
 
+        def exists?
+          !!file
+        end
+
+        def filename(options = {})
+          if file_url = url(options)
+            file_url.gsub(/.*\/(.*?$)/, '\1')
+          end
+        end
+
         def read
           file.read
         end
@@ -61,10 +68,6 @@ module CarrierWave
           file.content_length
         end
 
-        def exists?
-          !!file
-        end
-
         def store(new_file)
           aws_file = new_file.to_file
 
@@ -78,12 +81,8 @@ module CarrierWave
           true
         end
 
-        def authenticated_url
-          file.url_for(:read, expires: uploader.aws_authenticated_url_expiration).to_s
-        end
-
-        def public_url
-          file.public_url.to_s
+        def to_file
+          file
         end
 
         def url(options = {})
@@ -94,10 +93,12 @@ module CarrierWave
           end
         end
 
-        def filename(options = {})
-          if file_url = url(options)
-            file_url.gsub(/.*\/(.*?$)/, '\1')
-          end
+        def authenticated_url
+          file.url_for(:read, expires: uploader.aws_authenticated_url_expiration).to_s
+        end
+
+        def public_url
+          file.public_url.to_s
         end
 
         private

data/spec/{storage → carrierwave/storage}/aws_spec.rb

@@ -41,6 +41,12 @@ describe CarrierWave::Storage::AWS::File do
     end
   end
 
+  describe '#to_file' do
+    it 'returns the internal file instance' do
+      aws_file.to_file.should be(file)
+    end
+  end
+
   describe '#authenticated_url' do
     it 'requests a url for reading with the configured expiration' do
       uploader.stub(aws_authenticated_url_expiration: 60)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -72,8 +72,8 @@ files:
 - lib/carrierwave/aws/version.rb
 - lib/carrierwave/storage/aws.rb
 - spec/carrierwave-aws_spec.rb
+- spec/carrierwave/storage/aws_spec.rb
 - spec/spec_helper.rb
-- spec/storage/aws_spec.rb
 homepage: https://github.com/sorentwo/carrierwave-aws
 licenses: []
 metadata: {}
@@ -99,5 +99,5 @@ specification_version: 4
 summary: A slimmer alternative to using Fog for S3 support in CarrierWave
 test_files:
 - spec/carrierwave-aws_spec.rb
+- spec/carrierwave/storage/aws_spec.rb
 - spec/spec_helper.rb
-- spec/storage/aws_spec.rb