Skip to content

Commit b713264

Browse files
committed
Remove whitespace
1 parent c9b5cbb commit b713264

39 files changed

+242
-242
lines changed

README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ You'll need to configure a bucket, access id and secret key like this in an init
372372
config.s3_secret_access_key = 'xxxxxx'
373373
config.s3_bucket = 'name_of_bucket'
374374
end
375-
375+
376376
You'll need to create the bucket on Amazon S3 if it doesn't already exist.
377377

378378
In your uploader, set the storage to :s3

features/caching.feature

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Feature: uploader with file storage
22
In order to be able to temporarily store files to disk
33
As a developer using CarrierWave
44
I want to cache files
5-
5+
66
Scenario: cache a file
77
Given an uploader class that uses the 'file' storage
88
And an instance of that class
99
When I cache the file 'fixtures/bork.txt'
1010
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
1111
And the file called 'bork.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/bork.txt'
12-
12+
1313
Scenario: cache two files in succession
1414
Given an uploader class that uses the 'file' storage
1515
And an instance of that class
@@ -19,7 +19,7 @@ Feature: uploader with file storage
1919
When I cache the file 'fixtures/monkey.txt'
2020
Then there should be a file called 'monkey.txt' somewhere in a subdirectory of 'public/uploads/tmp'
2121
And the file called 'monkey.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/monkey.txt'
22-
22+
2323
Scenario: retrieving a file from cache
2424
Given an uploader class that uses the 'file' storage
2525
And an instance of that class

features/download.feature

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
Feature: downloading files
1+
Feature: downloading files
22
In order to allow users to upload remote files
33
As a developer using CarrierWave
44
I want to download files to the filesystem via HTTP
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And an instance of that class
9-
9+
1010
Scenario: download a file
1111
When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
1212
Then there should be a file called 'testfile.txt' somewhere in a subdirectory of 'public/uploads/tmp'
1313
And the file called 'testfile.txt' in a subdirectory of 'public/uploads/tmp' should contain 'S3 Remote File'
14-
14+
1515
Scenario: downloading a file then storing
1616
When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
1717
And I store the file

features/file_storage.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ Feature: uploader with file storage
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
8-
And an instance of that class
9-
8+
And an instance of that class
9+
1010
Scenario: store a file
1111
When I store the file 'fixtures/bork.txt'
1212
Then there should be a file at 'public/uploads/bork.txt'
1313
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
14-
14+
1515
Scenario: store two files in succession
1616
When I store the file 'fixtures/bork.txt'
1717
Then there should be a file at 'public/uploads/bork.txt'
1818
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
1919
When I store the file 'fixtures/monkey.txt'
2020
Then there should be a file at 'public/uploads/monkey.txt'
2121
And the file at 'public/uploads/monkey.txt' should be identical to the file at 'fixtures/monkey.txt'
22-
22+
2323
Scenario: cache a file and then store it
2424
When I cache the file 'fixtures/bork.txt'
2525
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -28,7 +28,7 @@ Feature: uploader with file storage
2828
When I store the file
2929
Then there should be a file at 'public/uploads/bork.txt'
3030
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
31-
31+
3232
Scenario: retrieving a file from cache then storing
3333
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3434
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache

features/file_storage_overridden_filename.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ Feature: uploader with file storage and overriden filename
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem with an overriden filename
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader reverses the filename
9-
And an instance of that class
10-
9+
And an instance of that class
10+
1111
Scenario: store a file
1212
When I store the file 'fixtures/bork.txt'
1313
Then there should be a file at 'public/uploads/txt.krob'
1414
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
15-
15+
1616
Scenario: store two files in succession
1717
When I store the file 'fixtures/bork.txt'
1818
Then there should be a file at 'public/uploads/txt.krob'
1919
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
2020
When I store the file 'fixtures/monkey.txt'
2121
Then there should be a file at 'public/uploads/txt.yeknom'
2222
And the file at 'public/uploads/txt.yeknom' should be identical to the file at 'fixtures/monkey.txt'
23-
23+
2424
Scenario: cache a file and then store it
2525
When I cache the file 'fixtures/bork.txt'
2626
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -29,7 +29,7 @@ Feature: uploader with file storage and overriden filename
2929
When I store the file
3030
Then there should be a file at 'public/uploads/txt.krob'
3131
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
32-
32+
3333
Scenario: retrieving a file from cache then storing
3434
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3535
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache

