carrierwave-aws 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c678b39eac5b7e4e2f854b3f5a70bfe12bce6a
-  data.tar.gz: 0c33b8c0130afd079e8e7c7d9f3ddac2f68037b6
+  metadata.gz: fde7bde0d28fce39233eaaeec5485fa7a9373941
+  data.tar.gz: 9fea88b1818a9332022752140de2e9abb464f7f6
 SHA512:
-  metadata.gz: 08d7a9ef287968623984f083c42305c919f3dabd9cea3a4811d352654e74303cf728c2b5d92673c3e99806883cfbb5d4f48b66ddb975912b8ae16ed84dcd4627
-  data.tar.gz: 5c57be525e7d6c6415ea6bfbca0912433c3f5cd6094da88721bc9485dc302bf86f2f5d4efb8013028d10844703965ddb835ae35aef263f333849362707e6d5bb
+  metadata.gz: f99e64f9f0c911d34ccc4f4c177a5239d3b69efd65a13587cd7107d96c80cc868e38c79a97c2797d189e4c4929bb99d608f0be89cd898bc838b7f5d91d54e8d8
+  data.tar.gz: bce06c56d190d3c2f234b57fd251aa5aa5d0955dbc33a7a5f6fc12d759423804063454196f6743385ce65d7b59c46fb747987c10670ef4d46b838d8f842a9087

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--require spec_helper

data/HISTORY.md

@@ -1,3 +1,8 @@
+=== 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
 
 * Fix storage bug when if `aws_attributes` is blank [#1]

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.1.2'
+  gem.add_dependency 'aws-sdk',     '~> 1.8.5'
 
   gem.add_development_dependency 'rspec', '~> 2.12.0'
 end

data/lib/carrierwave/aws/version.rb

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

data/lib/carrierwave/storage/aws.rb

@@ -8,13 +8,13 @@ module CarrierWave
       end
 
       def store!(file)
-        File.new(uploader, self, uploader.store_path).tap do |aws_file|
+        File.new(uploader, connection, uploader.store_path).tap do |aws_file|
           aws_file.store(file)
         end
       end
 
       def retrieve!(identifier)
-        File.new(uploader, self, uploader.store_path(identifier))
+        File.new(uploader, connection, uploader.store_path(identifier))
       end
 
       def connection
@@ -25,10 +25,12 @@ module CarrierWave
       end
 
       class File
-        attr_reader :uploader, :base, :path
+        attr_reader :uploader, :connection, :path
 
-        def initialize(uploader, base, path)
-          @uploader, @base, @path = uploader, base, path
+        def initialize(uploader, connection, path)
+          @uploader   = uploader
+          @connection = connection
+          @path       = path
         end
 
         def attributes
@@ -100,10 +102,6 @@ module CarrierWave
 
         private
 
-        def connection
-          base.connection
-        end
-
         def bucket
           @bucket ||= connection.buckets[uploader.aws_bucket]
         end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
 require 'rspec'
 require 'carrierwave'
 require 'carrierwave-aws'
+
+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
+end

data/spec/storage/aws_spec.rb

@@ -3,7 +3,10 @@ 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(:storage)     { described_class.new(uploader) }
+
+  subject(:storage) do
+    described_class.new(uploader)
+  end
 
   describe '#connection' do
     it 'instantiates a new connection' do
@@ -21,15 +24,16 @@ describe CarrierWave::Storage::AWS do
 end
 
 describe CarrierWave::Storage::AWS::File do
-  let(:file)       { mock(:file, read: '0101010') }
   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(:storage)    { mock(:storage, connection: connection) }
   let(:path)       { 'files/1/file.txt' }
 
-  subject(:aws_file) { described_class.new(uploader, storage, path) }
+  subject(:aws_file) do
+    described_class.new(uploader, connection, path)
+  end
 
   describe '#read' do
     it 'reads from the remote file object' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1.2
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1.2
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - HISTORY.md