carrierwave-aws 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9be17289878c899ad526a81fcb3313bdf15f1ca
-  data.tar.gz: f0e6f3c4095ad304a3130e5695af7eff750ff01a
+  metadata.gz: a92faaa25331fa4e10ea844d8fe5b90519c4ae87
+  data.tar.gz: 68352ca1f0ee3f20985a3c0063b360698d56566c
 SHA512:
-  metadata.gz: 87c746d630232b56ac8a36e8bbbd2cad987ad04422c73fc089daf19d359a448750a5d6dc936b741df502e252684bcebc47ab1c3f93889feb023b27facdbe0c09
-  data.tar.gz: 1c09c4a9ae97ca158460ff80988dfb07bdda401604589e43f947f1d59ab767a29e7d95bbca21854dc81c6be23eb807298f2081ee1f06935e1f305c17a2b552ba
+  metadata.gz: f9fddccad1b717d22910f426930192bbad53b65e1fc88d979d912893f68e1ee2e088e39c9c4e3209d3a6eafcc6a948fd53764e9f563c64f7ffd7d5adc826aadc
+  data.tar.gz: 07b0a3b8e7c45b095842d15238f660accd2893c75a6ced507809d5049a00668dcf0257b8ada8c6d580f627114862c018778a3f53364744001a2300857ebe01d8

data/.travis.yml

@@ -1,5 +1,20 @@
+---
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+- 1.9.3
+- 2.0.0
 script: bundle exec rspec spec
+env:
+  global:
+  - secure: |-
+      A6i5I0Y+ifiJr2yotcjMBOZxRnhaPbuDTuMW3PMMUaqHsCc2A5Tqemenb7WG
+      awCHOE6i9fuO/qAOPR3iKVdkR7Qv//CDtFZ9pZ7uiqVxfz1kYbv4aoPm1IvJ
+      Kd6Nons/AjkD+yhobP8WgiIZI/QcSylDZYNCasTwQlfOCdYLnag=
+  - secure: |-
+      IE4oVY30L0OH10J/poiEZ1PyFZgPY7dH1FneJI5OeYJJ8GfEHoLuMJXgBmyX
+      mC2v2PGK0pQTKGKFVV1mLhKdCzeLRCSMFqNvVo6blSoMLZoM1kj3sbU0kiIW
+      qAgafLka3iyxQnPsvfmjLVei3h+HOUIUV6QmagjcMfZREHfTDZk=
+  - secure: |-
+      B75vnSCFTnQgCP4dmz78VN/WWj88Tpnh4cjUCU0cQjQ5M7oQ0KTbM0d7WDyf
+      rf0F+B9OihBtLNQWqjocRvNH0dU5OzBLCC9DVolUgNwOdNTHW2I7CwlxJ5t7
+      ljQTxzPP+tFASwzBHjywbo7n0EX3efT5UOZhbD9LZL93X4SOlyU=

data/HISTORY.md