features/file_storage_overridden_store_dir.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ Feature: uploader with file storage and overridden store dir
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader has the store_dir overridden to 'public/monkey/llama'
9-
And an instance of that class
10-
9+
And an instance of that class
10+
1111
Scenario: store a file
1212
When I store the file 'fixtures/bork.txt'
1313
Then there should be a file at 'public/monkey/llama/bork.txt'
1414
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
15-
15+
1616
Scenario: store two files in succession
1717
When I store the file 'fixtures/bork.txt'
1818
Then there should be a file at 'public/monkey/llama/bork.txt'
1919
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
2020
When I store the file 'fixtures/monkey.txt'
2121
Then there should be a file at 'public/monkey/llama/monkey.txt'
2222
And the file at 'public/monkey/llama/monkey.txt' should be identical to the file at 'fixtures/monkey.txt'
23-
23+
2424
Scenario: cache a file and then store it
2525
When I cache the file 'fixtures/bork.txt'
2626
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -29,7 +29,7 @@ Feature: uploader with file storage and overridden store dir
2929
When I store the file
3030
Then there should be a file at 'public/monkey/llama/bork.txt'
3131
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
32-
32+
3333
Scenario: retrieving a file from cache then storing
3434
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3535
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache

features/file_storage_reversing_processor.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ Feature: uploader with file storage and a processor that reverses the file
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And an instance of that class
9-
And the class has a method called 'reverse' that reverses the contents of a file
9+
And the class has a method called 'reverse' that reverses the contents of a file
1010
And the class will process 'reverse'
11-
11+
1212
Scenario: store a file
1313
When I store the file 'fixtures/bork.txt'
1414
Then there should be a file at 'public/uploads/bork.txt'
1515
And the file at 'public/uploads/bork.txt' should not be identical to the file at 'fixtures/bork.txt'
1616
And the file at 'public/uploads/bork.txt' should be the reverse of the file at 'fixtures/bork.txt'
17-
17+
1818
Scenario: store two files in succession
1919
When I store the file 'fixtures/bork.txt'
2020
Then there should be a file at 'public/uploads/bork.txt'
@@ -24,7 +24,7 @@ Feature: uploader with file storage and a processor that reverses the file
2424
Then there should be a file at 'public/uploads/monkey.txt'
2525
And the file at 'public/uploads/monkey.txt' should not be identical to the file at 'fixtures/monkey.txt'
2626
And the file at 'public/uploads/monkey.txt' should be the reverse of the file at 'fixtures/monkey.txt'
27-
27+
2828
Scenario: cache a file and then store it
2929
When I cache the file 'fixtures/bork.txt'
3030
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -34,7 +34,7 @@ Feature: uploader with file storage and a processor that reverses the file
3434
Then there should be a file at 'public/uploads/bork.txt'
3535
And the file at 'public/uploads/bork.txt' should not be identical to the file at 'fixtures/bork.txt'
3636
And the file at 'public/uploads/bork.txt' should be the reverse of the file at 'fixtures/bork.txt'
37-
37+
3838
Scenario: retrieving a file from cache then storing
3939
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
4040
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache

features/grid_fs_storage.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ Feature: uploader with file storage
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'grid_fs' storage
8-
And an instance of that class
9-
8+
And an instance of that class
9+
1010
Scenario: store a file
1111
When I store the file 'fixtures/bork.txt'
1212
Then the contents of the file should be 'this is a file'
13-
13+
1414
Scenario: store two files in succession
1515
When I store the file 'fixtures/bork.txt'
1616
Then the contents of the file should be 'this is a file'
1717
When I store the file 'fixtures/monkey.txt'
1818
Then the contents of the file should be 'this is another file'
19-
19+
2020
Scenario: cache a file and then store it
2121
When I cache the file 'fixtures/bork.txt'
2222
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
2323
And the file called 'bork.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/bork.txt'
2424
And there should not be a file at 'public/uploads/bork.txt'
2525
When I store the file
2626
Then the contents of the file should be 'this is a file'
27-
27+
2828
Scenario: retrieving a file from cache then storing
2929
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3030
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache

features/mount_datamapper.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Feature: Mount an Uploader on ActiveRecord class
3636
# Then there should be a file at 'public/uploads/bork.txt'
3737
# When I reload the datamapper record
3838
# Then the url for the column 'avatar' should be '/uploads/bork.txt'
39-
#
39+
#
4040
# Scenario: store a file and delete the record
4141
# When I assign the file 'fixtures/bork.txt' to the 'avatar' column
4242
# And I retrieve the file later from the cache name for the column 'avatar'

