card 1.19.3 → 1.19.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardopts +1 -0
- data/VERSION +1 -1
- data/card.gemspec +1 -3
- data/db/migrate_core_cards/20160914132636_fix_mod_files.rb +25 -0
- data/lib/card.rb +0 -2
- data/lib/card/content/diff.rb +3 -4
- data/lib/card/format/error.rb +1 -1
- data/mod/admin/set/self/admin.rb +2 -2
- data/mod/admin/set/self/trash.rb +9 -3
- data/mod/basic_types/set/type/html.rb +1 -1
- data/mod/bootstrap/set/all/bootstrap/layout.rb +58 -0
- data/mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb +32 -0
- data/mod/carrierwave/lib/carrier_wave/cardmount.rb +0 -2
- data/mod/carrierwave/set/abstract/attachment/upload_cache.rb +2 -1
- data/mod/core/set/all/stages.rb +6 -4
- data/mod/history/lib/card/act.rb +8 -7
- data/mod/history/set/all/history.rb +10 -8
- data/mod/machines/set/abstract/script.rb +1 -1
- data/mod/machines/set/type/css.rb +1 -1
- data/mod/pointer/set/abstract/01_pointer.rb +1 -1
- data/mod/standard/file/credit_image/image-icon.png +0 -0
- data/mod/standard/file/credit_image/image-large.png +0 -0
- data/mod/standard/file/credit_image/image-medium.png +0 -0
- data/mod/standard/file/credit_image/image-small.png +0 -0
- data/mod/standard/file/favicon/image-icon.png +0 -0
- data/mod/standard/file/favicon/image-large.png +0 -0
- data/mod/standard/file/favicon/image-medium.png +0 -0
- data/mod/standard/file/favicon/image-small.png +0 -0
- data/mod/standard/file/logo/image-icon.png +0 -0
- data/mod/standard/file/logo/image-large.png +0 -0
- data/mod/standard/file/logo/image-medium.png +0 -0
- data/mod/standard/file/logo/image-small.png +0 -0
- data/mod/standard/set/self/recent.rb +2 -2
- data/spec/lib/card/diff_spec.rb +9 -9
- metadata +19 -156
- data/vendor/carrierwave/.gitignore +0 -19
- data/vendor/carrierwave/.rubocop.yml +0 -262
- data/vendor/carrierwave/.travis.yml +0 -58
- data/vendor/carrierwave/CHANGELOG.md +0 -81
- data/vendor/carrierwave/CONTRIBUTING.md +0 -37
- data/vendor/carrierwave/Gemfile +0 -5
- data/vendor/carrierwave/README.md +0 -995
- data/vendor/carrierwave/Rakefile +0 -26
- data/vendor/carrierwave/carrierwave.gemspec +0 -45
- data/vendor/carrierwave/cucumber.yml +0 -2
- data/vendor/carrierwave/features/caching.feature +0 -28
- data/vendor/carrierwave/features/download.feature +0 -20
- data/vendor/carrierwave/features/file_storage.feature +0 -37
- data/vendor/carrierwave/features/file_storage_overridden_filename.feature +0 -38
- data/vendor/carrierwave/features/file_storage_overridden_store_dir.feature +0 -38
- data/vendor/carrierwave/features/file_storage_reversing_processor.feature +0 -43
- data/vendor/carrierwave/features/fixtures/bork.txt +0 -1
- data/vendor/carrierwave/features/fixtures/monkey.txt +0 -1
- data/vendor/carrierwave/features/fixtures/upcased_bork.txt +0 -1
- data/vendor/carrierwave/features/mount_activerecord.feature +0 -46
- data/vendor/carrierwave/features/step_definitions/activerecord_steps.rb +0 -20
- data/vendor/carrierwave/features/step_definitions/caching_steps.rb +0 -12
- data/vendor/carrierwave/features/step_definitions/datamapper_steps.rb +0 -27
- data/vendor/carrierwave/features/step_definitions/download_steps.rb +0 -8
- data/vendor/carrierwave/features/step_definitions/file_steps.rb +0 -51
- data/vendor/carrierwave/features/step_definitions/general_steps.rb +0 -102
- data/vendor/carrierwave/features/step_definitions/mount_steps.rb +0 -17
- data/vendor/carrierwave/features/step_definitions/store_steps.rb +0 -16
- data/vendor/carrierwave/features/support/activerecord.rb +0 -18
- data/vendor/carrierwave/features/support/env.rb +0 -19
- data/vendor/carrierwave/features/versions_basics.feature +0 -50
- data/vendor/carrierwave/features/versions_caching_from_versions.feature +0 -32
- data/vendor/carrierwave/features/versions_nested_versions.feature +0 -70
- data/vendor/carrierwave/features/versions_overridden_filename.feature +0 -51
- data/vendor/carrierwave/features/versions_overriden_store_dir.feature +0 -41
- data/vendor/carrierwave/gemfiles/rails-4-0-stable.gemfile +0 -5
- data/vendor/carrierwave/gemfiles/rails-4-1-stable.gemfile +0 -5
- data/vendor/carrierwave/gemfiles/rails-4-2-stable.gemfile +0 -5
- data/vendor/carrierwave/gemfiles/rails-master.gemfile +0 -11
- data/vendor/carrierwave/lib/carrierwave.rb +0 -93
- data/vendor/carrierwave/lib/carrierwave/compatibility/paperclip.rb +0 -103
- data/vendor/carrierwave/lib/carrierwave/error.rb +0 -8
- data/vendor/carrierwave/lib/carrierwave/locale/cs.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/de.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/el.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/en.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/es.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/fr-CA.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/fr.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/id.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/ja.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/nb.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/nl.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/pl.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/pt-BR.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/pt-PT.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/ru.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/sk.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/tr.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/zh-CN.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/locale/zh-TW.yml +0 -14
- data/vendor/carrierwave/lib/carrierwave/mount.rb +0 -444
- data/vendor/carrierwave/lib/carrierwave/mounter.rb +0 -163
- data/vendor/carrierwave/lib/carrierwave/orm/activerecord.rb +0 -103
- data/vendor/carrierwave/lib/carrierwave/processing.rb +0 -2
- data/vendor/carrierwave/lib/carrierwave/processing/mini_magick.rb +0 -328
- data/vendor/carrierwave/lib/carrierwave/processing/rmagick.rb +0 -379
- data/vendor/carrierwave/lib/carrierwave/sanitized_file.rb +0 -348
- data/vendor/carrierwave/lib/carrierwave/storage.rb +0 -2
- data/vendor/carrierwave/lib/carrierwave/storage/abstract.rb +0 -43
- data/vendor/carrierwave/lib/carrierwave/storage/file.rb +0 -118
- data/vendor/carrierwave/lib/carrierwave/storage/fog.rb +0 -462
- data/vendor/carrierwave/lib/carrierwave/test/matchers.rb +0 -394
- data/vendor/carrierwave/lib/carrierwave/uploader.rb +0 -67
- data/vendor/carrierwave/lib/carrierwave/uploader/cache.rb +0 -207
- data/vendor/carrierwave/lib/carrierwave/uploader/callbacks.rb +0 -33
- data/vendor/carrierwave/lib/carrierwave/uploader/configuration.rb +0 -203
- data/vendor/carrierwave/lib/carrierwave/uploader/content_type_blacklist.rb +0 -48
- data/vendor/carrierwave/lib/carrierwave/uploader/content_type_whitelist.rb +0 -48
- data/vendor/carrierwave/lib/carrierwave/uploader/default_url.rb +0 -17
- data/vendor/carrierwave/lib/carrierwave/uploader/download.rb +0 -92
- data/vendor/carrierwave/lib/carrierwave/uploader/extension_blacklist.rb +0 -51
- data/vendor/carrierwave/lib/carrierwave/uploader/extension_whitelist.rb +0 -51
- data/vendor/carrierwave/lib/carrierwave/uploader/file_size.rb +0 -41
- data/vendor/carrierwave/lib/carrierwave/uploader/magic_mime_blacklist.rb +0 -94
- data/vendor/carrierwave/lib/carrierwave/uploader/magic_mime_whitelist.rb +0 -94
- data/vendor/carrierwave/lib/carrierwave/uploader/mountable.rb +0 -38
- data/vendor/carrierwave/lib/carrierwave/uploader/processing.rb +0 -88
- data/vendor/carrierwave/lib/carrierwave/uploader/proxy.rb +0 -86
- data/vendor/carrierwave/lib/carrierwave/uploader/remove.rb +0 -21
- data/vendor/carrierwave/lib/carrierwave/uploader/serialization.rb +0 -28
- data/vendor/carrierwave/lib/carrierwave/uploader/store.rb +0 -93
- data/vendor/carrierwave/lib/carrierwave/uploader/url.rb +0 -41
- data/vendor/carrierwave/lib/carrierwave/uploader/versions.rb +0 -295
- data/vendor/carrierwave/lib/carrierwave/utilities.rb +0 -6
- data/vendor/carrierwave/lib/carrierwave/utilities/uri.rb +0 -21
- data/vendor/carrierwave/lib/carrierwave/validations/active_model.rb +0 -78
- data/vendor/carrierwave/lib/carrierwave/version.rb +0 -3
- data/vendor/carrierwave/lib/generators/templates/uploader.rb +0 -49
- data/vendor/carrierwave/lib/generators/uploader_generator.rb +0 -7
- data/vendor/carrierwave/script/console +0 -10
- data/vendor/carrierwave/script/destroy +0 -14
- data/vendor/carrierwave/script/generate +0 -14
- data/vendor/carrierwave/spec/compatibility/paperclip_spec.rb +0 -138
- data/vendor/carrierwave/spec/fixtures/Uppercase.jpg +0 -1
- data/vendor/carrierwave/spec/fixtures/bork.ttxt +0 -1
- data/vendor/carrierwave/spec/fixtures/bork.txt +0 -1
- data/vendor/carrierwave/spec/fixtures/bork.txtt +0 -1
- data/vendor/carrierwave/spec/fixtures/case.JPG +0 -1
- data/vendor/carrierwave/spec/fixtures/landscape.jpg +0 -0
- data/vendor/carrierwave/spec/fixtures/multi_page.pdf +0 -0
- data/vendor/carrierwave/spec/fixtures/new.jpeg +0 -1
- data/vendor/carrierwave/spec/fixtures/new.txt +0 -1
- data/vendor/carrierwave/spec/fixtures/old.jpeg +0 -1
- data/vendor/carrierwave/spec/fixtures/old.txt +0 -1
- data/vendor/carrierwave/spec/fixtures/portrait.jpg +0 -0
- data/vendor/carrierwave/spec/fixtures/ruby.gif +0 -0
- data/vendor/carrierwave/spec/fixtures/sponsored.doc +0 -1
- data/vendor/carrierwave/spec/fixtures/test+.jpg +0 -1
- data/vendor/carrierwave/spec/fixtures/test.jpeg +0 -1
- data/vendor/carrierwave/spec/fixtures/test.jpg +0 -1
- data/vendor/carrierwave/spec/generators/uploader_generator_spec.rb +0 -19
- data/vendor/carrierwave/spec/mount_multiple_spec.rb +0 -913
- data/vendor/carrierwave/spec/mount_single_spec.rb +0 -793
- data/vendor/carrierwave/spec/orm/activerecord_spec.rb +0 -1556
- data/vendor/carrierwave/spec/processing/mini_magick_spec.rb +0 -210
- data/vendor/carrierwave/spec/processing/rmagick_spec.rb +0 -250
- data/vendor/carrierwave/spec/sanitized_file_spec.rb +0 -805
- data/vendor/carrierwave/spec/spec_helper.rb +0 -105
- data/vendor/carrierwave/spec/storage/file_spec.rb +0 -82
- data/vendor/carrierwave/spec/storage/fog_credentials.rb +0 -46
- data/vendor/carrierwave/spec/storage/fog_helper.rb +0 -428
- data/vendor/carrierwave/spec/storage/fog_spec.rb +0 -48
- data/vendor/carrierwave/spec/support/activerecord.rb +0 -31
- data/vendor/carrierwave/spec/support/file_utils_helper.rb +0 -15
- data/vendor/carrierwave/spec/uploader/cache_spec.rb +0 -324
- data/vendor/carrierwave/spec/uploader/callback_spec.rb +0 -30
- data/vendor/carrierwave/spec/uploader/configuration_spec.rb +0 -133
- data/vendor/carrierwave/spec/uploader/content_type_blacklist_spec.rb +0 -61
- data/vendor/carrierwave/spec/uploader/content_type_whitelist_spec.rb +0 -63
- data/vendor/carrierwave/spec/uploader/default_url_spec.rb +0 -77
- data/vendor/carrierwave/spec/uploader/download_spec.rb +0 -204
- data/vendor/carrierwave/spec/uploader/extension_blacklist_spec.rb +0 -112
- data/vendor/carrierwave/spec/uploader/extension_whitelist_spec.rb +0 -102
- data/vendor/carrierwave/spec/uploader/file_size_spec.rb +0 -52
- data/vendor/carrierwave/spec/uploader/mountable_spec.rb +0 -26
- data/vendor/carrierwave/spec/uploader/overrides_spec.rb +0 -71
- data/vendor/carrierwave/spec/uploader/paths_spec.rb +0 -18
- data/vendor/carrierwave/spec/uploader/processing_spec.rb +0 -159
- data/vendor/carrierwave/spec/uploader/proxy_spec.rb +0 -79
- data/vendor/carrierwave/spec/uploader/remove_spec.rb +0 -71
- data/vendor/carrierwave/spec/uploader/store_spec.rb +0 -400
- data/vendor/carrierwave/spec/uploader/url_spec.rb +0 -273
- data/vendor/carrierwave/spec/uploader/versions_spec.rb +0 -633
@@ -1,105 +0,0 @@
|
|
1
|
-
require 'rubygems'
|
2
|
-
require 'bundler/setup'
|
3
|
-
|
4
|
-
require 'pry'
|
5
|
-
require 'tempfile'
|
6
|
-
require 'time'
|
7
|
-
require 'logger'
|
8
|
-
|
9
|
-
require 'carrierwave'
|
10
|
-
require 'timecop'
|
11
|
-
require 'open-uri'
|
12
|
-
require "webmock/rspec"
|
13
|
-
require 'mini_magick'
|
14
|
-
|
15
|
-
I18n.enforce_available_locales = false
|
16
|
-
|
17
|
-
CARRIERWAVE_DIRECTORY = "carrierwave#{Time.now.to_i}" unless defined?(CARRIERWAVE_DIRECTORY)
|
18
|
-
|
19
|
-
alias :running :lambda
|
20
|
-
|
21
|
-
def file_path( *paths )
|
22
|
-
File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', *paths))
|
23
|
-
end
|
24
|
-
|
25
|
-
def public_path( *paths )
|
26
|
-
File.expand_path(File.join(File.dirname(__FILE__), 'public', *paths))
|
27
|
-
end
|
28
|
-
|
29
|
-
def tmp_path( *paths )
|
30
|
-
File.expand_path(File.join(File.dirname(__FILE__), 'tmp', *paths))
|
31
|
-
end
|
32
|
-
|
33
|
-
CarrierWave.root = public_path
|
34
|
-
I18n.load_path << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "carrierwave", "locale", 'en.yml'))
|
35
|
-
|
36
|
-
module CarrierWave
|
37
|
-
module Test
|
38
|
-
module MockStorage
|
39
|
-
def mock_storage(kind)
|
40
|
-
storage = double("storage for #{kind} uploader")
|
41
|
-
allow(storage).to receive(:setup!)
|
42
|
-
storage
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
module MockFiles
|
47
|
-
def stub_tempfile(filename, mime_type=nil, fake_name=nil)
|
48
|
-
raise "#{path} file does not exist" unless File.exist?(file_path(filename))
|
49
|
-
|
50
|
-
tempfile = Tempfile.new(filename)
|
51
|
-
FileUtils.copy_file(file_path(filename), tempfile.path)
|
52
|
-
allow(tempfile).to receive_messages(:original_filename => fake_name || filename,
|
53
|
-
:content_type => mime_type)
|
54
|
-
tempfile
|
55
|
-
end
|
56
|
-
|
57
|
-
alias_method :stub_merb_tempfile, :stub_tempfile
|
58
|
-
|
59
|
-
def stub_stringio(filename, mime_type=nil, fake_name=nil)
|
60
|
-
file = IO.read( file_path( filename ) ) if filename
|
61
|
-
stringio = StringIO.new(file)
|
62
|
-
allow(stringio).to receive_messages(:local_path => "",
|
63
|
-
:original_filename => filename || fake_name,
|
64
|
-
:content_type => mime_type)
|
65
|
-
stringio
|
66
|
-
end
|
67
|
-
|
68
|
-
def stub_file(filename, mime_type=nil, fake_name=nil)
|
69
|
-
File.open(file_path(filename))
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
module I18nHelpers
|
74
|
-
def change_locale_and_store_translations(locale, translations, &block)
|
75
|
-
current_locale = I18n.locale
|
76
|
-
begin
|
77
|
-
I18n.backend.store_translations locale, translations
|
78
|
-
I18n.locale = locale
|
79
|
-
yield
|
80
|
-
ensure
|
81
|
-
I18n.reload!
|
82
|
-
I18n.locale = current_locale
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|
86
|
-
|
87
|
-
module ManipulationHelpers
|
88
|
-
def color_of_pixel(path, x, y)
|
89
|
-
image = ::MiniMagick::Image.open(path)
|
90
|
-
color = image.run_command("convert", "#{image.path}[1x1+#{x}+#{y}]", "-depth", "8", "txt:").split("\n")[1]
|
91
|
-
end
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
RSpec.configure do |config|
|
97
|
-
config.include CarrierWave::Test::Matchers
|
98
|
-
config.include CarrierWave::Test::MockFiles
|
99
|
-
config.include CarrierWave::Test::MockStorage
|
100
|
-
config.include CarrierWave::Test::I18nHelpers
|
101
|
-
config.include CarrierWave::Test::ManipulationHelpers
|
102
|
-
if RUBY_ENGINE == 'jruby'
|
103
|
-
config.filter_run_excluding :rmagick => true
|
104
|
-
end
|
105
|
-
end
|
@@ -1,82 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'support/file_utils_helper'
|
3
|
-
require 'tempfile'
|
4
|
-
|
5
|
-
describe CarrierWave::Storage::File do
|
6
|
-
include FileUtilsHelper
|
7
|
-
|
8
|
-
subject(:storage) { described_class.new(uploader) }
|
9
|
-
|
10
|
-
let(:uploader_class) { Class.new(CarrierWave::Uploader::Base) }
|
11
|
-
let(:tempfile) { Tempfile.new("foo") }
|
12
|
-
let(:sanitized_temp_file) { CarrierWave::SanitizedFile.new(tempfile) }
|
13
|
-
let(:uploader) { uploader_class.new }
|
14
|
-
|
15
|
-
after { FileUtils.rm_rf(public_path) }
|
16
|
-
|
17
|
-
describe '#delete_dir!' do
|
18
|
-
let(:file) { File.open(file_path("test.jpg")) }
|
19
|
-
|
20
|
-
context "when the directory is not empty" do
|
21
|
-
let(:cache_id_dir) { File.dirname(cache_path) }
|
22
|
-
let(:cache_path) { File.expand_path(File.join(uploader.cache_dir, uploader.cache_name), uploader.root) }
|
23
|
-
let(:existing_file) { File.join(cache_id_dir, "exsting_file.txt") }
|
24
|
-
|
25
|
-
before do
|
26
|
-
uploader.cache!(file)
|
27
|
-
File.open(existing_file, "wb"){|f| f << "I exist"}
|
28
|
-
uploader.store!
|
29
|
-
end
|
30
|
-
|
31
|
-
it "doesn't delete the old cache_id" do
|
32
|
-
expect(File).to be_directory(cache_id_dir)
|
33
|
-
end
|
34
|
-
|
35
|
-
it "doesn't delete other existing files in old cache_id dir" do
|
36
|
-
expect(File).to exist existing_file
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
describe '#cache!' do
|
42
|
-
context "when FileUtils.mkdir_p raises Errno::EMLINK" do
|
43
|
-
before { fake_failed_mkdir_p }
|
44
|
-
after { storage.cache!(sanitized_temp_file) }
|
45
|
-
|
46
|
-
it { is_expected.to receive(:clean_cache!).with(600) }
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
describe '#clean_cache!' do
|
51
|
-
let(:five_days_ago_int) { 1369894322 }
|
52
|
-
let(:three_days_ago_int) { 1370067122 }
|
53
|
-
let(:yesterday_int) { 1370239922 }
|
54
|
-
let(:cache_dir) { File.expand_path(uploader_class.cache_dir, CarrierWave.root) }
|
55
|
-
|
56
|
-
before do
|
57
|
-
FileUtils.mkdir_p File.expand_path("#{five_days_ago_int}-234-2213", cache_dir)
|
58
|
-
FileUtils.mkdir_p File.expand_path("#{three_days_ago_int}-234-2213", cache_dir)
|
59
|
-
FileUtils.mkdir_p File.expand_path("#{yesterday_int}-234-2213", cache_dir)
|
60
|
-
end
|
61
|
-
|
62
|
-
after { FileUtils.rm_rf(cache_dir) }
|
63
|
-
|
64
|
-
it "clears all files older than, by default, 24 hours in the default cache directory" do
|
65
|
-
Timecop.freeze(Time.at(1370261522)) { uploader_class.clean_cached_files! }
|
66
|
-
|
67
|
-
expect(Dir.glob("#{cache_dir}/*").size).to eq(1)
|
68
|
-
end
|
69
|
-
|
70
|
-
it "allows to set since how many seconds delete the cached files" do
|
71
|
-
Timecop.freeze(Time.at(1370261522)) { uploader_class.clean_cached_files!(60*60*24*4) }
|
72
|
-
|
73
|
-
expect(Dir.glob("#{cache_dir}/*").size).to eq(2)
|
74
|
-
end
|
75
|
-
|
76
|
-
it "'s aliased on the CarrierWave module" do
|
77
|
-
Timecop.freeze(Time.at(1370261522)) { CarrierWave.clean_cached_files! }
|
78
|
-
|
79
|
-
expect(Dir.glob("#{cache_dir}/*").size).to eq(1)
|
80
|
-
end
|
81
|
-
end
|
82
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
unless defined?(FOG_CREDENTIALS)
|
2
|
-
|
3
|
-
credentials = []
|
4
|
-
|
5
|
-
if Fog.mocking?
|
6
|
-
# Local and Rackspace don't have fog double support yet
|
7
|
-
mappings = {
|
8
|
-
'AWS' => [:aws_access_key_id, :aws_secret_access_key],
|
9
|
-
'Google' => [:google_storage_access_key_id, :google_storage_secret_access_key],
|
10
|
-
# 'Local' => [:local_root],
|
11
|
-
# 'Rackspace' => [:rackspace_api_key, :rackspace_username]
|
12
|
-
}
|
13
|
-
|
14
|
-
mappings.each do |provider, keys|
|
15
|
-
data = {:provider => provider}
|
16
|
-
keys.each do |key|
|
17
|
-
data[key] = key.to_s
|
18
|
-
end
|
19
|
-
credentials << data
|
20
|
-
end
|
21
|
-
|
22
|
-
FOG_CREDENTIALS = credentials
|
23
|
-
else
|
24
|
-
Fog.credential = :carrierwave
|
25
|
-
|
26
|
-
mappings = {
|
27
|
-
'AWS' => [:aws_access_key_id, :aws_secret_access_key],
|
28
|
-
'Google' => [:google_storage_access_key_id, :google_storage_secret_access_key],
|
29
|
-
'Local' => [:local_root],
|
30
|
-
'Rackspace' => [:rackspace_api_key, :rackspace_username]
|
31
|
-
}
|
32
|
-
|
33
|
-
mappings.each do |provider, keys|
|
34
|
-
unless (creds = Fog.credentials.reject {|key, value| ![*keys].include?(key)}).empty?
|
35
|
-
data = {:provider => provider}
|
36
|
-
keys.each do |key|
|
37
|
-
data[key] = creds[key]
|
38
|
-
end
|
39
|
-
credentials << data
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
FOG_CREDENTIALS = credentials
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
@@ -1,428 +0,0 @@
|
|
1
|
-
def fog_tests(fog_credentials)
|
2
|
-
describe CarrierWave::Storage::Fog do
|
3
|
-
shared_examples_for "#{fog_credentials[:provider]} storage" do
|
4
|
-
|
5
|
-
before do
|
6
|
-
CarrierWave.configure do |config|
|
7
|
-
config.reset_config
|
8
|
-
config.fog_attributes = {}
|
9
|
-
config.fog_credentials = fog_credentials
|
10
|
-
config.fog_directory = CARRIERWAVE_DIRECTORY
|
11
|
-
config.fog_public = true
|
12
|
-
config.fog_use_ssl_for_aws = true
|
13
|
-
config.cache_storage = :fog
|
14
|
-
end
|
15
|
-
|
16
|
-
eval <<-RUBY
|
17
|
-
class FogSpec#{fog_credentials[:provider]}Uploader < CarrierWave::Uploader::Base
|
18
|
-
storage :fog
|
19
|
-
end
|
20
|
-
RUBY
|
21
|
-
|
22
|
-
@provider = fog_credentials[:provider]
|
23
|
-
|
24
|
-
# @uploader = FogSpecUploader.new
|
25
|
-
@uploader = eval("FogSpec#{@provider}Uploader")
|
26
|
-
allow(@uploader).to receive(:store_path).and_return('uploads/test.jpg')
|
27
|
-
|
28
|
-
@storage = CarrierWave::Storage::Fog.new(@uploader)
|
29
|
-
@directory = @storage.connection.directories.get(CARRIERWAVE_DIRECTORY) || @storage.connection.directories.create(:key => CARRIERWAVE_DIRECTORY, :public => true)
|
30
|
-
end
|
31
|
-
|
32
|
-
after do
|
33
|
-
CarrierWave.configure do |config|
|
34
|
-
config.reset_config
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
describe '#cache_stored_file!' do
|
39
|
-
it "should cache_stored_file! after store!" do
|
40
|
-
uploader = @uploader.new
|
41
|
-
uploader.store!(file)
|
42
|
-
expect { uploader.cache_stored_file! }.not_to raise_error
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
describe '#store!' do
|
47
|
-
|
48
|
-
let(:store_path) { 'uploads/test+.jpg' }
|
49
|
-
|
50
|
-
before do
|
51
|
-
allow(@uploader).to receive(:store_path).and_return(store_path)
|
52
|
-
@fog_file = @storage.store!(file)
|
53
|
-
end
|
54
|
-
|
55
|
-
it "should upload the file" do
|
56
|
-
# reading the file after upload should return the body, not a closed tempfile
|
57
|
-
expect(@fog_file.read).to eq('this is stuff')
|
58
|
-
# make sure it actually uploaded to the service, too
|
59
|
-
expect(@directory.files.get(store_path).body).to eq('this is stuff')
|
60
|
-
end
|
61
|
-
|
62
|
-
it "should have a path" do
|
63
|
-
expect(@fog_file.path).to eq(store_path)
|
64
|
-
end
|
65
|
-
|
66
|
-
it "should have a content_type" do
|
67
|
-
expect(@fog_file.content_type).to eq('image/jpeg')
|
68
|
-
expect(@directory.files.get(store_path).content_type).to eq('image/jpeg')
|
69
|
-
end
|
70
|
-
|
71
|
-
it "should have an extension" do
|
72
|
-
expect(@fog_file.extension).to eq("jpg")
|
73
|
-
end
|
74
|
-
|
75
|
-
context "without asset_host" do
|
76
|
-
it "should have a public_url" do
|
77
|
-
unless fog_credentials[:provider] == 'Local'
|
78
|
-
expect(@fog_file.public_url).not_to be_nil
|
79
|
-
end
|
80
|
-
end
|
81
|
-
|
82
|
-
it "should have a url" do
|
83
|
-
unless fog_credentials[:provider] == 'Local'
|
84
|
-
expect(@fog_file.url).not_to be_nil
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
it "should use a subdomain URL for AWS if the directory is a valid subdomain" do
|
89
|
-
if @provider == 'AWS'
|
90
|
-
allow(@uploader).to receive(:fog_directory).and_return('assets.site.com')
|
91
|
-
expect(@fog_file.public_url).to include('https://assets.site.com.s3.amazonaws.com')
|
92
|
-
end
|
93
|
-
end
|
94
|
-
|
95
|
-
it "should not use a subdomain URL for AWS if the directory is not a valid subdomain" do
|
96
|
-
if @provider == 'AWS'
|
97
|
-
allow(@uploader).to receive(:fog_directory).and_return('SiteAssets')
|
98
|
-
expect(@fog_file.public_url).to include('https://s3.amazonaws.com/SiteAssets')
|
99
|
-
end
|
100
|
-
end
|
101
|
-
|
102
|
-
it "should use https as a default protocol" do
|
103
|
-
if @provider == 'AWS'
|
104
|
-
expect(@fog_file.public_url).to start_with 'https://'
|
105
|
-
end
|
106
|
-
end
|
107
|
-
|
108
|
-
it "should use https as a default protocol" do
|
109
|
-
if @provider == 'AWS'
|
110
|
-
allow(@uploader).to receive(:fog_use_ssl_for_aws).and_return(false)
|
111
|
-
expect(@fog_file.public_url).to start_with 'http://'
|
112
|
-
end
|
113
|
-
end
|
114
|
-
end
|
115
|
-
|
116
|
-
context "with asset_host" do
|
117
|
-
before { allow(@uploader).to receive(:asset_host).and_return(asset_host) }
|
118
|
-
|
119
|
-
context "when a asset_host is a proc" do
|
120
|
-
|
121
|
-
let(:asset_host) { proc { "http://foo.bar" } }
|
122
|
-
|
123
|
-
describe "args passed to proc" do
|
124
|
-
let(:asset_host) { proc { |storage| expect(storage).to be_instance_of ::CarrierWave::Storage::Fog::File } }
|
125
|
-
|
126
|
-
it "should be the uploader" do
|
127
|
-
@fog_file.public_url
|
128
|
-
end
|
129
|
-
end
|
130
|
-
|
131
|
-
it "should have a asset_host rooted public_url" do
|
132
|
-
expect(@fog_file.public_url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
133
|
-
end
|
134
|
-
|
135
|
-
it "should have a asset_host rooted url" do
|
136
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
137
|
-
end
|
138
|
-
|
139
|
-
it "should always have the same asset_host rooted url" do
|
140
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
141
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
142
|
-
end
|
143
|
-
|
144
|
-
it 'should retrieve file name' do
|
145
|
-
expect(@fog_file.filename).to eq('test+.jpg')
|
146
|
-
end
|
147
|
-
end
|
148
|
-
|
149
|
-
context "when a string" do
|
150
|
-
let(:asset_host) { "http://foo.bar" }
|
151
|
-
|
152
|
-
it "should have a asset_host rooted public_url" do
|
153
|
-
expect(@fog_file.public_url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
154
|
-
end
|
155
|
-
|
156
|
-
it "should have a asset_host rooted url" do
|
157
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
158
|
-
end
|
159
|
-
|
160
|
-
it "should always have the same asset_host rooted url" do
|
161
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
162
|
-
expect(@fog_file.url).to eq('http://foo.bar/uploads/test%2B.jpg')
|
163
|
-
end
|
164
|
-
end
|
165
|
-
|
166
|
-
end
|
167
|
-
|
168
|
-
context "without extension" do
|
169
|
-
|
170
|
-
let(:store_path) { 'uploads/test' }
|
171
|
-
|
172
|
-
it "should have no extension" do
|
173
|
-
expect(@fog_file.extension).to be_nil
|
174
|
-
end
|
175
|
-
|
176
|
-
end
|
177
|
-
|
178
|
-
it "should return filesize" do
|
179
|
-
expect(@fog_file.size).to eq(13)
|
180
|
-
end
|
181
|
-
|
182
|
-
it "should be deletable" do
|
183
|
-
@fog_file.delete
|
184
|
-
expect(@directory.files.head(store_path)).to eq(nil)
|
185
|
-
end
|
186
|
-
|
187
|
-
context "when the file has been deleted" do
|
188
|
-
before { @fog_file.delete }
|
189
|
-
|
190
|
-
it "should not error getting the file size" do
|
191
|
-
expect { @fog_file.size }.not_to raise_error
|
192
|
-
end
|
193
|
-
|
194
|
-
it "should not error getting the content type" do
|
195
|
-
expect { @fog_file.content_type }.not_to raise_error
|
196
|
-
end
|
197
|
-
end
|
198
|
-
end
|
199
|
-
|
200
|
-
describe '#retrieve!' do
|
201
|
-
before do
|
202
|
-
@directory.files.create(:key => 'uploads/test.jpg', :body => 'A test, 1234', :public => true)
|
203
|
-
allow(@uploader).to receive(:store_path).with('test.jpg').and_return('uploads/test.jpg')
|
204
|
-
@fog_file = @storage.retrieve!('test.jpg')
|
205
|
-
end
|
206
|
-
|
207
|
-
it "should retrieve the file contents" do
|
208
|
-
expect(@fog_file.read.chomp).to eq("A test, 1234")
|
209
|
-
end
|
210
|
-
|
211
|
-
it "should have a path" do
|
212
|
-
expect(@fog_file.path).to eq('uploads/test.jpg')
|
213
|
-
end
|
214
|
-
|
215
|
-
it "should have a public url" do
|
216
|
-
unless fog_credentials[:provider] == 'Local'
|
217
|
-
expect(@fog_file.public_url).not_to be_nil
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
|
-
it "should return filesize" do
|
222
|
-
expect(@fog_file.size).to eq(12)
|
223
|
-
end
|
224
|
-
|
225
|
-
it "should be deletable" do
|
226
|
-
@fog_file.delete
|
227
|
-
expect(@directory.files.head('uploads/test.jpg')).to eq(nil)
|
228
|
-
end
|
229
|
-
end
|
230
|
-
|
231
|
-
describe '#cache!' do
|
232
|
-
before do
|
233
|
-
allow(@uploader).to receive(:cache_path).and_return('uploads/tmp/test+.jpg')
|
234
|
-
@fog_file = @storage.cache!(file)
|
235
|
-
end
|
236
|
-
|
237
|
-
it "should upload the file", focus: true do
|
238
|
-
expect(@directory.files.get('uploads/tmp/test+.jpg').body).to eq('this is stuff')
|
239
|
-
end
|
240
|
-
end
|
241
|
-
|
242
|
-
describe '#retrieve_from_cache!' do
|
243
|
-
before do
|
244
|
-
@directory.files.create(:key => 'uploads/tmp/test.jpg', :body => 'A test, 1234', :public => true)
|
245
|
-
allow(@uploader).to receive(:cache_path).with('test.jpg').and_return('uploads/tmp/test.jpg')
|
246
|
-
@fog_file = @storage.retrieve_from_cache!('test.jpg')
|
247
|
-
end
|
248
|
-
|
249
|
-
it "should retrieve the file contents" do
|
250
|
-
expect(@fog_file.read.chomp).to eq("A test, 1234")
|
251
|
-
end
|
252
|
-
end
|
253
|
-
|
254
|
-
describe '#delete_dir' do
|
255
|
-
it "should do nothing" do
|
256
|
-
expect(running{ @storage.delete_dir!('foobar') }).not_to raise_error
|
257
|
-
end
|
258
|
-
end
|
259
|
-
|
260
|
-
describe '#clean_cache!' do
|
261
|
-
let(:now){ Time.now.to_i }
|
262
|
-
before do
|
263
|
-
# clean up
|
264
|
-
@directory.files.each{|file| file.destroy }
|
265
|
-
# We can't use simple time freezing because of AWS request time check
|
266
|
-
five_days_ago_int = now - 367270
|
267
|
-
three_days_ago_int = now - 194400
|
268
|
-
yesterday_int = now - 21600
|
269
|
-
|
270
|
-
[five_days_ago_int, three_days_ago_int, yesterday_int].each do |as_of|
|
271
|
-
@directory.files.create(:key => "uploads/tmp/#{as_of}-234-2213/test.jpg", :body => 'A test, 1234', :public => true)
|
272
|
-
end
|
273
|
-
end
|
274
|
-
|
275
|
-
it "should clear all files older than, by defaul, 24 hours in the default cache directory" do
|
276
|
-
Timecop.freeze(Time.at(now)) do
|
277
|
-
@uploader.clean_cached_files!
|
278
|
-
end
|
279
|
-
expect(@directory.files.all(:prefix => 'uploads/tmp').size).to eq(1)
|
280
|
-
end
|
281
|
-
|
282
|
-
it "should permit to set since how many seconds delete the cached files" do
|
283
|
-
Timecop.freeze(Time.at(now)) do
|
284
|
-
@uploader.clean_cached_files!(60*60*24*4)
|
285
|
-
end
|
286
|
-
expect(@directory.files.all(:prefix => 'uploads/tmp').size).to eq(2)
|
287
|
-
end
|
288
|
-
|
289
|
-
it "should be aliased on the CarrierWave module" do
|
290
|
-
Timecop.freeze(Time.at(now)) do
|
291
|
-
CarrierWave.clean_cached_files!
|
292
|
-
end
|
293
|
-
expect(@directory.files.all(:prefix => 'uploads/tmp').size).to eq(1)
|
294
|
-
end
|
295
|
-
end
|
296
|
-
|
297
|
-
describe 'fog_public' do
|
298
|
-
|
299
|
-
context "true" do
|
300
|
-
before do
|
301
|
-
directory_key = "#{CARRIERWAVE_DIRECTORY}public"
|
302
|
-
@directory = @storage.connection.directories.create(:key => directory_key, :public => true)
|
303
|
-
allow(@uploader).to receive(:fog_directory).and_return(directory_key)
|
304
|
-
allow(@uploader).to receive(:store_path).and_return('uploads/public.txt')
|
305
|
-
@fog_file = @storage.store!(file)
|
306
|
-
end
|
307
|
-
|
308
|
-
after do
|
309
|
-
@directory.files.new(:key => 'uploads/public.txt').destroy
|
310
|
-
@directory.files.new(:key => 'test.jpg').destroy
|
311
|
-
@directory.destroy
|
312
|
-
end
|
313
|
-
|
314
|
-
it "should be available at public URL" do
|
315
|
-
unless Fog.mocking? || fog_credentials[:provider] == 'Local'
|
316
|
-
expect(open(@fog_file.public_url).read).to eq('this is stuff')
|
317
|
-
end
|
318
|
-
end
|
319
|
-
end
|
320
|
-
|
321
|
-
context "false" do
|
322
|
-
before do
|
323
|
-
directory_key = "#{CARRIERWAVE_DIRECTORY}private"
|
324
|
-
@directory = @storage.connection.directories.create(:key => directory_key, :public => true)
|
325
|
-
allow(@uploader).to receive(:fog_directory).and_return(directory_key)
|
326
|
-
allow(@uploader).to receive(:fog_public).and_return(false)
|
327
|
-
allow(@uploader).to receive(:store_path).and_return('uploads/private.txt')
|
328
|
-
@fog_file = @storage.store!(file)
|
329
|
-
end
|
330
|
-
|
331
|
-
after do
|
332
|
-
@directory.files.new(:key => 'uploads/private.txt').destroy
|
333
|
-
@directory.files.new(:key => 'test.jpg').destroy
|
334
|
-
@directory.destroy
|
335
|
-
end
|
336
|
-
|
337
|
-
it "should not be available at public URL" do
|
338
|
-
unless Fog.mocking? || fog_credentials[:provider] == 'Local'
|
339
|
-
expect(running{ open(@fog_file.public_url) }).to raise_error
|
340
|
-
end
|
341
|
-
end
|
342
|
-
|
343
|
-
it "should have an authenticated_url" do
|
344
|
-
if ['AWS', 'Rackspace', 'Google', 'OpenStack'].include?(@provider)
|
345
|
-
expect(@fog_file.authenticated_url).not_to be_nil
|
346
|
-
end
|
347
|
-
end
|
348
|
-
|
349
|
-
it 'should generate correct filename' do
|
350
|
-
expect(@fog_file.filename).to eq('private.txt')
|
351
|
-
end
|
352
|
-
|
353
|
-
it "should handle query params" do
|
354
|
-
if @provider == 'AWS' && !Fog.mocking?
|
355
|
-
headers = Excon.get(@fog_file.url(:query => {"response-content-disposition" => "attachment"})).headers
|
356
|
-
expect(headers["Content-Disposition"]).to eq("attachment")
|
357
|
-
end
|
358
|
-
end
|
359
|
-
end
|
360
|
-
end
|
361
|
-
|
362
|
-
end
|
363
|
-
|
364
|
-
describe "with a valid Hash" do
|
365
|
-
let(:file) do
|
366
|
-
CarrierWave::SanitizedFile.new(
|
367
|
-
:tempfile => stub_merb_tempfile('test.jpg'),
|
368
|
-
:filename => 'test.jpg',
|
369
|
-
:content_type => 'image/jpeg'
|
370
|
-
)
|
371
|
-
end
|
372
|
-
|
373
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
374
|
-
end
|
375
|
-
|
376
|
-
describe "with a valid Tempfile" do
|
377
|
-
let(:file) do
|
378
|
-
CarrierWave::SanitizedFile.new(stub_tempfile('test.jpg', 'image/jpeg'))
|
379
|
-
end
|
380
|
-
|
381
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
382
|
-
end
|
383
|
-
|
384
|
-
describe "with a valid StringIO" do
|
385
|
-
let(:file) do
|
386
|
-
CarrierWave::SanitizedFile.new(stub_stringio('test.jpg', 'image/jpeg'))
|
387
|
-
end
|
388
|
-
|
389
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
390
|
-
end
|
391
|
-
|
392
|
-
describe "with a valid File object" do
|
393
|
-
let(:file) do
|
394
|
-
CarrierWave::SanitizedFile.new(stub_file('test.jpg', 'image/jpeg'))
|
395
|
-
end
|
396
|
-
|
397
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
398
|
-
|
399
|
-
end
|
400
|
-
|
401
|
-
describe "with a valid path" do
|
402
|
-
let(:file) do
|
403
|
-
CarrierWave::SanitizedFile.new(file_path('test.jpg'))
|
404
|
-
end
|
405
|
-
|
406
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
407
|
-
end
|
408
|
-
|
409
|
-
describe "with a valid Pathname" do
|
410
|
-
let(:file) do
|
411
|
-
CarrierWave::SanitizedFile.new(Pathname.new(file_path('test.jpg')))
|
412
|
-
end
|
413
|
-
|
414
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
415
|
-
end
|
416
|
-
|
417
|
-
describe "with a CarrierWave::Storage::Fog::File" do
|
418
|
-
let(:file) do
|
419
|
-
CarrierWave::Storage::Fog::File.new(@uploader, @storage, 'test.jpg').
|
420
|
-
tap{|file| file.store(CarrierWave::SanitizedFile.new(
|
421
|
-
:tempfile => StringIO.new('this is stuff'), :content_type => 'image/jpeg')) }
|
422
|
-
end
|
423
|
-
|
424
|
-
it_should_behave_like "#{fog_credentials[:provider]} storage"
|
425
|
-
end
|
426
|
-
|
427
|
-
end
|
428
|
-
end
|