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,379 @@
|
|
1
|
+
module CarrierWave
|
2
|
+
|
3
|
+
##
|
4
|
+
# This module simplifies manipulation with RMagick 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/rmagick'
|
9
|
+
#
|
10
|
+
# And then include it in your uploader:
|
11
|
+
#
|
12
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
13
|
+
# include CarrierWave::RMagick
|
14
|
+
# end
|
15
|
+
#
|
16
|
+
# You can now use the provided helpers:
|
17
|
+
#
|
18
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
19
|
+
# include CarrierWave::RMagick
|
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 RMagick docs at http://www.imagemagick.org/RMagick/doc/ for more
|
26
|
+
# info
|
27
|
+
#
|
28
|
+
# class MyUploader < CarrierWave::Uploader::Base
|
29
|
+
# include CarrierWave::RMagick
|
30
|
+
#
|
31
|
+
# process :do_stuff => 10.0
|
32
|
+
#
|
33
|
+
# def do_stuff(blur_factor)
|
34
|
+
# manipulate! do |img|
|
35
|
+
# img = img.sepiatone
|
36
|
+
# img = img.auto_orient
|
37
|
+
# img = img.radial_blur(blur_factor)
|
38
|
+
# end
|
39
|
+
# end
|
40
|
+
# end
|
41
|
+
#
|
42
|
+
# === Note
|
43
|
+
#
|
44
|
+
# You should be aware how RMagick handles memory. manipulate! takes care
|
45
|
+
# of freeing up memory for you, but for optimum memory usage you should
|
46
|
+
# use destructive operations as much as possible:
|
47
|
+
#
|
48
|
+
# DON'T DO THIS:
|
49
|
+
# img = img.resize_to_fit
|
50
|
+
#
|
51
|
+
# DO THIS INSTEAD:
|
52
|
+
# img.resize_to_fit!
|
53
|
+
#
|
54
|
+
# Read this for more information why:
|
55
|
+
#
|
56
|
+
# http://rubyforge.org/forum/forum.php?thread_id=1374&forum_id=1618
|
57
|
+
#
|
58
|
+
module RMagick
|
59
|
+
extend ActiveSupport::Concern
|
60
|
+
|
61
|
+
included do
|
62
|
+
begin
|
63
|
+
require "rmagick"
|
64
|
+
rescue LoadError
|
65
|
+
require "RMagick"
|
66
|
+
rescue LoadError => e
|
67
|
+
e.message << " (You may need to install the rmagick gem)"
|
68
|
+
raise e
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
module ClassMethods
|
73
|
+
def convert(format)
|
74
|
+
process :convert => format
|
75
|
+
end
|
76
|
+
|
77
|
+
def resize_to_limit(width, height)
|
78
|
+
process :resize_to_limit => [width, height]
|
79
|
+
end
|
80
|
+
|
81
|
+
def resize_to_fit(width, height)
|
82
|
+
process :resize_to_fit => [width, height]
|
83
|
+
end
|
84
|
+
|
85
|
+
def resize_to_fill(width, height, gravity=::Magick::CenterGravity)
|
86
|
+
process :resize_to_fill => [width, height, gravity]
|
87
|
+
end
|
88
|
+
|
89
|
+
def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
|
90
|
+
process :resize_and_pad => [width, height, background, gravity]
|
91
|
+
end
|
92
|
+
|
93
|
+
def resize_to_geometry_string(geometry_string)
|
94
|
+
process :resize_to_geometry_string => [geometry_string]
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
##
|
99
|
+
# Changes the image encoding format to the given format
|
100
|
+
#
|
101
|
+
# See even http://www.imagemagick.org/RMagick/doc/magick.html#formats
|
102
|
+
#
|
103
|
+
# === Parameters
|
104
|
+
#
|
105
|
+
# [format (#to_s)] an abreviation of the format
|
106
|
+
#
|
107
|
+
# === Yields
|
108
|
+
#
|
109
|
+
# [Magick::Image] additional manipulations to perform
|
110
|
+
#
|
111
|
+
# === Examples
|
112
|
+
#
|
113
|
+
# image.convert(:png)
|
114
|
+
#
|
115
|
+
def convert(format)
|
116
|
+
manipulate!(:format => format)
|
117
|
+
@format = format
|
118
|
+
end
|
119
|
+
|
120
|
+
##
|
121
|
+
# Resize the image to fit within the specified dimensions while retaining
|
122
|
+
# the original aspect ratio. Will only resize the image if it is larger than the
|
123
|
+
# specified dimensions. The resulting image may be shorter or narrower than specified
|
124
|
+
# in the smaller dimension but will not be larger than the specified values.
|
125
|
+
#
|
126
|
+
# === Parameters
|
127
|
+
#
|
128
|
+
# [width (Integer)] the width to scale the image to
|
129
|
+
# [height (Integer)] the height to scale the image to
|
130
|
+
#
|
131
|
+
# === Yields
|
132
|
+
#
|
133
|
+
# [Magick::Image] additional manipulations to perform
|
134
|
+
#
|
135
|
+
def resize_to_limit(width, height)
|
136
|
+
manipulate! do |img|
|
137
|
+
geometry = Magick::Geometry.new(width, height, 0, 0, Magick::GreaterGeometry)
|
138
|
+
new_img = img.change_geometry(geometry) do |new_width, new_height|
|
139
|
+
img.resize(new_width, new_height)
|
140
|
+
end
|
141
|
+
destroy_image(img)
|
142
|
+
new_img = yield(new_img) if block_given?
|
143
|
+
new_img
|
144
|
+
end
|
145
|
+
end
|
146
|
+
|
147
|
+
##
|
148
|
+
# From the RMagick documentation: "Resize the image to fit within the
|
149
|
+
# specified dimensions while retaining the original aspect ratio. The
|
150
|
+
# image may be shorter or narrower than specified in the smaller dimension
|
151
|
+
# but will not be larger than the specified values."
|
152
|
+
#
|
153
|
+
# See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
|
154
|
+
#
|
155
|
+
# === Parameters
|
156
|
+
#
|
157
|
+
# [width (Integer)] the width to scale the image to
|
158
|
+
# [height (Integer)] the height to scale the image to
|
159
|
+
#
|
160
|
+
# === Yields
|
161
|
+
#
|
162
|
+
# [Magick::Image] additional manipulations to perform
|
163
|
+
#
|
164
|
+
def resize_to_fit(width, height)
|
165
|
+
manipulate! do |img|
|
166
|
+
img.resize_to_fit!(width, height)
|
167
|
+
img = yield(img) if block_given?
|
168
|
+
img
|
169
|
+
end
|
170
|
+
end
|
171
|
+
|
172
|
+
##
|
173
|
+
# From the RMagick documentation: "Resize the image to fit within the
|
174
|
+
# specified dimensions while retaining the aspect ratio of the original
|
175
|
+
# image. If necessary, crop the image in the larger dimension."
|
176
|
+
#
|
177
|
+
# See even http://www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
|
178
|
+
#
|
179
|
+
# === Parameters
|
180
|
+
#
|
181
|
+
# [width (Integer)] the width to scale the image to
|
182
|
+
# [height (Integer)] the height to scale the image to
|
183
|
+
#
|
184
|
+
# === Yields
|
185
|
+
#
|
186
|
+
# [Magick::Image] additional manipulations to perform
|
187
|
+
#
|
188
|
+
def resize_to_fill(width, height, gravity=::Magick::CenterGravity)
|
189
|
+
manipulate! do |img|
|
190
|
+
img.crop_resized!(width, height, gravity)
|
191
|
+
img = yield(img) if block_given?
|
192
|
+
img
|
193
|
+
end
|
194
|
+
end
|
195
|
+
|
196
|
+
##
|
197
|
+
# Resize the image to fit within the specified dimensions while retaining
|
198
|
+
# the original aspect ratio. If necessary, will pad the remaining area
|
199
|
+
# with the given color, which defaults to transparent (for gif and png,
|
200
|
+
# white for jpeg).
|
201
|
+
#
|
202
|
+
# === Parameters
|
203
|
+
#
|
204
|
+
# [width (Integer)] the width to scale the image to
|
205
|
+
# [height (Integer)] the height to scale the image to
|
206
|
+
# [background (String, :transparent)] the color of the background as a hexcode, like "#ff45de"
|
207
|
+
# [gravity (Magick::GravityType)] how to position the image
|
208
|
+
#
|
209
|
+
# === Yields
|
210
|
+
#
|
211
|
+
# [Magick::Image] additional manipulations to perform
|
212
|
+
#
|
213
|
+
def resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
|
214
|
+
manipulate! do |img|
|
215
|
+
img.resize_to_fit!(width, height)
|
216
|
+
new_img = ::Magick::Image.new(width, height) { self.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s }
|
217
|
+
if background == :transparent
|
218
|
+
filled = new_img.matte_floodfill(1, 1)
|
219
|
+
else
|
220
|
+
filled = new_img.color_floodfill(1, 1, ::Magick::Pixel.from_color(background))
|
221
|
+
end
|
222
|
+
destroy_image(new_img)
|
223
|
+
filled.composite!(img, gravity, ::Magick::OverCompositeOp)
|
224
|
+
destroy_image(img)
|
225
|
+
filled = yield(filled) if block_given?
|
226
|
+
filled
|
227
|
+
end
|
228
|
+
end
|
229
|
+
|
230
|
+
##
|
231
|
+
# Resize the image per the provided geometry string.
|
232
|
+
#
|
233
|
+
# === Parameters
|
234
|
+
#
|
235
|
+
# [geometry_string (String)] the proportions in which to scale image
|
236
|
+
#
|
237
|
+
# === Yields
|
238
|
+
#
|
239
|
+
# [Magick::Image] additional manipulations to perform
|
240
|
+
#
|
241
|
+
def resize_to_geometry_string(geometry_string)
|
242
|
+
manipulate! do |img|
|
243
|
+
new_img = img.change_geometry(geometry_string) do |new_width, new_height|
|
244
|
+
img.resize(new_width, new_height)
|
245
|
+
end
|
246
|
+
destroy_image(img)
|
247
|
+
new_img = yield(new_img) if block_given?
|
248
|
+
new_img
|
249
|
+
end
|
250
|
+
end
|
251
|
+
|
252
|
+
##
|
253
|
+
# Returns the width of the image.
|
254
|
+
#
|
255
|
+
# === Returns
|
256
|
+
#
|
257
|
+
# [Integer] the image's width in pixels
|
258
|
+
#
|
259
|
+
def width
|
260
|
+
rmagick_image.columns
|
261
|
+
end
|
262
|
+
|
263
|
+
##
|
264
|
+
# Returns the height of the image.
|
265
|
+
#
|
266
|
+
# === Returns
|
267
|
+
#
|
268
|
+
# [Integer] the image's height in pixels
|
269
|
+
#
|
270
|
+
def height
|
271
|
+
rmagick_image.rows
|
272
|
+
end
|
273
|
+
|
274
|
+
##
|
275
|
+
# Manipulate the image with RMagick. This method will load up an image
|
276
|
+
# and then pass each of its frames to the supplied block. It will then
|
277
|
+
# save the image to disk.
|
278
|
+
#
|
279
|
+
# === Gotcha
|
280
|
+
#
|
281
|
+
# This method assumes that the object responds to +current_path+.
|
282
|
+
# Any class that this module is mixed into must have a +current_path+ method.
|
283
|
+
# CarrierWave::Uploader does, so you won't need to worry about this in
|
284
|
+
# most cases.
|
285
|
+
#
|
286
|
+
# === Yields
|
287
|
+
#
|
288
|
+
# [Magick::Image] manipulations to perform
|
289
|
+
# [Integer] Frame index if the image contains multiple frames
|
290
|
+
# [Hash] options, see below
|
291
|
+
#
|
292
|
+
# === Options
|
293
|
+
#
|
294
|
+
# The options argument to this method is also yielded as the third
|
295
|
+
# block argument.
|
296
|
+
#
|
297
|
+
# Currently, the following options are defined:
|
298
|
+
#
|
299
|
+
# ==== :write
|
300
|
+
# A hash of assignments to be evaluated in the block given to the RMagick write call.
|
301
|
+
#
|
302
|
+
# An example:
|
303
|
+
#
|
304
|
+
# manipulate! do |img, index, options|
|
305
|
+
# options[:write] = {
|
306
|
+
# :quality => 50,
|
307
|
+
# :depth => 8
|
308
|
+
# }
|
309
|
+
# img
|
310
|
+
# end
|
311
|
+
#
|
312
|
+
# This will translate to the following RMagick::Image#write call:
|
313
|
+
#
|
314
|
+
# image.write do |img|
|
315
|
+
# self.quality = 50
|
316
|
+
# self.depth = 8
|
317
|
+
# end
|
318
|
+
#
|
319
|
+
# ==== :read
|
320
|
+
# A hash of assignments to be given to the RMagick read call.
|
321
|
+
#
|
322
|
+
# The options available are identical to those for write, but are passed in directly, like this:
|
323
|
+
#
|
324
|
+
# manipulate! :read => { :density => 300 }
|
325
|
+
#
|
326
|
+
# ==== :format
|
327
|
+
# Specify the output format. If unset, the filename extension is used to determine the format.
|
328
|
+
#
|
329
|
+
# === Raises
|
330
|
+
#
|
331
|
+
# [CarrierWave::ProcessingError] if manipulation failed.
|
332
|
+
#
|
333
|
+
def manipulate!(options={}, &block)
|
334
|
+
cache_stored_file! if !cached?
|
335
|
+
|
336
|
+
read_block = create_info_block(options[:read])
|
337
|
+
image = ::Magick::Image.read(current_path, &read_block)
|
338
|
+
frames = ::Magick::ImageList.new
|
339
|
+
|
340
|
+
image.each_with_index do |frame, index|
|
341
|
+
frame = yield *[frame, index, options].take(block.arity) if block_given?
|
342
|
+
frames << frame if frame
|
343
|
+
end
|
344
|
+
frames.append(true) if block_given?
|
345
|
+
|
346
|
+
write_block = create_info_block(options[:write])
|
347
|
+
|
348
|
+
if options[:format] || @format
|
349
|
+
frames.write("#{options[:format] || @format}:#{current_path}", &write_block)
|
350
|
+
move_to = current_path.chomp(File.extname(current_path)) + ".#{options[:format] || @format}"
|
351
|
+
file.move_to(move_to, permissions, directory_permissions)
|
352
|
+
else
|
353
|
+
frames.write(current_path, &write_block)
|
354
|
+
end
|
355
|
+
|
356
|
+
destroy_image(frames)
|
357
|
+
rescue ::Magick::ImageMagickError => e
|
358
|
+
raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :default => I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :locale => :en))
|
359
|
+
end
|
360
|
+
|
361
|
+
private
|
362
|
+
|
363
|
+
def create_info_block(options)
|
364
|
+
return nil unless options
|
365
|
+
assignments = options.map { |k, v| "self.#{k} = #{v}" }
|
366
|
+
code = "lambda { |img| " + assignments.join(";") + "}"
|
367
|
+
eval code
|
368
|
+
end
|
369
|
+
|
370
|
+
def destroy_image(image)
|
371
|
+
image.try(:destroy!)
|
372
|
+
end
|
373
|
+
|
374
|
+
def rmagick_image
|
375
|
+
::Magick::Image.read(current_path).first
|
376
|
+
end
|
377
|
+
|
378
|
+
end # RMagick
|
379
|
+
end # CarrierWave
|
@@ -0,0 +1,348 @@
|
|
1
|
+
require 'pathname'
|
2
|
+
require 'active_support/core_ext/string/multibyte'
|
3
|
+
|
4
|
+
begin
|
5
|
+
# Use mime/types/columnar if available, for reduced memory usage
|
6
|
+
require 'mime/types/columnar'
|
7
|
+
rescue LoadError
|
8
|
+
require 'mime/types'
|
9
|
+
end
|
10
|
+
|
11
|
+
module CarrierWave
|
12
|
+
|
13
|
+
##
|
14
|
+
# SanitizedFile is a base class which provides a common API around all
|
15
|
+
# the different quirky Ruby File libraries. It has support for Tempfile,
|
16
|
+
# File, StringIO, Merb-style upload Hashes, as well as paths given as
|
17
|
+
# Strings and Pathnames.
|
18
|
+
#
|
19
|
+
# It's probably needlessly comprehensive and complex. Help is appreciated.
|
20
|
+
#
|
21
|
+
class SanitizedFile
|
22
|
+
|
23
|
+
attr_accessor :file
|
24
|
+
|
25
|
+
class << self
|
26
|
+
attr_writer :sanitize_regexp
|
27
|
+
|
28
|
+
def sanitize_regexp
|
29
|
+
@sanitize_regexp ||= /[^[:word:]\.\-\+]/
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
def initialize(file)
|
34
|
+
self.file = file
|
35
|
+
end
|
36
|
+
|
37
|
+
##
|
38
|
+
# Returns the filename as is, without sanitizing it.
|
39
|
+
#
|
40
|
+
# === Returns
|
41
|
+
#
|
42
|
+
# [String] the unsanitized filename
|
43
|
+
#
|
44
|
+
def original_filename
|
45
|
+
return @original_filename if @original_filename
|
46
|
+
if @file and @file.respond_to?(:original_filename)
|
47
|
+
@file.original_filename
|
48
|
+
elsif path
|
49
|
+
File.basename(path)
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
##
|
54
|
+
# Returns the filename, sanitized to strip out any evil characters.
|
55
|
+
#
|
56
|
+
# === Returns
|
57
|
+
#
|
58
|
+
# [String] the sanitized filename
|
59
|
+
#
|
60
|
+
def filename
|
61
|
+
sanitize(original_filename) if original_filename
|
62
|
+
end
|
63
|
+
|
64
|
+
alias_method :identifier, :filename
|
65
|
+
|
66
|
+
##
|
67
|
+
# Returns the part of the filename before the extension. So if a file is called 'test.jpeg'
|
68
|
+
# this would return 'test'
|
69
|
+
#
|
70
|
+
# === Returns
|
71
|
+
#
|
72
|
+
# [String] the first part of the filename
|
73
|
+
#
|
74
|
+
def basename
|
75
|
+
split_extension(filename)[0] if filename
|
76
|
+
end
|
77
|
+
|
78
|
+
##
|
79
|
+
# Returns the file extension
|
80
|
+
#
|
81
|
+
# === Returns
|
82
|
+
#
|
83
|
+
# [String] the extension
|
84
|
+
#
|
85
|
+
def extension
|
86
|
+
split_extension(filename)[1] if filename
|
87
|
+
end
|
88
|
+
|
89
|
+
##
|
90
|
+
# Returns the file's size.
|
91
|
+
#
|
92
|
+
# === Returns
|
93
|
+
#
|
94
|
+
# [Integer] the file's size in bytes.
|
95
|
+
#
|
96
|
+
def size
|
97
|
+
if is_path?
|
98
|
+
exists? ? File.size(path) : 0
|
99
|
+
elsif @file.respond_to?(:size)
|
100
|
+
@file.size
|
101
|
+
elsif path
|
102
|
+
exists? ? File.size(path) : 0
|
103
|
+
else
|
104
|
+
0
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
##
|
109
|
+
# Returns the full path to the file. If the file has no path, it will return nil.
|
110
|
+
#
|
111
|
+
# === Returns
|
112
|
+
#
|
113
|
+
# [String, nil] the path where the file is located.
|
114
|
+
#
|
115
|
+
def path
|
116
|
+
unless @file.blank?
|
117
|
+
if is_path?
|
118
|
+
File.expand_path(@file)
|
119
|
+
elsif @file.respond_to?(:path) and not @file.path.blank?
|
120
|
+
File.expand_path(@file.path)
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
##
|
126
|
+
# === Returns
|
127
|
+
#
|
128
|
+
# [Boolean] whether the file is supplied as a pathname or string.
|
129
|
+
#
|
130
|
+
def is_path?
|
131
|
+
!!((@file.is_a?(String) || @file.is_a?(Pathname)) && !@file.blank?)
|
132
|
+
end
|
133
|
+
|
134
|
+
##
|
135
|
+
# === Returns
|
136
|
+
#
|
137
|
+
# [Boolean] whether the file is valid and has a non-zero size
|
138
|
+
#
|
139
|
+
def empty?
|
140
|
+
@file.nil? || self.size.nil? || (self.size.zero? && ! self.exists?)
|
141
|
+
end
|
142
|
+
|
143
|
+
##
|
144
|
+
# === Returns
|
145
|
+
#
|
146
|
+
# [Boolean] Whether the file exists
|
147
|
+
#
|
148
|
+
def exists?
|
149
|
+
self.path.present? && File.exist?(self.path)
|
150
|
+
end
|
151
|
+
|
152
|
+
##
|
153
|
+
# Returns the contents of the file.
|
154
|
+
#
|
155
|
+
# === Returns
|
156
|
+
#
|
157
|
+
# [String] contents of the file
|
158
|
+
#
|
159
|
+
def read
|
160
|
+
if @content
|
161
|
+
@content
|
162
|
+
elsif is_path?
|
163
|
+
File.open(@file, "rb") {|file| file.read}
|
164
|
+
else
|
165
|
+
@file.try(:rewind)
|
166
|
+
@content = @file.read
|
167
|
+
@file.try(:close) unless @file.try(:closed?)
|
168
|
+
@content
|
169
|
+
end
|
170
|
+
end
|
171
|
+
|
172
|
+
##
|
173
|
+
# Moves the file to the given path
|
174
|
+
#
|
175
|
+
# === Parameters
|
176
|
+
#
|
177
|
+
# [new_path (String)] The path where the file should be moved.
|
178
|
+
# [permissions (Integer)] permissions to set on the file in its new location.
|
179
|
+
# [directory_permissions (Integer)] permissions to set on created directories.
|
180
|
+
#
|
181
|
+
def move_to(new_path, permissions=nil, directory_permissions=nil, keep_filename=false)
|
182
|
+
return if self.empty?
|
183
|
+
new_path = File.expand_path(new_path)
|
184
|
+
|
185
|
+
mkdir!(new_path, directory_permissions)
|
186
|
+
move!(new_path)
|
187
|
+
chmod!(new_path, permissions)
|
188
|
+
if keep_filename
|
189
|
+
self.file = {:tempfile => new_path, :filename => original_filename}
|
190
|
+
else
|
191
|
+
self.file = new_path
|
192
|
+
end
|
193
|
+
self
|
194
|
+
end
|
195
|
+
##
|
196
|
+
# Helper to move file to new path.
|
197
|
+
#
|
198
|
+
def move!(new_path)
|
199
|
+
if exists?
|
200
|
+
FileUtils.mv(path, new_path) unless new_path == path
|
201
|
+
else
|
202
|
+
File.open(new_path, "wb") { |f| f.write(read) }
|
203
|
+
end
|
204
|
+
end
|
205
|
+
|
206
|
+
##
|
207
|
+
# Creates a copy of this file and moves it to the given path. Returns the copy.
|
208
|
+
#
|
209
|
+
# === Parameters
|
210
|
+
#
|
211
|
+
# [new_path (String)] The path where the file should be copied to.
|
212
|
+
# [permissions (Integer)] permissions to set on the copy
|
213
|
+
# [directory_permissions (Integer)] permissions to set on created directories.
|
214
|
+
#
|
215
|
+
# === Returns
|
216
|
+
#
|
217
|
+
# @return [CarrierWave::SanitizedFile] the location where the file will be stored.
|
218
|
+
#
|
219
|
+
def copy_to(new_path, permissions=nil, directory_permissions=nil)
|
220
|
+
return if self.empty?
|
221
|
+
new_path = File.expand_path(new_path)
|
222
|
+
|
223
|
+
mkdir!(new_path, directory_permissions)
|
224
|
+
copy!(new_path)
|
225
|
+
chmod!(new_path, permissions)
|
226
|
+
self.class.new({:tempfile => new_path, :content_type => content_type})
|
227
|
+
end
|
228
|
+
|
229
|
+
##
|
230
|
+
# Helper to create copy of file in new path.
|
231
|
+
#
|
232
|
+
def copy!(new_path)
|
233
|
+
if exists?
|
234
|
+
FileUtils.cp(path, new_path) unless new_path == path
|
235
|
+
else
|
236
|
+
File.open(new_path, "wb") { |f| f.write(read) }
|
237
|
+
end
|
238
|
+
end
|
239
|
+
|
240
|
+
##
|
241
|
+
# Removes the file from the filesystem.
|
242
|
+
#
|
243
|
+
def delete
|
244
|
+
FileUtils.rm(self.path) if exists?
|
245
|
+
end
|
246
|
+
|
247
|
+
##
|
248
|
+
# Returns a File object, or nil if it does not exist.
|
249
|
+
#
|
250
|
+
# === Returns
|
251
|
+
#
|
252
|
+
# [File] a File object representing the SanitizedFile
|
253
|
+
#
|
254
|
+
def to_file
|
255
|
+
return @file if @file.is_a?(File)
|
256
|
+
File.open(path, "rb") if exists?
|
257
|
+
end
|
258
|
+
|
259
|
+
##
|
260
|
+
# Returns the content type of the file.
|
261
|
+
#
|
262
|
+
# === Returns
|
263
|
+
#
|
264
|
+
# [String] the content type of the file
|
265
|
+
#
|
266
|
+
def content_type
|
267
|
+
return @content_type if @content_type
|
268
|
+
if @file.respond_to?(:content_type) and @file.content_type
|
269
|
+
@content_type = @file.content_type.to_s.chomp
|
270
|
+
elsif path
|
271
|
+
@content_type = ::MIME::Types.type_for(path).first.to_s
|
272
|
+
end
|
273
|
+
end
|
274
|
+
|
275
|
+
##
|
276
|
+
# Sets the content type of the file.
|
277
|
+
#
|
278
|
+
# === Returns
|
279
|
+
#
|
280
|
+
# [String] the content type of the file
|
281
|
+
#
|
282
|
+
def content_type=(type)
|
283
|
+
@content_type = type
|
284
|
+
end
|
285
|
+
|
286
|
+
##
|
287
|
+
# Used to sanitize the file name. Public to allow overriding for non-latin characters.
|
288
|
+
#
|
289
|
+
# === Returns
|
290
|
+
#
|
291
|
+
# [Regexp] the regexp for sanitizing the file name
|
292
|
+
#
|
293
|
+
def sanitize_regexp
|
294
|
+
CarrierWave::SanitizedFile.sanitize_regexp
|
295
|
+
end
|
296
|
+
|
297
|
+
private
|
298
|
+
|
299
|
+
def file=(file)
|
300
|
+
if file.is_a?(Hash)
|
301
|
+
@file = file["tempfile"] || file[:tempfile]
|
302
|
+
@original_filename = file["filename"] || file[:filename]
|
303
|
+
@content_type = file["content_type"] || file[:content_type] || file["type"] || file[:type]
|
304
|
+
else
|
305
|
+
@file = file
|
306
|
+
@original_filename = nil
|
307
|
+
@content_type = nil
|
308
|
+
end
|
309
|
+
end
|
310
|
+
|
311
|
+
# create the directory if it doesn't exist
|
312
|
+
def mkdir!(path, directory_permissions)
|
313
|
+
options = {}
|
314
|
+
options[:mode] = directory_permissions if directory_permissions
|
315
|
+
FileUtils.mkdir_p(File.dirname(path), options) unless File.exist?(File.dirname(path))
|
316
|
+
end
|
317
|
+
|
318
|
+
def chmod!(path, permissions)
|
319
|
+
File.chmod(permissions, path) if permissions
|
320
|
+
end
|
321
|
+
|
322
|
+
# Sanitize the filename, to prevent hacking
|
323
|
+
def sanitize(name)
|
324
|
+
name = name.tr("\\", "/") # work-around for IE
|
325
|
+
name = File.basename(name)
|
326
|
+
name = name.gsub(sanitize_regexp,"_")
|
327
|
+
name = "_#{name}" if name =~ /\A\.+\z/
|
328
|
+
name = "unnamed" if name.size == 0
|
329
|
+
return name.mb_chars.to_s
|
330
|
+
end
|
331
|
+
|
332
|
+
def split_extension(filename)
|
333
|
+
# regular expressions to try for identifying extensions
|
334
|
+
extension_matchers = [
|
335
|
+
/\A(.+)\.(tar\.([glx]?z|bz2))\z/, # matches "something.tar.gz"
|
336
|
+
/\A(.+)\.([^\.]+)\z/ # matches "something.jpg"
|
337
|
+
]
|
338
|
+
|
339
|
+
extension_matchers.each do |regexp|
|
340
|
+
if filename =~ regexp
|
341
|
+
return $1, $2
|
342
|
+
end
|
343
|
+
end
|
344
|
+
return filename, "" # In case we weren't able to split the extension
|
345
|
+
end
|
346
|
+
|
347
|
+
end # SanitizedFile
|
348
|
+
end # CarrierWave
|