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,38 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Mountable
|
4
|
+
|
5
|
+
attr_reader :model, :mounted_as
|
6
|
+
|
7
|
+
##
|
8
|
+
# If a model is given as the first parameter, it will be stored in the
|
9
|
+
# uploader, and available through +#model+. Likewise, mounted_as stores
|
10
|
+
# the name of the column where this instance of the uploader is mounted.
|
11
|
+
# These values can then be used inside your uploader.
|
12
|
+
#
|
13
|
+
# If you do not wish to mount your uploaders with the ORM extensions in
|
14
|
+
# -more then you can override this method inside your uploader. Just be
|
15
|
+
# sure to call +super+
|
16
|
+
#
|
17
|
+
# === Parameters
|
18
|
+
#
|
19
|
+
# [model (Object)] Any kind of model object
|
20
|
+
# [mounted_as (Symbol)] The name of the column where this uploader is mounted
|
21
|
+
#
|
22
|
+
# === Examples
|
23
|
+
#
|
24
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
25
|
+
#
|
26
|
+
# def store_dir
|
27
|
+
# File.join('public', 'files', mounted_as, model.permalink)
|
28
|
+
# end
|
29
|
+
# end
|
30
|
+
#
|
31
|
+
def initialize(model=nil, mounted_as=nil)
|
32
|
+
@model = model
|
33
|
+
@mounted_as = mounted_as
|
34
|
+
end
|
35
|
+
|
36
|
+
end # Mountable
|
37
|
+
end # Uploader
|
38
|
+
end # CarrierWave
|
@@ -0,0 +1,88 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Processing
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
|
6
|
+
include CarrierWave::Uploader::Callbacks
|
7
|
+
|
8
|
+
included do
|
9
|
+
class_attribute :processors, :instance_writer => false
|
10
|
+
self.processors = []
|
11
|
+
|
12
|
+
before :cache, :process!
|
13
|
+
end
|
14
|
+
|
15
|
+
module ClassMethods
|
16
|
+
|
17
|
+
##
|
18
|
+
# Adds a processor callback which applies operations as a file is uploaded.
|
19
|
+
# The argument may be the name of any method of the uploader, expressed as a symbol,
|
20
|
+
# or a list of such methods, or a hash where the key is a method and the value is
|
21
|
+
# an array of arguments to call the method with
|
22
|
+
#
|
23
|
+
# === Parameters
|
24
|
+
#
|
25
|
+
# args (*Symbol, Hash{Symbol => Array[]})
|
26
|
+
#
|
27
|
+
# === Examples
|
28
|
+
#
|
29
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
30
|
+
#
|
31
|
+
# process :sepiatone, :vignette
|
32
|
+
# process :scale => [200, 200]
|
33
|
+
# process :scale => [200, 200], :if => :image?
|
34
|
+
# process :sepiatone, :if => :image?
|
35
|
+
#
|
36
|
+
# def sepiatone
|
37
|
+
# ...
|
38
|
+
# end
|
39
|
+
#
|
40
|
+
# def vignette
|
41
|
+
# ...
|
42
|
+
# end
|
43
|
+
#
|
44
|
+
# def scale(height, width)
|
45
|
+
# ...
|
46
|
+
# end
|
47
|
+
#
|
48
|
+
# def image?
|
49
|
+
# ...
|
50
|
+
# end
|
51
|
+
#
|
52
|
+
# end
|
53
|
+
#
|
54
|
+
def process(*args)
|
55
|
+
new_processors = args.inject({}) do |hash, arg|
|
56
|
+
arg = { arg => [] } unless arg.is_a?(Hash)
|
57
|
+
hash.merge!(arg)
|
58
|
+
end
|
59
|
+
|
60
|
+
condition = new_processors.delete(:if)
|
61
|
+
new_processors.each do |processor, processor_args|
|
62
|
+
self.processors += [[processor, processor_args, condition]]
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
end # ClassMethods
|
67
|
+
|
68
|
+
##
|
69
|
+
# Apply all process callbacks added through CarrierWave.process
|
70
|
+
#
|
71
|
+
def process!(new_file=nil)
|
72
|
+
return unless enable_processing
|
73
|
+
|
74
|
+
self.class.processors.each do |method, args, condition|
|
75
|
+
if(condition)
|
76
|
+
if condition.respond_to?(:call)
|
77
|
+
next unless condition.call(self, :args => args, :method => method, :file => new_file)
|
78
|
+
else
|
79
|
+
next unless self.send(condition, new_file)
|
80
|
+
end
|
81
|
+
end
|
82
|
+
self.send(method, *args)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
end # Processing
|
87
|
+
end # Uploader
|
88
|
+
end # CarrierWave
|
@@ -0,0 +1,86 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Proxy
|
4
|
+
|
5
|
+
##
|
6
|
+
# === Returns
|
7
|
+
#
|
8
|
+
# [Boolean] Whether the uploaded file is blank
|
9
|
+
#
|
10
|
+
def blank?
|
11
|
+
file.blank?
|
12
|
+
end
|
13
|
+
|
14
|
+
##
|
15
|
+
# === Returns
|
16
|
+
#
|
17
|
+
# [String] the path where the file is currently located.
|
18
|
+
#
|
19
|
+
def current_path
|
20
|
+
file.try(:path)
|
21
|
+
end
|
22
|
+
|
23
|
+
alias_method :path, :current_path
|
24
|
+
|
25
|
+
##
|
26
|
+
# Returns a string that uniquely identifies the last stored file
|
27
|
+
#
|
28
|
+
# === Returns
|
29
|
+
#
|
30
|
+
# [String] uniquely identifies a file
|
31
|
+
#
|
32
|
+
def identifier
|
33
|
+
storage.try(:identifier)
|
34
|
+
end
|
35
|
+
|
36
|
+
##
|
37
|
+
# Read the contents of the file
|
38
|
+
#
|
39
|
+
# === Returns
|
40
|
+
#
|
41
|
+
# [String] contents of the file
|
42
|
+
#
|
43
|
+
def read
|
44
|
+
file.try(:read)
|
45
|
+
end
|
46
|
+
|
47
|
+
##
|
48
|
+
# Fetches the size of the currently stored/cached file
|
49
|
+
#
|
50
|
+
# === Returns
|
51
|
+
#
|
52
|
+
# [Integer] size of the file
|
53
|
+
#
|
54
|
+
def size
|
55
|
+
file.try(:size) || 0
|
56
|
+
end
|
57
|
+
|
58
|
+
##
|
59
|
+
# Return the size of the file when asked for its length
|
60
|
+
#
|
61
|
+
# === Returns
|
62
|
+
#
|
63
|
+
# [Integer] size of the file
|
64
|
+
#
|
65
|
+
# === Note
|
66
|
+
#
|
67
|
+
# This was added because of the way Rails handles length/size validations in 3.0.6 and above.
|
68
|
+
#
|
69
|
+
def length
|
70
|
+
size
|
71
|
+
end
|
72
|
+
|
73
|
+
##
|
74
|
+
# Read the content type of the file
|
75
|
+
#
|
76
|
+
# === Returns
|
77
|
+
#
|
78
|
+
# [String] content type of the file
|
79
|
+
#
|
80
|
+
def content_type
|
81
|
+
file.try(:content_type)
|
82
|
+
end
|
83
|
+
|
84
|
+
end # Proxy
|
85
|
+
end # Uploader
|
86
|
+
end # CarrierWave
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Remove
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
|
6
|
+
include CarrierWave::Uploader::Callbacks
|
7
|
+
|
8
|
+
##
|
9
|
+
# Removes the file and reset it
|
10
|
+
#
|
11
|
+
def remove!
|
12
|
+
with_callbacks(:remove) do
|
13
|
+
@file.delete if @file
|
14
|
+
@file = nil
|
15
|
+
@cache_id = nil
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
end # Remove
|
20
|
+
end # Uploader
|
21
|
+
end # CarrierWave
|
@@ -0,0 +1,28 @@
|
|
1
|
+
require "json"
|
2
|
+
require "active_support/core_ext/hash"
|
3
|
+
|
4
|
+
module CarrierWave
|
5
|
+
module Uploader
|
6
|
+
module Serialization
|
7
|
+
extend ActiveSupport::Concern
|
8
|
+
|
9
|
+
def serializable_hash(options = nil)
|
10
|
+
{"url" => url}.merge Hash[versions.map { |name, version| [name, { "url" => version.url }] }]
|
11
|
+
end
|
12
|
+
|
13
|
+
def as_json(options=nil)
|
14
|
+
serializable_hash
|
15
|
+
end
|
16
|
+
|
17
|
+
def to_json(options=nil)
|
18
|
+
JSON.generate(as_json)
|
19
|
+
end
|
20
|
+
|
21
|
+
def to_xml(options={})
|
22
|
+
merged_options = options.merge(:root => mounted_as || "uploader", :type => 'uploader')
|
23
|
+
serializable_hash.to_xml(merged_options)
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -0,0 +1,93 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Store
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
|
6
|
+
include CarrierWave::Uploader::Callbacks
|
7
|
+
include CarrierWave::Uploader::Configuration
|
8
|
+
include CarrierWave::Uploader::Cache
|
9
|
+
|
10
|
+
##
|
11
|
+
# Override this in your Uploader to change the filename.
|
12
|
+
#
|
13
|
+
# Be careful using record ids as filenames. If the filename is stored in the database
|
14
|
+
# the record id will be nil when the filename is set. Don't use record ids unless you
|
15
|
+
# understand this limitation.
|
16
|
+
#
|
17
|
+
# Do not use the version_name in the filename, as it will prevent versions from being
|
18
|
+
# loaded correctly.
|
19
|
+
#
|
20
|
+
# === Returns
|
21
|
+
#
|
22
|
+
# [String] a filename
|
23
|
+
#
|
24
|
+
def filename
|
25
|
+
@filename
|
26
|
+
end
|
27
|
+
|
28
|
+
##
|
29
|
+
# Calculates the path where the file should be stored. If +for_file+ is given, it will be
|
30
|
+
# used as the filename, otherwise +CarrierWave::Uploader#filename+ is assumed.
|
31
|
+
#
|
32
|
+
# === Parameters
|
33
|
+
#
|
34
|
+
# [for_file (String)] name of the file <optional>
|
35
|
+
#
|
36
|
+
# === Returns
|
37
|
+
#
|
38
|
+
# [String] the store path
|
39
|
+
#
|
40
|
+
def store_path(for_file=filename)
|
41
|
+
File.join([store_dir, full_filename(for_file)].compact)
|
42
|
+
end
|
43
|
+
|
44
|
+
##
|
45
|
+
# Stores the file by passing it to this Uploader's storage engine.
|
46
|
+
#
|
47
|
+
# If new_file is omitted, a previously cached file will be stored.
|
48
|
+
#
|
49
|
+
# === Parameters
|
50
|
+
#
|
51
|
+
# [new_file (File, IOString, Tempfile)] any kind of file object
|
52
|
+
#
|
53
|
+
def store!(new_file=nil)
|
54
|
+
cache!(new_file) if new_file && ((@cache_id != parent_cache_id) || @cache_id.nil?)
|
55
|
+
if !cache_only and @file and @cache_id
|
56
|
+
with_callbacks(:store, new_file) do
|
57
|
+
new_file = storage.store!(@file)
|
58
|
+
if delete_tmp_file_after_storage
|
59
|
+
@file.delete unless move_to_store
|
60
|
+
cache_storage.delete_dir!(cache_path(nil))
|
61
|
+
end
|
62
|
+
@file = new_file
|
63
|
+
@cache_id = nil
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
##
|
69
|
+
# Retrieves the file from the storage.
|
70
|
+
#
|
71
|
+
# === Parameters
|
72
|
+
#
|
73
|
+
# [identifier (String)] uniquely identifies the file to retrieve
|
74
|
+
#
|
75
|
+
def retrieve_from_store!(identifier)
|
76
|
+
with_callbacks(:retrieve_from_store, identifier) do
|
77
|
+
@file = storage.retrieve!(identifier)
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
private
|
82
|
+
|
83
|
+
def full_filename(for_file)
|
84
|
+
for_file
|
85
|
+
end
|
86
|
+
|
87
|
+
def storage
|
88
|
+
@storage ||= self.class.storage.new(self)
|
89
|
+
end
|
90
|
+
|
91
|
+
end # Store
|
92
|
+
end # Uploader
|
93
|
+
end # CarrierWave
|
@@ -0,0 +1,41 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Url
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
include CarrierWave::Uploader::Configuration
|
6
|
+
include CarrierWave::Utilities::Uri
|
7
|
+
|
8
|
+
##
|
9
|
+
# === Parameters
|
10
|
+
#
|
11
|
+
# [Hash] optional, the query params (only AWS)
|
12
|
+
#
|
13
|
+
# === Returns
|
14
|
+
#
|
15
|
+
# [String] the location where this file is accessible via a url
|
16
|
+
#
|
17
|
+
def url(options = {})
|
18
|
+
if file.respond_to?(:url) and not file.url.blank?
|
19
|
+
file.method(:url).arity == 0 ? file.url : file.url(options)
|
20
|
+
elsif file.respond_to?(:path)
|
21
|
+
path = encode_path(file.path.sub(File.expand_path(root), ''))
|
22
|
+
|
23
|
+
if host = asset_host
|
24
|
+
if host.respond_to? :call
|
25
|
+
"#{host.call(file)}#{path}"
|
26
|
+
else
|
27
|
+
"#{host}#{path}"
|
28
|
+
end
|
29
|
+
else
|
30
|
+
(base_path || "") + path
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
def to_s
|
36
|
+
url || ''
|
37
|
+
end
|
38
|
+
|
39
|
+
end # Url
|
40
|
+
end # Uploader
|
41
|
+
end # CarrierWave
|
@@ -0,0 +1,295 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
module Uploader
|
3
|
+
module Versions
|
4
|
+
extend ActiveSupport::Concern
|
5
|
+
|
6
|
+
include CarrierWave::Uploader::Callbacks
|
7
|
+
|
8
|
+
included do
|
9
|
+
class_attribute :versions, :version_names, :version_options, :instance_reader => false, :instance_writer => false
|
10
|
+
|
11
|
+
self.versions = {}
|
12
|
+
self.version_names = []
|
13
|
+
|
14
|
+
attr_accessor :parent_cache_id, :parent_version
|
15
|
+
|
16
|
+
after :cache, :assign_parent_cache_id
|
17
|
+
after :cache, :cache_versions!
|
18
|
+
after :store, :store_versions!
|
19
|
+
after :remove, :remove_versions!
|
20
|
+
after :retrieve_from_cache, :retrieve_versions_from_cache!
|
21
|
+
after :retrieve_from_store, :retrieve_versions_from_store!
|
22
|
+
end
|
23
|
+
|
24
|
+
module ClassMethods
|
25
|
+
|
26
|
+
##
|
27
|
+
# Adds a new version to this uploader
|
28
|
+
#
|
29
|
+
# === Parameters
|
30
|
+
#
|
31
|
+
# [name (#to_sym)] name of the version
|
32
|
+
# [options (Hash)] optional options hash
|
33
|
+
# [&block (Proc)] a block to eval on this version of the uploader
|
34
|
+
#
|
35
|
+
# === Examples
|
36
|
+
#
|
37
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
38
|
+
#
|
39
|
+
# version :thumb do
|
40
|
+
# process :scale => [200, 200]
|
41
|
+
# end
|
42
|
+
#
|
43
|
+
# version :preview, :if => :image? do
|
44
|
+
# process :scale => [200, 200]
|
45
|
+
# end
|
46
|
+
#
|
47
|
+
# end
|
48
|
+
#
|
49
|
+
def version(name, options = {}, &block)
|
50
|
+
name = name.to_sym
|
51
|
+
build_version(name, options)
|
52
|
+
|
53
|
+
versions[name].class_eval(&block) if block
|
54
|
+
versions[name]
|
55
|
+
end
|
56
|
+
|
57
|
+
def recursively_apply_block_to_versions(&block)
|
58
|
+
versions.each do |name, version|
|
59
|
+
version.class_eval(&block)
|
60
|
+
version.recursively_apply_block_to_versions(&block)
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def build_version(name, options)
|
67
|
+
if !versions.has_key?(name)
|
68
|
+
uploader = Class.new(self)
|
69
|
+
const_set("Uploader#{uploader.object_id}".tr('-', '_'), uploader)
|
70
|
+
uploader.version_names += [name]
|
71
|
+
uploader.versions = {}
|
72
|
+
uploader.processors = []
|
73
|
+
uploader.version_options = options
|
74
|
+
|
75
|
+
uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
76
|
+
# Define the enable_processing method for versions so they get the
|
77
|
+
# value from the parent class unless explicitly overwritten
|
78
|
+
def self.enable_processing(value=nil)
|
79
|
+
self.enable_processing = value if value
|
80
|
+
if !@enable_processing.nil?
|
81
|
+
@enable_processing
|
82
|
+
else
|
83
|
+
superclass.enable_processing
|
84
|
+
end
|
85
|
+
end
|
86
|
+
|
87
|
+
# Regardless of what is set in the parent uploader, do not enforce the
|
88
|
+
# move_to_cache config option on versions because it moves the original
|
89
|
+
# file to the version's target file.
|
90
|
+
#
|
91
|
+
# If you want to enforce this setting on versions, override this method
|
92
|
+
# in each version:
|
93
|
+
#
|
94
|
+
# version :thumb do
|
95
|
+
# def move_to_cache
|
96
|
+
# true
|
97
|
+
# end
|
98
|
+
# end
|
99
|
+
#
|
100
|
+
def move_to_cache
|
101
|
+
false
|
102
|
+
end
|
103
|
+
RUBY
|
104
|
+
|
105
|
+
class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
106
|
+
def #{name}
|
107
|
+
versions[:#{name}]
|
108
|
+
end
|
109
|
+
RUBY
|
110
|
+
else
|
111
|
+
uploader = Class.new(versions[name])
|
112
|
+
const_set("Uploader#{uploader.object_id}".tr('-', '_'), uploader)
|
113
|
+
uploader.processors = []
|
114
|
+
uploader.version_options = uploader.version_options.merge(options)
|
115
|
+
end
|
116
|
+
|
117
|
+
# Add the current version hash to class attribute :versions
|
118
|
+
self.versions = versions.merge(name => uploader)
|
119
|
+
end
|
120
|
+
|
121
|
+
end # ClassMethods
|
122
|
+
|
123
|
+
##
|
124
|
+
# Returns a hash mapping the name of each version of the uploader to an instance of it
|
125
|
+
#
|
126
|
+
# === Returns
|
127
|
+
#
|
128
|
+
# [Hash{Symbol => CarrierWave::Uploader}] a list of uploader instances
|
129
|
+
#
|
130
|
+
def versions
|
131
|
+
return @versions if @versions
|
132
|
+
@versions = {}
|
133
|
+
self.class.versions.each do |name, version|
|
134
|
+
@versions[name] = version.new(model, mounted_as)
|
135
|
+
@versions[name].parent_version = self
|
136
|
+
end
|
137
|
+
@versions
|
138
|
+
end
|
139
|
+
|
140
|
+
##
|
141
|
+
# === Returns
|
142
|
+
#
|
143
|
+
# [String] the name of this version of the uploader
|
144
|
+
#
|
145
|
+
def version_name
|
146
|
+
self.class.version_names.join('_').to_sym unless self.class.version_names.blank?
|
147
|
+
end
|
148
|
+
|
149
|
+
##
|
150
|
+
#
|
151
|
+
# === Parameters
|
152
|
+
#
|
153
|
+
# [name (#to_sym)] name of the version
|
154
|
+
#
|
155
|
+
# === Returns
|
156
|
+
#
|
157
|
+
# [Boolean] True when the version exists according to its :if condition
|
158
|
+
#
|
159
|
+
def version_exists?(name)
|
160
|
+
name = name.to_sym
|
161
|
+
|
162
|
+
return false unless self.class.versions.has_key?(name)
|
163
|
+
|
164
|
+
condition = self.class.versions[name].version_options[:if]
|
165
|
+
if(condition)
|
166
|
+
if(condition.respond_to?(:call))
|
167
|
+
condition.call(self, :version => name, :file => file)
|
168
|
+
else
|
169
|
+
send(condition, file)
|
170
|
+
end
|
171
|
+
else
|
172
|
+
true
|
173
|
+
end
|
174
|
+
end
|
175
|
+
|
176
|
+
##
|
177
|
+
# When given a version name as a parameter, will return the url for that version
|
178
|
+
# This also works with nested versions.
|
179
|
+
# When given a query hash as a parameter, will return the url with signature that contains query params
|
180
|
+
# Query hash only works with AWS (S3 storage).
|
181
|
+
#
|
182
|
+
# === Example
|
183
|
+
#
|
184
|
+
# my_uploader.url # => /path/to/my/uploader.gif
|
185
|
+
# my_uploader.url(:thumb) # => /path/to/my/thumb_uploader.gif
|
186
|
+
# my_uploader.url(:thumb, :small) # => /path/to/my/thumb_small_uploader.gif
|
187
|
+
# my_uploader.url(:query => {"response-content-disposition" => "attachment"})
|
188
|
+
# my_uploader.url(:version, :sub_version, :query => {"response-content-disposition" => "attachment"})
|
189
|
+
#
|
190
|
+
# === Parameters
|
191
|
+
#
|
192
|
+
# [*args (Symbol)] any number of versions
|
193
|
+
# OR/AND
|
194
|
+
# [Hash] query params
|
195
|
+
#
|
196
|
+
# === Returns
|
197
|
+
#
|
198
|
+
# [String] the location where this file is accessible via a url
|
199
|
+
#
|
200
|
+
def url(*args)
|
201
|
+
if (version = args.first) && version.respond_to?(:to_sym)
|
202
|
+
raise ArgumentError, "Version #{version} doesn't exist!" if versions[version.to_sym].nil?
|
203
|
+
# recursively proxy to version
|
204
|
+
versions[version.to_sym].url(*args[1..-1])
|
205
|
+
elsif args.first
|
206
|
+
super(args.first)
|
207
|
+
else
|
208
|
+
super
|
209
|
+
end
|
210
|
+
end
|
211
|
+
|
212
|
+
##
|
213
|
+
# Recreate versions and reprocess them. This can be used to recreate
|
214
|
+
# versions if their parameters somehow have changed.
|
215
|
+
#
|
216
|
+
def recreate_versions!(*versions)
|
217
|
+
# Some files could possibly not be stored on the local disk. This
|
218
|
+
# doesn't play nicely with processing. Make sure that we're only
|
219
|
+
# processing a cached file
|
220
|
+
#
|
221
|
+
# The call to store! will trigger the necessary callbacks to both
|
222
|
+
# process this version and all sub-versions
|
223
|
+
if versions.any?
|
224
|
+
file = sanitized_file if !cached?
|
225
|
+
store_versions!(file, versions)
|
226
|
+
else
|
227
|
+
cache! if !cached?
|
228
|
+
store!
|
229
|
+
end
|
230
|
+
end
|
231
|
+
|
232
|
+
private
|
233
|
+
def assign_parent_cache_id(file)
|
234
|
+
active_versions.each do |name, uploader|
|
235
|
+
uploader.parent_cache_id = @cache_id
|
236
|
+
end
|
237
|
+
end
|
238
|
+
|
239
|
+
def active_versions
|
240
|
+
versions.select do |name, uploader|
|
241
|
+
version_exists?(name)
|
242
|
+
end
|
243
|
+
end
|
244
|
+
|
245
|
+
def dependent_versions
|
246
|
+
active_versions.reject do |name, v|
|
247
|
+
v.class.version_options[:from_version]
|
248
|
+
end.to_a + sibling_versions.select do |name, v|
|
249
|
+
v.class.version_options[:from_version] == self.class.version_names.last
|
250
|
+
end.to_a
|
251
|
+
end
|
252
|
+
|
253
|
+
def sibling_versions
|
254
|
+
parent_version.try(:versions) || []
|
255
|
+
end
|
256
|
+
|
257
|
+
def full_filename(for_file)
|
258
|
+
[version_name, super(for_file)].compact.join('_')
|
259
|
+
end
|
260
|
+
|
261
|
+
def full_original_filename
|
262
|
+
[version_name, super].compact.join('_')
|
263
|
+
end
|
264
|
+
|
265
|
+
def cache_versions!(new_file)
|
266
|
+
dependent_versions.each do |name, v|
|
267
|
+
v.send(:cache_id=, @cache_id)
|
268
|
+
v.cache!(new_file)
|
269
|
+
end
|
270
|
+
end
|
271
|
+
|
272
|
+
def store_versions!(new_file, versions=nil)
|
273
|
+
if versions
|
274
|
+
active = Hash[active_versions]
|
275
|
+
versions.each { |v| active[v].try(:store!, new_file) } unless active.empty?
|
276
|
+
else
|
277
|
+
active_versions.each { |name, v| v.store!(new_file) }
|
278
|
+
end
|
279
|
+
end
|
280
|
+
|
281
|
+
def remove_versions!
|
282
|
+
versions.each { |name, v| v.remove! }
|
283
|
+
end
|
284
|
+
|
285
|
+
def retrieve_versions_from_cache!(cache_name)
|
286
|
+
active_versions.each { |name, v| v.retrieve_from_cache!(cache_name) }
|
287
|
+
end
|
288
|
+
|
289
|
+
def retrieve_versions_from_store!(identifier)
|
290
|
+
active_versions.each { |name, v| v.retrieve_from_store!(identifier) }
|
291
|
+
end
|
292
|
+
|
293
|
+
end # Versions
|
294
|
+
end # Uploader
|
295
|
+
end # CarrierWave
|