Permalink
Browse files

Remove whitespace

  • Loading branch information...
trevorturk committed Feb 18, 2011
1 parent c9b5cbb commit b71326404bf583573914c6228a15911e17f5b7bf
Showing with 242 additions and 242 deletions.
  1. +1 −1 README.rdoc
  2. +3 −3 features/caching.feature
  3. +4 −4 features/download.feature
  4. +6 −6 features/file_storage.feature
  5. +6 −6 features/file_storage_overridden_filename.feature
  6. +6 −6 features/file_storage_overridden_store_dir.feature
  7. +6 −6 features/file_storage_reversing_processor.feature
  8. +6 −6 features/grid_fs_storage.feature
  9. +1 −1 features/mount_datamapper.feature
  10. +1 −1 features/step_definitions/datamapper_steps.rb
  11. +5 −5 features/versions_basics.feature
  12. +5 −5 features/versions_nested_versions.feature
  13. +2 −2 features/versions_overridden_filename.feature
  14. +4 −4 features/versions_overriden_store_dir.feature
  15. +7 −7 lib/carrierwave/compatibility/paperclip.rb
  16. +5 −5 lib/carrierwave/mount.rb
  17. +5 −5 lib/carrierwave/orm/sequel.rb
  18. +2 −2 lib/carrierwave/processing/rmagick.rb
  19. +4 −4 lib/carrierwave/storage/cloud_files.rb
  20. +5 −5 lib/carrierwave/storage/grid_fs.rb
  21. +2 −2 lib/carrierwave/uploader/cache.rb
  22. +1 −1 lib/carrierwave/uploader/download.rb
  23. +1 −1 spec/compatibility/paperclip_spec.rb
  24. +47 −47 spec/mount_spec.rb
  25. +24 −24 spec/orm/sequel_spec.rb
  26. +4 −4 spec/processing/image_science_spec.rb
  27. +6 −6 spec/processing/mini_magick_spec.rb
  28. +6 −6 spec/processing/rmagick_spec.rb
  29. +16 −16 spec/storage/cloudfiles_spec.rb
  30. +17 −17 spec/storage/grid_fs_spec.rb
  31. +8 −8 spec/uploader/cache_spec.rb
  32. +6 −6 spec/uploader/callback_spec.rb
  33. +7 −7 spec/uploader/configuration_spec.rb
  34. +3 −3 spec/uploader/default_url_spec.rb
  35. +2 −2 spec/uploader/download_spec.rb
  36. +1 −1 spec/uploader/mountable_spec.rb
  37. +1 −1 spec/uploader/paths_spec.rb
  38. +1 −1 spec/uploader/processing_spec.rb
  39. +5 −5 spec/uploader/store_spec.rb
