radiant 1.0.0.rc1 → 1.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of radiant might be problematic. Click here for more details.
- data/app/controllers/admin/resource_controller.rb +1 -0
- data/app/controllers/application_controller.rb +1 -1
- data/app/models/deprecated_tags.rb +5 -48
- data/app/models/user_action_observer.rb +8 -2
- data/app/views/layouts/application.html.haml +1 -1
- data/config/boot.rb +2 -2
- data/config/environment.rb +5 -3
- data/config/initializers/compass.rb +5 -0
- data/config/locales/en.yml +2 -2
- data/features/step_definitions/admin/pages_management_steps.rb +6 -1
- data/features/support/paths.rb +13 -0
- data/lib/generators/extension/templates/cucumber_env.rb +5 -1
- data/lib/generators/extension/templates/cucumber_paths.rb +20 -12
- data/lib/generators/extension/templates/gemspec.rb +10 -5
- data/lib/generators/instance/templates/instance_environment.rb +4 -2
- data/lib/radiant.rb +1 -1
- data/lib/radiant/gem_dependency_fix.rb +1 -1
- data/lib/radiant/taggable.rb +42 -3
- data/lib/tasks/framework.rake +6 -6
- data/{vendor/plugins/haml/test/sass/results/warn.css → log/.keep} +0 -0
- data/radiant.gemspec +3 -2
- data/script/console +2 -2
- data/spec/controllers/admin/pages_controller_spec.rb +1 -1
- data/spec/lib/radiant/taggable_spec.rb +53 -0
- data/vendor/extensions/archive/Rakefile +3 -3
- data/vendor/extensions/archive/features/support/env.rb +5 -1
- data/vendor/extensions/archive/features/support/paths.rb +20 -12
- data/vendor/extensions/archive/radiant-archive-extension.gemspec +10 -5
- data/vendor/extensions/archive/tmp/cache/meta/0e/da69d02186242cdfda62e46044566f2bc50f3a +0 -0
- data/vendor/extensions/{assets → clipped}/LICENSE +0 -0
- data/vendor/extensions/{assets → clipped}/README.md +21 -21
- data/vendor/extensions/{assets → clipped}/Rakefile +29 -31
- data/vendor/extensions/{assets → clipped}/app/controllers/admin/assets_controller.rb +16 -11
- data/vendor/extensions/clipped/app/controllers/admin/page_attachments_controller.rb +18 -0
- data/vendor/extensions/clipped/app/helpers/admin/assets_helper.rb +16 -0
- data/vendor/extensions/{assets → clipped}/app/models/asset.rb +12 -9
- data/vendor/extensions/{assets → clipped}/app/models/asset_tags.rb +36 -53
- data/vendor/extensions/{assets → clipped}/app/models/asset_type.rb +1 -7
- data/vendor/extensions/{assets → clipped}/app/models/old_page_attachment.rb +0 -0
- data/vendor/extensions/clipped/app/models/page_attachment.rb +21 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_asset.html.haml +2 -2
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_asset_table.html.haml +4 -4
- data/vendor/extensions/clipped/app/views/admin/assets/_errors.html.haml +3 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_form.html.haml +2 -2
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_page_assets.html.haml +1 -1
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_search.html.haml +0 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/_search_results.html.haml +1 -1
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/edit.html.haml +7 -8
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/index.html.haml +3 -2
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/new.html.haml +2 -2
- data/vendor/extensions/clipped/app/views/admin/assets/refresh.html.haml +14 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/assets/remove.html.haml +3 -3
- data/vendor/extensions/{assets → clipped}/app/views/admin/configuration/_edit.html.haml +1 -1
- data/vendor/extensions/{assets → clipped}/app/views/admin/configuration/_show.html.haml +1 -1
- data/vendor/extensions/clipped/app/views/admin/page_attachments/_attachment.html.haml +25 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/page_parts/_page_part.html.haml +3 -2
- data/vendor/extensions/{assets → clipped}/app/views/admin/pages/_asset_popups.html.haml +7 -7
- data/vendor/extensions/clipped/app/views/admin/pages/_assets.html.haml +11 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_assets_bucket.html.haml +1 -1
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_assets_container.html.haml +9 -9
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_bucket.html.haml +1 -1
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_bucket_asset.html.haml +2 -2
- data/vendor/extensions/clipped/app/views/admin/removed/_show_bucket_link.html.haml +4 -0
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/_upload_to_page.html.haml +2 -2
- data/vendor/extensions/{assets → clipped}/app/views/admin/removed/bucket/_iframe.html.haml +0 -0
- data/vendor/extensions/{assets → clipped}/artwork/icons.png +0 -0
- data/vendor/extensions/{assets/assets_extension.rb → clipped/clipped_extension.rb} +10 -10
- data/vendor/extensions/{assets → clipped}/config/initializers/interpolation.rb +0 -0
- data/vendor/extensions/clipped/config/initializers/processors.rb +12 -0
- data/vendor/extensions/{assets → clipped}/config/initializers/radiant_config.rb +5 -4
- data/vendor/extensions/{assets → clipped}/config/locales/en.yml +6 -3
- data/vendor/extensions/{assets → clipped}/config/locales/nl.yml +1 -1
- data/vendor/extensions/{assets → clipped}/config/routes.rb +2 -2
- data/vendor/extensions/clipped/cucumber.yml +1 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/001_create_assets.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/002_create_paperclip_attributes.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/003_create_user_observer.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/004_create_page_attachments.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/005_rename_users.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/20090316132151_disable_file_types.rb +0 -0
- data/vendor/extensions/{assets → clipped}/db/migrate/20110513205050_asset_uuid.rb +0 -0
- data/vendor/extensions/clipped/features/support/env.rb +11 -0
- data/vendor/extensions/clipped/features/support/paths.rb +22 -0
- data/vendor/extensions/{assets/lib/assets_admin_ui.rb → clipped/lib/clipped_admin_ui.rb} +1 -1
- data/vendor/extensions/{assets → clipped}/lib/page_asset_associations.rb +1 -1
- data/vendor/extensions/{assets → clipped}/lib/paperclip/frame_grab.rb +0 -0
- data/vendor/extensions/clipped/lib/radiant-clipped-extension.rb +2 -0
- data/vendor/extensions/clipped/lib/radiant-clipped-extension/version.rb +3 -0
- data/vendor/extensions/{assets/lib/tasks/assets_extension_tasks.rake → clipped/lib/tasks/clipped_extension_tasks.rake} +22 -16
- data/vendor/extensions/{assets → clipped}/lib/tasks/paperclip_tasks.rake +0 -0
- data/{public → vendor/extensions/clipped/public}/flash/ZeroClipboard.swf +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/add.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/archive_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/audio_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/audio_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/c_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/copy.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/css_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/database_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/delete.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/document_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/document_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/flash_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/flash_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/font_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/gzip_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/html_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/image_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/image_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/java_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/page_edit.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/perl_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/php_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/presentation_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/python_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/reorder_assets.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/ruby_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/script_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/spreadsheet_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/tar_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/unknown_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/unknown_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/video_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/video_thumbnail.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/xml_icon.png +0 -0
- data/{public → vendor/extensions/clipped/public}/images/admin/assets/zip_icon.png +0 -0
- data/vendor/extensions/{assets → clipped}/public/javascripts/admin/assets.js +66 -8
- data/vendor/extensions/{assets → clipped}/public/stylesheets/sass/admin/assets.sass +12 -6
- data/vendor/extensions/clipped/radiant-clipped-extension.gemspec +33 -0
- data/vendor/extensions/{assets → clipped}/spec/controllers/admin/assets_controller_spec.rb +0 -0
- data/vendor/extensions/clipped/spec/controllers/admin/page_attachments_controller_spec.rb +50 -0
- data/vendor/extensions/{assets → clipped}/spec/datasets/assets_dataset.rb +2 -1
- data/vendor/extensions/{assets/spec/lib/tag_deprecation_spec.rb → clipped/spec/lib/asset_tags_spec.rb} +3 -15
- data/vendor/extensions/{assets → clipped}/spec/models/asset_spec.rb +3 -2
- data/vendor/extensions/{assets → clipped}/spec/models/asset_type_spec.rb +0 -0
- data/vendor/extensions/{assets → clipped}/spec/spec.opts +0 -0
- data/vendor/extensions/{assets → clipped}/spec/spec_helper.rb +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets-2.bmml +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets-2.png +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets-3.bmml +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets-3.png +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets.bmml +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page-assets.png +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page.bmml +0 -0
- data/vendor/extensions/{assets → clipped}/wireframes/edit-page.png +0 -0
- data/vendor/extensions/sheets/Rakefile +30 -18
- data/vendor/extensions/sheets/app/controllers/admin/sheet_resource_controller.rb +1 -1
- data/vendor/extensions/sheets/app/models/sheet.rb +4 -0
- data/vendor/extensions/sheets/app/views/admin/scripts/index.html.haml +9 -5
- data/vendor/extensions/sheets/app/views/admin/styles/index.html.haml +1 -1
- data/vendor/extensions/sheets/config/locales/en.yml +3 -1
- data/vendor/extensions/sheets/features/admin/managing_javascripts.feature +65 -0
- data/vendor/extensions/sheets/features/admin/managing_stylesheets.feature +65 -0
- data/vendor/extensions/sheets/features/support/env.rb +2 -7
- data/vendor/extensions/sheets/features/support/paths.rb +9 -12
- data/vendor/extensions/sheets/lib/radiant-sheets-extension/version.rb +1 -1
- data/vendor/extensions/sheets/radiant-sheets-extension.gemspec +9 -4
- data/vendor/extensions/sheets/spec/datasets/javascripts_dataset.rb +3 -1
- data/vendor/extensions/sheets/spec/datasets/stylesheets_dataset.rb +3 -1
- data/vendor/extensions/sheets/spec/lib/javascript_tags_spec.rb +4 -4
- data/vendor/extensions/sheets/spec/lib/stylesheet_tags_spec.rb +4 -4
- metadata +189 -599
- data/Gemfile +0 -3
- data/lib/generators/extension/templates/cucumber_datasets_loader.rb +0 -3
- data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n.jpg +0 -0
- data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_icon.png +0 -0
- data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_normal.jpg +0 -0
- data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_thumbnail.png +0 -0
- data/public/images/roasters/banner.jpg +0 -0
- data/public/images/roasters/closelabel.gif +0 -0
- data/public/images/roasters/comment.png +0 -0
- data/public/images/roasters/gallery1.jpg +0 -0
- data/public/images/roasters/gallery2.jpg +0 -0
- data/public/images/roasters/gallery3.jpg +0 -0
- data/public/images/roasters/gallery4.jpg +0 -0
- data/public/images/roasters/gift.gif +0 -0
- data/public/images/roasters/green.gif +0 -0
- data/public/images/roasters/nav-background.gif +0 -0
- data/public/images/roasters/nav-divider.gif +0 -0
- data/public/images/roasters/nextlabel.gif +0 -0
- data/public/images/roasters/open.gif +0 -0
- data/public/images/roasters/preview-1.jpg +0 -0
- data/public/images/roasters/preview.jpg +0 -0
- data/public/images/roasters/prevlabel.gif +0 -0
- data/public/images/roasters/prize.gif +0 -0
- data/public/images/roasters/recycle.gif +0 -0
- data/public/images/roasters/rss.gif +0 -0
- data/public/images/roasters/thumb-grinder.jpg +0 -0
- data/public/images/roasters/thumb-grower.jpg +0 -0
- data/public/images/roasters/thumb-roaster.jpg +0 -0
- data/public/images/roasters/truck.gif +0 -0
- data/vendor/extensions/assets/HELP_admin.markdown +0 -69
- data/vendor/extensions/assets/VERSION +0 -1
- data/vendor/extensions/assets/app/controllers/admin/page_attachments_controller.rb +0 -45
- data/vendor/extensions/assets/app/helpers/admin/assets_helper.rb +0 -11
- data/vendor/extensions/assets/app/models/page_attachment.rb +0 -14
- data/vendor/extensions/assets/app/views/admin/assets/_errors.html.haml +0 -3
- data/vendor/extensions/assets/app/views/admin/page_attachments/_attachment.html.haml +0 -22
- data/vendor/extensions/assets/app/views/admin/page_attachments/_new_attachment.html.haml +0 -18
- data/vendor/extensions/assets/app/views/admin/pages/_assets.html.haml +0 -13
- data/vendor/extensions/assets/app/views/admin/removed/_show_bucket_link.html.haml +0 -4
- data/vendor/extensions/assets/lib/tag_deprecation.rb +0 -73
- data/vendor/extensions/assets/public/flash/ZeroClipboard.swf +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/add.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/archive_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/audio_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/audio_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/c_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/copy.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/css_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/database_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/delete.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/document_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/document_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/flash_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/flash_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/font_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/gzip_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/html_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/image_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/image_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/java_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/page_edit.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/perl_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/php_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/presentation_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/python_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/reorder_assets.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/ruby_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/script_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/spreadsheet_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/tar_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/unknown_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/unknown_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/video_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/video_thumbnail.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/xml_icon.png +0 -0
- data/vendor/extensions/assets/public/images/admin/assets/zip_icon.png +0 -0
- data/vendor/extensions/assets/spec/controllers/admin/page_attachment_controller_spec.rb +0 -51
- data/vendor/extensions/assets/spec/lib/asset_tags_spec.rb +0 -9
- data/vendor/plugins/haml/CONTRIBUTING +0 -4
- data/vendor/plugins/haml/MIT-LICENSE +0 -20
- data/vendor/plugins/haml/README.md +0 -298
- data/vendor/plugins/haml/Rakefile +0 -436
- data/vendor/plugins/haml/TODO +0 -53
- data/vendor/plugins/haml/VERSION +0 -1
- data/vendor/plugins/haml/VERSION_NAME +0 -1
- data/vendor/plugins/haml/bin/css2sass +0 -13
- data/vendor/plugins/haml/bin/haml +0 -9
- data/vendor/plugins/haml/bin/html2haml +0 -7
- data/vendor/plugins/haml/bin/sass +0 -8
- data/vendor/plugins/haml/bin/sass-convert +0 -7
- data/vendor/plugins/haml/doc-src/FAQ.md +0 -187
- data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md +0 -1091
- data/vendor/plugins/haml/doc-src/HAML_REFERENCE.md +0 -1344
- data/vendor/plugins/haml/doc-src/INDENTED_SYNTAX.md +0 -210
- data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md +0 -1914
- data/vendor/plugins/haml/doc-src/SASS_REFERENCE.md +0 -1680
- data/vendor/plugins/haml/doc-src/SCSS_FOR_SASS_USERS.md +0 -155
- data/vendor/plugins/haml/ext/extconf.rb +0 -10
- data/vendor/plugins/haml/extra/haml-mode.el +0 -753
- data/vendor/plugins/haml/extra/sass-mode.el +0 -207
- data/vendor/plugins/haml/extra/update_watch.rb +0 -13
- data/vendor/plugins/haml/haml.gemspec +0 -35
- data/vendor/plugins/haml/init.rb +0 -18
- data/vendor/plugins/haml/init.rbc +0 -404
- data/vendor/plugins/haml/lib/haml.rb +0 -44
- data/vendor/plugins/haml/lib/haml.rbc +0 -569
- data/vendor/plugins/haml/lib/haml/buffer.rb +0 -320
- data/vendor/plugins/haml/lib/haml/buffer.rbc +0 -4048
- data/vendor/plugins/haml/lib/haml/engine.rb +0 -308
- data/vendor/plugins/haml/lib/haml/engine.rbc +0 -3852
- data/vendor/plugins/haml/lib/haml/error.rb +0 -22
- data/vendor/plugins/haml/lib/haml/error.rbc +0 -339
- data/vendor/plugins/haml/lib/haml/exec.rb +0 -862
- data/vendor/plugins/haml/lib/haml/filters.rb +0 -371
- data/vendor/plugins/haml/lib/haml/filters.rbc +0 -5617
- data/vendor/plugins/haml/lib/haml/helpers.rb +0 -605
- data/vendor/plugins/haml/lib/haml/helpers.rbc +0 -7086
- data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rb +0 -57
- data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rbc +0 -522
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +0 -244
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rbc +0 -5515
- data/vendor/plugins/haml/lib/haml/helpers/xss_mods.rb +0 -165
- data/vendor/plugins/haml/lib/haml/html.rb +0 -428
- data/vendor/plugins/haml/lib/haml/html/erb.rb +0 -141
- data/vendor/plugins/haml/lib/haml/precompiler.rb +0 -1104
- data/vendor/plugins/haml/lib/haml/precompiler.rbc +0 -22247
- data/vendor/plugins/haml/lib/haml/railtie.rb +0 -21
- data/vendor/plugins/haml/lib/haml/railtie.rbc +0 -409
- data/vendor/plugins/haml/lib/haml/root.rb +0 -7
- data/vendor/plugins/haml/lib/haml/root.rbc +0 -160
- data/vendor/plugins/haml/lib/haml/shared.rb +0 -78
- data/vendor/plugins/haml/lib/haml/shared.rbc +0 -1137
- data/vendor/plugins/haml/lib/haml/template.rb +0 -97
- data/vendor/plugins/haml/lib/haml/template.rbc +0 -1838
- data/vendor/plugins/haml/lib/haml/template/options.rb +0 -16
- data/vendor/plugins/haml/lib/haml/template/options.rbc +0 -235
- data/vendor/plugins/haml/lib/haml/template/patch.rb +0 -58
- data/vendor/plugins/haml/lib/haml/template/plugin.rb +0 -122
- data/vendor/plugins/haml/lib/haml/template/plugin.rbc +0 -2720
- data/vendor/plugins/haml/lib/haml/util.rb +0 -809
- data/vendor/plugins/haml/lib/haml/util.rbc +0 -12059
- data/vendor/plugins/haml/lib/haml/util/subset_map.rb +0 -101
- data/vendor/plugins/haml/lib/haml/util/subset_map.rbc +0 -1316
- data/vendor/plugins/haml/lib/haml/version.rb +0 -102
- data/vendor/plugins/haml/lib/haml/version.rbc +0 -1671
- data/vendor/plugins/haml/lib/sass.rb +0 -29
- data/vendor/plugins/haml/lib/sass.rbc +0 -492
- data/vendor/plugins/haml/lib/sass/callbacks.rb +0 -52
- data/vendor/plugins/haml/lib/sass/callbacks.rbc +0 -388
- data/vendor/plugins/haml/lib/sass/css.rb +0 -294
- data/vendor/plugins/haml/lib/sass/engine.rb +0 -720
- data/vendor/plugins/haml/lib/sass/engine.rbc +0 -17020
- data/vendor/plugins/haml/lib/sass/environment.rb +0 -143
- data/vendor/plugins/haml/lib/sass/environment.rbc +0 -1751
- data/vendor/plugins/haml/lib/sass/error.rb +0 -198
- data/vendor/plugins/haml/lib/sass/error.rbc +0 -2801
- data/vendor/plugins/haml/lib/sass/files.rb +0 -160
- data/vendor/plugins/haml/lib/sass/files.rbc +0 -3118
- data/vendor/plugins/haml/lib/sass/less.rb +0 -382
- data/vendor/plugins/haml/lib/sass/plugin.rb +0 -276
- data/vendor/plugins/haml/lib/sass/plugin.rbc +0 -4356
- data/vendor/plugins/haml/lib/sass/plugin/configuration.rb +0 -221
- data/vendor/plugins/haml/lib/sass/plugin/configuration.rbc +0 -1343
- data/vendor/plugins/haml/lib/sass/plugin/generic.rb +0 -15
- data/vendor/plugins/haml/lib/sass/plugin/merb.rb +0 -37
- data/vendor/plugins/haml/lib/sass/plugin/rack.rb +0 -47
- data/vendor/plugins/haml/lib/sass/plugin/rack.rbc +0 -446
- data/vendor/plugins/haml/lib/sass/plugin/rails.rb +0 -32
- data/vendor/plugins/haml/lib/sass/plugin/rails.rbc +0 -879
- data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rb +0 -123
- data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rbc +0 -2019
- data/vendor/plugins/haml/lib/sass/repl.rb +0 -58
- data/vendor/plugins/haml/lib/sass/script.rb +0 -63
- data/vendor/plugins/haml/lib/sass/script.rbc +0 -1188
- data/vendor/plugins/haml/lib/sass/script/bool.rb +0 -18
- data/vendor/plugins/haml/lib/sass/script/bool.rbc +0 -366
- data/vendor/plugins/haml/lib/sass/script/color.rb +0 -491
- data/vendor/plugins/haml/lib/sass/script/color.rbc +0 -8148
- data/vendor/plugins/haml/lib/sass/script/css_lexer.rb +0 -29
- data/vendor/plugins/haml/lib/sass/script/css_lexer.rbc +0 -809
- data/vendor/plugins/haml/lib/sass/script/css_parser.rb +0 -31
- data/vendor/plugins/haml/lib/sass/script/css_parser.rbc +0 -628
- data/vendor/plugins/haml/lib/sass/script/funcall.rb +0 -77
- data/vendor/plugins/haml/lib/sass/script/funcall.rbc +0 -1805
- data/vendor/plugins/haml/lib/sass/script/functions.rb +0 -861
- data/vendor/plugins/haml/lib/sass/script/functions.rbc +0 -8418
- data/vendor/plugins/haml/lib/sass/script/interpolation.rb +0 -70
- data/vendor/plugins/haml/lib/sass/script/interpolation.rbc +0 -1225
- data/vendor/plugins/haml/lib/sass/script/lexer.rb +0 -337
- data/vendor/plugins/haml/lib/sass/script/lexer.rbc +0 -7231
- data/vendor/plugins/haml/lib/sass/script/literal.rb +0 -236
- data/vendor/plugins/haml/lib/sass/script/literal.rbc +0 -3365
- data/vendor/plugins/haml/lib/sass/script/node.rb +0 -112
- data/vendor/plugins/haml/lib/sass/script/node.rbc +0 -1418
- data/vendor/plugins/haml/lib/sass/script/number.rb +0 -423
- data/vendor/plugins/haml/lib/sass/script/number.rbc +0 -6024
- data/vendor/plugins/haml/lib/sass/script/operation.rb +0 -95
- data/vendor/plugins/haml/lib/sass/script/operation.rbc +0 -1856
- data/vendor/plugins/haml/lib/sass/script/parser.rb +0 -401
- data/vendor/plugins/haml/lib/sass/script/parser.rbc +0 -8418
- data/vendor/plugins/haml/lib/sass/script/string.rb +0 -67
- data/vendor/plugins/haml/lib/sass/script/string.rbc +0 -1357
- data/vendor/plugins/haml/lib/sass/script/string_interpolation.rb +0 -93
- data/vendor/plugins/haml/lib/sass/script/string_interpolation.rbc +0 -1643
- data/vendor/plugins/haml/lib/sass/script/unary_operation.rb +0 -57
- data/vendor/plugins/haml/lib/sass/script/unary_operation.rbc +0 -1144
- data/vendor/plugins/haml/lib/sass/script/variable.rb +0 -48
- data/vendor/plugins/haml/lib/sass/script/variable.rbc +0 -844
- data/vendor/plugins/haml/lib/sass/scss.rb +0 -17
- data/vendor/plugins/haml/lib/sass/scss.rbc +0 -242
- data/vendor/plugins/haml/lib/sass/scss/css_parser.rb +0 -46
- data/vendor/plugins/haml/lib/sass/scss/css_parser.rbc +0 -1106
- data/vendor/plugins/haml/lib/sass/scss/parser.rb +0 -846
- data/vendor/plugins/haml/lib/sass/scss/parser.rbc +0 -19348
- data/vendor/plugins/haml/lib/sass/scss/rx.rb +0 -126
- data/vendor/plugins/haml/lib/sass/scss/rx.rbc +0 -2849
- data/vendor/plugins/haml/lib/sass/scss/sass_parser.rb +0 -11
- data/vendor/plugins/haml/lib/sass/scss/sass_parser.rbc +0 -287
- data/vendor/plugins/haml/lib/sass/scss/script_lexer.rb +0 -15
- data/vendor/plugins/haml/lib/sass/scss/script_lexer.rbc +0 -439
- data/vendor/plugins/haml/lib/sass/scss/script_parser.rb +0 -25
- data/vendor/plugins/haml/lib/sass/scss/script_parser.rbc +0 -482
- data/vendor/plugins/haml/lib/sass/scss/static_parser.rb +0 -40
- data/vendor/plugins/haml/lib/sass/scss/static_parser.rbc +0 -971
- data/vendor/plugins/haml/lib/sass/selector.rb +0 -361
- data/vendor/plugins/haml/lib/sass/selector.rbc +0 -4193
- data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rb +0 -62
- data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rbc +0 -798
- data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rb +0 -82
- data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rbc +0 -1814
- data/vendor/plugins/haml/lib/sass/selector/sequence.rb +0 -237
- data/vendor/plugins/haml/lib/sass/selector/sequence.rbc +0 -4928
- data/vendor/plugins/haml/lib/sass/selector/simple.rb +0 -113
- data/vendor/plugins/haml/lib/sass/selector/simple.rbc +0 -1553
- data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rb +0 -136
- data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rbc +0 -2346
- data/vendor/plugins/haml/lib/sass/tree/charset_node.rb +0 -37
- data/vendor/plugins/haml/lib/sass/tree/charset_node.rbc +0 -606
- data/vendor/plugins/haml/lib/sass/tree/comment_node.rb +0 -128
- data/vendor/plugins/haml/lib/sass/tree/comment_node.rbc +0 -2397
- data/vendor/plugins/haml/lib/sass/tree/debug_node.rb +0 -36
- data/vendor/plugins/haml/lib/sass/tree/debug_node.rbc +0 -740
- data/vendor/plugins/haml/lib/sass/tree/directive_node.rb +0 -75
- data/vendor/plugins/haml/lib/sass/tree/directive_node.rbc +0 -1302
- data/vendor/plugins/haml/lib/sass/tree/extend_node.rb +0 -65
- data/vendor/plugins/haml/lib/sass/tree/extend_node.rbc +0 -1276
- data/vendor/plugins/haml/lib/sass/tree/for_node.rb +0 -67
- data/vendor/plugins/haml/lib/sass/tree/for_node.rbc +0 -1145
- data/vendor/plugins/haml/lib/sass/tree/if_node.rb +0 -81
- data/vendor/plugins/haml/lib/sass/tree/if_node.rbc +0 -1119
- data/vendor/plugins/haml/lib/sass/tree/import_node.rb +0 -102
- data/vendor/plugins/haml/lib/sass/tree/import_node.rbc +0 -2242
- data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rb +0 -60
- data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rbc +0 -1001
- data/vendor/plugins/haml/lib/sass/tree/mixin_node.rb +0 -123
- data/vendor/plugins/haml/lib/sass/tree/mixin_node.rbc +0 -3355
- data/vendor/plugins/haml/lib/sass/tree/node.rb +0 -465
- data/vendor/plugins/haml/lib/sass/tree/node.rbc +0 -5533
- data/vendor/plugins/haml/lib/sass/tree/prop_node.rb +0 -220
- data/vendor/plugins/haml/lib/sass/tree/prop_node.rbc +0 -3949
- data/vendor/plugins/haml/lib/sass/tree/root_node.rb +0 -157
- data/vendor/plugins/haml/lib/sass/tree/root_node.rbc +0 -3112
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +0 -273
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rbc +0 -5636
- data/vendor/plugins/haml/lib/sass/tree/variable_node.rb +0 -39
- data/vendor/plugins/haml/lib/sass/tree/variable_node.rbc +0 -845
- data/vendor/plugins/haml/lib/sass/tree/warn_node.rb +0 -42
- data/vendor/plugins/haml/lib/sass/tree/warn_node.rbc +0 -1043
- data/vendor/plugins/haml/lib/sass/tree/while_node.rb +0 -48
- data/vendor/plugins/haml/lib/sass/tree/while_node.rbc +0 -722
- data/vendor/plugins/haml/rails/init.rb +0 -1
- data/vendor/plugins/haml/test/benchmark.rb +0 -99
- data/vendor/plugins/haml/test/haml/engine_test.rb +0 -1805
- data/vendor/plugins/haml/test/haml/erb/_av_partial_1.erb +0 -12
- data/vendor/plugins/haml/test/haml/erb/_av_partial_2.erb +0 -8
- data/vendor/plugins/haml/test/haml/erb/action_view.erb +0 -62
- data/vendor/plugins/haml/test/haml/erb/standard.erb +0 -54
- data/vendor/plugins/haml/test/haml/helper_test.rb +0 -450
- data/vendor/plugins/haml/test/haml/html2haml/erb_tests.rb +0 -426
- data/vendor/plugins/haml/test/haml/html2haml_test.rb +0 -336
- data/vendor/plugins/haml/test/haml/markaby/standard.mab +0 -52
- data/vendor/plugins/haml/test/haml/mocks/article.rb +0 -6
- data/vendor/plugins/haml/test/haml/results/content_for_layout.xhtml +0 -12
- data/vendor/plugins/haml/test/haml/results/eval_suppressed.xhtml +0 -9
- data/vendor/plugins/haml/test/haml/results/filters.xhtml +0 -62
- data/vendor/plugins/haml/test/haml/results/helpers.xhtml +0 -70
- data/vendor/plugins/haml/test/haml/results/helpful.xhtml +0 -10
- data/vendor/plugins/haml/test/haml/results/just_stuff.xhtml +0 -70
- data/vendor/plugins/haml/test/haml/results/list.xhtml +0 -12
- data/vendor/plugins/haml/test/haml/results/nuke_inner_whitespace.xhtml +0 -40
- data/vendor/plugins/haml/test/haml/results/nuke_outer_whitespace.xhtml +0 -148
- data/vendor/plugins/haml/test/haml/results/original_engine.xhtml +0 -20
- data/vendor/plugins/haml/test/haml/results/partial_layout.xhtml +0 -5
- data/vendor/plugins/haml/test/haml/results/partials.xhtml +0 -21
- data/vendor/plugins/haml/test/haml/results/render_layout.xhtml +0 -3
- data/vendor/plugins/haml/test/haml/results/silent_script.xhtml +0 -74
- data/vendor/plugins/haml/test/haml/results/standard.xhtml +0 -162
- data/vendor/plugins/haml/test/haml/results/tag_parsing.xhtml +0 -23
- data/vendor/plugins/haml/test/haml/results/very_basic.xhtml +0 -5
- data/vendor/plugins/haml/test/haml/results/whitespace_handling.xhtml +0 -89
- data/vendor/plugins/haml/test/haml/spec/LICENSE +0 -14
- data/vendor/plugins/haml/test/haml/spec/README.md +0 -106
- data/vendor/plugins/haml/test/haml/spec/lua_haml_spec.lua +0 -38
- data/vendor/plugins/haml/test/haml/spec/perl_haml_test.pl +0 -81
- data/vendor/plugins/haml/test/haml/spec/ruby_haml_test.rb +0 -19
- data/vendor/plugins/haml/test/haml/spec/tests.json +0 -603
- data/vendor/plugins/haml/test/haml/spec_test.rb +0 -44
- data/vendor/plugins/haml/test/haml/template_test.rb +0 -417
- data/vendor/plugins/haml/test/haml/templates/_av_partial_1.haml +0 -9
- data/vendor/plugins/haml/test/haml/templates/_av_partial_1_ugly.haml +0 -9
- data/vendor/plugins/haml/test/haml/templates/_av_partial_2.haml +0 -5
- data/vendor/plugins/haml/test/haml/templates/_av_partial_2_ugly.haml +0 -5
- data/vendor/plugins/haml/test/haml/templates/_layout.erb +0 -3
- data/vendor/plugins/haml/test/haml/templates/_layout_for_partial.haml +0 -3
- data/vendor/plugins/haml/test/haml/templates/_partial.haml +0 -8
- data/vendor/plugins/haml/test/haml/templates/_text_area.haml +0 -3
- data/vendor/plugins/haml/test/haml/templates/action_view.haml +0 -47
- data/vendor/plugins/haml/test/haml/templates/action_view_ugly.haml +0 -47
- data/vendor/plugins/haml/test/haml/templates/breakage.haml +0 -8
- data/vendor/plugins/haml/test/haml/templates/content_for_layout.haml +0 -8
- data/vendor/plugins/haml/test/haml/templates/eval_suppressed.haml +0 -11
- data/vendor/plugins/haml/test/haml/templates/filters.haml +0 -66
- data/vendor/plugins/haml/test/haml/templates/helpers.haml +0 -55
- data/vendor/plugins/haml/test/haml/templates/helpful.haml +0 -11
- data/vendor/plugins/haml/test/haml/templates/just_stuff.haml +0 -85
- data/vendor/plugins/haml/test/haml/templates/list.haml +0 -12
- data/vendor/plugins/haml/test/haml/templates/nuke_inner_whitespace.haml +0 -32
- data/vendor/plugins/haml/test/haml/templates/nuke_outer_whitespace.haml +0 -144
- data/vendor/plugins/haml/test/haml/templates/original_engine.haml +0 -17
- data/vendor/plugins/haml/test/haml/templates/partial_layout.haml +0 -7
- data/vendor/plugins/haml/test/haml/templates/partialize.haml +0 -1
- data/vendor/plugins/haml/test/haml/templates/partials.haml +0 -12
- data/vendor/plugins/haml/test/haml/templates/render_layout.haml +0 -2
- data/vendor/plugins/haml/test/haml/templates/silent_script.haml +0 -40
- data/vendor/plugins/haml/test/haml/templates/standard.haml +0 -42
- data/vendor/plugins/haml/test/haml/templates/standard_ugly.haml +0 -42
- data/vendor/plugins/haml/test/haml/templates/tag_parsing.haml +0 -21
- data/vendor/plugins/haml/test/haml/templates/very_basic.haml +0 -4
- data/vendor/plugins/haml/test/haml/templates/whitespace_handling.haml +0 -87
- data/vendor/plugins/haml/test/haml/util/subset_map_test.rb +0 -91
- data/vendor/plugins/haml/test/haml/util_test.rb +0 -268
- data/vendor/plugins/haml/test/linked_rails.rb +0 -42
- data/vendor/plugins/haml/test/sass/callbacks_test.rb +0 -61
- data/vendor/plugins/haml/test/sass/conversion_test.rb +0 -1218
- data/vendor/plugins/haml/test/sass/css2sass_test.rb +0 -364
- data/vendor/plugins/haml/test/sass/data/hsl-rgb.txt +0 -319
- data/vendor/plugins/haml/test/sass/engine_test.rb +0 -2263
- data/vendor/plugins/haml/test/sass/extend_test.rb +0 -1348
- data/vendor/plugins/haml/test/sass/functions_test.rb +0 -556
- data/vendor/plugins/haml/test/sass/less_conversion_test.rb +0 -653
- data/vendor/plugins/haml/test/sass/more_results/more1.css +0 -9
- data/vendor/plugins/haml/test/sass/more_results/more1_with_line_comments.css +0 -26
- data/vendor/plugins/haml/test/sass/more_results/more_import.css +0 -29
- data/vendor/plugins/haml/test/sass/more_templates/_more_partial.sass +0 -2
- data/vendor/plugins/haml/test/sass/more_templates/more1.sass +0 -23
- data/vendor/plugins/haml/test/sass/more_templates/more_import.sass +0 -11
- data/vendor/plugins/haml/test/sass/plugin_test.rb +0 -433
- data/vendor/plugins/haml/test/sass/results/alt.css +0 -4
- data/vendor/plugins/haml/test/sass/results/basic.css +0 -9
- data/vendor/plugins/haml/test/sass/results/compact.css +0 -5
- data/vendor/plugins/haml/test/sass/results/complex.css +0 -86
- data/vendor/plugins/haml/test/sass/results/compressed.css +0 -1
- data/vendor/plugins/haml/test/sass/results/expanded.css +0 -19
- data/vendor/plugins/haml/test/sass/results/import.css +0 -31
- data/vendor/plugins/haml/test/sass/results/import_charset.css +0 -4
- data/vendor/plugins/haml/test/sass/results/import_charset_1_8.css +0 -4
- data/vendor/plugins/haml/test/sass/results/import_charset_ibm866.css +0 -4
- data/vendor/plugins/haml/test/sass/results/line_numbers.css +0 -49
- data/vendor/plugins/haml/test/sass/results/mixins.css +0 -95
- data/vendor/plugins/haml/test/sass/results/multiline.css +0 -24
- data/vendor/plugins/haml/test/sass/results/nested.css +0 -22
- data/vendor/plugins/haml/test/sass/results/options.css +0 -1
- data/vendor/plugins/haml/test/sass/results/parent_ref.css +0 -13
- data/vendor/plugins/haml/test/sass/results/script.css +0 -16
- data/vendor/plugins/haml/test/sass/results/scss_import.css +0 -31
- data/vendor/plugins/haml/test/sass/results/scss_importee.css +0 -2
- data/vendor/plugins/haml/test/sass/results/subdir/nested_subdir/nested_subdir.css +0 -1
- data/vendor/plugins/haml/test/sass/results/subdir/subdir.css +0 -3
- data/vendor/plugins/haml/test/sass/results/units.css +0 -11
- data/vendor/plugins/haml/test/sass/results/warn_imported.css +0 -0
- data/vendor/plugins/haml/test/sass/script_conversion_test.rb +0 -314
- data/vendor/plugins/haml/test/sass/script_test.rb +0 -470
- data/vendor/plugins/haml/test/sass/scss/css_test.rb +0 -916
- data/vendor/plugins/haml/test/sass/scss/rx_test.rb +0 -156
- data/vendor/plugins/haml/test/sass/scss/scss_test.rb +0 -1088
- data/vendor/plugins/haml/test/sass/scss/test_helper.rb +0 -37
- data/vendor/plugins/haml/test/sass/templates/_imported_charset_ibm866.sass +0 -4
- data/vendor/plugins/haml/test/sass/templates/_imported_charset_utf8.sass +0 -4
- data/vendor/plugins/haml/test/sass/templates/_partial.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/alt.sass +0 -16
- data/vendor/plugins/haml/test/sass/templates/basic.sass +0 -23
- data/vendor/plugins/haml/test/sass/templates/bork1.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/bork2.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/bork3.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/bork4.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/compact.sass +0 -17
- data/vendor/plugins/haml/test/sass/templates/complex.sass +0 -305
- data/vendor/plugins/haml/test/sass/templates/compressed.sass +0 -15
- data/vendor/plugins/haml/test/sass/templates/expanded.sass +0 -17
- data/vendor/plugins/haml/test/sass/templates/import.sass +0 -12
- data/vendor/plugins/haml/test/sass/templates/import_charset.sass +0 -7
- data/vendor/plugins/haml/test/sass/templates/import_charset_1_8.sass +0 -4
- data/vendor/plugins/haml/test/sass/templates/import_charset_ibm866.sass +0 -9
- data/vendor/plugins/haml/test/sass/templates/importee.less +0 -2
- data/vendor/plugins/haml/test/sass/templates/importee.sass +0 -19
- data/vendor/plugins/haml/test/sass/templates/line_numbers.sass +0 -13
- data/vendor/plugins/haml/test/sass/templates/mixin_bork.sass +0 -5
- data/vendor/plugins/haml/test/sass/templates/mixins.sass +0 -76
- data/vendor/plugins/haml/test/sass/templates/multiline.sass +0 -20
- data/vendor/plugins/haml/test/sass/templates/nested.sass +0 -25
- data/vendor/plugins/haml/test/sass/templates/nested_bork1.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/nested_bork2.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/nested_bork3.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/nested_bork4.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/nested_mixin_bork.sass +0 -6
- data/vendor/plugins/haml/test/sass/templates/options.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/parent_ref.sass +0 -25
- data/vendor/plugins/haml/test/sass/templates/script.sass +0 -101
- data/vendor/plugins/haml/test/sass/templates/scss_import.scss +0 -11
- data/vendor/plugins/haml/test/sass/templates/scss_importee.scss +0 -1
- data/vendor/plugins/haml/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +0 -3
- data/vendor/plugins/haml/test/sass/templates/subdir/subdir.sass +0 -6
- data/vendor/plugins/haml/test/sass/templates/units.sass +0 -11
- data/vendor/plugins/haml/test/sass/templates/warn.sass +0 -3
- data/vendor/plugins/haml/test/sass/templates/warn_imported.sass +0 -4
- data/vendor/plugins/haml/test/test_helper.rb +0 -98
- data/vendor/plugins/haml/vendor/fssm/LICENSE +0 -20
- data/vendor/plugins/haml/vendor/fssm/README.markdown +0 -55
- data/vendor/plugins/haml/vendor/fssm/Rakefile +0 -59
- data/vendor/plugins/haml/vendor/fssm/VERSION.yml +0 -5
- data/vendor/plugins/haml/vendor/fssm/example.rb +0 -9
- data/vendor/plugins/haml/vendor/fssm/fssm.gemspec +0 -77
- data/vendor/plugins/haml/vendor/fssm/lib/fssm.rb +0 -33
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/fsevents.rb +0 -36
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/inotify.rb +0 -26
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/polling.rb +0 -25
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +0 -131
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/monitor.rb +0 -26
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/path.rb +0 -91
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/pathname.rb +0 -502
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/directory.rb +0 -57
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/file.rb +0 -24
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/support.rb +0 -63
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/tree.rb +0 -176
- data/vendor/plugins/haml/vendor/fssm/profile/prof-cache.rb +0 -40
- data/vendor/plugins/haml/vendor/fssm/profile/prof-fssm-pathname.html +0 -1231
- data/vendor/plugins/haml/vendor/fssm/profile/prof-pathname.rb +0 -68
- data/vendor/plugins/haml/vendor/fssm/profile/prof-plain-pathname.html +0 -988
- data/vendor/plugins/haml/vendor/fssm/profile/prof.html +0 -2379
- data/vendor/plugins/haml/vendor/fssm/spec/path_spec.rb +0 -75
- data/vendor/plugins/haml/vendor/fssm/spec/root/duck/quack.txt +0 -0
- data/vendor/plugins/haml/vendor/fssm/spec/root/file.css +0 -0
- data/vendor/plugins/haml/vendor/fssm/spec/root/file.rb +0 -0
- data/vendor/plugins/haml/vendor/fssm/spec/root/file.yml +0 -0
- data/vendor/plugins/haml/vendor/fssm/spec/root/moo/cow.txt +0 -0
- data/vendor/plugins/haml/vendor/fssm/spec/spec_helper.rb +0 -14
- data/vendor/plugins/haml/yard/callbacks.rb +0 -29
- data/vendor/plugins/haml/yard/default/fulldoc/html/css/common.sass +0 -26
- data/vendor/plugins/haml/yard/default/layout/html/footer.erb +0 -12
- data/vendor/plugins/haml/yard/inherited_hash.rb +0 -41
data/vendor/plugins/haml/TODO
DELETED
@@ -1,53 +0,0 @@
|
|
1
|
-
y# -*- mode: org -*-
|
2
|
-
#+STARTUP: nofold
|
3
|
-
|
4
|
-
* Documentation
|
5
|
-
Redo tutorial?
|
6
|
-
Using helpers
|
7
|
-
haml_concat and haml_tag in particular
|
8
|
-
Syntax highlighting?
|
9
|
-
|
10
|
-
* Code
|
11
|
-
Keep track of error offsets everywhere
|
12
|
-
Use this to show error location in messages
|
13
|
-
Just clean up SassScript syntax errors in general
|
14
|
-
Lexer errors in particular are icky
|
15
|
-
See in particular error changes made in c07b5c8
|
16
|
-
** Haml
|
17
|
-
Support finer-grained HTML-escaping in filters
|
18
|
-
Speed
|
19
|
-
Make tags with dynamic attributes pre-render as much as possible
|
20
|
-
Including the attribute name where doable
|
21
|
-
:ugly + :html improvements
|
22
|
-
Ignore closing tags where we can
|
23
|
-
http://code.google.com/speed/articles/optimizing-html.html
|
24
|
-
Requires Haml parsing refactor
|
25
|
-
Don't quote attributes that don't require it
|
26
|
-
http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
|
27
|
-
http://www.w3.org/TR/html5/syntax.html#attributes
|
28
|
-
** Sass
|
29
|
-
Benchmark the effects of storing the raw template in sassc
|
30
|
-
If it's expensive, overload RootNode dumping/loading to dup and set @template to nil
|
31
|
-
Then fall back on reading from actual file
|
32
|
-
Make Rack middleware the default for Rails and Merb versions that support it
|
33
|
-
CSS superset
|
34
|
-
Classes are mixins
|
35
|
-
Can refer to specific property values? Syntax?
|
36
|
-
Pull in Compass watcher stuff
|
37
|
-
Internationalization
|
38
|
-
Particularly word constituents in Regexps
|
39
|
-
Optimization
|
40
|
-
http://csstidy.sourceforge.net/
|
41
|
-
http://developer.yahoo.com/yui/compressor/
|
42
|
-
Also comma-folding identical rules where possible
|
43
|
-
Multiple levels
|
44
|
-
0: No optimization
|
45
|
-
1: Nothing that changes doc structure
|
46
|
-
No comma-folding
|
47
|
-
2: Anything that keeps functionality identical to O2 (default)
|
48
|
-
3: Assume order of rules doesn't matter
|
49
|
-
Comma-fold even if there are intervening rules that might interfere
|
50
|
-
CSS3
|
51
|
-
Add (optional) support for http://www.w3.org/TR/css3-values/#calc
|
52
|
-
Cross-unit arithmetic should compile into this
|
53
|
-
Should we use "mod" in Sass for consistency?
|
data/vendor/plugins/haml/VERSION
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
3.0.23
|
@@ -1 +0,0 @@
|
|
1
|
-
Classy Cassidy
|
@@ -1,13 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require File.dirname(__FILE__) + '/../lib/haml'
|
4
|
-
require 'haml/exec'
|
5
|
-
|
6
|
-
warn <<END
|
7
|
-
DEPRECATION WARNING:
|
8
|
-
The css2sass tool is deprecated and will be removed in Sass 3.2.
|
9
|
-
Use the sass-convert tool instead.
|
10
|
-
END
|
11
|
-
|
12
|
-
opts = Haml::Exec::SassConvert.new(%w[--from css --to sass] + ARGV)
|
13
|
-
opts.parse!
|
@@ -1,187 +0,0 @@
|
|
1
|
-
# Frequently Asked Questions
|
2
|
-
|
3
|
-
* Table of contents
|
4
|
-
{:toc}
|
5
|
-
|
6
|
-
## Haml
|
7
|
-
|
8
|
-
### Why is my markup indented properly in development mode, but not in production?
|
9
|
-
{#q-indentation-in-production}
|
10
|
-
|
11
|
-
To improve performance, Haml defaults to {file:HAML_REFERENCE.md#ugly-option "ugly" mode} in Rails
|
12
|
-
apps running in production.
|
13
|
-
|
14
|
-
|
15
|
-
### How do I put a punctuation mark after an element, like "`I like <strong>cake</strong>!`"?
|
16
|
-
{#q-punctuation}
|
17
|
-
|
18
|
-
Expressing the structure of a document
|
19
|
-
and expressing inline formatting are two very different problems.
|
20
|
-
Haml is mostly designed for structure,
|
21
|
-
so the best way to deal with formatting is to leave it to other languages
|
22
|
-
that are designed for it.
|
23
|
-
You could use Textile:
|
24
|
-
|
25
|
-
%p
|
26
|
-
:textile
|
27
|
-
I like *cake*!
|
28
|
-
|
29
|
-
or Markdown:
|
30
|
-
|
31
|
-
%p
|
32
|
-
:markdown
|
33
|
-
I like **cake**!
|
34
|
-
|
35
|
-
or plain old XHTML:
|
36
|
-
|
37
|
-
%p I like <strong>cake</strong>!
|
38
|
-
|
39
|
-
If you're inserting something that's generated by a helper, like a link,
|
40
|
-
then it's even easier:
|
41
|
-
|
42
|
-
%p== I like #{link_to 'chocolate', 'http://franschocolates.com'}!
|
43
|
-
|
44
|
-
### How do I stop Haml from indenting the contents of my `pre` and `textarea` tags?
|
45
|
-
{#q-preserve}
|
46
|
-
|
47
|
-
Because Haml automatically indents the HTML source code,
|
48
|
-
the contents of whitespace-sensitive tags like `pre` and `textarea`
|
49
|
-
can get screwed up.
|
50
|
-
The solution is to replace the newlines inside these tags
|
51
|
-
with HTML newline entities (`
`),
|
52
|
-
which Haml does using the {Haml::Helpers#preserve} and {Haml::Helpers#find_and_preserve} helpers.
|
53
|
-
|
54
|
-
Normally, Haml will do this for you automatically
|
55
|
-
when you're using a tag that needs it
|
56
|
-
(this can be customized using the {file:HAML_REFERENCE.md#preserve-option `:preserve`} option.
|
57
|
-
For example,
|
58
|
-
|
59
|
-
%p
|
60
|
-
%textarea= "Foo\nBar"
|
61
|
-
|
62
|
-
will be compiled to
|
63
|
-
|
64
|
-
<p>
|
65
|
-
<textarea>Foo
Bar</textarea>
|
66
|
-
</p>
|
67
|
-
|
68
|
-
However, if a helper is generating the tag,
|
69
|
-
Haml can't detect that and so you'll have to call {Haml::Helpers#find_and_preserve} yourself.
|
70
|
-
You can also use `~`, which is the same as `=`
|
71
|
-
except that it automatically runs `find_and_preserve` on its input.
|
72
|
-
For example:
|
73
|
-
|
74
|
-
%p= find_and_preserve "<textarea>Foo\nBar</textarea>"
|
75
|
-
|
76
|
-
is the same as
|
77
|
-
|
78
|
-
%p~ "<textarea>Foo\nBar</textarea>"
|
79
|
-
|
80
|
-
and renders
|
81
|
-
|
82
|
-
<p><textarea>Foo
Bar</textarea></p>
|
83
|
-
|
84
|
-
### How do I make my long lines of Ruby code look nicer in my Haml document?
|
85
|
-
{#q-multiline}
|
86
|
-
|
87
|
-
Put them in a helper or your model.
|
88
|
-
|
89
|
-
Haml purposefully makes it annoying to put lots of Ruby code into your templates,
|
90
|
-
because lots of code doesn't belong in the view.
|
91
|
-
If you take that huge `link_to_remote` call
|
92
|
-
and move it to a `update_sidebar_link` helper,
|
93
|
-
it'll make your view both easier to read and more semantic.
|
94
|
-
|
95
|
-
If you absolutely must put lots of code in your template,
|
96
|
-
Haml offers a somewhat awkward multiline-continuation tool.
|
97
|
-
Put a `|` (pipe character) at the end of each line you want to be merged into one
|
98
|
-
(including the last line!).
|
99
|
-
For example:
|
100
|
-
|
101
|
-
%p= @this.is(way.too.much). |
|
102
|
-
code("and I should"). |
|
103
|
-
really_move.it.into( |
|
104
|
-
:a => @helper) |
|
105
|
-
|
106
|
-
Note that sometimes it is valid to include lots of Ruby in a template
|
107
|
-
when that Ruby is a helper call that passes in a lot of template information.
|
108
|
-
Thus when a function has lots of arguments,
|
109
|
-
it's possible to wrap it across multiple lines
|
110
|
-
as long as each line ends in a comma.
|
111
|
-
For example:
|
112
|
-
|
113
|
-
= link_to_remote "Add to cart",
|
114
|
-
:url => { :action => "add", :id => product.id },
|
115
|
-
:update => { :success => "cart", :failure => "error" }
|
116
|
-
|
117
|
-
### `form_for` is printing the form tag twice!
|
118
|
-
|
119
|
-
Make sure you're calling it with `-`, not `=`.
|
120
|
-
Just like in ERB, you have to do
|
121
|
-
|
122
|
-
<% form_for stuff do %>
|
123
|
-
...
|
124
|
-
<% end %>
|
125
|
-
|
126
|
-
in Haml, you have to do
|
127
|
-
|
128
|
-
- form_for stuff do
|
129
|
-
...
|
130
|
-
|
131
|
-
### I have Haml installed. Why is Rails (only looking for `.html.erb` files | rendering Haml files as plain text | rendering Haml files as blank pages)?
|
132
|
-
{#q-blank-page}
|
133
|
-
|
134
|
-
There are several reasons these things might be happening.
|
135
|
-
First of all, make sure that Haml really is installed;
|
136
|
-
either you've loaded the gem (via `config.gem` in Rails 2.3 or in the Gemfile in Rails 3),
|
137
|
-
or `vendor/plugins/haml` exists and contains files.
|
138
|
-
Then try restarting Mongrel or WEBrick or whatever you might be using.
|
139
|
-
|
140
|
-
Finally, if none of these work,
|
141
|
-
chances are you've got some localization plugin like Globalize installed.
|
142
|
-
Such plugins often don't play nicely with Haml.
|
143
|
-
Luckily, there's usually an easy fix.
|
144
|
-
For Globalize, just edit `globalize/lib/globalize/rails/action_view.rb`
|
145
|
-
and change
|
146
|
-
|
147
|
-
@@re_extension = /\.(rjs|rhtml|rxml)$/
|
148
|
-
|
149
|
-
to
|
150
|
-
|
151
|
-
@@re_extension = /\.(rjs|rhtml|rxml|erb|builder|haml)$/
|
152
|
-
|
153
|
-
For other plugins, a little searching will probably turn up a way to fix them as well.
|
154
|
-
|
155
|
-
## Sass
|
156
|
-
|
157
|
-
### Can I use a variable from my controller in my Sass file?
|
158
|
-
{#q-ruby-code}
|
159
|
-
|
160
|
-
No. Sass files aren't views.
|
161
|
-
They're compiled once into static CSS files,
|
162
|
-
then left along until they're changed and need to be compiled again.
|
163
|
-
Not only don't you want to be running a full request cycle
|
164
|
-
every time someone requests a stylesheet,
|
165
|
-
but it's not a great idea to put much logic in there anyway
|
166
|
-
due to how browsers handle them.
|
167
|
-
|
168
|
-
If you really need some sort of dynamic CSS,
|
169
|
-
you can define your own {Sass::Script::Functions Sass functions} using Ruby
|
170
|
-
that can access the database or other configuration.
|
171
|
-
*Be aware when doing this that Sass files are by default only compiled once
|
172
|
-
and then served statically.*
|
173
|
-
|
174
|
-
If you really, really need to compile Sass on each request,
|
175
|
-
first make sure you have adequate caching set up.
|
176
|
-
Then you can use {Sass::Engine} to render the code,
|
177
|
-
using the {file:SASS_REFERENCE.md#custom-option `:custom` option}
|
178
|
-
to pass in data that {Sass::Script::Functions::EvaluationContext#options can be accessed}
|
179
|
-
from your Sass functions.
|
180
|
-
|
181
|
-
## You still haven't answered my question!
|
182
|
-
|
183
|
-
Sorry! Try looking at the [Haml](http://haml-lang.com/docs/yardoc/HAML_REFERENCE.md.html)
|
184
|
-
or [Sass](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html) references,
|
185
|
-
If you can't find an answer there,
|
186
|
-
feel free to ask in `#haml` on irc.freenode.net
|
187
|
-
or send an email to the [mailing list](http://groups.google.com/group/haml?hl=en).
|
@@ -1,1091 +0,0 @@
|
|
1
|
-
# Haml Changelog
|
2
|
-
|
3
|
-
* Table of contents
|
4
|
-
{:toc}
|
5
|
-
|
6
|
-
## 3.0.23
|
7
|
-
|
8
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.23).
|
9
|
-
|
10
|
-
* Fix the error message for unloadable modules when running the executables under Ruby 1.9.2.
|
11
|
-
|
12
|
-
* Fix an error when combining old-style and new-style attributes.
|
13
|
-
|
14
|
-
## 3.0.22
|
15
|
-
|
16
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.22).
|
17
|
-
|
18
|
-
* Allow an empty line after `case` but before `when`.
|
19
|
-
|
20
|
-
* Remove `vendor/sass`, which snuck into the gem by mistake
|
21
|
-
and was causing trouble for Heroku users (thanks to [Jacques Crocker](http://railsjedi.com/)).
|
22
|
-
|
23
|
-
* Support the Rails 3.1 template handler API.
|
24
|
-
|
25
|
-
## 3.0.21
|
26
|
-
|
27
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.21).
|
28
|
-
|
29
|
-
* Fix the permissions errors for good.
|
30
|
-
|
31
|
-
## 3.0.20
|
32
|
-
|
33
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.20).
|
34
|
-
|
35
|
-
* Fix some permissions errors.
|
36
|
-
|
37
|
-
## 3.0.19
|
38
|
-
|
39
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.19).
|
40
|
-
|
41
|
-
* Fix the `:encoding` option under Ruby 1.9.2.
|
42
|
-
|
43
|
-
* Fix interpolated if statement when HTML escaping is enabled.
|
44
|
-
|
45
|
-
* Allow the `--unix-newlines` flag to work on Unix, where it's a no-op.
|
46
|
-
|
47
|
-
## 3.0.18
|
48
|
-
|
49
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.18).
|
50
|
-
|
51
|
-
* Don't require `rake` in the gemspec, for bundler compatibility under
|
52
|
-
JRuby. Thanks to [Gordon McCreight](http://www.gmccreight.com/blog).
|
53
|
-
|
54
|
-
* Get rid of the annoying RDoc errors on install.
|
55
|
-
|
56
|
-
* Disambiguate references to the `Rails` module when `haml-rails` is installed.
|
57
|
-
|
58
|
-
* Fix a bug in `haml_tag` that would allow duplicate attributes to be added
|
59
|
-
and make `data-` attributes not work.
|
60
|
-
|
61
|
-
* Compatibility with Rails 3 final.
|
62
|
-
|
63
|
-
## 3.0.17
|
64
|
-
|
65
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.17).
|
66
|
-
|
67
|
-
* Understand that mingw counts as Windows.
|
68
|
-
|
69
|
-
## 3.0.16
|
70
|
-
|
71
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.16).
|
72
|
-
|
73
|
-
* Fix an html2haml ERB-parsing bug where ERB blocks were occasionally
|
74
|
-
left without indentation in Haml.
|
75
|
-
|
76
|
-
* Fix parsing of `if` and `case` statements whose values were assigned to variables.
|
77
|
-
This is still bad style, though.
|
78
|
-
|
79
|
-
* Fix `form_for` and `form_tag` when they're passed a block that
|
80
|
-
returns a string in a helper.
|
81
|
-
|
82
|
-
## 3.0.15
|
83
|
-
|
84
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.15).
|
85
|
-
|
86
|
-
There were no changes made to Haml between versions 3.0.14 and 3.0.15.
|
87
|
-
|
88
|
-
## 3.0.14
|
89
|
-
|
90
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.14).
|
91
|
-
|
92
|
-
* Allow CSS-style classes and ids to contain colons.
|
93
|
-
|
94
|
-
* Fix an obscure bug with if statements.
|
95
|
-
|
96
|
-
### Rails 3 Support
|
97
|
-
|
98
|
-
* Don't use the `#returning` method, which Rails 3 no longer provides.
|
99
|
-
|
100
|
-
## 3.0.13
|
101
|
-
|
102
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.13).
|
103
|
-
|
104
|
-
## Rails 3 Support
|
105
|
-
|
106
|
-
Support for Rails 3 versions prior to beta 4 has been removed.
|
107
|
-
Upgrade to Rails 3.0.0.beta4 if you haven't already.
|
108
|
-
|
109
|
-
### Minor Improvements
|
110
|
-
|
111
|
-
* Properly process frozen strings with encoding declarations.
|
112
|
-
|
113
|
-
## 3.0.12
|
114
|
-
|
115
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.12).
|
116
|
-
|
117
|
-
## Rails 3 Support
|
118
|
-
|
119
|
-
Apparently the last version broke in new and exciting ways under Rails 3,
|
120
|
-
due to the inconsistent load order caused by certain combinations of gems.
|
121
|
-
3.0.12 hacks around that inconsistency, and *should* be fully Rails 3-compatible.
|
122
|
-
|
123
|
-
### Deprecated: Rails 3 Beta 3
|
124
|
-
|
125
|
-
Haml's support for Rails 3.0.0.beta.3 has been deprecated.
|
126
|
-
Haml 3.0.13 will only support 3.0.0.beta.4.
|
127
|
-
|
128
|
-
## 3.0.11
|
129
|
-
|
130
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.11).
|
131
|
-
|
132
|
-
## 3.0.10
|
133
|
-
|
134
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.10).
|
135
|
-
|
136
|
-
### Appengine-JRuby Support
|
137
|
-
|
138
|
-
The way we determine the location of the Haml installation
|
139
|
-
no longer breaks the version of JRuby
|
140
|
-
used by [`appengine-jruby`](http://code.google.com/p/appengine-jruby/).
|
141
|
-
|
142
|
-
### Bug Fixes
|
143
|
-
|
144
|
-
* Single-line comments are now handled properly by `html2haml`.
|
145
|
-
|
146
|
-
## 3.0.9
|
147
|
-
|
148
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.9).
|
149
|
-
|
150
|
-
There were no changes made to Haml between versions 3.0.8 and 3.0.9.
|
151
|
-
A bug in Gemcutter caused the gem to be uploaded improperly.
|
152
|
-
|
153
|
-
## 3.0.8
|
154
|
-
|
155
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.8).
|
156
|
-
|
157
|
-
* Fix a bug with Rails versions prior to Rails 3.
|
158
|
-
|
159
|
-
## 3.0.7
|
160
|
-
|
161
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.7).
|
162
|
-
|
163
|
-
### Encoding Support
|
164
|
-
|
165
|
-
Haml 3.0.7 adds support for Ruby-style `-# coding:` comments
|
166
|
-
for declaring the encoding of a template.
|
167
|
-
For details see {file:HAML_REFERENCE.md#encodings the reference}.
|
168
|
-
|
169
|
-
This also slightly changes the behavior of Haml when the
|
170
|
-
{file:HAML_REFERENCE.md#encoding-option `:encoding` option} is not set.
|
171
|
-
Rather than defaulting to `"utf-8"`,
|
172
|
-
it defaults to the encoding of the source document,
|
173
|
-
and only falls back to `"utf-8"` if this encoding is `"us-ascii"`.
|
174
|
-
|
175
|
-
The `haml` executable also now takes an `-E` option for specifying encoding,
|
176
|
-
which works the same way as Ruby's `-E` option.
|
177
|
-
|
178
|
-
### Other Changes
|
179
|
-
|
180
|
-
* Default to the {file:HAML_REFERENCE.md#format-option `:html5` format}
|
181
|
-
when running under Rails 3,
|
182
|
-
since it defaults to HTML5 as well.
|
183
|
-
|
184
|
-
### Bug Fixes
|
185
|
-
|
186
|
-
* When generating Haml for something like `<span>foo</span>,`,
|
187
|
-
use `= succeed` rather than `- succeed` (which doesn't work).
|
188
|
-
|
189
|
-
## 3.0.6
|
190
|
-
|
191
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.6).
|
192
|
-
|
193
|
-
### Rails 2.3.7 Support
|
194
|
-
|
195
|
-
This release fully supports Rails 2.3.7.
|
196
|
-
|
197
|
-
### Rails 2.3.6 Support Removed
|
198
|
-
|
199
|
-
Rails 2.3.6 was released with various bugs related to XSS-protection
|
200
|
-
and interfacing with Haml.
|
201
|
-
Rails 2.3.7 was released shortly after with fixes for these bugs.
|
202
|
-
Thus, Haml no longer supports Rails 2.3.6,
|
203
|
-
and anyone using it should upgrade to 2.3.7.
|
204
|
-
|
205
|
-
Attempting to use Haml with Rails 2.3.6 will cause an error.
|
206
|
-
|
207
|
-
## 3.0.5
|
208
|
-
|
209
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.5).
|
210
|
-
|
211
|
-
### Rails 2.3.6 Support
|
212
|
-
|
213
|
-
This release hacks around various bugs in Rails 2.3.6,
|
214
|
-
bringing Haml up to full compatibility.
|
215
|
-
|
216
|
-
### Rails 3 Support
|
217
|
-
|
218
|
-
Make sure the `#capture` helper in Rails 3
|
219
|
-
doesn't print its value directly to the template.
|
220
|
-
|
221
|
-
## 3.0.4
|
222
|
-
|
223
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.4).
|
224
|
-
|
225
|
-
There were no changes made to Haml between versions 3.0.3 and 3.0.4.
|
226
|
-
|
227
|
-
## 3.0.3
|
228
|
-
|
229
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.3).
|
230
|
-
|
231
|
-
### Rails 3 Support
|
232
|
-
|
233
|
-
In order to make some Rails loading errors easier to debug,
|
234
|
-
Sass will now raise an error if `Rails.root` is `nil` when Sass is loading.
|
235
|
-
Previously, this would just cause the paths to be mis-set.
|
236
|
-
|
237
|
-
## 3.0.2
|
238
|
-
|
239
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.2).
|
240
|
-
|
241
|
-
There were no changes made to Haml between versions 3.0.1 and 3.0.2.
|
242
|
-
|
243
|
-
## 3.0.1
|
244
|
-
|
245
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.1).
|
246
|
-
|
247
|
-
### Installation in Rails
|
248
|
-
|
249
|
-
`haml --rails` is no longer necessary for installing Haml in Rails.
|
250
|
-
Now all you need to do is add `gem "haml"` to the Gemfile for Rails 3,
|
251
|
-
or add `config.gem "haml"` to `config/environment.rb` for previous versions.
|
252
|
-
|
253
|
-
`haml --rails` will still work,
|
254
|
-
but it has been deprecated and will print an error message.
|
255
|
-
It will not work in the next version of Haml.
|
256
|
-
|
257
|
-
### Rails Test Speed
|
258
|
-
|
259
|
-
The {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is now on by default
|
260
|
-
in the testing environment in Rails to help tests run faster.
|
261
|
-
|
262
|
-
## 3.0.0
|
263
|
-
{#3-0-0}
|
264
|
-
|
265
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0).
|
266
|
-
|
267
|
-
### Backwards Incompatibilities: Must Read!
|
268
|
-
|
269
|
-
* The `puts` helper has been removed.
|
270
|
-
Use {Haml::Helpers#haml\_concat} instead.
|
271
|
-
|
272
|
-
### More Useful Multiline
|
273
|
-
|
274
|
-
Ruby code can now be wrapped across multiple lines
|
275
|
-
as long as each line but the last ends in a comma.
|
276
|
-
For example:
|
277
|
-
|
278
|
-
= link_to_remote "Add to cart",
|
279
|
-
:url => { :action => "add", :id => product.id },
|
280
|
-
:update => { :success => "cart", :failure => "error" }
|
281
|
-
|
282
|
-
### `haml_tag` and `haml_concat` Improvements
|
283
|
-
|
284
|
-
#### `haml_tag` with CSS Selectors
|
285
|
-
|
286
|
-
The {Haml::Helpers#haml_tag haml\_tag} helper can now take a string
|
287
|
-
using the same class/id shorthand as in standard Haml code.
|
288
|
-
Manually-specified class and id attributes are merged,
|
289
|
-
again as in standard Haml code.
|
290
|
-
For example:
|
291
|
-
|
292
|
-
haml_tag('#foo') #=> <div id='foo' />
|
293
|
-
haml_tag('.bar') #=> <div class='bar' />
|
294
|
-
haml_tag('span#foo.bar') #=> <span class='bar' id='foo' />
|
295
|
-
haml_tag('span#foo.bar', :class => 'abc') #=> <span class='abc bar' id='foo' />
|
296
|
-
haml_tag('span#foo.bar', :id => 'abc') #=> <span class='bar' id='abc_foo' />
|
297
|
-
|
298
|
-
Cheers, [S. Burkhard](http://github.com/hasclass/).
|
299
|
-
|
300
|
-
#### `haml_tag` with Multiple Lines of Content
|
301
|
-
|
302
|
-
The {Haml::Helpers#haml_tag haml\_tag} helper also does a better job
|
303
|
-
of formatting tags with multiple lines of content.
|
304
|
-
If a tag has multiple levels of content,
|
305
|
-
that content is indented beneath the tag.
|
306
|
-
For example:
|
307
|
-
|
308
|
-
haml_tag(:p, "foo\nbar") #=>
|
309
|
-
# <p>
|
310
|
-
# foo
|
311
|
-
# bar
|
312
|
-
# </p>
|
313
|
-
|
314
|
-
#### `haml_tag` with Multiple Lines of Content
|
315
|
-
|
316
|
-
Similarly, the {Haml::Helpers#haml_concat haml\_concat} helper
|
317
|
-
will properly indent multiple lines of content.
|
318
|
-
For example:
|
319
|
-
|
320
|
-
haml_tag(:p) {haml_concat "foo\nbar"} #=>
|
321
|
-
# <p>
|
322
|
-
# foo
|
323
|
-
# bar
|
324
|
-
# </p>
|
325
|
-
|
326
|
-
#### `haml_tag` and `haml_concat` with `:ugly`
|
327
|
-
|
328
|
-
When the {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is enabled,
|
329
|
-
{Haml::Helpers#haml_tag haml\_tag} and {Haml::Helpers#haml_concat haml\_concat}
|
330
|
-
won't do any indentation of their arguments.
|
331
|
-
|
332
|
-
### Basic Tag Improvements
|
333
|
-
|
334
|
-
* It's now possible to customize the name used for {file:HAML_REFERENCE.md#object_reference_ object reference}
|
335
|
-
for a given object by implementing the `haml_object_ref` method on that object.
|
336
|
-
This method should return a string that will be used in place of the class name of the object
|
337
|
-
in the generated class and id.
|
338
|
-
Thanks to [Tim Carey-Smith](http://twitter.com/halorgium).
|
339
|
-
|
340
|
-
* All attribute values may be non-String types.
|
341
|
-
Their `#to_s` method will be called to convert them to strings.
|
342
|
-
Previously, this only worked for attributes other than `class`.
|
343
|
-
|
344
|
-
### `:class` and `:id` Attributes Accept Ruby Arrays
|
345
|
-
|
346
|
-
In an attribute hash, the `:class` attribute now accepts an Array
|
347
|
-
whose elements will be converted to strings and joined with <nobr>`" "`</nobr>.
|
348
|
-
Likewise, the `:id` attribute now accepts an Array
|
349
|
-
whose elements will be converted to strings and joined with `"_"`.
|
350
|
-
The array will first be flattened and any elements that do not test as true
|
351
|
-
will be stripped out. For example:
|
352
|
-
|
353
|
-
.column{:class => [@item.type, @item == @sortcol && [:sort, @sortdir]] }
|
354
|
-
|
355
|
-
could render as any of:
|
356
|
-
|
357
|
-
class="column numeric sort ascending"
|
358
|
-
class="column numeric"
|
359
|
-
class="column sort descending"
|
360
|
-
class="column"
|
361
|
-
|
362
|
-
depending on whether `@item.type` is `"numeric"` or `nil`,
|
363
|
-
whether `@item == @sortcol`,
|
364
|
-
and whether `@sortdir` is `"ascending"` or `"descending"`.
|
365
|
-
|
366
|
-
A single value can still be specified.
|
367
|
-
If that value evaluates to false it is ignored;
|
368
|
-
otherwise it gets converted to a string.
|
369
|
-
For example:
|
370
|
-
|
371
|
-
.item{:class => @item.is_empty? && "empty"}
|
372
|
-
|
373
|
-
could render as either of:
|
374
|
-
|
375
|
-
class="item"
|
376
|
-
class="item empty"
|
377
|
-
|
378
|
-
Thanks to [Ronen Barzel](http://www.ronenbarzel.org/).
|
379
|
-
|
380
|
-
### HTML5 Custom Data Attributes
|
381
|
-
|
382
|
-
Creating an attribute named `:data` with a Hash value
|
383
|
-
will generate [HTML5 custom data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data).
|
384
|
-
For example:
|
385
|
-
|
386
|
-
%div{:data => {:author_id => 123, :post_id => 234}}
|
387
|
-
|
388
|
-
Will compile to:
|
389
|
-
|
390
|
-
<div data-author_id='123' data-post_id='234'></div>
|
391
|
-
|
392
|
-
Thanks to [John Reilly](http://twitter.com/johnreilly).
|
393
|
-
|
394
|
-
### More Powerful `:autoclose` Option
|
395
|
-
|
396
|
-
The {file:HAML_REFERENCE.md#attributes_option `:attributes`} option
|
397
|
-
can now take regular expressions that specify which tags to make self-closing.
|
398
|
-
|
399
|
-
### `--double-quote-attributes` Option
|
400
|
-
|
401
|
-
The Haml executable now has a `--double-quote-attributes` option (short form: `-q`)
|
402
|
-
that causes attributes to use a double-quote mark rather than single-quote.
|
403
|
-
Thanks to [Charles Roper](http://charlesroper.com/).
|
404
|
-
|
405
|
-
### `:css` Filter
|
406
|
-
|
407
|
-
Haml now supports a {file:HAML_REFERENCE.md#css-filter `:css` filter}
|
408
|
-
that surrounds the filtered text with `<style>` and CDATA tags.
|
409
|
-
|
410
|
-
### `haml-spec` Integration
|
411
|
-
|
412
|
-
We've added the cross-implementation tests from the [haml-spec](http://github.com/norman/haml-spec) project
|
413
|
-
to the standard Haml test suite, to be sure we remain compatible with the base functionality
|
414
|
-
of the many and varied [Haml implementations](http://en.wikipedia.org/wiki/Haml#Implementations).
|
415
|
-
|
416
|
-
### Ruby 1.9 Support
|
417
|
-
|
418
|
-
* Haml and `html2haml` now produce more descriptive errors
|
419
|
-
when given a template with invalid byte sequences for that template's encoding,
|
420
|
-
including the line number and the offending character.
|
421
|
-
|
422
|
-
* Haml and `html2haml` now accept Unicode documents with a
|
423
|
-
[byte-order-mark](http://en.wikipedia.org/wiki/Byte_order_mark).
|
424
|
-
|
425
|
-
### Rails Support
|
426
|
-
|
427
|
-
* When `form_for` is used with `=`, or `form_tag` is used with `=` and a block,
|
428
|
-
they will now raise errors explaining that they should be used with `-`.
|
429
|
-
This is similar to how {Haml::Helpers#haml\_concat} behaves,
|
430
|
-
and will hopefully clear up some difficult bugs for some users.
|
431
|
-
|
432
|
-
### Rip Support
|
433
|
-
|
434
|
-
Haml is now compatible with the [Rip](http://hellorip.com/) package management system.
|
435
|
-
Thanks to [Josh Peek](http://joshpeek.com/).
|
436
|
-
|
437
|
-
### `html2haml` Improvements
|
438
|
-
|
439
|
-
* Ruby blocks within ERB are now supported.
|
440
|
-
The Haml code is properly indented and the `end`s are removed.
|
441
|
-
This includes methods with blocks and all language constructs
|
442
|
-
such as `if`, `begin`, and `case`.
|
443
|
-
For example:
|
444
|
-
|
445
|
-
<% content_for :footer do %>
|
446
|
-
<p>Hi there!</p>
|
447
|
-
<% end %>
|
448
|
-
|
449
|
-
is now transformed into:
|
450
|
-
|
451
|
-
- content_for :footer do
|
452
|
-
%p Hi there!
|
453
|
-
|
454
|
-
Thanks to [Jack Chen](http://chendo.net) and [Dr. Nic Williams](http://drnicwilliams)
|
455
|
-
for inspiring this and creating the first draft of the code.
|
456
|
-
|
457
|
-
* Inline HTML text nodes are now transformed into inline Haml text.
|
458
|
-
For example, `<p>foo</p>` now becomes `%p foo`, whereas before it became:
|
459
|
-
|
460
|
-
%p
|
461
|
-
foo
|
462
|
-
|
463
|
-
The same is true for inline comments,
|
464
|
-
and inline ERB when running in ERB mode:
|
465
|
-
`<p><%= foo %></p>` will now become `%p= foo`.
|
466
|
-
|
467
|
-
* ERB included within text is now transformed into Ruby interpolation.
|
468
|
-
For example:
|
469
|
-
|
470
|
-
<p>
|
471
|
-
Foo <%= bar %> baz!
|
472
|
-
Flip <%= bang %>.
|
473
|
-
</p>
|
474
|
-
|
475
|
-
is now transformed into:
|
476
|
-
|
477
|
-
%p
|
478
|
-
Foo #{bar} baz!
|
479
|
-
Flip #{bang}.
|
480
|
-
|
481
|
-
* `<script>` tags are now transformed into `:javascript` filters,
|
482
|
-
and `<style>` tags into `:css` filters.
|
483
|
-
and indentation is preserved.
|
484
|
-
For example:
|
485
|
-
|
486
|
-
<script type="text/javascript">
|
487
|
-
function foo() {
|
488
|
-
return 12;
|
489
|
-
}
|
490
|
-
</script>
|
491
|
-
|
492
|
-
is now transformed into:
|
493
|
-
|
494
|
-
:javascript
|
495
|
-
function foo() {
|
496
|
-
return 12;
|
497
|
-
}
|
498
|
-
|
499
|
-
* `<pre>` and `<textarea>` tags are now transformed into the `:preserve` filter.
|
500
|
-
For example:
|
501
|
-
|
502
|
-
<pre>Foo
|
503
|
-
bar
|
504
|
-
baz</pre>
|
505
|
-
|
506
|
-
is now transformed into:
|
507
|
-
|
508
|
-
%pre
|
509
|
-
:preserve
|
510
|
-
Foo
|
511
|
-
bar
|
512
|
-
baz
|
513
|
-
|
514
|
-
* Self-closing tags (such as `<br />`) are now transformed into
|
515
|
-
self-closing Haml tags (like `%br/`).
|
516
|
-
|
517
|
-
* IE conditional comments are now properly parsed.
|
518
|
-
|
519
|
-
* Attributes are now output in a more-standard format,
|
520
|
-
without spaces within the curly braces
|
521
|
-
(e.g. `%p{:foo => "bar"}` as opposed to `%p{ :foo => "bar" }`).
|
522
|
-
|
523
|
-
* IDs and classes containing `#` and `.` are now output as string attributes
|
524
|
-
(e.g. `%p{:class => "foo.bar"}`).
|
525
|
-
|
526
|
-
* Attributes are now sorted, to maintain a deterministic order.
|
527
|
-
|
528
|
-
* `>` or {Haml::Helpers#succeed #succeed} are inserted where necessary
|
529
|
-
when inline formatting is used.
|
530
|
-
|
531
|
-
* Multi-line ERB statements are now properly indented,
|
532
|
-
and those without any content are removed.
|
533
|
-
|
534
|
-
### Minor Improvements
|
535
|
-
|
536
|
-
* {Haml::Helpers#capture_haml capture\_haml} is now faster when using `:ugly`.
|
537
|
-
Thanks to [Alf Mikula](http://alfmikula.blogspot.com/).
|
538
|
-
|
539
|
-
* Add an `RDFa` doctype shortcut.
|
540
|
-
|
541
|
-
## 2.2.24
|
542
|
-
|
543
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.24).
|
544
|
-
|
545
|
-
* Don't prevent ActiveModel form elements from having error formatting applied.
|
546
|
-
|
547
|
-
* Make sure `form_for` blocks are properly indented under Rails 3.0.0.beta.3.
|
548
|
-
|
549
|
-
* Don't activate a bug in the `dynamic_form` plugin under Rails 3.0.0.beta.3
|
550
|
-
that would cause its methods not to be loaded.
|
551
|
-
|
552
|
-
## 2.2.23
|
553
|
-
|
554
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.23).
|
555
|
-
|
556
|
-
* Don't crash when `rake gems` is run in Rails with Haml installed.
|
557
|
-
Thanks to [Florian Frank](http://github.com/flori).
|
558
|
-
|
559
|
-
* Don't remove `\n` in filters with interpolation.
|
560
|
-
|
561
|
-
* Silence those annoying `"regexp match /.../n against to UTF-8 string"` warnings.
|
562
|
-
|
563
|
-
## 2.2.22
|
564
|
-
|
565
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.22).
|
566
|
-
|
567
|
-
* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
|
568
|
-
Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
|
569
|
-
|
570
|
-
* Add a deprecation message for using `-` with methods like `form_for`
|
571
|
-
that return strings in Rails 3.
|
572
|
-
This is [the same deprecation that exists in Rails 3](http://github.com/rails/rails/commit/9de83050d3a4b260d4aeb5d09ec4eb64f913ba64).
|
573
|
-
|
574
|
-
* Make sure line numbers are reported correctly when filters are being used.
|
575
|
-
|
576
|
-
* Make loading the gemspec not crash on read-only filesystems like Heroku's.
|
577
|
-
|
578
|
-
* Don't crash when methods like `form_for` return `nil` in, for example, Rails 3 beta.
|
579
|
-
|
580
|
-
* Compatibility with Rails 3 beta's RJS facilities.
|
581
|
-
|
582
|
-
## 2.2.21
|
583
|
-
|
584
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
|
585
|
-
|
586
|
-
* Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
|
587
|
-
In particular, it will still work if `git gc` has been called recently,
|
588
|
-
or if various files are missing.
|
589
|
-
|
590
|
-
* Always use `__FILE__` when reading files within the Haml repo in the `Rakefile`.
|
591
|
-
According to [this bug report](http://github.com/carlhuda/bundler/issues/issue/44),
|
592
|
-
this should make Haml work better with Bundler.
|
593
|
-
|
594
|
-
* Make the error message for `- end` a little more intuitive based on user feedback.
|
595
|
-
|
596
|
-
* Compatibility with methods like `form_for`
|
597
|
-
that return strings rather than concatenate to the template in Rails 3.
|
598
|
-
|
599
|
-
* Add a {Haml::Helpers#with_tabs with_tabs} helper,
|
600
|
-
which sets the indentation level for the duration of a block.
|
601
|
-
|
602
|
-
## 2.2.20
|
603
|
-
|
604
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.20).
|
605
|
-
|
606
|
-
* The `form_tag` Rails helper is now properly marked as HTML-safe
|
607
|
-
when using Rails' XSS protection with Rails 2.3.5.
|
608
|
-
|
609
|
-
* Calls to `defined?` shouldn't interfere with Rails' autoloading
|
610
|
-
in very old versions (1.2.x).
|
611
|
-
|
612
|
-
* Fix a bug where calls to ActionView's `render` method
|
613
|
-
with blocks and layouts wouldn't work under the Rails 3.0 beta.
|
614
|
-
|
615
|
-
* Fix a bug where the closing tags of nested calls to \{Haml::Helpers#haml\_concat}
|
616
|
-
were improperly escaped under the Rails 3.0 beta.
|
617
|
-
|
618
|
-
## 2.2.19
|
619
|
-
|
620
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.19).
|
621
|
-
|
622
|
-
* Fix a bug with the integration with Rails' XSS support.
|
623
|
-
In particular, correctly override `safe_concat`.
|
624
|
-
|
625
|
-
## 2.2.18
|
626
|
-
|
627
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.18).
|
628
|
-
|
629
|
-
* Support [the new XSS-protection API](http://yehudakatz.com/2010/02/01/safebuffers-and-rails-3-0/)
|
630
|
-
used in Rails 3.
|
631
|
-
|
632
|
-
* Use `Rails.env` rather than `RAILS_ENV` when running under Rails 3.0.
|
633
|
-
Thanks to [Duncan Grazier](http://duncangrazier.com/).
|
634
|
-
|
635
|
-
* Add a `--unix-newlines` flag to all executables
|
636
|
-
for outputting Unix-style newlines on Windows.
|
637
|
-
|
638
|
-
* Fix a couple bugs with the `:erb` filter:
|
639
|
-
make sure error reporting uses the correct line numbers,
|
640
|
-
and allow multi-line expressions.
|
641
|
-
|
642
|
-
* Fix a parsing bug for HTML-style attributes including `#`.
|
643
|
-
|
644
|
-
## 2.2.17
|
645
|
-
|
646
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.17).
|
647
|
-
|
648
|
-
* Fix compilation of HTML5 doctypes when using `html2haml`.
|
649
|
-
|
650
|
-
* `nil` values for Sass options are now ignored,
|
651
|
-
rather than raising errors.
|
652
|
-
|
653
|
-
## 2.2.16
|
654
|
-
|
655
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.16).
|
656
|
-
|
657
|
-
* Abstract out references to `ActionView::TemplateError`,
|
658
|
-
`ActionView::TemplateHandler`, etc.
|
659
|
-
These have all been renamed to `ActionView::Template::*`
|
660
|
-
in Rails 3.0.
|
661
|
-
|
662
|
-
## 2.2.15
|
663
|
-
|
664
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.15).
|
665
|
-
|
666
|
-
* Allow `if` statements with no content followed by `else` clauses.
|
667
|
-
For example:
|
668
|
-
|
669
|
-
- if foo
|
670
|
-
- else
|
671
|
-
bar
|
672
|
-
|
673
|
-
## 2.2.14
|
674
|
-
|
675
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.14).
|
676
|
-
|
677
|
-
* Don't print warnings when escaping attributes containing non-ASCII characters
|
678
|
-
in Ruby 1.9.
|
679
|
-
|
680
|
-
* Don't crash when parsing an XHTML Strict doctype in `html2haml`.
|
681
|
-
|
682
|
-
* Support the HTML5 doctype in an XHTML document
|
683
|
-
by using `!!! 5` as the doctype declaration.
|
684
|
-
|
685
|
-
## 2.2.13
|
686
|
-
|
687
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.13).
|
688
|
-
|
689
|
-
* Allow users to specify {file:HAML_REFERENCE.md#encoding_option `:encoding => "ascii-8bit"`}
|
690
|
-
even for templates that include non-ASCII byte sequences.
|
691
|
-
This makes Haml templates not crash when given non-ASCII input
|
692
|
-
that's marked as having an ASCII encoding.
|
693
|
-
|
694
|
-
* Fixed an incompatibility with Hpricot 0.8.2, which is used for `html2haml`.
|
695
|
-
|
696
|
-
## 2.2.12
|
697
|
-
|
698
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.12).
|
699
|
-
|
700
|
-
There were no changes made to Haml between versions 2.2.11 and 2.2.12.
|
701
|
-
|
702
|
-
## 2.2.11
|
703
|
-
|
704
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.11).
|
705
|
-
|
706
|
-
* Fixed a bug with XSS protection where HTML escaping would raise an error
|
707
|
-
if passed a non-string value.
|
708
|
-
Note that this doesn't affect any HTML escaping when XSS protection is disabled.
|
709
|
-
|
710
|
-
* Fixed a bug in outer-whitespace nuking where whitespace-only Ruby strings
|
711
|
-
blocked whitespace nuking beyond them.
|
712
|
-
|
713
|
-
* Use `ensure` to protect the resetting of the Haml output buffer
|
714
|
-
against exceptions that are raised within the compiled Haml code.
|
715
|
-
|
716
|
-
* Fix an error line-numbering bug that appeared if an error was thrown
|
717
|
-
within loud script (`=`).
|
718
|
-
This is not the best solution, as it disables a few optimizations,
|
719
|
-
but it shouldn't have too much effect and the optimizations
|
720
|
-
will hopefully be re-enabled in version 2.4.
|
721
|
-
|
722
|
-
* Don't crash if the plugin skeleton is installed and `rake gems:install` is run.
|
723
|
-
|
724
|
-
* Don't use `RAILS_ROOT` directly.
|
725
|
-
This no longer exists in Rails 3.0.
|
726
|
-
Instead abstract this out as `Haml::Util.rails_root`.
|
727
|
-
This changes makes Haml fully compatible with edge Rails as of this writing.
|
728
|
-
|
729
|
-
## 2.2.10
|
730
|
-
|
731
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.10).
|
732
|
-
|
733
|
-
* Fixed a bug where elements with dynamic attributes and no content
|
734
|
-
would have too much whitespace between the opening and closing tag.
|
735
|
-
|
736
|
-
* Changed `rails/init.rb` away from loading `init.rb` and instead
|
737
|
-
have it basically copy the content.
|
738
|
-
This allows us to transfer the proper binding to `Haml.init_rails`.
|
739
|
-
|
740
|
-
* Make sure Haml only tries to enable XSS protection integration
|
741
|
-
once all other plugins are loaded.
|
742
|
-
This allows it to work properly when Haml is a gem
|
743
|
-
and the `rails_xss` plugin is being used.
|
744
|
-
|
745
|
-
* Mark the return value of Haml templates as HTML safe.
|
746
|
-
This makes Haml partials work with Rails' XSS protection.
|
747
|
-
|
748
|
-
## 2.2.9
|
749
|
-
|
750
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.9).
|
751
|
-
|
752
|
-
* Fixed a bug where Haml's text was concatenated to the wrong buffer
|
753
|
-
under certain circumstances.
|
754
|
-
This was mostly an issue under Rails when using methods like `capture`.
|
755
|
-
|
756
|
-
* Fixed a bug where template text was escaped when there was interpolation in a line
|
757
|
-
and the `:escape_html` option was enabled. For example:
|
758
|
-
|
759
|
-
Foo < Bar #{"<"} Baz
|
760
|
-
|
761
|
-
with `:escape_html` used to render as
|
762
|
-
|
763
|
-
Foo &lt; Bar < Baz
|
764
|
-
|
765
|
-
but now renders as
|
766
|
-
|
767
|
-
Foo < Bar < Baz
|
768
|
-
|
769
|
-
### Rails XSS Protection
|
770
|
-
|
771
|
-
Haml 2.2.9 supports the XSS protection in Rails versions 2.3.5+.
|
772
|
-
There are several components to this:
|
773
|
-
|
774
|
-
* If XSS protection is enabled, Haml's {file:HAML_REFERENCE.md#escape_html-option `:escape_html`}
|
775
|
-
option is set to `true` by default.
|
776
|
-
|
777
|
-
* Strings declared as HTML safe won't be escaped by Haml,
|
778
|
-
including the {file:Haml/Helpers.html#html_escape-instance_method `#html_escape`} helper
|
779
|
-
and `&=` if `:escape_html` has been disabled.
|
780
|
-
|
781
|
-
* Haml helpers that generate HTML are marked as HTML safe,
|
782
|
-
and will escape their input if it's not HTML safe.
|
783
|
-
|
784
|
-
## 2.2.8
|
785
|
-
|
786
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.8).
|
787
|
-
|
788
|
-
* Fixed a potential XSS issue with HTML escaping and wacky Unicode nonsense.
|
789
|
-
This is the same as [the issue fixed in Rails](http://groups.google.com/group/rubyonrails-security/browse_thread/thread/48ab3f4a2c16190f) a bit ago.
|
790
|
-
|
791
|
-
## 2.2.7
|
792
|
-
|
793
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.7).
|
794
|
-
|
795
|
-
* Fixed an `html2haml` issue where ERB attribute values
|
796
|
-
weren't HTML-unescaped before being transformed into Haml.
|
797
|
-
|
798
|
-
* Fixed an `html2haml` issue where `#{}` wasn't escaped
|
799
|
-
before being transformed into Haml.
|
800
|
-
|
801
|
-
* Add `<code>` to the list of tags that's
|
802
|
-
{file:HAML_REFERENCE.md#preserve-option automatically whitespace-preserved}.
|
803
|
-
|
804
|
-
* Fixed a bug with `end` being followed by code in silent scripts -
|
805
|
-
it no longer throws an error when it's nested beneath tags.
|
806
|
-
|
807
|
-
* Fixed a bug with inner whitespace-nuking and conditionals.
|
808
|
-
The `else` et al. clauses of conditionals are now properly
|
809
|
-
whitespace-nuked.
|
810
|
-
|
811
|
-
## 2.2.6
|
812
|
-
|
813
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.6).
|
814
|
-
|
815
|
-
* Made the error message when unable to load a dependency for html2haml
|
816
|
-
respect the `--trace` option.
|
817
|
-
|
818
|
-
* Don't crash when the `__FILE__` constant of a Ruby file is a relative path,
|
819
|
-
as apparently happens sometimes in TextMate
|
820
|
-
(thanks to [Karl Varga](http://github.com/kjvarga)).
|
821
|
-
|
822
|
-
* Add "Sass" to the `--version` string for the executables.
|
823
|
-
|
824
|
-
* Raise an exception when commas are omitted in static attributes
|
825
|
-
(e.g. `%p{:foo => "bar" :baz => "bang"}`).
|
826
|
-
|
827
|
-
## 2.2.5
|
828
|
-
|
829
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.5).
|
830
|
-
|
831
|
-
* Got rid of trailing whitespace produced when opening a conditional comment
|
832
|
-
(thanks to [Norman Clarke](http://blog.njclarke.com/)).
|
833
|
-
|
834
|
-
* Fixed CSS id concatenation when a numeric id is given as an attribute.
|
835
|
-
(thanks to [Norman Clarke](http://blog.njclarke.com/)).
|
836
|
-
|
837
|
-
* Fixed a couple bugs with using "-end" in strings.
|
838
|
-
|
839
|
-
## 2.2.4
|
840
|
-
|
841
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.4).
|
842
|
-
|
843
|
-
* Allow `end` to be used for silent script when it's followed by code.
|
844
|
-
For example:
|
845
|
-
|
846
|
-
- form_for do
|
847
|
-
...
|
848
|
-
- end if @show_form
|
849
|
-
|
850
|
-
This isn't very good style, but we're supporting it for consistency's sake.
|
851
|
-
|
852
|
-
* Don't add `require 'rubygems'` to the top of init.rb when installed
|
853
|
-
via `haml --rails`. This isn't necessary, and actually gets
|
854
|
-
clobbered as soon as haml/template is loaded.
|
855
|
-
|
856
|
-
## 2.2.3
|
857
|
-
|
858
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.3).
|
859
|
-
|
860
|
-
Haml 2.2.3 adds support for the JRuby bundling tools
|
861
|
-
for Google AppEngine, thanks to [Jan Ulbrich](http://github.com/ulbrich).
|
862
|
-
|
863
|
-
## 2.2.2
|
864
|
-
|
865
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.2).
|
866
|
-
|
867
|
-
Haml 2.2.2 is a minor bugfix release, with several notable changes.
|
868
|
-
First, {file:Haml/Helpers.html#haml_concat-instance_method `haml_concat`}
|
869
|
-
will now raise an error when used with `=`.
|
870
|
-
This has always been incorrect behavior,
|
871
|
-
and in fact has never actually worked.
|
872
|
-
The only difference is that now it will fail loudly.
|
873
|
-
Second, Ruby 1.9 is now more fully supported,
|
874
|
-
especially with the {file:HAML_REFERENCE.md#htmlstyle_attributes_ new attribute syntax}.
|
875
|
-
Third, filters are no longer escaped when the {file:HAML_REFERENCE.md#escape_html-option `:escape_html` option}
|
876
|
-
is enabled and `#{}` interpolation is used.
|
877
|
-
|
878
|
-
## 2.2.1
|
879
|
-
|
880
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.1).
|
881
|
-
|
882
|
-
Haml 2.2.1 is a minor bug-fix release.
|
883
|
-
|
884
|
-
## 2.2.0
|
885
|
-
|
886
|
-
[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.0).
|
887
|
-
|
888
|
-
Haml 2.2 adds several new features to the language,
|
889
|
-
fixes several bugs, and dramatically improves performance
|
890
|
-
(particularly when running with {file:HAML_REFERENCE.md#ugly-option `:ugly`} enabled).
|
891
|
-
|
892
|
-
### Syntax Changes
|
893
|
-
|
894
|
-
#### HTML-Style Attribute Syntax
|
895
|
-
|
896
|
-
Haml 2.2 introduces a new syntax for attributes
|
897
|
-
based on the HTML syntax.
|
898
|
-
For example:
|
899
|
-
|
900
|
-
%a(href="http://haml-lang.com" title="Haml's so cool!")
|
901
|
-
%img(src="/images/haml.png" alt="Haml")
|
902
|
-
|
903
|
-
There are two main reasons for this.
|
904
|
-
First, the hash-style syntax is very Ruby-specific.
|
905
|
-
There are now [Haml implementations](http://en.wikipedia.org/wiki/Haml#Implementations)
|
906
|
-
in many languages, each of which has its own syntax for hashes
|
907
|
-
(or dicts or associative arrays or whatever they're called).
|
908
|
-
The HTML syntax will be adopted by all of them,
|
909
|
-
so you can feel comfortable using Haml in whichever language you need.
|
910
|
-
|
911
|
-
Second, the hash-style syntax is quite verbose.
|
912
|
-
`%img{:src => "/images/haml.png", :alt => "Haml"}`
|
913
|
-
is eight characters longer than `%img(src="/images/haml.png" alt="Haml")`.
|
914
|
-
Haml's supposed to be about writing templates quickly and easily;
|
915
|
-
HTML-style attributes should help out a lot with that.
|
916
|
-
|
917
|
-
Ruby variables can be used as attribute values by omitting quotes.
|
918
|
-
Local variables or instance variables can be used.
|
919
|
-
For example:
|
920
|
-
|
921
|
-
%a(title=@title href=href) Stuff
|
922
|
-
|
923
|
-
This is the same as:
|
924
|
-
|
925
|
-
%a{:title => @title, :href => href} Stuff
|
926
|
-
|
927
|
-
Because there are no commas separating attributes,
|
928
|
-
more complicated expressions aren't allowed.
|
929
|
-
You can use `#{}` interpolation to insert complicated expressions
|
930
|
-
in a HTML-style attribute, though:
|
931
|
-
|
932
|
-
%span(class="widget_#{@widget.number}")
|
933
|
-
|
934
|
-
#### Multiline Attributes
|
935
|
-
|
936
|
-
In general, Haml tries to keep individual elements on a single line.
|
937
|
-
There is a [multiline syntax](#multiline) for overflowing onto further lines,
|
938
|
-
but it's intentionally awkward to use to encourage shorter lines.
|
939
|
-
|
940
|
-
However, there is one case where overflow is reasonable: attributes.
|
941
|
-
Often a tag will simply have a lot of attributes, and in this case
|
942
|
-
it makes sense to allow overflow.
|
943
|
-
You can now stretch an attribute hash across multiple lines:
|
944
|
-
|
945
|
-
%script{:type => "text/javascript",
|
946
|
-
:src => "javascripts/script_#{2 + 7}"}
|
947
|
-
|
948
|
-
This also works for HTML-style attributes:
|
949
|
-
|
950
|
-
%script(type="text/javascript"
|
951
|
-
src="javascripts/script_#{2 + 7}")
|
952
|
-
|
953
|
-
Note that for hash-style attributes, the newlines must come after commas.
|
954
|
-
|
955
|
-
#### Universal interpolation
|
956
|
-
|
957
|
-
In Haml 2.0, you could use `==` to interpolate Ruby code
|
958
|
-
within a line of text using `#{}`.
|
959
|
-
In Haml 2.2, the `==` is unnecessary;
|
960
|
-
`#{}` can be used in any text.
|
961
|
-
For example:
|
962
|
-
|
963
|
-
%p This is a really cool #{h what_is_this}!
|
964
|
-
But is it a #{h what_isnt_this}?
|
965
|
-
|
966
|
-
In addition, to {file:HAML_REFERENCE.md#escaping_html escape} or {file:HAML_REFERENCE.md#unescaping_html unescape}
|
967
|
-
the interpolated code, you can just add `&` or `!`, respectively,
|
968
|
-
to the beginning of the line:
|
969
|
-
|
970
|
-
%p& This is a really cool #{what_is_this}!
|
971
|
-
& But is it a #{what_isnt_this}?
|
972
|
-
|
973
|
-
#### Flexible indentation
|
974
|
-
|
975
|
-
Haml has traditionally required its users to use two spaces of indentation.
|
976
|
-
This is the universal Ruby style, and still highly recommended.
|
977
|
-
However, Haml now allows any number of spaces or even tabs for indentation,
|
978
|
-
provided:
|
979
|
-
|
980
|
-
* Tabs and spaces are not mixed
|
981
|
-
* The indentation is consistent within a given document
|
982
|
-
|
983
|
-
### New Options
|
984
|
-
|
985
|
-
#### `:ugly`
|
986
|
-
|
987
|
-
The `:ugly` option is not technically new;
|
988
|
-
it was introduced in Haml 2.0 to make rendering deeply nested templates less painful.
|
989
|
-
However, it's been greatly empowered in Haml 2.2.
|
990
|
-
It now does all sorts of performance optimizations
|
991
|
-
that couldn't be done before,
|
992
|
-
and its use increases Haml's performance dramatically.
|
993
|
-
It's enabled by default in production in Rails,
|
994
|
-
and it's highly recommended for production environments
|
995
|
-
in other frameworks.
|
996
|
-
|
997
|
-
#### `:encoding` {#encoding-option}
|
998
|
-
|
999
|
-
This option specifies the encoding of the Haml template
|
1000
|
-
when running under Ruby 1.9. It defaults to `Encoding.default_internal` or `"utf-8"`.
|
1001
|
-
This is useful for making sure that you don't get weird
|
1002
|
-
encoding errors when dealing with non-ASCII input data.
|
1003
|
-
|
1004
|
-
### Deprecations
|
1005
|
-
|
1006
|
-
#### `Haml::Helpers#puts`
|
1007
|
-
|
1008
|
-
This helper is being deprecated for the obvious reason
|
1009
|
-
that it conflicts with the `Kernel#puts` method.
|
1010
|
-
I'm ashamed I ever chose this name.
|
1011
|
-
Use `haml_concat` instead and spare me the embarrassment.
|
1012
|
-
|
1013
|
-
#### `= haml_tag`
|
1014
|
-
|
1015
|
-
A lot of people accidentally use "`= haml_tag`".
|
1016
|
-
This has always been wrong; `haml_tag` outputs directly to the template,
|
1017
|
-
and so should be used as "`- haml_tag`".
|
1018
|
-
Now it raises an error when you use `=`.
|
1019
|
-
|
1020
|
-
### Compatibility
|
1021
|
-
|
1022
|
-
#### Rails
|
1023
|
-
|
1024
|
-
Haml 2.2 is fully compatible with Rails,
|
1025
|
-
from 2.0.6 to the latest revision of edge, 783db25.
|
1026
|
-
|
1027
|
-
#### Ruby 1.9
|
1028
|
-
|
1029
|
-
Haml 2.2 is also fully compatible with Ruby 1.9.
|
1030
|
-
It supports Ruby 1.9-style attribute hashes,
|
1031
|
-
and handles encoding-related issues
|
1032
|
-
(see [the `:encoding` option](#encoding-option)).
|
1033
|
-
|
1034
|
-
### Filters
|
1035
|
-
|
1036
|
-
#### `:markdown`
|
1037
|
-
|
1038
|
-
There are numerous improvements to the Markdown filter.
|
1039
|
-
No longer will Haml attempt to use RedCloth's inferior Markdown implementation.
|
1040
|
-
Instead, it will look for all major Markdown implementations:
|
1041
|
-
[RDiscount](http://github.com/rtomayko/rdiscount),
|
1042
|
-
[RPeg-Markdown](http://github.com/rtomayko/rpeg-markdown),
|
1043
|
-
[Maruku](http://maruku.rubyforge.org),
|
1044
|
-
and [BlueCloth](www.deveiate.org/projects/BlueCloth).
|
1045
|
-
|
1046
|
-
#### `:cdata`
|
1047
|
-
|
1048
|
-
There is now a `:cdata` filter for wrapping text in CDATA tags.
|
1049
|
-
|
1050
|
-
#### `:sass`
|
1051
|
-
|
1052
|
-
The `:sass` filter now uses options set in {Sass::Plugin},
|
1053
|
-
if they're available.
|
1054
|
-
|
1055
|
-
### Executables
|
1056
|
-
|
1057
|
-
#### `haml`
|
1058
|
-
|
1059
|
-
The `haml` executable now takes `-r` and `-I` flags
|
1060
|
-
that act just like the same flags for the `ruby` executable.
|
1061
|
-
This allows users to load helper files when using Haml
|
1062
|
-
from the command line.
|
1063
|
-
|
1064
|
-
It also takes a `--debug` flag that causes it to spit out
|
1065
|
-
the Ruby code that Haml generates from the template.
|
1066
|
-
This is more for my benefit than anything,
|
1067
|
-
but you may find it interesting.
|
1068
|
-
|
1069
|
-
#### `html2haml`
|
1070
|
-
|
1071
|
-
The `html2haml` executable has undergone significant improvements.
|
1072
|
-
Many of these are bugfixes, but there are also a few features.
|
1073
|
-
For one, it now understands CDATA tags and autodetects ERB files.
|
1074
|
-
In addition, a line containing just "`- end`" is now a Haml error;
|
1075
|
-
since it's not possible for `html2haml` to properly parse all Ruby blocks,
|
1076
|
-
this acts as a signal for the author that there are blocks
|
1077
|
-
to be dealt with.
|
1078
|
-
|
1079
|
-
### Miscellaneous
|
1080
|
-
|
1081
|
-
#### XHTML Mobile DTD
|
1082
|
-
|
1083
|
-
Haml 2.2 supports a DTD for XHTML Mobile: `!!! Mobile`.
|
1084
|
-
|
1085
|
-
#### YARD
|
1086
|
-
|
1087
|
-
All the documentation for Haml 2.2, including this changelog,
|
1088
|
-
has been moved to [YARD](http://yard.soen.ca).
|
1089
|
-
YARD is an excellent documentation system,
|
1090
|
-
and allows us to write our documentation in [Maruku](http://maruku.rubyforge.org),
|
1091
|
-
which is also excellent.
|