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,163 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
|
3
|
+
# this is an internal class, used by CarrierWave::Mount so that
|
4
|
+
# we don't pollute the model with a lot of methods.
|
5
|
+
class Mounter #:nodoc:
|
6
|
+
attr_reader :column, :record, :remote_urls, :integrity_error, :processing_error, :download_error
|
7
|
+
attr_accessor :remove
|
8
|
+
|
9
|
+
def initialize(record, column, options={})
|
10
|
+
@record = record
|
11
|
+
@column = column
|
12
|
+
@options = record.class.uploader_options[column]
|
13
|
+
end
|
14
|
+
|
15
|
+
def uploader_class
|
16
|
+
record.class.uploaders[column]
|
17
|
+
end
|
18
|
+
|
19
|
+
def blank_uploader
|
20
|
+
uploader_class.new(record, column)
|
21
|
+
end
|
22
|
+
|
23
|
+
def identifiers
|
24
|
+
uploaders.map(&:identifier)
|
25
|
+
end
|
26
|
+
|
27
|
+
def read_identifiers
|
28
|
+
[record.read_uploader(serialization_column)].flatten.reject(&:blank?)
|
29
|
+
end
|
30
|
+
|
31
|
+
def uploaders
|
32
|
+
@uploaders ||= read_identifiers.map do |identifier|
|
33
|
+
uploader = blank_uploader
|
34
|
+
uploader.retrieve_from_store!(identifier) if identifier.present?
|
35
|
+
uploader
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def cache(new_files)
|
40
|
+
return if not new_files or new_files == ""
|
41
|
+
@uploaders = new_files.map do |new_file|
|
42
|
+
uploader = blank_uploader
|
43
|
+
uploader.cache!(new_file)
|
44
|
+
uploader
|
45
|
+
end
|
46
|
+
|
47
|
+
@integrity_error = nil
|
48
|
+
@processing_error = nil
|
49
|
+
rescue CarrierWave::IntegrityError => e
|
50
|
+
@integrity_error = e
|
51
|
+
raise e unless option(:ignore_integrity_errors)
|
52
|
+
rescue CarrierWave::ProcessingError => e
|
53
|
+
@processing_error = e
|
54
|
+
raise e unless option(:ignore_processing_errors)
|
55
|
+
end
|
56
|
+
|
57
|
+
def cache_names
|
58
|
+
uploaders.map(&:cache_name).compact
|
59
|
+
end
|
60
|
+
|
61
|
+
def cache_names=(cache_names)
|
62
|
+
return if not cache_names or cache_names == "" or uploaders.any?(&:cached?)
|
63
|
+
@uploaders = cache_names.map do |cache_name|
|
64
|
+
uploader = blank_uploader
|
65
|
+
uploader.retrieve_from_cache!(cache_name)
|
66
|
+
uploader
|
67
|
+
end
|
68
|
+
rescue CarrierWave::InvalidParameter
|
69
|
+
end
|
70
|
+
|
71
|
+
def remote_urls=(urls)
|
72
|
+
return if not urls or urls == "" or urls.all?(&:blank?)
|
73
|
+
|
74
|
+
@remote_urls = urls
|
75
|
+
@download_error = nil
|
76
|
+
@integrity_error = nil
|
77
|
+
|
78
|
+
@uploaders = urls.map do |url|
|
79
|
+
uploader = blank_uploader
|
80
|
+
uploader.download!(url)
|
81
|
+
uploader
|
82
|
+
end
|
83
|
+
|
84
|
+
rescue CarrierWave::DownloadError => e
|
85
|
+
@download_error = e
|
86
|
+
raise e unless option(:ignore_download_errors)
|
87
|
+
rescue CarrierWave::ProcessingError => e
|
88
|
+
@processing_error = e
|
89
|
+
raise e unless option(:ignore_processing_errors)
|
90
|
+
rescue CarrierWave::IntegrityError => e
|
91
|
+
@integrity_error = e
|
92
|
+
raise e unless option(:ignore_integrity_errors)
|
93
|
+
end
|
94
|
+
|
95
|
+
def store!
|
96
|
+
if remove?
|
97
|
+
remove!
|
98
|
+
else
|
99
|
+
uploaders.reject(&:blank?).each(&:store!)
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def urls(*args)
|
104
|
+
uploaders.map { |u| u.url(*args) }
|
105
|
+
end
|
106
|
+
|
107
|
+
def blank?
|
108
|
+
uploaders.none?(&:present?)
|
109
|
+
end
|
110
|
+
|
111
|
+
def remove?
|
112
|
+
remove.present? && remove !~ /\A0|false$\z/
|
113
|
+
end
|
114
|
+
|
115
|
+
def remove!
|
116
|
+
uploaders.reject(&:blank?).each(&:remove!)
|
117
|
+
@uploaders = []
|
118
|
+
end
|
119
|
+
|
120
|
+
def serialization_column
|
121
|
+
option(:mount_on) || column
|
122
|
+
end
|
123
|
+
|
124
|
+
def remove_previous(before=nil, after=nil)
|
125
|
+
return unless before
|
126
|
+
|
127
|
+
# both 'before' and 'after' can be string when 'mount_on' option is set
|
128
|
+
before = before.reject(&:blank?).map do |value|
|
129
|
+
if value.is_a?(String)
|
130
|
+
uploader = blank_uploader
|
131
|
+
uploader.retrieve_from_store!(value)
|
132
|
+
uploader
|
133
|
+
else
|
134
|
+
value
|
135
|
+
end
|
136
|
+
end
|
137
|
+
after_paths = after.reject(&:blank?).map do |value|
|
138
|
+
if value.is_a?(String)
|
139
|
+
uploader = blank_uploader
|
140
|
+
uploader.retrieve_from_store!(value)
|
141
|
+
uploader
|
142
|
+
else
|
143
|
+
value
|
144
|
+
end.path
|
145
|
+
end
|
146
|
+
before.each do |uploader|
|
147
|
+
if uploader.remove_previously_stored_files_after_update and not after_paths.include?(uploader.path)
|
148
|
+
uploader.remove!
|
149
|
+
end
|
150
|
+
end
|
151
|
+
end
|
152
|
+
|
153
|
+
attr_accessor :uploader_options
|
154
|
+
|
155
|
+
private
|
156
|
+
|
157
|
+
def option(name)
|
158
|
+
self.uploader_options ||= {}
|
159
|
+
self.uploader_options[name] ||= record.class.uploader_option(column, name)
|
160
|
+
end
|
161
|
+
|
162
|
+
end # Mounter
|
163
|
+
end # CarrierWave
|
@@ -0,0 +1,103 @@
|
|
1
|
+
require 'active_record'
|
2
|
+
require 'carrierwave/validations/active_model'
|
3
|
+
|
4
|
+
module CarrierWave
|
5
|
+
module ActiveRecord
|
6
|
+
|
7
|
+
include CarrierWave::Mount
|
8
|
+
|
9
|
+
##
|
10
|
+
# See +CarrierWave::Mount#mount_uploader+ for documentation
|
11
|
+
#
|
12
|
+
def mount_uploader(column, uploader=nil, options={}, &block)
|
13
|
+
super
|
14
|
+
|
15
|
+
class_eval <<-RUBY, __FILE__, __LINE__+1
|
16
|
+
def remote_#{column}_url=(url)
|
17
|
+
column = _mounter(:#{column}).serialization_column
|
18
|
+
send(:"\#{column}_will_change!")
|
19
|
+
super
|
20
|
+
end
|
21
|
+
RUBY
|
22
|
+
end
|
23
|
+
|
24
|
+
##
|
25
|
+
# See +CarrierWave::Mount#mount_uploaders+ for documentation
|
26
|
+
#
|
27
|
+
def mount_uploaders(column, uploader=nil, options={}, &block)
|
28
|
+
super
|
29
|
+
|
30
|
+
class_eval <<-RUBY, __FILE__, __LINE__+1
|
31
|
+
def remote_#{column}_urls=(url)
|
32
|
+
column = _mounter(:#{column}).serialization_column
|
33
|
+
send(:"\#{column}_will_change!")
|
34
|
+
super
|
35
|
+
end
|
36
|
+
RUBY
|
37
|
+
end
|
38
|
+
|
39
|
+
private
|
40
|
+
|
41
|
+
def mount_base(column, uploader=nil, options={}, &block)
|
42
|
+
super
|
43
|
+
|
44
|
+
alias_method :read_uploader, :read_attribute
|
45
|
+
alias_method :write_uploader, :write_attribute
|
46
|
+
public :read_uploader
|
47
|
+
public :write_uploader
|
48
|
+
|
49
|
+
include CarrierWave::Validations::ActiveModel
|
50
|
+
|
51
|
+
validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
|
52
|
+
validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
|
53
|
+
validates_download_of column if uploader_option(column.to_sym, :validate_download)
|
54
|
+
|
55
|
+
after_save :"store_#{column}!"
|
56
|
+
before_save :"write_#{column}_identifier"
|
57
|
+
after_commit :"remove_#{column}!", :on => :destroy
|
58
|
+
after_commit :"mark_remove_#{column}_false", :on => :update
|
59
|
+
|
60
|
+
after_save :"store_previous_changes_for_#{column}"
|
61
|
+
after_commit :"remove_previously_stored_#{column}", :on => :update
|
62
|
+
|
63
|
+
class_eval <<-RUBY, __FILE__, __LINE__+1
|
64
|
+
def #{column}=(new_file)
|
65
|
+
column = _mounter(:#{column}).serialization_column
|
66
|
+
if !(new_file.blank? && send(:#{column}).blank?)
|
67
|
+
send(:"\#{column}_will_change!")
|
68
|
+
end
|
69
|
+
|
70
|
+
super
|
71
|
+
end
|
72
|
+
|
73
|
+
def remove_#{column}=(value)
|
74
|
+
column = _mounter(:#{column}).serialization_column
|
75
|
+
send(:"\#{column}_will_change!")
|
76
|
+
super
|
77
|
+
end
|
78
|
+
|
79
|
+
def remove_#{column}!
|
80
|
+
self.remove_#{column} = true
|
81
|
+
write_#{column}_identifier
|
82
|
+
self.remove_#{column} = false
|
83
|
+
super
|
84
|
+
end
|
85
|
+
|
86
|
+
# Reset cached mounter on record reload
|
87
|
+
def reload(*)
|
88
|
+
@_mounters = nil
|
89
|
+
super
|
90
|
+
end
|
91
|
+
|
92
|
+
# Reset cached mounter on record dup
|
93
|
+
def initialize_dup(other)
|
94
|
+
@_mounters = nil
|
95
|
+
super
|
96
|
+
end
|
97
|
+
RUBY
|
98
|
+
end
|
99
|
+
|
100
|
+
end # ActiveRecord
|
101
|
+
end # CarrierWave
|
102
|
+
|
103
|
+
ActiveRecord::Base.extend CarrierWave::ActiveRecord
|
@@ -0,0 +1,328 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
|
3
|
+
##
|
4
|
+
# This module simplifies manipulation with MiniMagick by providing a set
|
5
|
+
# of convenient helper methods. If you want to use them, you'll need to
|
6
|
+
# require this file:
|
7
|
+
#
|
8
|
+
# require 'carrierwave/processing/mini_magick'
|
9
|
+
#
|
10
|
+
# And then include it in your uploader:
|
11
|
+
#
|
12
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
13
|
+
# include CarrierWave::MiniMagick
|
14
|
+
# end
|
15
|
+
#
|
16
|
+
# You can now use the provided helpers:
|
17
|
+
#
|
18
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
19
|
+
# include CarrierWave::MiniMagick
|
20
|
+
#
|
21
|
+
# process :resize_to_fit => [200, 200]
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
# Or create your own helpers with the powerful manipulate! method. Check
|
25
|
+
# out the ImageMagick docs at http://www.imagemagick.org/script/command-line-options.php for more
|
26
|
+
# info
|
27
|
+
#
|
28
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
29
|
+
# include CarrierWave::MiniMagick
|
30
|
+
#
|
31
|
+
# process :radial_blur => 10
|
32
|
+
#
|
33
|
+
# def radial_blur(amount)
|
34
|
+
# manipulate! do |img|
|
35
|
+
# img.radial_blur(amount)
|
36
|
+
# img = yield(img) if block_given?
|
37
|
+
# img
|
38
|
+
# end
|
39
|
+
# end
|
40
|
+
# end
|
41
|
+
#
|
42
|
+
# === Note
|
43
|
+
#
|
44
|
+
# MiniMagick is a mini replacement for RMagick that uses the command line
|
45
|
+
# tool "mogrify" for image manipulation.
|
46
|
+
#
|
47
|
+
# You can find more information here:
|
48
|
+
#
|
49
|
+
# http://mini_magick.rubyforge.org/
|
50
|
+
# and
|
51
|
+
# https://github.com/minimagick/minimagick/
|
52
|
+
#
|
53
|
+
#
|
54
|
+
module MiniMagick
|
55
|
+
extend ActiveSupport::Concern
|
56
|
+
|
57
|
+
included do
|
58
|
+
begin
|
59
|
+
require "mini_magick"
|
60
|
+
rescue LoadError => e
|
61
|
+
e.message << " (You may need to install the mini_magick gem)"
|
62
|
+
raise e
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
module ClassMethods
|
67
|
+
def convert(format)
|
68
|
+
process :convert => format
|
69
|
+
end
|
70
|
+
|
71
|
+
def resize_to_limit(width, height)
|
72
|
+
process :resize_to_limit => [width, height]
|
73
|
+
end
|
74
|
+
|
75
|
+
def resize_to_fit(width, height)
|
76
|
+
process :resize_to_fit => [width, height]
|
77
|
+
end
|
78
|
+
|
79
|
+
def resize_to_fill(width, height, gravity='Center')
|
80
|
+
process :resize_to_fill => [width, height, gravity]
|
81
|
+
end
|
82
|
+
|
83
|
+
def resize_and_pad(width, height, background=:transparent, gravity='Center')
|
84
|
+
process :resize_and_pad => [width, height, background, gravity]
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
##
|
89
|
+
# Changes the image encoding format to the given format
|
90
|
+
#
|
91
|
+
# See http://www.imagemagick.org/script/command-line-options.php#format
|
92
|
+
#
|
93
|
+
# === Parameters
|
94
|
+
#
|
95
|
+
# [format (#to_s)] an abreviation of the format
|
96
|
+
#
|
97
|
+
# === Yields
|
98
|
+
#
|
99
|
+
# [MiniMagick::Image] additional manipulations to perform
|
100
|
+
#
|
101
|
+
# === Examples
|
102
|
+
#
|
103
|
+
# image.convert(:png)
|
104
|
+
#
|
105
|
+
def convert(format, page=nil)
|
106
|
+
@format = format
|
107
|
+
@page = page
|
108
|
+
manipulate! do |img|
|
109
|
+
img = yield(img) if block_given?
|
110
|
+
img
|
111
|
+
end
|
112
|
+
end
|
113
|
+
|
114
|
+
##
|
115
|
+
# Resize the image to fit within the specified dimensions while retaining
|
116
|
+
# the original aspect ratio. Will only resize the image if it is larger than the
|
117
|
+
# specified dimensions. The resulting image may be shorter or narrower than specified
|
118
|
+
# in the smaller dimension but will not be larger than the specified values.
|
119
|
+
#
|
120
|
+
# === Parameters
|
121
|
+
#
|
122
|
+
# [width (Integer)] the width to scale the image to
|
123
|
+
# [height (Integer)] the height to scale the image to
|
124
|
+
#
|
125
|
+
# === Yields
|
126
|
+
#
|
127
|
+
# [MiniMagick::Image] additional manipulations to perform
|
128
|
+
#
|
129
|
+
def resize_to_limit(width, height, combine_options: {})
|
130
|
+
manipulate! do |img|
|
131
|
+
img.combine_options do |cmd|
|
132
|
+
cmd.resize "#{width}x#{height}>"
|
133
|
+
append_combine_options cmd, combine_options
|
134
|
+
end
|
135
|
+
img = yield(img) if block_given?
|
136
|
+
img
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|
140
|
+
##
|
141
|
+
# Resize the image to fit within the specified dimensions while retaining
|
142
|
+
# the original aspect ratio. The image may be shorter or narrower than
|
143
|
+
# specified in the smaller dimension but will not be larger than the specified values.
|
144
|
+
#
|
145
|
+
# === Parameters
|
146
|
+
#
|
147
|
+
# [width (Integer)] the width to scale the image to
|
148
|
+
# [height (Integer)] the height to scale the image to
|
149
|
+
#
|
150
|
+
# === Yields
|
151
|
+
#
|
152
|
+
# [MiniMagick::Image] additional manipulations to perform
|
153
|
+
#
|
154
|
+
def resize_to_fit(width, height, combine_options: {})
|
155
|
+
manipulate! do |img|
|
156
|
+
img.combine_options do |cmd|
|
157
|
+
cmd.resize "#{width}x#{height}"
|
158
|
+
append_combine_options cmd, combine_options
|
159
|
+
end
|
160
|
+
img = yield(img) if block_given?
|
161
|
+
img
|
162
|
+
end
|
163
|
+
end
|
164
|
+
|
165
|
+
##
|
166
|
+
# Resize the image to fit within the specified dimensions while retaining
|
167
|
+
# the aspect ratio of the original image. If necessary, crop the image in the
|
168
|
+
# larger dimension.
|
169
|
+
#
|
170
|
+
# === Parameters
|
171
|
+
#
|
172
|
+
# [width (Integer)] the width to scale the image to
|
173
|
+
# [height (Integer)] the height to scale the image to
|
174
|
+
# [gravity (String)] the current gravity suggestion (default: 'Center'; options: 'NorthWest', 'North', 'NorthEast', 'West', 'Center', 'East', 'SouthWest', 'South', 'SouthEast')
|
175
|
+
#
|
176
|
+
# === Yields
|
177
|
+
#
|
178
|
+
# [MiniMagick::Image] additional manipulations to perform
|
179
|
+
#
|
180
|
+
def resize_to_fill(width, height, gravity = 'Center', combine_options: {})
|
181
|
+
manipulate! do |img|
|
182
|
+
cols, rows = img[:dimensions]
|
183
|
+
img.combine_options do |cmd|
|
184
|
+
if width != cols || height != rows
|
185
|
+
scale_x = width/cols.to_f
|
186
|
+
scale_y = height/rows.to_f
|
187
|
+
if scale_x >= scale_y
|
188
|
+
cols = (scale_x * (cols + 0.5)).round
|
189
|
+
rows = (scale_x * (rows + 0.5)).round
|
190
|
+
cmd.resize "#{cols}"
|
191
|
+
else
|
192
|
+
cols = (scale_y * (cols + 0.5)).round
|
193
|
+
rows = (scale_y * (rows + 0.5)).round
|
194
|
+
cmd.resize "x#{rows}"
|
195
|
+
end
|
196
|
+
end
|
197
|
+
cmd.gravity gravity
|
198
|
+
cmd.background "rgba(255,255,255,0.0)"
|
199
|
+
cmd.extent "#{width}x#{height}" if cols != width || rows != height
|
200
|
+
append_combine_options cmd, combine_options
|
201
|
+
end
|
202
|
+
img = yield(img) if block_given?
|
203
|
+
img
|
204
|
+
end
|
205
|
+
end
|
206
|
+
|
207
|
+
##
|
208
|
+
# Resize the image to fit within the specified dimensions while retaining
|
209
|
+
# the original aspect ratio. If necessary, will pad the remaining area
|
210
|
+
# with the given color, which defaults to transparent (for gif and png,
|
211
|
+
# white for jpeg).
|
212
|
+
#
|
213
|
+
# See http://www.imagemagick.org/script/command-line-options.php#gravity
|
214
|
+
# for gravity options.
|
215
|
+
#
|
216
|
+
# === Parameters
|
217
|
+
#
|
218
|
+
# [width (Integer)] the width to scale the image to
|
219
|
+
# [height (Integer)] the height to scale the image to
|
220
|
+
# [background (String, :transparent)] the color of the background as a hexcode, like "#ff45de"
|
221
|
+
# [gravity (String)] how to position the image
|
222
|
+
#
|
223
|
+
# === Yields
|
224
|
+
#
|
225
|
+
# [MiniMagick::Image] additional manipulations to perform
|
226
|
+
#
|
227
|
+
def resize_and_pad(width, height, background=:transparent, gravity='Center', combine_options: {})
|
228
|
+
manipulate! do |img|
|
229
|
+
img.combine_options do |cmd|
|
230
|
+
cmd.thumbnail "#{width}x#{height}>"
|
231
|
+
if background == :transparent
|
232
|
+
cmd.background "rgba(255, 255, 255, 0.0)"
|
233
|
+
else
|
234
|
+
cmd.background background
|
235
|
+
end
|
236
|
+
cmd.gravity gravity
|
237
|
+
cmd.extent "#{width}x#{height}"
|
238
|
+
append_combine_options cmd, combine_options
|
239
|
+
end
|
240
|
+
img = yield(img) if block_given?
|
241
|
+
img
|
242
|
+
end
|
243
|
+
end
|
244
|
+
|
245
|
+
##
|
246
|
+
# Returns the width of the image in pixels.
|
247
|
+
#
|
248
|
+
# === Returns
|
249
|
+
#
|
250
|
+
# [Integer] the image's width in pixels
|
251
|
+
#
|
252
|
+
def width
|
253
|
+
mini_magick_image[:width]
|
254
|
+
end
|
255
|
+
|
256
|
+
##
|
257
|
+
# Returns the height of the image in pixels.
|
258
|
+
#
|
259
|
+
# === Returns
|
260
|
+
#
|
261
|
+
# [Integer] the image's height in pixels
|
262
|
+
#
|
263
|
+
def height
|
264
|
+
mini_magick_image[:height]
|
265
|
+
end
|
266
|
+
|
267
|
+
##
|
268
|
+
# Manipulate the image with MiniMagick. This method will load up an image
|
269
|
+
# and then pass each of its frames to the supplied block. It will then
|
270
|
+
# save the image to disk.
|
271
|
+
#
|
272
|
+
# === Gotcha
|
273
|
+
#
|
274
|
+
# This method assumes that the object responds to +current_path+.
|
275
|
+
# Any class that this module is mixed into must have a +current_path+ method.
|
276
|
+
# CarrierWave::Uploader does, so you won't need to worry about this in
|
277
|
+
# most cases.
|
278
|
+
#
|
279
|
+
# === Yields
|
280
|
+
#
|
281
|
+
# [MiniMagick::Image] manipulations to perform
|
282
|
+
#
|
283
|
+
# === Raises
|
284
|
+
#
|
285
|
+
# [CarrierWave::ProcessingError] if manipulation failed.
|
286
|
+
#
|
287
|
+
def manipulate!
|
288
|
+
cache_stored_file! if !cached?
|
289
|
+
image = ::MiniMagick::Image.open(current_path)
|
290
|
+
|
291
|
+
begin
|
292
|
+
image.format(@format.to_s.downcase, @page) if @format
|
293
|
+
image = yield(image)
|
294
|
+
image.write(current_path)
|
295
|
+
|
296
|
+
if @format
|
297
|
+
move_to = current_path.chomp(File.extname(current_path)) + ".#{@format}"
|
298
|
+
file.move_to(move_to, permissions, directory_permissions)
|
299
|
+
end
|
300
|
+
|
301
|
+
image.run_command("identify", current_path)
|
302
|
+
ensure
|
303
|
+
image.destroy!
|
304
|
+
end
|
305
|
+
rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
|
306
|
+
default = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :locale => :en)
|
307
|
+
message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :default => default)
|
308
|
+
raise CarrierWave::ProcessingError, message
|
309
|
+
end
|
310
|
+
|
311
|
+
private
|
312
|
+
|
313
|
+
def append_combine_options(cmd, combine_options)
|
314
|
+
combine_options.each do |method, options|
|
315
|
+
cmd.send(method, options)
|
316
|
+
end
|
317
|
+
end
|
318
|
+
|
319
|
+
def mini_magick_image
|
320
|
+
if url
|
321
|
+
::MiniMagick::Image.open(url)
|
322
|
+
else
|
323
|
+
::MiniMagick::Image.open(current_path)
|
324
|
+
end
|
325
|
+
end
|
326
|
+
|
327
|
+
end # MiniMagick
|
328
|
+
end # CarrierWave
|