card 1.19.0 → 1.19.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/card.gemspec +3 -3
- data/config/initializers/{02_extensions → 02_patches}/kaminari.rb +16 -5
- data/config/initializers/patches.rb +7 -0
- data/config/locales/en.yml +15 -6
- data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb +11 -11
- data/db/migrate_core_cards/data/themes/bootstrap_default/_variables.scss +2 -1
- data/db/seed/new/card_actions.yml +915 -443
- data/db/seed/new/card_acts.yml +348 -186
- data/db/seed/new/card_changes.yml +4409 -3329
- data/db/seed/new/card_references.yml +220 -3
- data/db/seed/new/cards.yml +6687 -3445
- data/db/seed/test/fixtures/card_actions.yml +1953 -1513
- data/db/seed/test/fixtures/card_acts.yml +615 -453
- data/db/seed/test/fixtures/card_changes.yml +7596 -6516
- data/db/seed/test/fixtures/card_references.yml +892 -675
- data/db/seed/test/fixtures/cards.yml +8803 -5561
- data/db/seeds.rb +8 -0
- data/lib/card.rb +10 -0
- data/lib/card/auth/setup.rb +6 -6
- data/lib/card/mod/dirs.rb +13 -3
- data/lib/card/set/advanced_api.rb +5 -4
- data/lib/cardio.rb +7 -3
- data/mod/Modfile +2 -2
- data/mod/admin/set/self/admin.rb +47 -30
- data/mod/admin/set/self/admin_info.rb +11 -11
- data/mod/basic_formats/set/self/head.rb +1 -1
- data/mod/{basic_types → basic_formats}/spec/set/all/all_css_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/all_csv_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/base_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/file_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/json_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/rss_spec.rb +0 -0
- data/mod/{basic_types → basic_formats}/spec/set/all/text_spec.rb +0 -0
- data/mod/bootstrap/lib/stylesheets/bootstrap/_variables.scss +1 -1
- data/mod/bootstrap/set/all/bootstrap/table.rb +1 -1
- data/mod/bootstrap/set/self/bootswatch_shared.rb +1 -1
- data/mod/carrierwave/Gemfile +4 -0
- data/mod/carrierwave/lib/carrier_wave/cardmount.rb +24 -13
- data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb +189 -57
- data/mod/carrierwave/lib/carrier_wave/image_card_uploader.rb +5 -0
- data/mod/carrierwave/set/abstract/attachment.rb +26 -190
- data/mod/carrierwave/set/abstract/attachment/paths.rb +50 -0
- data/mod/carrierwave/set/abstract/attachment/storage_type.rb +319 -0
- data/mod/carrierwave/set/abstract/attachment/upload_cache.rb +77 -0
- data/mod/carrierwave/set/all/file_utils.rb +28 -0
- data/mod/carrierwave/set/self/admin.rb +23 -0
- data/mod/carrierwave/set/type/file.rb +26 -23
- data/mod/carrierwave/set/type/image.rb +1 -0
- data/mod/carrierwave/spec/lib/carrier_wave/file_card_uploader_spec.rb +67 -0
- data/mod/carrierwave/spec/set/type/file_spec.rb +557 -0
- data/mod/{standard → carrierwave}/spec/set/type/image_spec.rb +22 -4
- data/mod/core/set/abstract/code_file.rb +3 -3
- data/mod/core/set/all/debug.rb +23 -0
- data/mod/core/set/all/name.rb +1 -1
- data/mod/core/set/all/permissions.rb +22 -12
- data/mod/core/set/all/tracked_attributes.rb +0 -76
- data/mod/core/set/all/trash.rb +50 -0
- data/mod/core/set/all/update_read_rules.rb +84 -0
- data/mod/core/set/all/utils.rb +1 -75
- data/mod/email/set/type_plus_right/user/follow.rb +4 -8
- data/mod/history/lib/card/act.rb +3 -1
- data/mod/history/lib/card/action.rb +3 -1
- data/mod/history/lib/card/action/differ.rb +12 -1
- data/mod/history/set/all/history.rb +2 -1
- data/mod/machines/file/all_script_machine_output/file.js +211 -0
- data/mod/machines/file/all_style_machine_output/file.css +19 -0
- data/mod/machines/set/abstract/machine.rb +270 -0
- data/mod/machines/set/abstract/machine_input.rb +76 -0
- data/mod/machines/set/right/machine_output.rb +9 -1
- data/mod/machines/set/type/coffee_script.rb +2 -6
- data/mod/machines/set/type/css.rb +2 -2
- data/mod/machines/set/type/java_script.rb +2 -2
- data/mod/machines/set/type/skin.rb +2 -2
- data/mod/machines/spec/set/abstract/machine_spec.rb +10 -0
- data/mod/{basic_types → pointer}/spec/set/type/pointer_spec.rb +10 -26
- data/mod/settings/set/right/script.rb +1 -1
- data/mod/settings/set/right/style.rb +1 -1
- data/mod/solid_cache/set/all/solid_cache.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/all/links.rb +2 -2
- data/spec/spec_helper.rb +15 -3
- data/tmpsets/set/{mod014-admin → mod001-admin}/self/admin.rb +47 -30
- data/tmpsets/set/{mod014-admin → mod001-admin}/self/admin_info.rb +11 -11
- data/tmpsets/set/{mod014-admin → mod001-admin}/self/version.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/abstract/code_file.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/actify.rb +6 -5
- data/tmpsets/set/{mod001-core → mod002-core}/all/active_card.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/collection.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/content.rb +0 -0
- data/tmpsets/set/mod002-core/all/debug.rb +30 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/erb.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/event.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/export.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/fetch.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/haml.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/initialize.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/location_history.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/name.rb +1 -1
- data/tmpsets/set/{mod001-core → mod002-core}/all/name_validations.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/pattern.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/permissions.rb +22 -12
- data/tmpsets/set/{mod001-core → mod002-core}/all/phases.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/references.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/rules.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/stages.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/states.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/subcards.rb +0 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/templating.rb +0 -0
- data/tmpsets/set/mod002-core/all/tracked_attributes.rb +78 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/trash.rb +50 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/type.rb +0 -0
- data/tmpsets/set/mod002-core/all/update_read_rules.rb +91 -0
- data/tmpsets/set/mod002-core/all/utils.rb +62 -0
- data/tmpsets/set/{mod001-core → mod002-core}/all/view_cache.rb +0 -0
- data/tmpsets/set/{mod002-history → mod003-history}/all/actions.rb +0 -0
- data/tmpsets/set/{mod002-history → mod003-history}/all/content_history.rb +0 -0
- data/tmpsets/set/{mod002-history → mod003-history}/all/history.rb +2 -1
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/all_css.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/all_csv.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/all_js.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/base.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/file.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/json.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/rss.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/all/text.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/self/01_head/javascript.rb +0 -0
- data/tmpsets/set/{mod003-basic_formats → mod004-basic_formats}/self/head.rb +1 -1
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/abstract/01_pointer.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/abstract/01_pointer/edit.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/abstract/code_pointer.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/self/script_editors.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/self/script_mods.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/self/script_pointer_config.rb +0 -0
- data/tmpsets/set/{mod004-pointer → mod005-pointer}/type/pointer.rb +0 -0
- data/tmpsets/set/{mod005-ace_editor → mod006-ace_editor}/abstract/ace_editor.rb +0 -0
- data/tmpsets/set/{mod005-ace_editor → mod006-ace_editor}/self/script_ace.rb +0 -0
- data/tmpsets/set/{mod005-ace_editor → mod006-ace_editor}/self/script_ace_config.rb +0 -0
- data/tmpsets/set/{mod006-prosemirror_editor → mod007-prosemirror_editor}/abstract/prosemirror_editor.rb +0 -0
- data/tmpsets/set/{mod006-prosemirror_editor → mod007-prosemirror_editor}/self/script_prosemirror.rb +0 -0
- data/tmpsets/set/{mod006-prosemirror_editor → mod007-prosemirror_editor}/self/script_prosemirror_config.rb +0 -0
- data/tmpsets/set/{mod008-solid_cache → mod009-solid_cache}/abstract/solid_cache.rb +0 -0
- data/tmpsets/set/{mod008-solid_cache → mod009-solid_cache}/all/solid_cache.rb +0 -0
- data/tmpsets/set/{mod008-solid_cache → mod009-solid_cache}/right/solid_cache.rb +0 -0
- data/tmpsets/set/{mod009-basic_types → mod010-basic_types}/type/html.rb +0 -0
- data/tmpsets/set/{mod009-basic_types → mod010-basic_types}/type/plain_text.rb +0 -0
- data/tmpsets/set/mod011-machines/abstract/machine.rb +277 -0
- data/tmpsets/set/mod011-machines/abstract/machine_input.rb +83 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/abstract/script.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/all/reset_machines.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/right/machine_cache.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/right/machine_input.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/right/machine_output.rb +9 -1
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/script_card_menu.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/script_html5shiv_printshiv.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/script_jquery.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/script_jquery_helper.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/script_slot.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/style_bootstrap_compatible.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/style_cards.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/self/style_jquery_ui_smoothness.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/type/coffee_script.rb +2 -6
- data/tmpsets/set/{mod010-machines → mod011-machines}/type/css.rb +2 -2
- data/tmpsets/set/{mod010-machines → mod011-machines}/type/java_script.rb +2 -2
- data/tmpsets/set/{mod010-machines → mod011-machines}/type/scss.rb +0 -0
- data/tmpsets/set/{mod010-machines → mod011-machines}/type/skin.rb +2 -2
- data/tmpsets/set/{mod011-settings → mod012-settings}/abstract/permission.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/add_help.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/comment.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/create.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/default.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/delete.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/help.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/read.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/script.rb +1 -1
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/structure.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/style.rb +1 -1
- data/tmpsets/set/{mod011-settings → mod012-settings}/right/update.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/accountable.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/add_help.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/autoname.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/captcha.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/create.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/default.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/default_html_view.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/delete.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/follow_fields.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/help.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/input.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/layout.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/on_create.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/on_delete.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/on_update.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/options.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/options_label.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/read.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/recent_settings.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/script.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/structure.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/style.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/table_of_contents.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/thanks.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/self/update.rb +0 -0
- data/tmpsets/set/{mod011-settings → mod012-settings}/type/setting.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/all/email_html.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/all/email_text.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/all/follow.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/all/notify.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/all/observer.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/bcc.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/cc.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/follow.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/follow_fields.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/followers.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/following.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/from.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/html_message.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/right/to.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/always.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/created.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/edited.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/follow.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/follow_defaults.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/self/never.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/type/email_template.rb +0 -0
- data/tmpsets/set/{mod012-email → mod013-email}/type_plus_right/user/follow.rb +4 -8
- data/tmpsets/set/{mod015-developer → mod014-developer}/all/event_viz.rb +0 -0
- data/tmpsets/set/{mod015-developer → mod014-developer}/all/view_viz.rb +0 -0
- data/tmpsets/set/{mod015-developer → mod014-developer}/right/debug.rb +0 -0
- data/tmpsets/set/mod015-carrierwave/abstract/attachment.rb +118 -0
- data/tmpsets/set/mod015-carrierwave/abstract/attachment/paths.rb +57 -0
- data/tmpsets/set/mod015-carrierwave/abstract/attachment/storage_type.rb +326 -0
- data/tmpsets/set/mod015-carrierwave/abstract/attachment/upload_cache.rb +84 -0
- data/tmpsets/set/mod015-carrierwave/all/file_utils.rb +35 -0
- data/tmpsets/set/mod015-carrierwave/self/admin.rb +30 -0
- data/tmpsets/set/{mod013-carrierwave → mod015-carrierwave}/type/file.rb +27 -24
- data/tmpsets/set/{mod013-carrierwave → mod015-carrierwave}/type/image.rb +1 -0
- data/tmpsets/set/mod016-standard/all/links.rb +2 -2
- data/tmpsets/set/mod018-bootstrap/all/bootstrap/table.rb +1 -1
- data/tmpsets/set/mod018-bootstrap/self/bootswatch_shared.rb +1 -1
- data/vendor/carrierwave/.gitignore +19 -0
- data/vendor/carrierwave/.rubocop.yml +262 -0
- data/vendor/carrierwave/.travis.yml +58 -0
- data/vendor/carrierwave/CHANGELOG.md +81 -0
- data/vendor/carrierwave/CONTRIBUTING.md +37 -0
- data/vendor/carrierwave/Gemfile +5 -0
- data/vendor/carrierwave/README.md +995 -0
- data/vendor/carrierwave/Rakefile +26 -0
- data/vendor/carrierwave/carrierwave.gemspec +45 -0
- data/vendor/carrierwave/cucumber.yml +2 -0
- data/vendor/carrierwave/features/caching.feature +28 -0
- data/vendor/carrierwave/features/download.feature +20 -0
- data/vendor/carrierwave/features/file_storage.feature +37 -0
- data/vendor/carrierwave/features/file_storage_overridden_filename.feature +38 -0
- data/vendor/carrierwave/features/file_storage_overridden_store_dir.feature +38 -0
- data/vendor/carrierwave/features/file_storage_reversing_processor.feature +43 -0
- data/vendor/carrierwave/features/fixtures/bork.txt +1 -0
- data/vendor/carrierwave/features/fixtures/monkey.txt +1 -0
- data/vendor/carrierwave/features/fixtures/upcased_bork.txt +1 -0
- data/vendor/carrierwave/features/mount_activerecord.feature +46 -0
- data/vendor/carrierwave/features/step_definitions/activerecord_steps.rb +20 -0
- data/vendor/carrierwave/features/step_definitions/caching_steps.rb +12 -0
- data/vendor/carrierwave/features/step_definitions/datamapper_steps.rb +27 -0
- data/vendor/carrierwave/features/step_definitions/download_steps.rb +8 -0
- data/vendor/carrierwave/features/step_definitions/file_steps.rb +51 -0
- data/vendor/carrierwave/features/step_definitions/general_steps.rb +102 -0
- data/vendor/carrierwave/features/step_definitions/mount_steps.rb +17 -0
- data/vendor/carrierwave/features/step_definitions/store_steps.rb +16 -0
- data/vendor/carrierwave/features/support/activerecord.rb +18 -0
- data/vendor/carrierwave/features/support/env.rb +19 -0
- data/vendor/carrierwave/features/versions_basics.feature +50 -0
- data/vendor/carrierwave/features/versions_caching_from_versions.feature +32 -0
- data/vendor/carrierwave/features/versions_nested_versions.feature +70 -0
- data/vendor/carrierwave/features/versions_overridden_filename.feature +51 -0
- data/vendor/carrierwave/features/versions_overriden_store_dir.feature +41 -0
- data/vendor/carrierwave/gemfiles/rails-4-0-stable.gemfile +5 -0
- data/vendor/carrierwave/gemfiles/rails-4-1-stable.gemfile +5 -0
- data/vendor/carrierwave/gemfiles/rails-4-2-stable.gemfile +5 -0
- data/vendor/carrierwave/gemfiles/rails-master.gemfile +11 -0
- data/vendor/carrierwave/lib/carrierwave.rb +93 -0
- data/vendor/carrierwave/lib/carrierwave/compatibility/paperclip.rb +103 -0
- data/vendor/carrierwave/lib/carrierwave/error.rb +8 -0
- data/vendor/carrierwave/lib/carrierwave/locale/cs.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/de.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/el.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/en.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/es.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/fr-CA.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/fr.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/id.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/ja.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/nb.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/nl.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/pl.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/pt-BR.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/pt-PT.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/ru.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/sk.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/tr.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/zh-CN.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/locale/zh-TW.yml +14 -0
- data/vendor/carrierwave/lib/carrierwave/mount.rb +444 -0
- data/vendor/carrierwave/lib/carrierwave/mounter.rb +163 -0
- data/vendor/carrierwave/lib/carrierwave/orm/activerecord.rb +103 -0
- data/vendor/carrierwave/lib/carrierwave/processing.rb +2 -0
- data/vendor/carrierwave/lib/carrierwave/processing/mini_magick.rb +328 -0
- data/vendor/carrierwave/lib/carrierwave/processing/rmagick.rb +379 -0
- data/vendor/carrierwave/lib/carrierwave/sanitized_file.rb +348 -0
- data/vendor/carrierwave/lib/carrierwave/storage.rb +2 -0
- data/vendor/carrierwave/lib/carrierwave/storage/abstract.rb +43 -0
- data/vendor/carrierwave/lib/carrierwave/storage/file.rb +118 -0
- data/vendor/carrierwave/lib/carrierwave/storage/fog.rb +462 -0
- data/vendor/carrierwave/lib/carrierwave/test/matchers.rb +394 -0
- data/vendor/carrierwave/lib/carrierwave/uploader.rb +67 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/cache.rb +207 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/callbacks.rb +33 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/configuration.rb +203 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/content_type_blacklist.rb +48 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/content_type_whitelist.rb +48 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/default_url.rb +17 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/download.rb +92 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/extension_blacklist.rb +51 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/extension_whitelist.rb +51 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/file_size.rb +41 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/magic_mime_blacklist.rb +94 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/magic_mime_whitelist.rb +94 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/mountable.rb +38 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/processing.rb +88 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/proxy.rb +86 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/remove.rb +21 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/serialization.rb +28 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/store.rb +93 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/url.rb +41 -0
- data/vendor/carrierwave/lib/carrierwave/uploader/versions.rb +295 -0
- data/vendor/carrierwave/lib/carrierwave/utilities.rb +6 -0
- data/vendor/carrierwave/lib/carrierwave/utilities/uri.rb +21 -0
- data/vendor/carrierwave/lib/carrierwave/validations/active_model.rb +78 -0
- data/vendor/carrierwave/lib/carrierwave/version.rb +3 -0
- data/vendor/carrierwave/lib/generators/templates/uploader.rb +49 -0
- data/vendor/carrierwave/lib/generators/uploader_generator.rb +7 -0
- data/vendor/carrierwave/script/console +10 -0
- data/vendor/carrierwave/script/destroy +14 -0
- data/vendor/carrierwave/script/generate +14 -0
- data/vendor/carrierwave/spec/compatibility/paperclip_spec.rb +138 -0
- data/vendor/carrierwave/spec/fixtures/Uppercase.jpg +1 -0
- data/vendor/carrierwave/spec/fixtures/bork.ttxt +1 -0
- data/vendor/carrierwave/spec/fixtures/bork.txt +1 -0
- data/vendor/carrierwave/spec/fixtures/bork.txtt +1 -0
- data/vendor/carrierwave/spec/fixtures/case.JPG +1 -0
- 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 +1 -0
- data/vendor/carrierwave/spec/fixtures/new.txt +1 -0
- data/vendor/carrierwave/spec/fixtures/old.jpeg +1 -0
- data/vendor/carrierwave/spec/fixtures/old.txt +1 -0
- 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 +1 -0
- data/vendor/carrierwave/spec/fixtures/test+.jpg +1 -0
- data/vendor/carrierwave/spec/fixtures/test.jpeg +1 -0
- data/vendor/carrierwave/spec/fixtures/test.jpg +1 -0
- data/vendor/carrierwave/spec/generators/uploader_generator_spec.rb +19 -0
- data/vendor/carrierwave/spec/mount_multiple_spec.rb +913 -0
- data/vendor/carrierwave/spec/mount_single_spec.rb +793 -0
- data/vendor/carrierwave/spec/orm/activerecord_spec.rb +1556 -0
- data/vendor/carrierwave/spec/processing/mini_magick_spec.rb +210 -0
- data/vendor/carrierwave/spec/processing/rmagick_spec.rb +250 -0
- data/vendor/carrierwave/spec/sanitized_file_spec.rb +805 -0
- data/vendor/carrierwave/spec/spec_helper.rb +105 -0
- data/vendor/carrierwave/spec/storage/file_spec.rb +82 -0
- data/vendor/carrierwave/spec/storage/fog_credentials.rb +46 -0
- data/vendor/carrierwave/spec/storage/fog_helper.rb +428 -0
- data/vendor/carrierwave/spec/storage/fog_spec.rb +48 -0
- data/vendor/carrierwave/spec/support/activerecord.rb +31 -0
- data/vendor/carrierwave/spec/support/file_utils_helper.rb +15 -0
- data/vendor/carrierwave/spec/uploader/cache_spec.rb +324 -0
- data/vendor/carrierwave/spec/uploader/callback_spec.rb +30 -0
- data/vendor/carrierwave/spec/uploader/configuration_spec.rb +133 -0
- data/vendor/carrierwave/spec/uploader/content_type_blacklist_spec.rb +61 -0
- data/vendor/carrierwave/spec/uploader/content_type_whitelist_spec.rb +63 -0
- data/vendor/carrierwave/spec/uploader/default_url_spec.rb +77 -0
- data/vendor/carrierwave/spec/uploader/download_spec.rb +204 -0
- data/vendor/carrierwave/spec/uploader/extension_blacklist_spec.rb +112 -0
- data/vendor/carrierwave/spec/uploader/extension_whitelist_spec.rb +102 -0
- data/vendor/carrierwave/spec/uploader/file_size_spec.rb +52 -0
- data/vendor/carrierwave/spec/uploader/mountable_spec.rb +26 -0
- data/vendor/carrierwave/spec/uploader/overrides_spec.rb +71 -0
- data/vendor/carrierwave/spec/uploader/paths_spec.rb +18 -0
- data/vendor/carrierwave/spec/uploader/processing_spec.rb +159 -0
- data/vendor/carrierwave/spec/uploader/proxy_spec.rb +79 -0
- data/vendor/carrierwave/spec/uploader/remove_spec.rb +71 -0
- data/vendor/carrierwave/spec/uploader/store_spec.rb +400 -0
- data/vendor/carrierwave/spec/uploader/url_spec.rb +273 -0
- data/vendor/carrierwave/spec/uploader/versions_spec.rb +633 -0
- metadata +339 -187
- data/config/initializers/extensions.rb +0 -3
- data/mod/05_standard/file/favicon/image-icon.png +0 -0
- data/mod/05_standard/file/favicon/image-large.png +0 -0
- data/mod/05_standard/file/favicon/image-medium.png +0 -0
- data/mod/05_standard/file/favicon/image-original.png +0 -0
- data/mod/05_standard/file/favicon/image-small.png +0 -0
- data/mod/machines/lib/card/machine.rb +0 -261
- data/mod/machines/lib/card/machine_input.rb +0 -80
- data/mod/standard/file/credit/icon-image.png +0 -0
- data/mod/standard/file/credit/large-image.png +0 -0
- data/mod/standard/file/credit/medium-image.png +0 -0
- data/mod/standard/file/credit/original-image.png +0 -0
- data/mod/standard/file/credit/small-image.png +0 -0
- data/mod/standard/spec/set/type/file_spec.rb +0 -99
- data/tmpsets/set/mod001-core/all/tracked_attributes.rb +0 -154
- data/tmpsets/set/mod001-core/all/utils.rb +0 -132
- data/tmpsets/set/mod013-carrierwave/abstract/attachment.rb +0 -282
@@ -0,0 +1,79 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CarrierWave::Uploader do
|
4
|
+
let(:uploader_class) { Class.new(CarrierWave::Uploader::Base) }
|
5
|
+
let(:uploader) { uploader_class.new }
|
6
|
+
let(:test_file_name) { 'test.jpg' }
|
7
|
+
let(:test_file) { File.open(file_path(test_file_name)) }
|
8
|
+
let(:path) { '1369894322-345-1234-2255/test.jpeg' }
|
9
|
+
|
10
|
+
after { FileUtils.rm_rf(public_path) }
|
11
|
+
|
12
|
+
describe '#blank?' do
|
13
|
+
subject { uploader }
|
14
|
+
|
15
|
+
context "when nothing has been done" do
|
16
|
+
it { is_expected.to be_blank }
|
17
|
+
end
|
18
|
+
|
19
|
+
context "when file is empty" do
|
20
|
+
before { uploader.retrieve_from_cache!(path) }
|
21
|
+
|
22
|
+
it { is_expected.to be_blank }
|
23
|
+
end
|
24
|
+
|
25
|
+
context "when file has been cached" do
|
26
|
+
before { uploader.cache!(test_file) }
|
27
|
+
|
28
|
+
it { is_expected.not_to be_blank }
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
describe '#read' do
|
33
|
+
subject { uploader.read }
|
34
|
+
|
35
|
+
describe "default behavior" do
|
36
|
+
it { is_expected.to be nil }
|
37
|
+
end
|
38
|
+
|
39
|
+
context "when file is cached" do
|
40
|
+
before { uploader.cache!(test_file) }
|
41
|
+
|
42
|
+
it { is_expected.to eq("this is stuff") }
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
describe '#size' do
|
47
|
+
subject { uploader.size }
|
48
|
+
|
49
|
+
describe "default behavior" do
|
50
|
+
it { is_expected.to be 0 }
|
51
|
+
end
|
52
|
+
|
53
|
+
context "when file is cached" do
|
54
|
+
before { uploader.cache!(test_file) }
|
55
|
+
|
56
|
+
it { is_expected.to be 13 }
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
describe '#content_type' do
|
61
|
+
subject { uploader.content_type }
|
62
|
+
|
63
|
+
context "when nothing has been done" do
|
64
|
+
it { is_expected.to be_nil }
|
65
|
+
end
|
66
|
+
|
67
|
+
context "when the file has been cached" do
|
68
|
+
before { uploader.cache!(test_file) }
|
69
|
+
|
70
|
+
it { is_expected.to eq('image/jpeg') }
|
71
|
+
end
|
72
|
+
|
73
|
+
context "when the file is empty" do
|
74
|
+
before { uploader.retrieve_from_cache!(path) }
|
75
|
+
|
76
|
+
it { is_expected.to eq('image/jpeg') }
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CarrierWave::Uploader do
|
4
|
+
let(:uploader_class) { Class.new(CarrierWave::Uploader::Base) }
|
5
|
+
let(:uploader) { uploader_class.new }
|
6
|
+
let(:file_name) { 'test.jpg' }
|
7
|
+
let(:file) { File.open(file_path(file_name)) }
|
8
|
+
|
9
|
+
after { FileUtils.rm_rf(public_path) }
|
10
|
+
|
11
|
+
describe '#remove!' do
|
12
|
+
let(:stored_file) { double('a stored file') }
|
13
|
+
|
14
|
+
before do
|
15
|
+
allow(CarrierWave).to receive(:generate_cache_id).and_return('1390890634-26112-1234-2122')
|
16
|
+
|
17
|
+
cached_file = double('a cached file')
|
18
|
+
allow(cached_file).to receive(:delete)
|
19
|
+
|
20
|
+
allow(stored_file).to receive(:path).and_return('/path/to/somewhere')
|
21
|
+
allow(stored_file).to receive(:url).and_return('http://www.example.com')
|
22
|
+
allow(stored_file).to receive(:identifier).and_return('this-is-me')
|
23
|
+
allow(stored_file).to receive(:delete)
|
24
|
+
|
25
|
+
storage = double('a storage engine')
|
26
|
+
allow(storage).to receive(:store!).and_return(stored_file)
|
27
|
+
allow(storage).to receive(:cache!).and_return(cached_file)
|
28
|
+
allow(storage).to receive(:delete_dir!).with("uploads/tmp/#{CarrierWave.generate_cache_id}")
|
29
|
+
|
30
|
+
allow(uploader_class.storage).to receive(:new).and_return(storage)
|
31
|
+
uploader.store!(file)
|
32
|
+
end
|
33
|
+
|
34
|
+
it "resets the current path" do
|
35
|
+
uploader.remove!
|
36
|
+
expect(uploader.current_path).to be_nil
|
37
|
+
end
|
38
|
+
|
39
|
+
it "should not be cached" do
|
40
|
+
uploader.remove!
|
41
|
+
expect(uploader).not_to be_cached
|
42
|
+
end
|
43
|
+
|
44
|
+
it "resets the url" do
|
45
|
+
uploader.cache!(file)
|
46
|
+
uploader.remove!
|
47
|
+
expect(uploader.url).to be_nil
|
48
|
+
end
|
49
|
+
|
50
|
+
it "resets the identifier" do
|
51
|
+
uploader.remove!
|
52
|
+
expect(uploader.identifier).to be_nil
|
53
|
+
end
|
54
|
+
|
55
|
+
it "deletes the file" do
|
56
|
+
expect(stored_file).to receive(:delete)
|
57
|
+
uploader.remove!
|
58
|
+
end
|
59
|
+
|
60
|
+
it "resets the cache_name" do
|
61
|
+
uploader.cache!(file)
|
62
|
+
uploader.remove!
|
63
|
+
expect(uploader.cache_name).to be_nil
|
64
|
+
end
|
65
|
+
|
66
|
+
it "does nothing when trying to remove an empty file" do
|
67
|
+
expect{ uploader.remove! }.not_to raise_error
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
end
|
@@ -0,0 +1,400 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CarrierWave::Uploader do
|
4
|
+
|
5
|
+
before do
|
6
|
+
@uploader_class = Class.new(CarrierWave::Uploader::Base)
|
7
|
+
@uploader = @uploader_class.new
|
8
|
+
end
|
9
|
+
|
10
|
+
after do
|
11
|
+
FileUtils.rm_rf(public_path)
|
12
|
+
end
|
13
|
+
|
14
|
+
describe '#store_dir' do
|
15
|
+
it "should default to the config option" do
|
16
|
+
expect(@uploader.store_dir).to eq('uploads')
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
describe '#filename' do
|
21
|
+
it "should default to nil" do
|
22
|
+
expect(@uploader.filename).to be_nil
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
describe '#store!' do
|
27
|
+
before do
|
28
|
+
@file = File.open(file_path('test.jpg'))
|
29
|
+
|
30
|
+
allow(CarrierWave).to receive(:generate_cache_id).and_return('1390890634-26112-1234-2122')
|
31
|
+
|
32
|
+
@cached_file = double('a cached file')
|
33
|
+
allow(@cached_file).to receive(:delete)
|
34
|
+
|
35
|
+
@stored_file = double('a stored file')
|
36
|
+
allow(@stored_file).to receive(:path).and_return('/path/to/somewhere')
|
37
|
+
allow(@stored_file).to receive(:url).and_return('http://www.example.com')
|
38
|
+
|
39
|
+
@storage = double('a storage engine')
|
40
|
+
allow(@storage).to receive(:cache!).and_return(@cached_file)
|
41
|
+
allow(@storage).to receive(:retrieve_from_cache!).and_return(@cached_file)
|
42
|
+
allow(@storage).to receive(:store!).and_return(@stored_file)
|
43
|
+
allow(@storage).to receive(:identifier).and_return('this-is-me')
|
44
|
+
allow(@storage).to receive(:delete_dir!).with("uploads/tmp/#{CarrierWave.generate_cache_id}")
|
45
|
+
|
46
|
+
allow(@uploader_class.storage).to receive(:new).with(@uploader).and_return(@storage)
|
47
|
+
end
|
48
|
+
|
49
|
+
it "should set the current path" do
|
50
|
+
@uploader.store!(@file)
|
51
|
+
expect(@uploader.current_path).to eq('/path/to/somewhere')
|
52
|
+
end
|
53
|
+
|
54
|
+
it "should not be cached" do
|
55
|
+
@uploader.store!(@file)
|
56
|
+
expect(@uploader).not_to be_cached
|
57
|
+
end
|
58
|
+
|
59
|
+
it "should set the url" do
|
60
|
+
@uploader.store!(@file)
|
61
|
+
expect(@uploader.url).to eq('http://www.example.com')
|
62
|
+
end
|
63
|
+
|
64
|
+
it "should set the identifier" do
|
65
|
+
@uploader.store!(@file)
|
66
|
+
expect(@uploader.identifier).to eq('this-is-me')
|
67
|
+
end
|
68
|
+
|
69
|
+
it "should, if a file is given as argument, cache that file" do
|
70
|
+
expect(@uploader).to receive(:cache!).with(@file)
|
71
|
+
@uploader.store!(@file)
|
72
|
+
end
|
73
|
+
|
74
|
+
it "should use a previously cached file if no argument is given" do
|
75
|
+
@uploader.cache!(File.open(file_path('test.jpg')))
|
76
|
+
expect(@uploader).not_to receive(:cache!)
|
77
|
+
@uploader.store!
|
78
|
+
end
|
79
|
+
|
80
|
+
it "should instruct the storage engine to store the file" do
|
81
|
+
@uploader.cache!(@file)
|
82
|
+
expect(@storage).to receive(:store!).with(@uploader.file).and_return(:monkey)
|
83
|
+
@uploader.store!
|
84
|
+
end
|
85
|
+
|
86
|
+
it "should reset the cache_name" do
|
87
|
+
@uploader.cache!(@file)
|
88
|
+
@uploader.store!
|
89
|
+
expect(@uploader.cache_name).to be_nil
|
90
|
+
end
|
91
|
+
|
92
|
+
it "should cache the result given by the storage engine" do
|
93
|
+
@uploader.store!(@file)
|
94
|
+
expect(@uploader.file).to eq(@stored_file)
|
95
|
+
end
|
96
|
+
|
97
|
+
it "should delete the old file" do
|
98
|
+
@uploader.cache!(@file)
|
99
|
+
expect(@uploader.file).to receive(:delete).and_return(true)
|
100
|
+
@uploader.store!
|
101
|
+
end
|
102
|
+
|
103
|
+
context "with the cache_only option set to true" do
|
104
|
+
before do
|
105
|
+
@uploader_class.cache_only = true
|
106
|
+
end
|
107
|
+
|
108
|
+
it "should not instruct the storage engine to store the file" do
|
109
|
+
@uploader.cache!(@file)
|
110
|
+
expect(@storage).not_to receive(:store!)
|
111
|
+
@uploader.store!
|
112
|
+
end
|
113
|
+
|
114
|
+
it "should still be cached" do
|
115
|
+
@uploader.store!(@file)
|
116
|
+
expect(@uploader).to be_cached
|
117
|
+
end
|
118
|
+
|
119
|
+
it "should not reset the cache_name" do
|
120
|
+
@uploader.cache!(@file)
|
121
|
+
@uploader.store!
|
122
|
+
expect(@uploader.cache_name).not_to be_nil
|
123
|
+
end
|
124
|
+
|
125
|
+
it "should not delete the old file" do
|
126
|
+
@uploader.cache!(@file)
|
127
|
+
expect(@uploader.file).not_to receive(:delete)
|
128
|
+
@uploader.store!
|
129
|
+
end
|
130
|
+
end
|
131
|
+
|
132
|
+
context "with the delete_tmp_file_after_storage option set to false" do
|
133
|
+
before do
|
134
|
+
@uploader_class.delete_tmp_file_after_storage = false
|
135
|
+
end
|
136
|
+
|
137
|
+
it "should not delete the old file" do
|
138
|
+
@uploader.cache!(@file)
|
139
|
+
expect(@uploader.file).not_to receive(:delete)
|
140
|
+
@uploader.store!
|
141
|
+
end
|
142
|
+
|
143
|
+
it "should not delete the old cache_id" do
|
144
|
+
@uploader.cache!(@file)
|
145
|
+
|
146
|
+
expect(@storage).not_to receive(:delete_dir!)
|
147
|
+
@uploader.store!
|
148
|
+
end
|
149
|
+
end
|
150
|
+
|
151
|
+
it "should delete the old cache_id" do
|
152
|
+
@uploader.cache!(@file)
|
153
|
+
|
154
|
+
expect(@storage).to receive(:delete_dir!)
|
155
|
+
@uploader.store!
|
156
|
+
end
|
157
|
+
|
158
|
+
it "should do nothing when trying to store an empty file" do
|
159
|
+
@uploader.store!(nil)
|
160
|
+
end
|
161
|
+
|
162
|
+
it "should not re-store a retrieved file" do
|
163
|
+
@stored_file = double('a stored file')
|
164
|
+
allow(@storage).to receive(:retrieve!).and_return(@stored_file)
|
165
|
+
|
166
|
+
expect(@uploader_class.storage).not_to receive(:store!)
|
167
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
168
|
+
@uploader.store!
|
169
|
+
end
|
170
|
+
end
|
171
|
+
|
172
|
+
describe '#retrieve_from_store!' do
|
173
|
+
before do
|
174
|
+
@cached_file = double('a cached file')
|
175
|
+
allow(@cached_file).to receive(:delete)
|
176
|
+
|
177
|
+
@stored_file = double('a stored file')
|
178
|
+
allow(@stored_file).to receive(:path).and_return('/path/to/somewhere')
|
179
|
+
allow(@stored_file).to receive(:url).and_return('http://www.example.com')
|
180
|
+
|
181
|
+
@storage = double('a storage engine')
|
182
|
+
allow(@storage).to receive(:retrieve_from_cache!).and_return(@cached_file)
|
183
|
+
allow(@storage).to receive(:retrieve!).and_return(@stored_file)
|
184
|
+
allow(@storage).to receive(:identifier).and_return('this-is-me')
|
185
|
+
|
186
|
+
allow(@uploader_class.storage).to receive(:new).with(@uploader).and_return(@storage)
|
187
|
+
end
|
188
|
+
|
189
|
+
it "should set the current path" do
|
190
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
191
|
+
expect(@uploader.current_path).to eq('/path/to/somewhere')
|
192
|
+
end
|
193
|
+
|
194
|
+
it "should not be cached" do
|
195
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
196
|
+
expect(@uploader).not_to be_cached
|
197
|
+
end
|
198
|
+
|
199
|
+
it "should set the url" do
|
200
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
201
|
+
expect(@uploader.url).to eq('http://www.example.com')
|
202
|
+
end
|
203
|
+
|
204
|
+
it "should set the identifier" do
|
205
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
206
|
+
expect(@uploader.identifier).to eq('this-is-me')
|
207
|
+
end
|
208
|
+
|
209
|
+
it "should instruct the storage engine to retrieve the file and store the result" do
|
210
|
+
expect(@storage).to receive(:retrieve!).with('monkey.txt').and_return(@stored_file)
|
211
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
212
|
+
expect(@uploader.file).to eq(@stored_file)
|
213
|
+
end
|
214
|
+
|
215
|
+
it "should overwrite a file that has already been cached" do
|
216
|
+
@uploader.retrieve_from_cache!('1369894322-345-1234-2255/test.jpeg')
|
217
|
+
@uploader.retrieve_from_store!('bork.txt')
|
218
|
+
expect(@uploader.file).to eq(@stored_file)
|
219
|
+
end
|
220
|
+
end
|
221
|
+
|
222
|
+
describe 'with an overridden filename' do
|
223
|
+
before do
|
224
|
+
@uploader_class.class_eval do
|
225
|
+
def filename; "foo.jpg"; end
|
226
|
+
end
|
227
|
+
end
|
228
|
+
|
229
|
+
it "should create new files if there is a file" do
|
230
|
+
@file = File.open(file_path('test.jpg'))
|
231
|
+
@uploader.store!(@file)
|
232
|
+
@path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
233
|
+
expect(File.exist?(@path)).to be_truthy
|
234
|
+
end
|
235
|
+
|
236
|
+
it "should not create new files if there is no file" do
|
237
|
+
@uploader.store!(nil)
|
238
|
+
@path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
239
|
+
expect(File.exist?(@path)).to be_falsey
|
240
|
+
end
|
241
|
+
end
|
242
|
+
|
243
|
+
describe 'without a store dir' do
|
244
|
+
before do
|
245
|
+
@uploader_class.class_eval do
|
246
|
+
def store_dir; nil; end
|
247
|
+
end
|
248
|
+
end
|
249
|
+
|
250
|
+
it "should create a new file with a valid path and url" do
|
251
|
+
@file = File.open(file_path('test.jpg'))
|
252
|
+
@uploader.store!(@file)
|
253
|
+
@path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
254
|
+
expect(File.exist?(@path)).to be_truthy
|
255
|
+
expect(@uploader.url).to eq('/test.jpg')
|
256
|
+
end
|
257
|
+
end
|
258
|
+
|
259
|
+
describe 'with an overridden, reversing, filename' do
|
260
|
+
before do
|
261
|
+
@uploader_class.class_eval do
|
262
|
+
def filename
|
263
|
+
super.reverse unless super.blank?
|
264
|
+
end
|
265
|
+
end
|
266
|
+
end
|
267
|
+
|
268
|
+
describe '#store!' do
|
269
|
+
before do
|
270
|
+
@file = File.open(file_path('test.jpg'))
|
271
|
+
|
272
|
+
allow(CarrierWave).to receive(:generate_cache_id).and_return('1390890634-26112-1234-2122')
|
273
|
+
|
274
|
+
@cached_file = double('a cached file')
|
275
|
+
allow(@cached_file).to receive(:delete)
|
276
|
+
|
277
|
+
@stored_file = double('a stored file')
|
278
|
+
allow(@stored_file).to receive(:path).and_return('/path/to/somewhere')
|
279
|
+
allow(@stored_file).to receive(:url).and_return('http://www.example.com')
|
280
|
+
|
281
|
+
@storage = double('a storage engine')
|
282
|
+
allow(@storage).to receive(:cache!).and_return(@cached_file)
|
283
|
+
allow(@storage).to receive(:store!).and_return(@stored_file)
|
284
|
+
allow(@storage).to receive(:delete_dir!).with("uploads/tmp/#{CarrierWave.generate_cache_id}")
|
285
|
+
|
286
|
+
allow(@uploader_class.storage).to receive(:new).with(@uploader).and_return(@storage)
|
287
|
+
end
|
288
|
+
|
289
|
+
it "should set the current path" do
|
290
|
+
@uploader.store!(@file)
|
291
|
+
expect(@uploader.current_path).to eq('/path/to/somewhere')
|
292
|
+
end
|
293
|
+
|
294
|
+
it "should set the url" do
|
295
|
+
@uploader.store!(@file)
|
296
|
+
expect(@uploader.url).to eq('http://www.example.com')
|
297
|
+
end
|
298
|
+
|
299
|
+
it "should, if a file is given as argument, reverse the filename" do
|
300
|
+
@uploader.store!(@file)
|
301
|
+
expect(@uploader.filename).to eq('gpj.tset')
|
302
|
+
end
|
303
|
+
|
304
|
+
end
|
305
|
+
|
306
|
+
describe '#retrieve_from_store!' do
|
307
|
+
before do
|
308
|
+
@stored_file = double('a stored file')
|
309
|
+
allow(@stored_file).to receive(:path).and_return('/path/to/somewhere')
|
310
|
+
allow(@stored_file).to receive(:url).and_return('http://www.example.com')
|
311
|
+
|
312
|
+
@storage = double('a storage engine')
|
313
|
+
allow(@storage).to receive(:retrieve!).and_return(@stored_file)
|
314
|
+
|
315
|
+
allow(@uploader_class.storage).to receive(:new).with(@uploader).and_return(@storage)
|
316
|
+
end
|
317
|
+
|
318
|
+
it "should set the current path" do
|
319
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
320
|
+
expect(@uploader.current_path).to eq('/path/to/somewhere')
|
321
|
+
end
|
322
|
+
|
323
|
+
it "should set the url" do
|
324
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
325
|
+
expect(@uploader.url).to eq('http://www.example.com')
|
326
|
+
end
|
327
|
+
|
328
|
+
it "should pass the identifier to the storage engine" do
|
329
|
+
expect(@storage).to receive(:retrieve!).with('monkey.txt').and_return(@stored_file)
|
330
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
331
|
+
expect(@uploader.file).to eq(@stored_file)
|
332
|
+
end
|
333
|
+
|
334
|
+
it "should not set the filename" do
|
335
|
+
@uploader.retrieve_from_store!('monkey.txt')
|
336
|
+
expect(@uploader.filename).to be_nil
|
337
|
+
end
|
338
|
+
end
|
339
|
+
|
340
|
+
end
|
341
|
+
|
342
|
+
describe "#store! with the move_to_store option" do
|
343
|
+
|
344
|
+
before do
|
345
|
+
@file = File.open(file_path('test.jpg'))
|
346
|
+
@uploader_class.permissions = 0777
|
347
|
+
@uploader_class.directory_permissions = 0777
|
348
|
+
allow(CarrierWave).to receive(:generate_cache_id).and_return('1369894322-345-1234-2255')
|
349
|
+
end
|
350
|
+
|
351
|
+
context "set to true" do
|
352
|
+
before do
|
353
|
+
@uploader_class.move_to_store = true
|
354
|
+
end
|
355
|
+
|
356
|
+
it "should move it from the tmp dir to the store dir" do
|
357
|
+
@uploader.cache!(@file)
|
358
|
+
|
359
|
+
@cached_path = @uploader.file.path
|
360
|
+
@stored_path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
361
|
+
|
362
|
+
expect(@cached_path).to eq(public_path('uploads/tmp/1369894322-345-1234-2255/test.jpg'))
|
363
|
+
expect(File.exist?(@cached_path)).to be_truthy
|
364
|
+
expect(File.exist?(@stored_path)).to be_falsey
|
365
|
+
|
366
|
+
@uploader.store!
|
367
|
+
|
368
|
+
expect(File.exist?(@cached_path)).to be_falsey
|
369
|
+
expect(File.exist?(@stored_path)).to be_truthy
|
370
|
+
end
|
371
|
+
|
372
|
+
it "should use move_to() during store!()" do
|
373
|
+
@uploader.cache!(@file)
|
374
|
+
@stored_path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
375
|
+
|
376
|
+
expect(@uploader.file).to receive(:move_to).with(@stored_path, 0777, 0777)
|
377
|
+
expect(@uploader.file).not_to receive(:copy_to)
|
378
|
+
|
379
|
+
@uploader.store!
|
380
|
+
end
|
381
|
+
end
|
382
|
+
|
383
|
+
context "set to false" do
|
384
|
+
before do
|
385
|
+
@uploader_class.move_to_store = false
|
386
|
+
end
|
387
|
+
|
388
|
+
it "should use copy_to() during store!()" do
|
389
|
+
@uploader.cache!(@file)
|
390
|
+
@stored_path = ::File.expand_path(@uploader.store_path, @uploader.root)
|
391
|
+
|
392
|
+
expect(@uploader.file).to receive(:copy_to).with(@stored_path, 0777, 0777)
|
393
|
+
expect(@uploader.file).not_to receive(:move_to)
|
394
|
+
|
395
|
+
@uploader.store!
|
396
|
+
end
|
397
|
+
end
|
398
|
+
end
|
399
|
+
|
400
|
+
end
|