carrierwave-aws 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022aaea7ed4d3e117c7607e00ce672bf4f299b0d
-  data.tar.gz: 423d96993911c11c21b443f20086482af5d3072e
+  metadata.gz: ec70707302830ad68344002780286686534f2cfe
+  data.tar.gz: 5f6a31d07df412d97e8af6c70a7dc4dd89cc8212
 SHA512:
-  metadata.gz: d808008e5023f518b901581476e6152c13f9b484d6506c80d8accf9033159ad6e9f90e5d7ff77293a45d02068d2ccdfdbe5f4468f702a869e14b0945f0173924
-  data.tar.gz: 1fedff06ff918da9b9b808e453b726a8a1fcf3c8624bf18e880409ead4a3a7ac5ef942f01a01e6fca4b5e00259a5654dac251e0001b6d7ca17d1f0ceda2f01ee
+  metadata.gz: 3ced29508da5597363c14709224b971e03b8c237a38f830dc2a7aeaaf34d0d1b7cea9489471ca5238dc8576883a8db4e7530fcab0c70d05c6558e8772ded2690
+  data.tar.gz: a528306304867a49a75c8052378e43438a5d84ff69485865adb7354ec6073d0e5c1006e4288bf111be31fa9cad006cce535ab2377bb315b691623939c112c362

data/.env.sample

@@ -0,0 +1,3 @@
+S3_BUCKET_NAME=BUCKET_NAME
+S3_ACCESS_KEY=YOUR_KEY
+S3_SECRET_ACCESS_KEY=YOUR_KEY

data/.gitignore

@@ -1,6 +1,8 @@
 *.gem
 .bundle
 .config
+.env
 Gemfile.lock
 bin
 vendor
+uploads

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 script: bundle exec rspec spec

data/HISTORY.md

@@ -1,3 +1,8 @@
+## Version 0.3.0 2013-05-23
+
+* Pass the file path directly to aws-sdk to prevent upload timeouts stemming
+  incorrect `content_length`.
+
 ## Version 0.2.1 2013-04-20
 
 * Provide a `to_file` method on AWS::File in an attempt to prevent errors when

data/README.md

@@ -1,6 +1,8 @@
 # Carrierwave AWS Storage
 
 [![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)
 
 Use the officially supported AWS-SDK library for S3 storage rather than relying
 on fog. There are several things going for it:
@@ -45,8 +47,32 @@ CarrierWave.configure do |config|
 end
 ```
 
+If you want to supply your own AWS configuration, put it inside
+`config.aws_credentials` like this:
+
+```ruby
+config.aws_credentials = {
+  access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
+  secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+  config: AWS.config(my_aws_options)
+}
+```
+
+`AWS.config` will return `AWS::Core::Configuration` object which is used
+through `aws-sdk` gem. Browse [Amazon docs](http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/Core/Configuration.html)
+for additional info. For example, if you want to turn off SSL for your asset
+URLs, you could simply set `AWS.config(use_ssl: false)`.
+
 ## Contributing
 
+In order to run the integration specs you will need to configure some
+environment variables. A sample file is provided as `.env.sample`. Copy it over
+and plug in the appropriate values.
+
+```bash
+cp .env.sample .env
+```
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/lib/carrierwave/aws/version.rb

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

data/lib/carrierwave/storage/aws.rb

@@ -7,6 +7,10 @@ module CarrierWave
         @connection_cache ||= {}
       end
 
+      def self.clear_connection_cache!
+        @connection_cache = {}
+      end
+
       def store!(file)
         File.new(uploader, connection, uploader.store_path).tap do |aws_file|
           aws_file.store(file)
@@ -69,15 +73,11 @@ module CarrierWave
         end
 
         def store(new_file)
-          aws_file = new_file.to_file
-
-          @file = bucket.objects[path].write(aws_file, {
+          @file = bucket.objects[path].write(new_file.file, {
             acl: uploader.aws_acl,
             content_type: new_file.content_type
           }.merge(uploader.aws_attributes || {}))
 
-          aws_file.close unless aws_file.closed?
-
           true
         end
 

data/spec/carrierwave/storage/aws_spec.rb

@@ -5,7 +5,11 @@ describe CarrierWave::Storage::AWS do
   let(:uploader)    { mock(:uploader, aws_credentials: credentials) }
 
   subject(:storage) do
-    described_class.new(uploader)
+    CarrierWave::Storage::AWS.new(uploader)
+  end
+
+  before do
+    CarrierWave::Storage::AWS.clear_connection_cache!
   end
 
   describe '#connection' do
@@ -32,7 +36,7 @@ describe CarrierWave::Storage::AWS::File do
   let(:path)       { 'files/1/file.txt' }
 
   subject(:aws_file) do
-    described_class.new(uploader, connection, path)
+    CarrierWave::Storage::AWS::File.new(uploader, connection, path)
   end
 
   describe '#read' do

data/spec/features/storing_files_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+if ENV['S3_BUCKET_NAME']
+  describe 'Storing Files' do
+    before(:all) do
+      CarrierWave.configure do |config|
+        config.storage    = :aws
+        config.aws_bucket = ENV['S3_BUCKET_NAME']
+        config.aws_acl    = :public_read
+
+        config.aws_credentials = {
+          access_key_id:     ENV['S3_ACCESS_KEY'],
+          secret_access_key: ENV['S3_SECRET_ACCESS_KEY']
+        }
+      end
+    end
+
+    it 'uploads the file to the configured bucket' do
+      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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,9 +2,20 @@ require 'rspec'
 require 'carrierwave'
 require 'carrierwave-aws'
 
+def source_environment_file!
+  return unless File.exists?('.env')
+
+  File.readlines('.env').each do |line|
+    values = line.split('=')
+    ENV[values.first] = values.last.chomp
+  end
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus
   config.order = 'random'
   config.run_all_when_everything_filtered = true
+
+  source_environment_file!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .env.sample
 - .gitignore
 - .rspec
 - .travis.yml
@@ -73,6 +74,8 @@ files:
 - lib/carrierwave/storage/aws.rb
 - spec/carrierwave-aws_spec.rb
 - spec/carrierwave/storage/aws_spec.rb
+- spec/features/storing_files_spec.rb
+- spec/fixtures/image.png
 - spec/spec_helper.rb
 homepage: https://github.com/sorentwo/carrierwave-aws
 licenses: []
@@ -100,4 +103,6 @@ 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/features/storing_files_spec.rb
+- spec/fixtures/image.png
 - spec/spec_helper.rb