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,210 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CarrierWave::MiniMagick do
|
4
|
+
let(:klass) { Class.new(CarrierWave::Uploader::Base) { include CarrierWave::MiniMagick } }
|
5
|
+
|
6
|
+
let(:instance) { klass.new }
|
7
|
+
let(:landscape_file_path) { file_path('landscape.jpg') }
|
8
|
+
let(:landscape_copy_file_path) { file_path('landscape_copy.jpg') }
|
9
|
+
|
10
|
+
before do
|
11
|
+
FileUtils.cp(landscape_file_path, landscape_copy_file_path)
|
12
|
+
allow(instance).to receive(:cached?).and_return true
|
13
|
+
allow(instance).to receive(:url).and_return nil
|
14
|
+
allow(instance).to receive(:file).and_return(CarrierWave::SanitizedFile.new(landscape_copy_file_path))
|
15
|
+
end
|
16
|
+
|
17
|
+
after { FileUtils.rm(landscape_copy_file_path) if File.exist?(landscape_copy_file_path) }
|
18
|
+
|
19
|
+
describe "#convert" do
|
20
|
+
it "converts from one format to another" do
|
21
|
+
instance.convert('png')
|
22
|
+
expect(instance.file.extension).to eq('png')
|
23
|
+
expect(instance).to be_format('png')
|
24
|
+
end
|
25
|
+
|
26
|
+
it "converts all pages when no page number is specified" do
|
27
|
+
expect_any_instance_of(::MiniMagick::Image).to receive(:format).with('png', nil).once
|
28
|
+
instance.convert('png')
|
29
|
+
end
|
30
|
+
|
31
|
+
it "converts specific page" do
|
32
|
+
expect_any_instance_of(::MiniMagick::Image).to receive(:format).with('png', 1).once
|
33
|
+
instance.convert('png', 1)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
describe '#resize_to_fill' do
|
38
|
+
it "resizes the image to exactly the given dimensions and maintain file type" do
|
39
|
+
instance.resize_to_fill(200, 200)
|
40
|
+
|
41
|
+
expect(instance).to have_dimensions(200, 200)
|
42
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/JPEG/)
|
43
|
+
end
|
44
|
+
|
45
|
+
it "resizes the image to exactly the given dimensions and maintain updated file type" do
|
46
|
+
instance.convert('png')
|
47
|
+
instance.resize_to_fill(200, 200)
|
48
|
+
|
49
|
+
expect(instance).to have_dimensions(200, 200)
|
50
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/PNG/)
|
51
|
+
expect(instance.file.extension).to eq('png')
|
52
|
+
end
|
53
|
+
|
54
|
+
it "scales up the image if it smaller than the given dimensions" do
|
55
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
|
56
|
+
|
57
|
+
instance.resize_to_fill(1000, 1000, combine_options: { quality: 70 })
|
58
|
+
|
59
|
+
expect(instance).to have_dimensions(1000, 1000)
|
60
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
describe '#resize_and_pad' do
|
65
|
+
it "resizes the image to exactly the given dimensions and maintain file type" do
|
66
|
+
instance.resize_and_pad(200, 200)
|
67
|
+
|
68
|
+
expect(instance).to have_dimensions(200, 200)
|
69
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/JPEG/)
|
70
|
+
end
|
71
|
+
|
72
|
+
it "resizes the image to exactly the given dimensions and maintain updated file type" do
|
73
|
+
instance.convert('png')
|
74
|
+
instance.resize_and_pad(200, 200)
|
75
|
+
|
76
|
+
expect(instance).to have_dimensions(200, 200)
|
77
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/PNG/)
|
78
|
+
end
|
79
|
+
|
80
|
+
it "scales up the image if it smaller than the given dimensions" do
|
81
|
+
instance.resize_and_pad(1000, 1000)
|
82
|
+
|
83
|
+
expect(instance).to have_dimensions(1000, 1000)
|
84
|
+
end
|
85
|
+
|
86
|
+
it "pads with white" do
|
87
|
+
instance.resize_and_pad(200, 200)
|
88
|
+
|
89
|
+
color_of_pixel(instance.current_path, 0, 0).tap do |color|
|
90
|
+
expect(color).to include('#FFFFFF')
|
91
|
+
expect(color).not_to include('#FFFFFF00')
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
it "pads with transparent" do
|
96
|
+
instance.convert('png')
|
97
|
+
instance.resize_and_pad(200, 200, :transparent)
|
98
|
+
|
99
|
+
expect(color_of_pixel(instance.current_path, 0, 0)).to include('#FFFFFF00')
|
100
|
+
end
|
101
|
+
|
102
|
+
it "doesn't pad with transparent" do
|
103
|
+
instance.resize_and_pad(200, 200, :transparent)
|
104
|
+
instance.convert('png')
|
105
|
+
|
106
|
+
color_of_pixel(instance.current_path, 0, 0).tap do |color|
|
107
|
+
expect(color).to include('#FFFFFF')
|
108
|
+
expect(color).not_to include('#FFFFFF00')
|
109
|
+
end
|
110
|
+
end
|
111
|
+
|
112
|
+
it 'accepts combine_options and set quality' do
|
113
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
|
114
|
+
|
115
|
+
instance.resize_and_pad(1000, 1000, combine_options: {quality: 70})
|
116
|
+
|
117
|
+
expect(instance).to have_dimensions(1000, 1000)
|
118
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
|
119
|
+
end
|
120
|
+
end
|
121
|
+
|
122
|
+
describe '#resize_to_fit' do
|
123
|
+
it "resizes the image to fit within the given dimensions and maintain file type" do
|
124
|
+
instance.resize_to_fit(200, 200)
|
125
|
+
|
126
|
+
expect(instance).to have_dimensions(200, 150)
|
127
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/JPEG/)
|
128
|
+
end
|
129
|
+
|
130
|
+
it "resizes the image to fit within the given dimensions and maintain updated file type" do
|
131
|
+
instance.convert('png')
|
132
|
+
instance.resize_to_fit(200, 200)
|
133
|
+
|
134
|
+
expect(instance).to have_dimensions(200, 150)
|
135
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/PNG/)
|
136
|
+
expect(instance.file.extension).to eq('png')
|
137
|
+
end
|
138
|
+
|
139
|
+
it 'scales up the image if it smaller than the given dimensions and set quality' do
|
140
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
|
141
|
+
|
142
|
+
instance.resize_to_fit(1000, 1000, combine_options: {quality: 70})
|
143
|
+
|
144
|
+
expect(instance).to have_dimensions(1000, 750)
|
145
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
|
146
|
+
end
|
147
|
+
end
|
148
|
+
|
149
|
+
describe '#resize_to_limit' do
|
150
|
+
it 'resizes the image to fit within the given dimensions, maintain file type and set quality' do
|
151
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
|
152
|
+
|
153
|
+
instance.resize_to_limit(200, 200, combine_options: {quality: 70})
|
154
|
+
|
155
|
+
expect(instance).to have_dimensions(200, 150)
|
156
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/JPEG/)
|
157
|
+
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
|
158
|
+
end
|
159
|
+
|
160
|
+
it "resizes the image to fit within the given dimensions and maintain updated file type" do
|
161
|
+
instance.convert('png')
|
162
|
+
instance.resize_to_limit(200, 200)
|
163
|
+
|
164
|
+
expect(instance).to have_dimensions(200, 150)
|
165
|
+
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/PNG/)
|
166
|
+
expect(instance.file.extension).to eq('png')
|
167
|
+
end
|
168
|
+
|
169
|
+
it "doesn't scale up the image if it smaller than the given dimensions" do
|
170
|
+
instance.resize_to_limit(1000, 1000)
|
171
|
+
|
172
|
+
expect(instance).to have_dimensions(640, 480)
|
173
|
+
end
|
174
|
+
end
|
175
|
+
|
176
|
+
describe "#width and #height" do
|
177
|
+
it "returns the width and height of the image" do
|
178
|
+
instance.resize_to_fill(200, 300)
|
179
|
+
|
180
|
+
expect(instance.width).to eq(200)
|
181
|
+
expect(instance.height).to eq(300)
|
182
|
+
end
|
183
|
+
end
|
184
|
+
|
185
|
+
describe "test errors" do
|
186
|
+
context "invalid image file" do
|
187
|
+
before { File.open(instance.current_path, 'w') { |f| f.puts "bogus" } }
|
188
|
+
|
189
|
+
it "fails to process a non image file" do
|
190
|
+
expect { instance.resize_to_limit(200, 200) }.to raise_exception(CarrierWave::ProcessingError, /^Failed to manipulate with MiniMagick, maybe it is not an image\?/)
|
191
|
+
end
|
192
|
+
|
193
|
+
it "uses I18n" do
|
194
|
+
change_locale_and_store_translations(:nl, :errors => {
|
195
|
+
:messages => {
|
196
|
+
:mini_magick_processing_error => "Kon bestand niet met MiniMagick bewerken, misschien is het geen beeld bestand?"
|
197
|
+
}
|
198
|
+
}) do
|
199
|
+
expect {instance.resize_to_limit(200, 200)}.to raise_exception(CarrierWave::ProcessingError, /^Kon bestand niet met MiniMagick bewerken, misschien is het geen beeld bestand\?/)
|
200
|
+
end
|
201
|
+
end
|
202
|
+
|
203
|
+
it "doesn't suppress errors when translation is unavailable" do
|
204
|
+
change_locale_and_store_translations(:foo, {}) do
|
205
|
+
expect { instance.resize_to_limit(200, 200) }.to raise_exception( CarrierWave::ProcessingError )
|
206
|
+
end
|
207
|
+
end
|
208
|
+
end
|
209
|
+
end
|
210
|
+
end
|
@@ -0,0 +1,250 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CarrierWave::RMagick, :rmagick => true do
|
4
|
+
|
5
|
+
let(:klass) { Class.new(CarrierWave::Uploader::Base) { include CarrierWave::RMagick } }
|
6
|
+
let(:instance) { klass.new }
|
7
|
+
let(:landscape_file_path) { file_path('landscape.jpg') }
|
8
|
+
let(:landscape_file_copy_path) { file_path('landscape_copy.jpg') }
|
9
|
+
|
10
|
+
before do
|
11
|
+
FileUtils.cp(landscape_file_path, landscape_file_copy_path)
|
12
|
+
allow(instance).to receive(:cached?).and_return true
|
13
|
+
allow(instance).to receive(:file).and_return(CarrierWave::SanitizedFile.new(landscape_file_copy_path))
|
14
|
+
end
|
15
|
+
|
16
|
+
after do
|
17
|
+
FileUtils.rm(landscape_file_copy_path) if File.exist?(file_path('landscape_copy.jpg'))
|
18
|
+
FileUtils.rm(landscape_file_copy_path) if File.exist?(file_path('landscape_copy.jpg'))
|
19
|
+
end
|
20
|
+
|
21
|
+
describe '#convert' do
|
22
|
+
it "converts the image to the given format" do
|
23
|
+
instance.convert(:png)
|
24
|
+
expect(instance.file.extension).to eq('png')
|
25
|
+
expect(instance).to be_format('png')
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
describe '#resize_to_fill' do
|
30
|
+
it "resizes the image to exactly the given dimensions and maintain file type" do
|
31
|
+
instance.resize_to_fill(200, 200)
|
32
|
+
|
33
|
+
expect(instance).to have_dimensions(200, 200)
|
34
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('JPEG')
|
35
|
+
end
|
36
|
+
|
37
|
+
it "resizes the image to exactly the given dimensions and maintain updated file type" do
|
38
|
+
instance.convert('png')
|
39
|
+
instance.resize_to_fill(200, 200)
|
40
|
+
|
41
|
+
expect(instance).to have_dimensions(200, 200)
|
42
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('PNG')
|
43
|
+
expect(instance.file.extension).to eq('png')
|
44
|
+
end
|
45
|
+
|
46
|
+
it "scales up the image if it smaller than the given dimensions" do
|
47
|
+
instance.resize_to_fill(1000, 1000)
|
48
|
+
expect(instance).to have_dimensions(1000, 1000)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
describe '#resize_and_pad' do
|
53
|
+
it "resizes the image to exactly the given dimensions and maintain file type" do
|
54
|
+
instance.resize_and_pad(200, 200)
|
55
|
+
|
56
|
+
expect(instance).to have_dimensions(200, 200)
|
57
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('JPEG')
|
58
|
+
end
|
59
|
+
|
60
|
+
it "resize the image to exactly the given dimensions and maintain updated file type" do
|
61
|
+
instance.convert('png')
|
62
|
+
instance.resize_and_pad(200, 200)
|
63
|
+
|
64
|
+
expect(instance).to have_dimensions(200, 200)
|
65
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('PNG')
|
66
|
+
expect(instance.file.extension).to eq('png')
|
67
|
+
end
|
68
|
+
|
69
|
+
it "pads with white" do
|
70
|
+
instance.resize_and_pad(200, 200)
|
71
|
+
|
72
|
+
color = color_of_pixel(instance.current_path, 0, 0)
|
73
|
+
expect(color).to include('#FFFFFF')
|
74
|
+
expect(color).not_to include('#FFFFFF00')
|
75
|
+
end
|
76
|
+
|
77
|
+
it "pads with transparent" do
|
78
|
+
instance.convert('png')
|
79
|
+
instance.resize_and_pad(200, 200, :transparent)
|
80
|
+
|
81
|
+
color = color_of_pixel(instance.current_path, 0, 0)
|
82
|
+
expect(color).to include('#FFFFFF00')
|
83
|
+
end
|
84
|
+
|
85
|
+
it "doesn't pad with transparent" do
|
86
|
+
instance.resize_and_pad(200, 200, :transparent)
|
87
|
+
instance.convert('png')
|
88
|
+
|
89
|
+
color = color_of_pixel(instance.current_path, 0, 0)
|
90
|
+
expect(color).to include('#FFFFFF')
|
91
|
+
expect(color).not_to include('#FFFFFF00')
|
92
|
+
end
|
93
|
+
|
94
|
+
it "pads with given color" do
|
95
|
+
instance.resize_and_pad(200, 200, '#888')
|
96
|
+
color = color_of_pixel(instance.current_path, 0, 0)
|
97
|
+
|
98
|
+
expect(color).to include('#888888')
|
99
|
+
end
|
100
|
+
|
101
|
+
it "scales up the image if it smaller than the given dimensions" do
|
102
|
+
instance.resize_and_pad(1000, 1000)
|
103
|
+
|
104
|
+
expect(instance).to have_dimensions(1000, 1000)
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
describe '#resize_to_fit' do
|
109
|
+
it "resizes the image to fit within the given dimensions and maintain file type" do
|
110
|
+
instance.resize_to_fit(200, 200)
|
111
|
+
|
112
|
+
expect(instance).to have_dimensions(200, 150)
|
113
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('JPEG')
|
114
|
+
end
|
115
|
+
|
116
|
+
it "resize the image to fit within the given dimensions and maintain updated file type" do
|
117
|
+
instance.convert('png')
|
118
|
+
instance.resize_to_fit(200, 200)
|
119
|
+
|
120
|
+
expect(instance).to have_dimensions(200, 150)
|
121
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('PNG')
|
122
|
+
end
|
123
|
+
|
124
|
+
it "scales up the image if it smaller than the given dimensions" do
|
125
|
+
instance.resize_to_fit(1000, 1000)
|
126
|
+
|
127
|
+
expect(instance).to have_dimensions(1000, 750)
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
describe '#resize_to_limit' do
|
132
|
+
it "resizes the image to fit within the given dimensions and maintain file type" do
|
133
|
+
instance.resize_to_limit(200, 200)
|
134
|
+
|
135
|
+
expect(instance).to have_dimensions(200, 150)
|
136
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('JPEG')
|
137
|
+
end
|
138
|
+
|
139
|
+
it "resizes the image to fit within the given dimensions and maintain updated file type" do
|
140
|
+
instance.convert('png')
|
141
|
+
instance.resize_to_limit(200, 200)
|
142
|
+
|
143
|
+
expect(instance).to have_dimensions(200, 150)
|
144
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('PNG')
|
145
|
+
expect(instance.file.extension).to eq('png')
|
146
|
+
end
|
147
|
+
|
148
|
+
it "doesn't scale up the image if it smaller than the given dimensions" do
|
149
|
+
instance.resize_to_limit(1000, 1000)
|
150
|
+
expect(instance).to have_dimensions(640, 480)
|
151
|
+
end
|
152
|
+
end
|
153
|
+
|
154
|
+
describe '#resize_to_geometry_string' do
|
155
|
+
it "resizes the image to comply with `200x200^` Geometry String spec and maintain file type" do
|
156
|
+
instance.resize_to_geometry_string('200x200^')
|
157
|
+
|
158
|
+
expect(instance).to have_dimensions(267, 200)
|
159
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('JPEG')
|
160
|
+
end
|
161
|
+
|
162
|
+
it "resizes the image to comply with `200x200^` Geometry String spec and maintain updated file type" do
|
163
|
+
instance.convert('png')
|
164
|
+
instance.resize_to_geometry_string('200x200^')
|
165
|
+
|
166
|
+
expect(instance).to have_dimensions(267, 200)
|
167
|
+
expect(::Magick::Image.read(instance.current_path).first.format).to eq('PNG')
|
168
|
+
expect(instance.file.extension).to eq('png')
|
169
|
+
end
|
170
|
+
|
171
|
+
it "resizes the image to have 125% larger dimensions" do
|
172
|
+
instance.resize_to_geometry_string('125%')
|
173
|
+
expect(instance).to have_dimensions(800, 600)
|
174
|
+
end
|
175
|
+
|
176
|
+
it "resizes the image to have a given height" do
|
177
|
+
instance.resize_to_geometry_string('x256')
|
178
|
+
expect(instance).to have_height(256)
|
179
|
+
end
|
180
|
+
|
181
|
+
it "resizes the image to have a given width" do
|
182
|
+
instance.resize_to_geometry_string('256x')
|
183
|
+
expect(instance).to have_width(256)
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
187
|
+
describe "#manipulate!" do
|
188
|
+
let(:image) { ::Magick::Image.read(landscape_file_path) }
|
189
|
+
|
190
|
+
it 'supports passing write options to RMagick' do
|
191
|
+
allow(::Magick::Image).to receive_messages(:read => image)
|
192
|
+
expect_any_instance_of(::Magick::Image::Info).to receive(:quality=).with(50)
|
193
|
+
expect_any_instance_of(::Magick::Image::Info).to receive(:depth=).with(8)
|
194
|
+
|
195
|
+
instance.manipulate! do |image, index, options|
|
196
|
+
options[:write] = {
|
197
|
+
:quality => 50,
|
198
|
+
:depth => 8
|
199
|
+
}
|
200
|
+
image
|
201
|
+
end
|
202
|
+
end
|
203
|
+
|
204
|
+
it 'supports passing read options to RMagick' do
|
205
|
+
expect_any_instance_of(::Magick::Image::Info).to receive(:density=).with(10)
|
206
|
+
expect_any_instance_of(::Magick::Image::Info).to receive(:size=).with("200x200")
|
207
|
+
|
208
|
+
instance.manipulate! :read => {
|
209
|
+
:density => 10,
|
210
|
+
:size => %{"200x200"}
|
211
|
+
}
|
212
|
+
end
|
213
|
+
end
|
214
|
+
|
215
|
+
describe "#width and #height" do
|
216
|
+
it "returns the width and height of the image" do
|
217
|
+
instance.resize_to_fill(200, 300)
|
218
|
+
expect(instance.width).to eq(200)
|
219
|
+
expect(instance.height).to eq(300)
|
220
|
+
end
|
221
|
+
end
|
222
|
+
|
223
|
+
describe "test errors" do
|
224
|
+
context "invalid image file" do
|
225
|
+
before do
|
226
|
+
File.open(instance.current_path, 'w') { |f| f.puts "bogus" }
|
227
|
+
end
|
228
|
+
|
229
|
+
it "fails to process a non image file" do
|
230
|
+
expect {instance.resize_to_limit(200, 200)}.to raise_exception(CarrierWave::ProcessingError, /^Failed to manipulate with rmagick, maybe it is not an image\?/)
|
231
|
+
end
|
232
|
+
|
233
|
+
it "uses I18n" do
|
234
|
+
change_locale_and_store_translations(:nl, :errors => {
|
235
|
+
:messages => {
|
236
|
+
:rmagick_processing_error => "Kon bestand niet met rmagick bewerken, misschien is het geen beeld bestand?"
|
237
|
+
}
|
238
|
+
}) do
|
239
|
+
expect {instance.resize_to_limit(200, 200)}.to raise_exception(CarrierWave::ProcessingError, /^Kon bestand niet met rmagick bewerken, misschien is het geen beeld bestand\?/)
|
240
|
+
end
|
241
|
+
end
|
242
|
+
|
243
|
+
it "doesn't suppress errors when translation is unavailable" do
|
244
|
+
change_locale_and_store_translations(:foo, {}) do
|
245
|
+
expect { instance.resize_to_limit(200, 200) }.to raise_exception( CarrierWave::ProcessingError )
|
246
|
+
end
|
247
|
+
end
|
248
|
+
end
|
249
|
+
end
|
250
|
+
end
|