View
@@ -372,7 +372,7 @@ You'll need to configure a bucket, access id and secret key like this in an init
config.s3_secret_access_key = 'xxxxxx'
config.s3_bucket = 'name_of_bucket'
end
-
+
You'll need to create the bucket on Amazon S3 if it doesn't already exist.
In your uploader, set the storage to :s3
View
@@ -2,14 +2,14 @@ Feature: uploader with file storage
In order to be able to temporarily store files to disk
As a developer using CarrierWave
I want to cache files
-
+
Scenario: cache a file
Given an uploader class that uses the 'file' storage
And an instance of that class
When I cache the file 'fixtures/bork.txt'
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
And the file called 'bork.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: cache two files in succession
Given an uploader class that uses the 'file' storage
And an instance of that class
@@ -19,7 +19,7 @@ Feature: uploader with file storage
When I cache the file 'fixtures/monkey.txt'
Then there should be a file called 'monkey.txt' somewhere in a subdirectory of 'public/uploads/tmp'
And the file called 'monkey.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/monkey.txt'
-
+
Scenario: retrieving a file from cache
Given an uploader class that uses the 'file' storage
And an instance of that class
@@ -1,17 +1,17 @@
-Feature: downloading files
+Feature: downloading files
In order to allow users to upload remote files
As a developer using CarrierWave
I want to download files to the filesystem via HTTP
-
+
Background:
Given an uploader class that uses the 'file' storage
And an instance of that class
-
+
Scenario: download a file
When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
Then there should be a file called 'testfile.txt' somewhere in a subdirectory of 'public/uploads/tmp'
And the file called 'testfile.txt' in a subdirectory of 'public/uploads/tmp' should contain 'S3 Remote File'
-
+
Scenario: downloading a file then storing
When I download the file 'http://s3.amazonaws.com/Monkey/testfile.txt'
And I store the file
@@ -2,24 +2,24 @@ Feature: uploader with file storage
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'file' storage
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: store two files in succession
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
When I store the file 'fixtures/monkey.txt'
Then there should be a file at 'public/uploads/monkey.txt'
And the file at 'public/uploads/monkey.txt' should be identical to the file at 'fixtures/monkey.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
When I store the file
Then there should be a file at 'public/uploads/bork.txt'
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
@@ -2,25 +2,25 @@ Feature: uploader with file storage and overriden filename
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem with an overriden filename
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader reverses the filename
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/txt.krob'
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: store two files in succession
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/txt.krob'
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
When I store the file 'fixtures/monkey.txt'
Then there should be a file at 'public/uploads/txt.yeknom'
And the file at 'public/uploads/txt.yeknom' should be identical to the file at 'fixtures/monkey.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
When I store the file
Then there should be a file at 'public/uploads/txt.krob'
And the file at 'public/uploads/txt.krob' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
@@ -2,25 +2,25 @@ Feature: uploader with file storage and overridden store dir
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader has the store_dir overridden to 'public/monkey/llama'
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/monkey/llama/bork.txt'
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: store two files in succession
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/monkey/llama/bork.txt'
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
When I store the file 'fixtures/monkey.txt'
Then there should be a file at 'public/monkey/llama/monkey.txt'
And the file at 'public/monkey/llama/monkey.txt' should be identical to the file at 'fixtures/monkey.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
When I store the file
Then there should be a file at 'public/monkey/llama/bork.txt'
And the file at 'public/monkey/llama/bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
@@ -2,19 +2,19 @@ Feature: uploader with file storage and a processor that reverses the file
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'file' storage
And an instance of that class
- And the class has a method called 'reverse' that reverses the contents of a file
+ And the class has a method called 'reverse' that reverses the contents of a file
And the class will process 'reverse'
-
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
And the file at 'public/uploads/bork.txt' should not be identical to the file at 'fixtures/bork.txt'
And the file at 'public/uploads/bork.txt' should be the reverse of the file at 'fixtures/bork.txt'
-
+
Scenario: store two files in succession
When I store the file 'fixtures/bork.txt'
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
Then there should be a file at 'public/uploads/monkey.txt'
And the file at 'public/uploads/monkey.txt' should not be identical to the file at 'fixtures/monkey.txt'
And the file at 'public/uploads/monkey.txt' should be the reverse of the file at 'fixtures/monkey.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
Then there should be a file at 'public/uploads/bork.txt'
And the file at 'public/uploads/bork.txt' should not be identical to the file at 'fixtures/bork.txt'
And the file at 'public/uploads/bork.txt' should be the reverse of the file at 'fixtures/bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
@@ -2,29 +2,29 @@ Feature: uploader with file storage
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'grid_fs' storage
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then the contents of the file should be 'this is a file'
-
+
Scenario: store two files in succession
When I store the file 'fixtures/bork.txt'
Then the contents of the file should be 'this is a file'
When I store the file 'fixtures/monkey.txt'
Then the contents of the file should be 'this is another file'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
Then there should be a file called 'bork.txt' somewhere in a subdirectory of 'public/uploads/tmp'
And the file called 'bork.txt' in a subdirectory of 'public/uploads/tmp' should be identical to the file at 'fixtures/bork.txt'
And there should not be a file at 'public/uploads/bork.txt'
When I store the file
Then the contents of the file should be 'this is a file'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
When I retrieve the cache name '20090212-2343-8336-0348/bork.txt' from the cache
@@ -36,7 +36,7 @@ Feature: Mount an Uploader on ActiveRecord class
# Then there should be a file at 'public/uploads/bork.txt'
# When I reload the datamapper record
# Then the url for the column 'avatar' should be '/uploads/bork.txt'
- #
+ #
# Scenario: store a file and delete the record
# When I assign the file 'fixtures/bork.txt' to the 'avatar' column
# And I retrieve the file later from the cache name for the column 'avatar'
@@ -5,7 +5,7 @@
include DataMapper::Resource
storage_names[:default] = 'users'
-
+
property :id, DataMapper::Types::Serial
property column.to_sym, String
end
@@ -2,12 +2,12 @@ Feature: uploader with file storage and versions
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader class has a version named 'thumb'
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
@@ -16,7 +16,7 @@ Feature: uploader with file storage and versions
And the file at 'public/uploads/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
And the uploader should have the url '/uploads/bork.txt'
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
And the file at 'public/uploads/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
And the uploader should have the url '/uploads/bork.txt'
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'
@@ -2,14 +2,14 @@ Feature: uploader with nested versions
In order to optimize performance for processing
As a developer using CarrierWave
I want to set nested versions
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader class has a version named 'thumb'
And yo dawg, I put a version called 'mini' in your version called 'thumb'
And yo dawg, I put a version called 'micro' in your version called 'thumb'
- And an instance of that class
-
+ And an instance of that class
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
@@ -24,7 +24,7 @@ Feature: uploader with nested versions
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
And the uploader's nested version 'mini' nested in 'thumb' should have the url '/uploads/thumb_mini_bork.txt'
And the uploader's nested version 'micro' nested in 'thumb' should have the url '/uploads/thumb_micro_bork.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
And the uploader's version 'thumb' should have the url '/uploads/thumb_bork.txt'
And the uploader's nested version 'mini' nested in 'thumb' should have the url '/uploads/thumb_mini_bork.txt'
And the uploader's nested version 'micro' nested in 'thumb' should have the url '/uploads/thumb_micro_bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'
@@ -2,13 +2,13 @@ Feature: uploader with file storage and overriden filename
In order to customize the filaname of uploaded files
As a developer using CarrierWave
I want to upload files to the filesystem with an overriden filename and different verions
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader class has a version named 'thumb'
And that the uploader has the filename overridden to 'grark.png'
And an instance of that class
-
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/grark.png'
@@ -2,20 +2,20 @@ Feature: uploader with file storage and versions with overridden store dir
In order to be awesome
As a developer using CarrierWave
I want to upload files to the filesystem
-
+
Background:
Given an uploader class that uses the 'file' storage
And that the uploader class has a version named 'thumb'
And that the version 'thumb' has the store_dir overridden to 'public/monkey/llama'
And an instance of that class
-
+
Scenario: store a file
When I store the file 'fixtures/bork.txt'
Then there should be a file at 'public/uploads/bork.txt'
Then there should be a file at 'public/monkey/llama/thumb_bork.txt'
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
And the file at 'public/monkey/llama/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: cache a file and then store it
When I cache the file 'fixtures/bork.txt'
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
Then there should be a file at 'public/monkey/llama/thumb_bork.txt'
And the file at 'public/uploads/bork.txt' should be identical to the file at 'fixtures/bork.txt'
And the file at 'public/monkey/llama/thumb_bork.txt' should be identical to the file at 'fixtures/bork.txt'
-
+
Scenario: retrieving a file from cache then storing
Given the file 'fixtures/bork.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/bork.txt'
Given the file 'fixtures/monkey.txt' is cached file at 'public/uploads/tmp/20090212-2343-8336-0348/thumb_bork.txt'
Oops, something went wrong.

0 comments on commit b713264

Please sign in to comment.