carrierwave-aws 0.1.1 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b9c678b39eac5b7e4e2f854b3f5a70bfe12bce6a
4
- data.tar.gz: 0c33b8c0130afd079e8e7c7d9f3ddac2f68037b6
3
+ metadata.gz: fde7bde0d28fce39233eaaeec5485fa7a9373941
4
+ data.tar.gz: 9fea88b1818a9332022752140de2e9abb464f7f6
5
5
  SHA512:
6
- metadata.gz: 08d7a9ef287968623984f083c42305c919f3dabd9cea3a4811d352654e74303cf728c2b5d92673c3e99806883cfbb5d4f48b66ddb975912b8ae16ed84dcd4627
7
- data.tar.gz: 5c57be525e7d6c6415ea6bfbca0912433c3f5cd6094da88721bc9485dc302bf86f2f5d4efb8013028d10844703965ddb835ae35aef263f333849362707e6d5bb
6
+ metadata.gz: f99e64f9f0c911d34ccc4f4c177a5239d3b69efd65a13587cd7107d96c80cc868e38c79a97c2797d189e4c4929bb99d608f0be89cd898bc838b7f5d91d54e8d8
7
+ data.tar.gz: bce06c56d190d3c2f234b57fd251aa5aa5d0955dbc33a7a5f6fc12d759423804063454196f6743385ce65d7b59c46fb747987c10670ef4d46b838d8f842a9087
data/.rspec ADDED
@@ -0,0 +1,3 @@
1
+ --color
2
+ --format progress
3
+ --require spec_helper
data/HISTORY.md CHANGED
@@ -1,3 +1,8 @@
1
+ === Version 0.2.0 2013-04-19
2
+
3
+ * Update aws-sdk depdendency to 1.8.5
4
+ * Clean up some internal storage object passing
5
+
1
6
  === Version 0.1.1 2013-04-09
2
7
 
3
8
  * Fix storage bug when if `aws_attributes` is blank [#1]
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
17
17
  gem.require_paths = ['lib']
18
18
 
19
19
  gem.add_dependency 'carrierwave', '>= 0.7.0'
20
- gem.add_dependency 'aws-sdk', '~> 1.8.1.2'
20
+ gem.add_dependency 'aws-sdk', '~> 1.8.5'
21
21
 
22
22
  gem.add_development_dependency 'rspec', '~> 2.12.0'
23
23
  end
@@ -1,5 +1,5 @@
1
1
  module Carrierwave
2
2
  module AWS
3
- VERSION = '0.1.1'
3
+ VERSION = '0.2.0'
4
4
  end
5
5
  end
@@ -8,13 +8,13 @@ module CarrierWave
8
8
  end
9
9
 
10
10
  def store!(file)
11
- File.new(uploader, self, uploader.store_path).tap do |aws_file|
11
+ File.new(uploader, connection, uploader.store_path).tap do |aws_file|
12
12
  aws_file.store(file)
13
13
  end
14
14
  end
15
15
 
16
16
  def retrieve!(identifier)
17
- File.new(uploader, self, uploader.store_path(identifier))
17
+ File.new(uploader, connection, uploader.store_path(identifier))
18
18
  end
19
19
 
20
20
  def connection
@@ -25,10 +25,12 @@ module CarrierWave
25
25
  end
26
26
 
27
27
  class File
28
- attr_reader :uploader, :base, :path
28
+ attr_reader :uploader, :connection, :path
29
29
 
30
- def initialize(uploader, base, path)
31
- @uploader, @base, @path = uploader, base, path
30
+ def initialize(uploader, connection, path)
31
+ @uploader = uploader
32
+ @connection = connection
33
+ @path = path
32
34
  end
33
35
 
34
36
  def attributes
@@ -100,10 +102,6 @@ module CarrierWave
100
102
 
101
103
  private
102
104
 
103
- def connection
104
- base.connection
105
- end
106
-
107
105
  def bucket
108
106
  @bucket ||= connection.buckets[uploader.aws_bucket]
109
107
  end
@@ -1,3 +1,10 @@
1
1
  require 'rspec'
2
2
  require 'carrierwave'
3
3
  require 'carrierwave-aws'
4
+
5
+ RSpec.configure do |config|
6
+ config.treat_symbols_as_metadata_keys_with_true_values = true
7
+ config.filter_run :focus
8
+ config.order = 'random'
9
+ config.run_all_when_everything_filtered = true
10
+ end
@@ -3,7 +3,10 @@ require 'spec_helper'
3
3
  describe CarrierWave::Storage::AWS do
4
4
  let(:credentials) { { access_key_id: 'abc', secret_access_key: '123' } }
5
5
  let(:uploader) { mock(:uploader, aws_credentials: credentials) }
6
- let(:storage) { described_class.new(uploader) }
6
+
7
+ subject(:storage) do
8
+ described_class.new(uploader)
9
+ end
7
10
 
8
11
  describe '#connection' do
9
12
  it 'instantiates a new connection' do
@@ -21,15 +24,16 @@ describe CarrierWave::Storage::AWS do
21
24
  end
22
25
 
23
26
  describe CarrierWave::Storage::AWS::File do
24
- let(:file) { mock(:file, read: '0101010') }
25
27
  let(:objects) { { 'files/1/file.txt' => file } }
26
28
  let(:bucket) { mock(:bucket, objects: objects) }
27
29
  let(:connection) { mock(:connection, buckets: { 'example-com' => bucket }) }
30
+ let(:file) { mock(:file, read: '0101010') }
28
31
  let(:uploader) { mock(:uploader, aws_bucket: 'example-com') }
29
- let(:storage) { mock(:storage, connection: connection) }
30
32
  let(:path) { 'files/1/file.txt' }
31
33
 
32
- subject(:aws_file) { described_class.new(uploader, storage, path) }
34
+ subject(:aws_file) do
35
+ described_class.new(uploader, connection, path)
36
+ end
33
37
 
34
38
  describe '#read' do
35
39
  it 'reads from the remote file object' do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave-aws
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Parker Selbert
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-04-10 00:00:00.000000000 Z
11
+ date: 2013-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 1.8.1.2
33
+ version: 1.8.5
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ~>
39
39
  - !ruby/object:Gem::Version
40
- version: 1.8.1.2
40
+ version: 1.8.5
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ extensions: []
60
60
  extra_rdoc_files: []
61
61
  files:
62
62
  - .gitignore
63
+ - .rspec
63
64
  - .travis.yml
64
65
  - Gemfile
65
66
  - HISTORY.md