@@ -1,3 +1,8 @@
+## Version 0.3.2 2013-08-06
+
+* And we're back to passing the path. An updated integration test confirms it
+  is working properly.
+
 ## Version 0.3.1 2013-05-23
 
 * Use the "alternate" object writing syntax. The primary method (as documented)

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/sorentwo/carrierwave-aws.png?branch=master)](https://travis-ci.org/sorentwo/carrierwave-aws)
 [![Code Climate](https://codeclimate.com/github/sorentwo/carrierwave-aws.png)](https://codeclimate.com/github/sorentwo/carrierwave-aws)
 [![Gem Version](https://badge.fury.io/rb/carrierwave-aws.png)](http://badge.fury.io/rb/carrierwave-aws)
+[![Dependency Status](https://gemnasium.com/sorentwo/carrierwave-aws.png)](https://gemnasium.com/sorentwo/carrierwave-aws)
 
 Use the officially supported AWS-SDK library for S3 storage rather than relying
 on fog. There are several things going for it:
@@ -12,12 +13,12 @@ on fog. There are several things going for it:
 * Fewer dependencies
 * Clear documentation
 
-Here is a simple comparison table [02/04/2013]
+Here is a simple comparison table [07/17/2013]
 
 | Library | Disk Space | Lines of Code | Boot Time | Runtime Deps | Develop Deps |
 | ------- | ---------- | ------------- | --------- | ------------ | ------------ |
 | fog     | 28.0M      | 133469        | 0.693     | 9            | 11           |
-| aws-sdk | 4.4M       |  80017        | 0.098     | 3            | 8            |
+| aws-sdk | 5.4M       |  90290        | 0.098     | 3            | 8            |
 
 ## Installation
 
@@ -38,6 +39,7 @@ CarrierWave.configure do |config|
   config.storage    = :aws
   config.aws_bucket = ENV['S3_BUCKET_NAME']
   config.aws_acl    = :public_read
+  config.asset_host = 'http://example.com'
   config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365
 
   config.aws_credentials = {

data/carrierwave-aws.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'carrierwave', '>= 0.7.0'
-  gem.add_dependency 'aws-sdk',     '~> 1.8.5'
+  gem.add_dependency 'aws-sdk',     '>= 1.8.0'
 
-  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/lib/carrierwave/aws/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module AWS
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/lib/carrierwave/storage/aws.rb

@@ -76,7 +76,7 @@ module CarrierWave
           @file = bucket.objects[path].write({
             acl:          uploader.aws_acl,
             content_type: new_file.content_type,
-            file:         new_file.file
+            file:         new_file.path
           }.merge(uploader.aws_attributes || {}))
 
           true
@@ -99,7 +99,11 @@ module CarrierWave
         end
 
         def public_url
-          file.public_url.to_s
+          if uploader.asset_host
+            "#{uploader.asset_host}/#{path}"
+          else
+            file.public_url.to_s
+          end
         end
 
         private

data/spec/carrierwave/storage/aws_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe CarrierWave::Storage::AWS do
   let(:credentials) { { access_key_id: 'abc', secret_access_key: '123' } }
-  let(:uploader)    { mock(:uploader, aws_credentials: credentials) }
+  let(:uploader)    { double(:uploader, aws_credentials: credentials) }
 
   subject(:storage) do
     CarrierWave::Storage::AWS.new(uploader)
@@ -20,7 +20,7 @@ describe CarrierWave::Storage::AWS do
     end
 
     it 'caches connections by credentials' do
-      AWS::S3.should_receive(:new).with(credentials).and_return(mock)
+      AWS::S3.should_receive(:new).with(credentials).and_return(double)
 
       storage.connection.should === storage.connection
     end
@@ -29,10 +29,10 @@ end
 
 describe CarrierWave::Storage::AWS::File do
   let(:objects)    { { 'files/1/file.txt' => file } }
-  let(:bucket)     { mock(:bucket, objects: objects) }
-  let(:connection) { mock(:connection, buckets: { 'example-com' => bucket }) }
-  let(:file)       { mock(:file, read: '0101010') }
-  let(:uploader)   { mock(:uploader, aws_bucket: 'example-com') }
+  let(:bucket)     { double(:bucket, objects: objects) }
+  let(:connection) { double(:connection, buckets: { 'example-com' => bucket }) }
+  let(:file)       { double(:file, read: '0101010') }
+  let(:uploader)   { double(:uploader, aws_bucket: 'example-com', asset_host: nil) }
   let(:path)       { 'files/1/file.txt' }
 
   subject(:aws_file) do
@@ -76,5 +76,12 @@ describe CarrierWave::Storage::AWS::File do
 
       aws_file.url
     end
+
+    it 'uses the asset_host and file path if asset_host is set' do
+      uploader.stub(aws_acl: :public_read)
+      uploader.stub(asset_host: 'http://example.com')
+
+      aws_file.url.should eql 'http://example.com/files/1/file.txt'
+    end
   end
 end

data/spec/features/storing_files_spec.rb

@@ -16,14 +16,18 @@ if ENV['S3_BUCKET_NAME']
     end
 
     it 'uploads the file to the configured bucket' do
+      uploader = Class.new(CarrierWave::Uploader::Base) do
+        def filename; 'image.png'; end
+      end
+
       image    = File.open('spec/fixtures/image.png', 'r')
-      uploader = Class.new(CarrierWave::Uploader::Base)
       instance = uploader.new
 
-      expect {
-        instance.store!(image)
-        instance.retrieve_from_store!('image_file.png')
-      }.to_not raise_error
+      instance.store!(image)
+      instance.retrieve_from_store!('image.png')
+
+      expect(instance.file.size).to be_nonzero
+      expect(image.size).to eq(instance.file.size)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -28,30 +28,30 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 description: Use aws-sdk for S3 support in CarrierWave
 email:
 - parker@sorentwo.com