features/step_definitions/datamapper_steps.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
include DataMapper::Resource
66

77
storage_names[:default] = 'users'
8-
8+
99
property :id, DataMapper::Types::Serial
1010
property column.to_sym, String
1111
end

features/versions_basics.feature

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Feature: uploader with file storage and versions
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader class has a version named 'thumb'
9-
And an instance of that class
10-
9+
And an instance of that class
10+
1111
Scenario: store a file
1212
When I store the file 'fixtures/bork.txt'
1313
Then there should be a file at 'public/uploads/bork.txt'
@@ -16,7 +16,7 @@ Feature: uploader with file storage and versions
1616
And the file at 'public/uploads/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
1717
And the uploader should have the url '/uploads/bork.txt'
1818
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
19-
19+
2020
Scenario: cache a file and then store it
2121
When I cache the file 'fixtures/bork.txt'
2222
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -31,7 +31,7 @@ Feature: uploader with file storage and versions
3131
And the file at 'public/uploads/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
3232
And the uploader should have the url '/uploads/bork.txt'
3333
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
34-
34+
3535
Scenario: retrieving a file from cache then storing
3636
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3737
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'

features/versions_nested_versions.feature

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Feature: uploader with nested versions
22
In order to optimize performance for processing
33
As a developer using CarrierWave
44
I want to set nested versions
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader class has a version named 'thumb'
99
And yo dawg, I put a version called 'mini' in your version called 'thumb'
1010
And yo dawg, I put a version called 'micro' in your version called 'thumb'
11-
And an instance of that class
12-
11+
And an instance of that class
12+
1313
Scenario: store a file
1414
When I store the file 'fixtures/bork.txt'
1515
Then there should be a file at 'public/uploads/bork.txt'
@@ -24,7 +24,7 @@ Feature: uploader with nested versions
2424
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
2525
And the uploader's nested version 'mini' nested in 'thumb' should have the url '/uploads/thumb_mini_bork.txt'
2626
And the uploader's nested version 'micro' nested in 'thumb' should have the url '/uploads/thumb_micro_bork.txt'
27-
27+
2828
Scenario: cache a file and then store it
2929
When I cache the file 'fixtures/bork.txt'
3030
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -41,7 +41,7 @@ Feature: uploader with nested versions
4141
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
4242
And the uploader's nested version 'mini' nested in 'thumb' should have the url '/uploads/thumb_mini_bork.txt'
4343
And the uploader's nested version 'micro' nested in 'thumb' should have the url '/uploads/thumb_micro_bork.txt'
44-
44+
4545
Scenario: retrieving a file from cache then storing
4646
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
4747
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'

features/versions_overridden_filename.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Feature: uploader with file storage and overriden filename
22
In order to customize the filaname of uploaded files
33
As a developer using CarrierWave
44
I want to upload files to the filesystem with an overriden filename and different verions
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader class has a version named 'thumb'
99
And that the uploader has the filename overridden to 'grark.png'
1010
And an instance of that class
11-
11+
1212
Scenario: store a file
1313
When I store the file 'fixtures/bork.txt'
1414
Then there should be a file at 'public/uploads/grark.png'

features/versions_overriden_store_dir.feature

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ Feature: uploader with file storage and versions with overridden store dir
22
In order to be awesome
33
As a developer using CarrierWave
44
I want to upload files to the filesystem
5-
5+
66
Background:
77
Given an uploader class that uses the 'file' storage
88
And that the uploader class has a version named 'thumb'
99
And that the version 'thumb' has the store_dir overridden to 'public/monkey/llama'
1010
And an instance of that class
11-
11+
1212
Scenario: store a file
1313
When I store the file 'fixtures/bork.txt'
1414
Then there should be a file at 'public/uploads/bork.txt'
1515
Then there should be a file at 'public/monkey/llama/thumb_bork.txt'
1616
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
1717
And the file at 'public/monkey/llama/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
18-
18+
1919
Scenario: cache a file and then store it
2020
When I cache the file 'fixtures/bork.txt'
2121
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
@@ -29,7 +29,7 @@ Feature: uploader with file storage and versions with overridden store dir
2929
Then there should be a file at 'public/monkey/llama/thumb_bork.txt'
3030
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
3131
And the file at 'public/monkey/llama/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
32-
32+
3333
Scenario: retrieving a file from cache then storing
3434
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
3535
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'

0 commit comments

Comments
 (0)