radiant 0.9.1 → 1.0.0.rc1
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/.gitignore +19 -0
- data/CHANGELOG +26 -0
- data/CONTRIBUTORS +18 -0
- data/Gemfile +3 -0
- data/app/controllers/admin/configuration_controller.rb +50 -0
- data/app/controllers/admin/page_fields_controller.rb +9 -0
- data/app/controllers/admin/pages_controller.rb +39 -8
- data/app/controllers/admin/preferences_controller.rb +1 -1
- data/app/controllers/admin/resource_controller.rb +10 -2
- data/app/controllers/admin/welcome_controller.rb +6 -1
- data/app/controllers/application_controller.rb +0 -1
- data/app/controllers/site_controller.rb +1 -1
- data/app/helpers/admin/configuration_helper.rb +80 -0
- data/app/helpers/admin/node_helper.rb +47 -1
- data/app/helpers/admin/pages_helper.rb +5 -7
- data/app/helpers/admin/preferences_helper.rb +1 -0
- data/app/helpers/admin/references_helper.rb +2 -3
- data/app/helpers/application_helper.rb +4 -3
- data/app/models/deprecated_tags.rb +77 -0
- data/app/models/file_not_found_page.rb +4 -0
- data/app/models/page.rb +75 -24
- data/app/models/page_field.rb +3 -0
- data/app/models/page_part.rb +0 -1
- data/app/models/radiant/config.rb +239 -38
- data/app/models/snippet.rb +4 -0
- data/app/models/standard_tags.rb +202 -156
- data/app/models/status.rb +9 -1
- data/app/models/text_filter.rb +12 -1
- data/app/models/user.rb +1 -2
- data/app/models/user_action_observer.rb +9 -3
- data/app/views/admin/configuration/edit.html.haml +38 -0
- data/app/views/admin/configuration/show.html.haml +58 -0
- data/app/views/admin/extensions/index.html.haml +2 -2
- data/app/views/admin/layouts/_form.html.haml +2 -2
- data/app/views/admin/layouts/index.html.haml +10 -10
- data/app/views/admin/layouts/remove.html.haml +1 -1
- data/app/views/admin/page_fields/_page_field.html.haml +12 -0
- data/app/views/admin/pages/_fields.html.haml +22 -5
- data/app/views/admin/pages/_meta_row.html.haml +5 -1
- data/app/views/admin/pages/_node.html.haml +10 -9
- data/app/views/admin/pages/_popups.html.haml +17 -4
- data/app/views/admin/pages/edit.html.haml +1 -1
- data/app/views/admin/pages/index.html.haml +5 -5
- data/app/views/admin/pages/remove.html.haml +1 -1
- data/app/views/admin/preferences/edit.html.haml +1 -1
- data/app/views/admin/references/filters.haml +1 -1
- data/app/views/admin/references/tags.haml +1 -1
- data/app/views/admin/snippets/_form.html.haml +2 -2
- data/app/views/admin/snippets/index.html.haml +11 -11
- data/app/views/admin/snippets/remove.html.haml +1 -1
- data/app/views/admin/users/_avatar.html.haml +3 -1
- data/app/views/admin/users/_form.html.haml +3 -3
- data/app/views/admin/users/_password_fields.html.haml +2 -2
- data/app/views/admin/users/index.html.haml +11 -11
- data/app/views/admin/users/remove.html.haml +1 -1
- data/app/views/admin/welcome/login.html.haml +1 -1
- data/app/views/layouts/application.html.haml +9 -14
- data/config/boot.rb +28 -11
- data/config/compass.config +18 -0
- data/config/environment.rb +10 -5
- data/config/environments/cucumber.rb +5 -5
- data/config/environments/test.rb +5 -5
- data/config/initializers/compass.rb +3 -0
- data/config/initializers/radiant_config.rb +17 -0
- data/config/locales/en.yml +61 -13
- data/config/locales/en_available_tags.yml +131 -39
- data/config/routes.rb +4 -6
- data/db/migrate/20100805154952_add_page_fields.rb +15 -0
- data/db/migrate/20100805155020_convert_page_metas.rb +15 -0
- data/db/migrate/20100810151922_add_field_name_index.rb +11 -0
- data/db/schema.rb +32 -7
- data/features/admin/configuration.feature +38 -0
- data/features/admin/pages_management.feature +2 -9
- data/features/admin/resource_pagination.feature +1 -1
- data/features/admin/snippets_management.feature +2 -1
- data/features/admin/user_permissions.feature +3 -4
- data/features/admin/user_preferences.feature +1 -1
- data/features/step_definitions/admin/admin_steps.rb +1 -1
- data/features/step_definitions/admin/content_negotiation_steps.rb +4 -0
- data/features/step_definitions/admin/pages_management_steps.rb +5 -1
- data/features/step_definitions/admin/pagination_steps.rb +2 -4
- data/features/step_definitions/page_serving_steps.rb +16 -0
- data/features/support/dataset.rb +7 -3
- data/features/support/datasets_loader.rb +3 -0
- data/features/support/env.rb +2 -0
- data/features/support/matchers.rb +3 -0
- data/features/support/paths.rb +2 -0
- data/lib/generators/extension/extension_generator.rb +6 -0
- data/lib/generators/extension/templates/README +4 -1
- data/lib/generators/extension/templates/RSpecRakefile +1 -28
- data/lib/generators/extension/templates/Rakefile +0 -17
- data/lib/generators/extension/templates/cucumber_datasets_loader.rb +3 -0
- data/lib/generators/extension/templates/cucumber_env.rb +1 -10
- data/lib/generators/extension/templates/extension.rb +3 -3
- data/lib/generators/extension/templates/gemspec.rb +24 -0
- data/lib/generators/extension/templates/lib.rb +2 -0
- data/lib/generators/extension/templates/radiant_config.rb +3 -0
- data/lib/generators/extension/templates/version.rb +3 -0
- data/lib/generators/instance/instance_generator.rb +3 -2
- data/lib/generators/instance/templates/instance_boot.rb +28 -10
- data/lib/generators/instance/templates/instance_environment.rb +10 -5
- data/lib/generators/instance/templates/instance_radiant_config.rb +16 -0
- data/lib/generators/language_extension/templates/lang.yml +11 -11
- data/lib/plugins/active_record_extensions/lib/active_record_extensions.rb +10 -0
- data/lib/plugins/object_extensions/lib/object_extensions.rb +3 -0
- data/lib/radiant.rb +4 -4
- data/lib/radiant/admin_ui.rb +58 -41
- data/lib/radiant/available_locales.rb +8 -8
- data/lib/radiant/cache.rb +1 -0
- data/lib/radiant/config/definition.rb +142 -0
- data/lib/radiant/extension.rb +20 -4
- data/lib/radiant/extension/script.rb +15 -15
- data/lib/radiant/extension_gem.rb +12 -0
- data/lib/radiant/extension_loader.rb +12 -5
- data/lib/radiant/extension_locator.rb +25 -0
- data/lib/radiant/extension_migrator.rb +3 -2
- data/lib/radiant/gem_dependency_fix.rb +21 -0
- data/lib/radiant/gem_locator.rb +28 -0
- data/lib/radiant/initializer.rb +74 -7
- data/lib/radiant/pagination/controller.rb +1 -0
- data/lib/radiant/setup.rb +19 -11
- data/lib/task_support.rb +14 -8
- data/lib/tasks/database.rake +2 -0
- data/lib/tasks/framework.rake +32 -15
- data/lib/tasks/prototype.rake +8 -11
- data/lib/tasks/release.rake +1 -0
- 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/flash/ZeroClipboard.swf +0 -0
- data/public/images/admin/assets/add.png +0 -0
- data/public/images/admin/assets/archive_icon.png +0 -0
- data/public/images/admin/assets/audio_icon.png +0 -0
- data/public/images/admin/assets/audio_thumbnail.png +0 -0
- data/public/images/admin/assets/c_icon.png +0 -0
- data/public/images/admin/assets/copy.png +0 -0
- data/public/images/admin/assets/css_icon.png +0 -0
- data/public/images/admin/assets/database_icon.png +0 -0
- data/public/images/admin/assets/delete.png +0 -0
- data/public/images/admin/assets/document_icon.png +0 -0
- data/public/images/admin/assets/document_thumbnail.png +0 -0
- data/public/images/admin/assets/flash_icon.png +0 -0
- data/public/images/admin/assets/flash_thumbnail.png +0 -0
- data/public/images/admin/assets/font_icon.png +0 -0
- data/public/images/admin/assets/gzip_icon.png +0 -0
- data/public/images/admin/assets/html_icon.png +0 -0
- data/public/images/admin/assets/image_icon.png +0 -0
- data/public/images/admin/assets/image_thumbnail.png +0 -0
- data/public/images/admin/assets/java_icon.png +0 -0
- data/public/images/admin/assets/page_edit.png +0 -0
- data/public/images/admin/assets/perl_icon.png +0 -0
- data/public/images/admin/assets/php_icon.png +0 -0
- data/public/images/admin/assets/presentation_icon.png +0 -0
- data/public/images/admin/assets/python_icon.png +0 -0
- data/public/images/admin/assets/reorder_assets.png +0 -0
- data/public/images/admin/assets/ruby_icon.png +0 -0
- data/public/images/admin/assets/script_icon.png +0 -0
- data/public/images/admin/assets/spreadsheet_icon.png +0 -0
- data/public/images/admin/assets/tar_icon.png +0 -0
- data/public/images/admin/assets/unknown_icon.png +0 -0
- data/public/images/admin/assets/unknown_thumbnail.png +0 -0
- data/public/images/admin/assets/video_icon.png +0 -0
- data/public/images/admin/assets/video_thumbnail.png +0 -0
- data/public/images/admin/assets/xml_icon.png +0 -0
- data/public/images/admin/assets/zip_icon.png +0 -0
- data/public/images/admin/avatar_64x64.png +0 -0
- data/public/images/admin/image.png +0 -0
- data/public/images/admin/javascript.png +0 -0
- data/public/images/admin/navigation_secondary_separator.gif +0 -0
- data/public/images/admin/plus_disabled.png +0 -0
- data/public/images/admin/search.png +0 -0
- data/public/images/admin/status_spinner.gif +0 -0
- data/public/images/admin/stylesheet.png +0 -0
- data/public/images/admin/upload.png +0 -0
- data/public/images/{radiant-badge-color.png → radiant/radiant-badge-color.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/public/javascripts/admin/application.js +11 -2
- data/public/javascripts/admin/codearea.js +4 -4
- data/public/javascripts/admin/cookie.js +1 -1
- data/public/javascripts/admin/dateinput.js +5 -5
- data/public/javascripts/admin/dropdown.js +216 -0
- data/public/javascripts/admin/page_preview.js +41 -0
- data/public/javascripts/admin/pagefield.js +54 -0
- data/public/javascripts/admin/popup.js +187 -64
- data/public/javascripts/admin/sitemap.js +2 -2
- data/public/javascripts/admin/status.js +13 -13
- data/public/javascripts/admin/tabcontrol.js +9 -7
- data/public/javascripts/admin/toggle.js +18 -18
- data/public/javascripts/admin/utility.js +5 -4
- data/public/loading-iframe.html +11 -0
- data/public/stylesheets/admin/base.css +1 -0
- data/public/stylesheets/admin/main.css +1 -1213
- data/public/stylesheets/admin/overrides.css +0 -1
- data/public/stylesheets/sass/admin/_base.sass +17 -0
- data/public/stylesheets/sass/admin/main.sass +21 -21
- data/public/stylesheets/sass/admin/modules/_boxes.sass +6 -0
- data/public/stylesheets/sass/admin/modules/_links.sass +6 -3
- data/public/stylesheets/sass/admin/partials/_actions.sass +51 -38
- data/public/stylesheets/sass/admin/partials/_avatars.sass +4 -4
- data/public/stylesheets/sass/admin/partials/_content.sass +41 -182
- data/public/stylesheets/sass/admin/partials/_dateinput.sass +5 -5
- data/public/stylesheets/sass/admin/partials/_deprecated.sass +31 -2
- data/public/stylesheets/sass/admin/partials/_dropdown.sass +28 -0
- data/public/stylesheets/sass/admin/partials/_forms.sass +40 -27
- data/public/stylesheets/sass/admin/partials/_header.sass +78 -76
- data/public/stylesheets/sass/admin/partials/_index.sass +147 -0
- data/public/stylesheets/sass/admin/partials/_popup.sass +116 -20
- data/public/stylesheets/sass/admin/partials/_tabcontrol.sass +5 -3
- data/public/stylesheets/sass/admin/partials/{_base.sass → _typography.sass} +4 -3
- data/public/stylesheets/sass/admin/partials/_validations.sass +16 -18
- data/radiant.gemspec +42 -0
- data/spec/controllers/admin/page_fields_controller_spec.rb +17 -0
- data/spec/controllers/admin/pages_controller_spec.rb +87 -6
- data/spec/controllers/admin/preferences_controller_spec.rb +1 -1
- data/spec/controllers/site_controller_spec.rb +4 -4
- data/spec/datasets/config_dataset.rb +3 -1
- data/spec/datasets/home_page_dataset.rb +1 -3
- data/spec/datasets/pages_dataset.rb +1 -1
- data/spec/datasets/users_dataset.rb +1 -1
- data/spec/fixtures/bad_settings.rb +5 -0
- data/spec/fixtures/invalid_config.yml +11 -0
- data/spec/fixtures/more_settings.rb +8 -0
- data/spec/fixtures/radiant_config.yml +2 -2
- data/spec/fixtures/settings.rb +5 -0
- data/spec/generators/extension_controller_generator_spec.rb +20 -18
- data/spec/generators/extension_generator_spec.rb +39 -17
- data/spec/generators/extension_generators_spec_helper.rb +10 -12
- data/spec/generators/extension_mailer_generator_spec.rb +15 -13
- data/spec/generators/extension_migration_generator_spec.rb +6 -5
- data/spec/generators/extension_model_generator_spec.rb +16 -14
- data/spec/generators/instance_generator_spec.rb +27 -20
- data/spec/helpers/admin/node_helper_spec.rb +57 -2
- data/spec/helpers/admin/pages_helper_spec.rb +4 -1
- data/spec/helpers/admin/references_helper_spec.rb +10 -1
- data/spec/helpers/application_helper_spec.rb +7 -2
- data/spec/lib/locator_spec.rb +41 -0
- data/spec/lib/login_system_spec.rb +6 -0
- data/spec/lib/radiant/admin_ui_spec.rb +12 -11
- data/spec/lib/radiant/config/definition_spec.rb +160 -0
- data/spec/lib/radiant/extension_loader_spec.rb +29 -6
- data/spec/lib/radiant/extension_migrator_spec.rb +11 -0
- data/spec/lib/radiant/extension_spec.rb +24 -4
- data/spec/lib/radiant/initializer_spec.rb +10 -0
- data/spec/lib/task_support_spec.rb +6 -0
- data/spec/matchers/render_matcher.rb +4 -4
- data/spec/models/deprecated_tags_spec.rb +85 -0
- data/spec/models/file_not_found_page_spec.rb +15 -11
- data/spec/models/page_part_spec.rb +0 -7
- data/spec/models/page_spec.rb +230 -174
- data/spec/models/radiant/config_spec.rb +38 -3
- data/spec/models/snippet_spec.rb +18 -0
- data/spec/models/standard_tags_spec.rb +175 -154
- data/spec/models/status_spec.rb +11 -0
- data/spec/models/text_filter_spec.rb +6 -2
- data/spec/models/user_spec.rb +0 -7
- data/test/fixtures/extensions/basic/basic_extension.rb +1 -6
- data/test/fixtures/extensions/basic/config/routes.rb +3 -0
- data/test/fixtures/extensions/unrouted/unrouted_extension.rb +2 -0
- data/{log/.keep → test/fixtures/gems/radiant-gem_ext-extension-0.0.0/app/views/dummy.haml} +0 -0
- data/vendor/extensions/archive/Rakefile +13 -24
- data/vendor/extensions/archive/app/models/archive_day_index_page.rb +4 -0
- data/vendor/extensions/archive/app/models/archive_finder.rb +2 -2
- data/vendor/extensions/archive/app/models/archive_month_index_page.rb +4 -0
- data/vendor/extensions/archive/app/models/archive_page.rb +50 -9
- data/vendor/extensions/archive/app/models/archive_year_index_page.rb +4 -0
- data/vendor/extensions/archive/archive_extension.rb +13 -12
- data/vendor/extensions/archive/config/initializers/radiant_config.rb +3 -0
- data/vendor/extensions/archive/config/locales/en.yml +3 -0
- data/vendor/extensions/archive/config/routes.rb +5 -0
- data/vendor/extensions/archive/cucumber.yml +1 -0
- data/vendor/extensions/archive/features/archive_content.feature +51 -0
- data/vendor/extensions/archive/features/step_definitions/web_steps.rb +7 -0
- data/vendor/extensions/archive/features/support/datasets_loader.rb +3 -0
- data/vendor/extensions/archive/features/support/env.rb +7 -0
- data/vendor/extensions/archive/features/support/matchers.rb +3 -0
- data/vendor/extensions/archive/features/support/paths.rb +14 -0
- data/vendor/extensions/archive/lib/archive_index_tags_and_methods.rb +28 -8
- data/vendor/extensions/archive/lib/radiant-archive-extension.rb +2 -0
- data/vendor/extensions/archive/lib/radiant-archive-extension/version.rb +3 -0
- data/vendor/extensions/archive/lib/tasks/archive_extension_tasks.rake +30 -3
- data/vendor/extensions/archive/radiant-archive-extension.gemspec +24 -0
- data/vendor/extensions/archive/spec/datasets/archive_dataset.rb +10 -6
- data/vendor/extensions/archive/spec/models/archive_day_index_page_spec.rb +13 -3
- data/vendor/extensions/archive/spec/models/archive_month_index_page_spec.rb +17 -3
- data/vendor/extensions/archive/spec/models/archive_page_spec.rb +31 -8
- data/vendor/extensions/archive/spec/models/archive_year_index_page_spec.rb +14 -3
- data/vendor/extensions/archive/spec/models/page_spec.rb +6 -0
- data/vendor/extensions/archive/tmp/cache/entity/d0/580097d24f3e7cfc7bf9706a0a3a3729a9de3e +6 -0
- data/vendor/extensions/archive/tmp/cache/meta/0e/da69d02186242cdfda62e46044566f2bc50f3a +0 -0
- data/vendor/extensions/assets/HELP_admin.markdown +69 -0
- data/vendor/extensions/assets/LICENSE +22 -0
- data/vendor/extensions/assets/README.md +230 -0
- data/vendor/extensions/assets/Rakefile +111 -0
- data/vendor/extensions/assets/VERSION +1 -0
- data/vendor/extensions/assets/app/controllers/admin/assets_controller.rb +54 -0
- data/vendor/extensions/assets/app/controllers/admin/page_attachments_controller.rb +45 -0
- data/vendor/extensions/assets/app/helpers/admin/assets_helper.rb +11 -0
- data/vendor/extensions/assets/app/models/asset.rb +161 -0
- data/vendor/extensions/assets/app/models/asset_tags.rb +378 -0
- data/vendor/extensions/assets/app/models/asset_type.rb +160 -0
- data/vendor/extensions/assets/app/models/old_page_attachment.rb +26 -0
- data/vendor/extensions/assets/app/models/page_attachment.rb +14 -0
- data/vendor/extensions/assets/app/views/admin/assets/_asset.html.haml +12 -0
- data/vendor/extensions/assets/app/views/admin/assets/_asset_table.html.haml +30 -0
- data/vendor/extensions/assets/app/views/admin/assets/_errors.html.haml +3 -0
- data/vendor/extensions/assets/app/views/admin/assets/_form.html.haml +20 -0
- data/vendor/extensions/assets/app/views/admin/assets/_page_assets.html.haml +12 -0
- data/vendor/extensions/assets/app/views/admin/assets/_search.html.haml +17 -0
- data/vendor/extensions/assets/app/views/admin/assets/_search_results.html.haml +17 -0
- data/vendor/extensions/assets/app/views/admin/assets/edit.html.haml +41 -0
- data/vendor/extensions/assets/app/views/admin/assets/index.html.haml +18 -0
- data/vendor/extensions/assets/app/views/admin/assets/new.html.haml +24 -0
- data/vendor/extensions/assets/app/views/admin/assets/remove.html.haml +16 -0
- data/vendor/extensions/assets/app/views/admin/configuration/_edit.html.haml +8 -0
- data/vendor/extensions/assets/app/views/admin/configuration/_show.html.haml +12 -0
- data/vendor/extensions/assets/app/views/admin/page_attachments/_attachment.html.haml +22 -0
- data/vendor/extensions/assets/app/views/admin/page_attachments/_new_attachment.html.haml +18 -0
- data/vendor/extensions/assets/app/views/admin/page_parts/_page_part.html.haml +20 -0
- data/vendor/extensions/assets/app/views/admin/pages/_asset_popups.html.haml +42 -0
- data/vendor/extensions/assets/app/views/admin/pages/_assets.html.haml +13 -0
- data/vendor/extensions/assets/app/views/admin/removed/_assets_bucket.html.haml +8 -0
- data/vendor/extensions/assets/app/views/admin/removed/_assets_container.html.haml +58 -0
- data/vendor/extensions/assets/app/views/admin/removed/_bucket.html.haml +11 -0
- data/vendor/extensions/assets/app/views/admin/removed/_bucket_asset.html.haml +9 -0
- data/vendor/extensions/assets/app/views/admin/removed/_show_bucket_link.html.haml +4 -0
- data/vendor/extensions/assets/app/views/admin/removed/_upload_to_page.html.haml +12 -0
- data/vendor/extensions/assets/app/views/admin/removed/bucket/_iframe.html.haml +1 -0
- data/vendor/extensions/assets/artwork/icons.png +0 -0
- data/vendor/extensions/assets/assets_extension.rb +86 -0
- data/vendor/extensions/assets/config/initializers/interpolation.rb +6 -0
- data/vendor/extensions/assets/config/initializers/radiant_config.rb +37 -0
- data/vendor/extensions/assets/config/locales/en.yml +105 -0
- data/vendor/extensions/assets/config/locales/nl.yml +105 -0
- data/vendor/extensions/assets/config/routes.rb +8 -0
- data/vendor/extensions/assets/db/migrate/001_create_assets.rb +12 -0
- data/vendor/extensions/assets/db/migrate/002_create_paperclip_attributes.rb +13 -0
- data/vendor/extensions/assets/db/migrate/003_create_user_observer.rb +13 -0
- data/vendor/extensions/assets/db/migrate/004_create_page_attachments.rb +19 -0
- data/vendor/extensions/assets/db/migrate/005_rename_users.rb +13 -0
- data/vendor/extensions/assets/db/migrate/20090316132151_disable_file_types.rb +20 -0
- data/vendor/extensions/assets/db/migrate/20110513205050_asset_uuid.rb +11 -0
- data/vendor/extensions/assets/lib/assets_admin_ui.rb +32 -0
- data/vendor/extensions/assets/lib/page_asset_associations.rb +13 -0
- data/vendor/extensions/assets/lib/paperclip/frame_grab.rb +39 -0
- data/vendor/extensions/assets/lib/tag_deprecation.rb +73 -0
- data/vendor/extensions/assets/lib/tasks/assets_extension_tasks.rake +123 -0
- data/vendor/extensions/assets/lib/tasks/paperclip_tasks.rake +79 -0
- 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/public/javascripts/admin/assets.js +238 -0
- data/vendor/extensions/assets/public/stylesheets/sass/admin/assets.sass +203 -0
- data/vendor/extensions/assets/spec/controllers/admin/assets_controller_spec.rb +50 -0
- data/vendor/extensions/assets/spec/controllers/admin/page_attachment_controller_spec.rb +51 -0
- data/vendor/extensions/assets/spec/datasets/assets_dataset.rb +31 -0
- data/vendor/extensions/assets/spec/lib/asset_tags_spec.rb +9 -0
- data/vendor/extensions/assets/spec/lib/tag_deprecation_spec.rb +49 -0
- data/vendor/extensions/assets/spec/models/asset_spec.rb +71 -0
- data/vendor/extensions/assets/spec/models/asset_type_spec.rb +49 -0
- data/vendor/extensions/assets/spec/spec.opts +6 -0
- data/vendor/extensions/assets/spec/spec_helper.rb +36 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets-2.bmml +453 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets-2.png +0 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets-3.bmml +454 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets-3.png +0 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets.bmml +433 -0
- data/vendor/extensions/assets/wireframes/edit-page-assets.png +0 -0
- data/vendor/extensions/assets/wireframes/edit-page.bmml +174 -0
- data/vendor/extensions/assets/wireframes/edit-page.png +0 -0
- data/vendor/extensions/debug/README +3 -0
- data/vendor/extensions/debug/Rakefile +136 -0
- data/{app → vendor/extensions/debug/app}/models/env_dump_page.rb +0 -0
- data/vendor/extensions/debug/config/locales/en.yml +3 -0
- data/vendor/extensions/debug/config/routes.rb +5 -0
- data/vendor/extensions/debug/debug_extension.rb +11 -0
- data/vendor/extensions/debug/lib/tasks/debug_extension_tasks.rake +55 -0
- data/{spec → vendor/extensions/debug/spec}/models/env_dump_page_spec.rb +0 -0
- data/vendor/extensions/debug/spec/spec.opts +6 -0
- data/vendor/extensions/debug/spec/spec_helper.rb +36 -0
- data/vendor/extensions/dutch_language_pack/config/locales/nl.yml +80 -29
- data/vendor/extensions/exporter/README +5 -0
- data/vendor/extensions/exporter/Rakefile +116 -0
- data/vendor/extensions/exporter/app/controllers/admin/export_controller.rb +5 -0
- data/vendor/extensions/exporter/app/models/radiant/exporter.rb +41 -0
- data/vendor/extensions/exporter/config/locales/en.yml +3 -0
- data/vendor/extensions/exporter/config/routes.rb +6 -0
- data/vendor/extensions/exporter/cucumber.yml +1 -0
- data/vendor/extensions/exporter/exporter_extension.rb +8 -0
- data/vendor/extensions/exporter/features/support/env.rb +16 -0
- data/vendor/extensions/exporter/features/support/paths.rb +14 -0
- data/vendor/extensions/exporter/lib/tasks/exporter_extension_tasks.rake +55 -0
- data/{spec → vendor/extensions/exporter/spec}/controllers/admin/export_controller_spec.rb +1 -1
- data/vendor/extensions/exporter/spec/models/radiant/exporter_spec.rb +29 -0
- data/vendor/extensions/exporter/spec/spec.opts +6 -0
- data/vendor/extensions/exporter/spec/spec_helper.rb +36 -0
- data/vendor/extensions/german_language_pack/config/locales/de.yml +52 -0
- data/vendor/extensions/japanese_language_pack/README +40 -1
- data/vendor/extensions/japanese_language_pack/config/locales/ja.yml +107 -71
- data/vendor/extensions/japanese_language_pack/config/locales/ja_available_tags.yml +327 -347
- data/vendor/extensions/japanese_language_pack/japanese_language_pack_extension.rb +3 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/CONTRIBUTERS +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/ChangeLog +1250 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/README +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/Rakefile +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/VERSION +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/bin/kramdown +5 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/data/kramdown/document.html +11 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/{default.less.css → default.scss.css} +18 -9
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.template +11 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/documentation.page +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/index.page +37 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/quickref.page +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/syntax.page +281 -187
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter.rb +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/html.rb +92 -90
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/kramdown.rb +421 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/latex.rb +311 -289
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/document.rb +10 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/options.rb +29 -15
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/base.rb +0 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/html.rb +153 -41
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown.rb +21 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/abbreviation.rb +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/attribute_list.rb +20 -12
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/autolink.rb +11 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/block_boundary.rb +46 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/blockquote.rb +7 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/codeblock.rb +5 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/escaped_chars.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/extension.rb +23 -8
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/footnote.rb +3 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/header.rb +11 -11
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html.rb +18 -16
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html_entity.rb +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/link.rb +13 -10
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/list.rb +48 -37
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/math.rb +15 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/paragraph.rb +14 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/table.rb +17 -9
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/typographic_symbol.rb +4 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils.rb +37 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/entities.rb +335 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/html.rb +75 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/ordered_hash.rb +79 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/version.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/man/man1/kramdown.1 +60 -36
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb +66 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/02_eob/middle.html +0 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.html +5 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.text +3 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html +4 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html.19 +30 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.html +34 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.text +20 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/with_code_blocks.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.html +4 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/whitespace.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.html +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/error.html.19 +7 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.html +0 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.text +0 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.html +1 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.html +39 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.text +29 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.html +5 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.html +0 -13
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.text +0 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.html +8 -31
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.text +2 -15
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_normal.html +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.html +40 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.text +42 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/typography.html.19 +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/invalid_html_1.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_raw.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_span.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html.19 +64 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/auto_id_and_ial.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/simple.html +4 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.html +6 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.text +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.html +5 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.html +5 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.kramdown +20 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.latex +13 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.text +11 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.html +0 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.text +0 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.html +12 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.text +8 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/simple.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.html +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.text +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/header.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/no_table.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.html +78 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.text +22 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.html +11 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.text +10 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.html +33 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.text +16 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.html +24 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.text +16 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/encoding.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/image_in_a.html +3 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.html +8 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html +11 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html.19 +46 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.text +11 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.html +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.text +4 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html.19 +35 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.latex +3 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.text +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/footnote_nr.latex +1 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/markers.latex +5 -14
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.html +5 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.text +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/comment.html +5 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/ignored.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/line_breaks/normal.latex +12 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html.19 +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html.19 +18 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.text +1 -1
- data/vendor/extensions/russian_language_pack/README +3 -1
- data/vendor/extensions/russian_language_pack/config/locales/ru.yml +28 -19
- data/vendor/extensions/russian_language_pack/config/locales/ru_available_tags.yml +6 -8
- data/vendor/extensions/russian_language_pack/lib/tasks/i18n_ru_extension_tasks.rake +4 -4
- data/vendor/extensions/russian_language_pack/russian_language_pack_extension.rb +4 -4
- data/vendor/extensions/sheets/LICENSE +21 -0
- data/vendor/extensions/sheets/README.md +33 -0
- data/vendor/extensions/sheets/Rakefile +117 -0
- data/vendor/extensions/sheets/app/controllers/admin/scripts_controller.rb +13 -0
- data/vendor/extensions/sheets/app/controllers/admin/sheet_resource_controller.rb +54 -0
- data/vendor/extensions/sheets/app/controllers/admin/styles_controller.rb +13 -0
- data/vendor/extensions/sheets/app/helpers/admin/scripts_helper.rb +5 -0
- data/vendor/extensions/sheets/app/helpers/admin/styles_helper.rb +5 -0
- data/vendor/extensions/sheets/app/models/javascript_page.rb +16 -0
- data/vendor/extensions/sheets/app/models/sheet.rb +89 -0
- data/vendor/extensions/sheets/app/models/stylesheet_page.rb +16 -0
- data/vendor/extensions/sheets/app/views/admin/scripts/edit.html.haml +30 -0
- data/vendor/extensions/sheets/app/views/admin/scripts/index.html.haml +27 -0
- data/vendor/extensions/sheets/app/views/admin/scripts/new.html.haml +30 -0
- data/vendor/extensions/sheets/app/views/admin/sheets/_edit_scripts.html.haml +40 -0
- data/vendor/extensions/sheets/app/views/admin/sheets/_upload_script.html.haml +16 -0
- data/vendor/extensions/sheets/app/views/admin/styles/edit.html.haml +30 -0
- data/vendor/extensions/sheets/app/views/admin/styles/index.html.haml +31 -0
- data/vendor/extensions/sheets/app/views/admin/styles/new.html.haml +30 -0
- data/vendor/extensions/sheets/config/locales/en.yml +15 -0
- data/vendor/extensions/sheets/config/routes.rb +6 -0
- data/vendor/extensions/sheets/cucumber.yml +1 -0
- data/vendor/extensions/sheets/features/support/env.rb +16 -0
- data/vendor/extensions/sheets/features/support/paths.rb +14 -0
- data/vendor/extensions/sheets/lib/javascript_tags.rb +58 -0
- data/vendor/extensions/sheets/lib/radiant-sheets-extension.rb +2 -0
- data/vendor/extensions/sheets/lib/radiant-sheets-extension/version.rb +3 -0
- data/vendor/extensions/sheets/lib/sass_filter.rb +16 -0
- data/vendor/extensions/sheets/lib/stylesheet_tags.rb +61 -0
- data/vendor/extensions/sheets/lib/tasks/sheets_extension_tasks.rake +79 -0
- data/vendor/extensions/sheets/public/images/admin/javascript.png +0 -0
- data/vendor/extensions/sheets/public/images/admin/stylesheet.png +0 -0
- data/vendor/extensions/sheets/radiant-sheets-extension.gemspec +24 -0
- data/vendor/extensions/sheets/sass.html +82 -0
- data/vendor/extensions/sheets/sheets_extension.rb +88 -0
- data/vendor/extensions/sheets/spec/controllers/admin/scripts_controller_spec.rb +123 -0
- data/vendor/extensions/sheets/spec/controllers/admin/styles_controller_spec.rb +124 -0
- data/vendor/extensions/sheets/spec/datasets/javascripts_dataset.rb +10 -0
- data/vendor/extensions/sheets/spec/datasets/stylesheets_dataset.rb +15 -0
- data/vendor/extensions/sheets/spec/helpers/admin/scripts_helper_spec.rb +5 -0
- data/vendor/extensions/sheets/spec/helpers/admin/styles_helper_spec.rb +5 -0
- data/vendor/extensions/sheets/spec/lib/javascript_tags_spec.rb +36 -0
- data/vendor/extensions/sheets/spec/lib/stylesheet_tags_spec.rb +41 -0
- data/vendor/extensions/sheets/spec/models/javascript_page_spec.rb +80 -0
- data/vendor/extensions/sheets/spec/models/page_spec.rb +5 -0
- data/vendor/extensions/sheets/spec/models/stylesheet_page_spec.rb +80 -0
- data/vendor/extensions/sheets/spec/spec.opts +6 -0
- data/vendor/extensions/sheets/spec/spec_helper.rb +36 -0
- data/vendor/extensions/site_templates/README +3 -0
- data/vendor/extensions/site_templates/Rakefile +136 -0
- data/{db → vendor/extensions/site_templates/db}/templates/empty.yml +0 -0
- data/vendor/extensions/site_templates/db/templates/roasters.yml +7826 -0
- data/vendor/extensions/site_templates/db/templates/simple-blog.yml +251 -0
- data/vendor/extensions/site_templates/db/templates/styled-blog.yml +535 -0
- data/vendor/extensions/site_templates/lib/tasks/site_templates_extension_tasks.rake +55 -0
- data/vendor/extensions/site_templates/public/images/roasters/banner.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/closelabel.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/comment.png +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/gallery1.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/gallery2.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/gallery3.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/gallery4.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/gift.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/green.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/nav-background.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/nav-divider.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/nextlabel.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/open.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/preview-1.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/preview.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/prevlabel.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/prize.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/recycle.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/rss.gif +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/thumb-grinder.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/thumb-grower.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/thumb-roaster.jpg +0 -0
- data/vendor/extensions/site_templates/public/images/roasters/truck.gif +0 -0
- data/vendor/extensions/site_templates/site_templates_extension.rb +8 -0
- data/vendor/extensions/textile_filter/textile.html +2 -2
- data/vendor/plugins/dataset/lib/dataset.rb +2 -2
- data/vendor/plugins/dataset/plugit/descriptor.rb +25 -0
- data/vendor/plugins/haml/README.md +95 -154
- data/vendor/plugins/haml/Rakefile +104 -91
- data/vendor/plugins/haml/TODO +26 -20
- data/vendor/plugins/haml/VERSION +1 -1
- data/vendor/plugins/haml/VERSION_NAME +1 -1
- data/vendor/plugins/haml/bin/css2sass +7 -1
- data/vendor/plugins/haml/bin/sass-convert +7 -0
- data/vendor/plugins/haml/doc-src/FAQ.md +16 -4
- data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md +536 -1
- data/vendor/plugins/haml/doc-src/HAML_REFERENCE.md +176 -16
- data/vendor/plugins/haml/doc-src/INDENTED_SYNTAX.md +210 -0
- data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md +1159 -0
- data/vendor/plugins/haml/doc-src/SASS_REFERENCE.md +1163 -633
- data/vendor/plugins/haml/doc-src/SCSS_FOR_SASS_USERS.md +155 -0
- data/vendor/plugins/haml/ext/extconf.rb +10 -0
- data/vendor/plugins/haml/extra/haml-mode.el +36 -34
- data/vendor/plugins/haml/extra/sass-mode.el +10 -9
- data/vendor/plugins/haml/haml.gemspec +8 -33
- data/vendor/plugins/haml/init.rbc +404 -0
- data/vendor/plugins/haml/lib/haml.rb +5 -2
- data/vendor/plugins/haml/lib/haml.rbc +569 -0
- data/vendor/plugins/haml/lib/haml/buffer.rb +22 -4
- data/vendor/plugins/haml/lib/haml/buffer.rbc +4048 -0
- data/vendor/plugins/haml/lib/haml/engine.rb +13 -4
- data/vendor/plugins/haml/lib/haml/engine.rbc +3852 -0
- data/vendor/plugins/haml/lib/haml/error.rbc +339 -0
- data/vendor/plugins/haml/lib/haml/exec.rb +456 -64
- data/vendor/plugins/haml/lib/haml/filters.rb +19 -1
- data/vendor/plugins/haml/lib/haml/filters.rbc +5617 -0
- data/vendor/plugins/haml/lib/haml/helpers.rb +40 -19
- data/vendor/plugins/haml/lib/haml/helpers.rbc +7086 -0
- data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rbc +522 -0
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +38 -12
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rbc +5515 -0
- data/vendor/plugins/haml/lib/haml/helpers/xss_mods.rb +13 -2
- data/vendor/plugins/haml/lib/haml/html.rb +209 -49
- data/vendor/plugins/haml/lib/haml/html/erb.rb +141 -0
- data/vendor/plugins/haml/lib/haml/precompiler.rb +130 -89
- data/vendor/plugins/haml/lib/haml/precompiler.rbc +22247 -0
- data/vendor/plugins/haml/lib/haml/railtie.rb +16 -13
- data/vendor/plugins/haml/lib/haml/railtie.rbc +409 -0
- data/vendor/plugins/haml/lib/haml/root.rb +7 -0
- data/vendor/plugins/haml/lib/haml/root.rbc +160 -0
- data/vendor/plugins/haml/lib/haml/shared.rbc +1137 -0
- data/vendor/plugins/haml/lib/haml/template.rb +13 -12
- data/vendor/plugins/haml/lib/haml/template.rbc +1838 -0
- data/vendor/plugins/haml/lib/haml/template/options.rb +16 -0
- data/vendor/plugins/haml/lib/haml/template/options.rbc +235 -0
- data/vendor/plugins/haml/lib/haml/template/plugin.rb +18 -6
- data/vendor/plugins/haml/lib/haml/template/plugin.rbc +2720 -0
- data/vendor/plugins/haml/lib/haml/util.rb +483 -44
- data/vendor/plugins/haml/lib/haml/util.rbc +12059 -0
- data/vendor/plugins/haml/lib/haml/util/subset_map.rb +101 -0
- data/vendor/plugins/haml/lib/haml/util/subset_map.rbc +1316 -0
- data/vendor/plugins/haml/lib/haml/version.rb +25 -2
- data/vendor/plugins/haml/lib/haml/version.rbc +1671 -0
- data/vendor/plugins/haml/lib/sass.rb +7 -2
- data/vendor/plugins/haml/lib/sass.rbc +492 -0
- data/vendor/plugins/haml/lib/sass/callbacks.rb +52 -0
- data/vendor/plugins/haml/lib/sass/callbacks.rbc +388 -0
- data/vendor/plugins/haml/lib/sass/css.rb +86 -196
- data/vendor/plugins/haml/lib/sass/engine.rb +304 -99
- data/vendor/plugins/haml/lib/sass/engine.rbc +17020 -0
- data/vendor/plugins/haml/lib/sass/environment.rb +67 -3
- data/vendor/plugins/haml/lib/sass/environment.rbc +1751 -0
- data/vendor/plugins/haml/lib/sass/error.rb +166 -25
- data/vendor/plugins/haml/lib/sass/error.rbc +2801 -0
- data/vendor/plugins/haml/lib/sass/files.rb +43 -38
- data/vendor/plugins/haml/lib/sass/files.rbc +3118 -0
- data/vendor/plugins/haml/lib/sass/less.rb +382 -0
- data/vendor/plugins/haml/lib/sass/plugin.rb +198 -150
- data/vendor/plugins/haml/lib/sass/plugin.rbc +4356 -0
- data/vendor/plugins/haml/lib/sass/plugin/configuration.rb +221 -0
- data/vendor/plugins/haml/lib/sass/plugin/configuration.rbc +1343 -0
- data/vendor/plugins/haml/lib/sass/plugin/generic.rb +15 -0
- data/vendor/plugins/haml/lib/sass/plugin/merb.rb +8 -20
- data/vendor/plugins/haml/lib/sass/plugin/rack.rb +2 -20
- data/vendor/plugins/haml/lib/sass/plugin/rack.rbc +446 -0
- data/vendor/plugins/haml/lib/sass/plugin/rails.rb +16 -9
- data/vendor/plugins/haml/lib/sass/plugin/rails.rbc +879 -0
- data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rb +123 -0
- data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rbc +2019 -0
- data/vendor/plugins/haml/lib/sass/repl.rb +1 -1
- data/vendor/plugins/haml/lib/sass/script.rb +32 -31
- data/vendor/plugins/haml/lib/sass/script.rbc +1188 -0
- data/vendor/plugins/haml/lib/sass/script/bool.rb +2 -1
- data/vendor/plugins/haml/lib/sass/script/bool.rbc +366 -0
- data/vendor/plugins/haml/lib/sass/script/color.rb +295 -26
- data/vendor/plugins/haml/lib/sass/script/color.rbc +8148 -0
- data/vendor/plugins/haml/lib/sass/script/css_lexer.rb +29 -0
- data/vendor/plugins/haml/lib/sass/script/css_lexer.rbc +809 -0
- data/vendor/plugins/haml/lib/sass/script/css_parser.rb +31 -0
- data/vendor/plugins/haml/lib/sass/script/css_parser.rbc +628 -0
- data/vendor/plugins/haml/lib/sass/script/funcall.rb +33 -6
- data/vendor/plugins/haml/lib/sass/script/funcall.rbc +1805 -0
- data/vendor/plugins/haml/lib/sass/script/functions.rb +637 -33
- data/vendor/plugins/haml/lib/sass/script/functions.rbc +8418 -0
- data/vendor/plugins/haml/lib/sass/script/interpolation.rb +70 -0
- data/vendor/plugins/haml/lib/sass/script/interpolation.rbc +1225 -0
- data/vendor/plugins/haml/lib/sass/script/lexer.rb +200 -57
- data/vendor/plugins/haml/lib/sass/script/lexer.rbc +7231 -0
- data/vendor/plugins/haml/lib/sass/script/literal.rb +69 -10
- data/vendor/plugins/haml/lib/sass/script/literal.rbc +3365 -0
- data/vendor/plugins/haml/lib/sass/script/node.rb +99 -1
- data/vendor/plugins/haml/lib/sass/script/node.rbc +1418 -0
- data/vendor/plugins/haml/lib/sass/script/number.rb +64 -24
- data/vendor/plugins/haml/lib/sass/script/number.rbc +6024 -0
- data/vendor/plugins/haml/lib/sass/script/operation.rb +53 -3
- data/vendor/plugins/haml/lib/sass/script/operation.rbc +1856 -0
- data/vendor/plugins/haml/lib/sass/script/parser.rb +229 -50
- data/vendor/plugins/haml/lib/sass/script/parser.rbc +8418 -0
- data/vendor/plugins/haml/lib/sass/script/string.rb +57 -2
- data/vendor/plugins/haml/lib/sass/script/string.rbc +1357 -0
- data/vendor/plugins/haml/lib/sass/script/string_interpolation.rb +93 -0
- data/vendor/plugins/haml/lib/sass/script/string_interpolation.rbc +1643 -0
- data/vendor/plugins/haml/lib/sass/script/unary_operation.rb +25 -2
- data/vendor/plugins/haml/lib/sass/script/unary_operation.rbc +1144 -0
- data/vendor/plugins/haml/lib/sass/script/variable.rb +22 -5
- data/vendor/plugins/haml/lib/sass/script/variable.rbc +844 -0
- data/vendor/plugins/haml/lib/sass/scss.rb +17 -0
- data/vendor/plugins/haml/lib/sass/scss.rbc +242 -0
- data/vendor/plugins/haml/lib/sass/scss/css_parser.rb +46 -0
- data/vendor/plugins/haml/lib/sass/scss/css_parser.rbc +1106 -0
- data/vendor/plugins/haml/lib/sass/scss/parser.rb +846 -0
- data/vendor/plugins/haml/lib/sass/scss/parser.rbc +19348 -0
- data/vendor/plugins/haml/lib/sass/scss/rx.rb +126 -0
- data/vendor/plugins/haml/lib/sass/scss/rx.rbc +2849 -0
- data/vendor/plugins/haml/lib/sass/scss/sass_parser.rb +11 -0
- data/vendor/plugins/haml/lib/sass/scss/sass_parser.rbc +287 -0
- data/vendor/plugins/haml/lib/sass/scss/script_lexer.rb +15 -0
- data/vendor/plugins/haml/lib/sass/scss/script_lexer.rbc +439 -0
- data/vendor/plugins/haml/lib/sass/scss/script_parser.rb +25 -0
- data/vendor/plugins/haml/lib/sass/scss/script_parser.rbc +482 -0
- data/vendor/plugins/haml/lib/sass/scss/static_parser.rb +40 -0
- data/vendor/plugins/haml/lib/sass/scss/static_parser.rbc +971 -0
- data/vendor/plugins/haml/lib/sass/selector.rb +361 -0
- data/vendor/plugins/haml/lib/sass/selector.rbc +4193 -0
- data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rb +62 -0
- data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rbc +798 -0
- data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rb +82 -0
- data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rbc +1814 -0
- data/vendor/plugins/haml/lib/sass/selector/sequence.rb +237 -0
- data/vendor/plugins/haml/lib/sass/selector/sequence.rbc +4928 -0
- data/vendor/plugins/haml/lib/sass/selector/simple.rb +113 -0
- data/vendor/plugins/haml/lib/sass/selector/simple.rbc +1553 -0
- data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rb +136 -0
- data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rbc +2346 -0
- data/vendor/plugins/haml/lib/sass/tree/charset_node.rb +37 -0
- data/vendor/plugins/haml/lib/sass/tree/charset_node.rbc +606 -0
- data/vendor/plugins/haml/lib/sass/tree/comment_node.rb +71 -27
- data/vendor/plugins/haml/lib/sass/tree/comment_node.rbc +2397 -0
- data/vendor/plugins/haml/lib/sass/tree/debug_node.rb +8 -2
- data/vendor/plugins/haml/lib/sass/tree/debug_node.rbc +740 -0
- data/vendor/plugins/haml/lib/sass/tree/directive_node.rb +44 -37
- data/vendor/plugins/haml/lib/sass/tree/directive_node.rbc +1302 -0
- data/vendor/plugins/haml/lib/sass/tree/extend_node.rb +65 -0
- data/vendor/plugins/haml/lib/sass/tree/extend_node.rbc +1276 -0
- data/vendor/plugins/haml/lib/sass/tree/for_node.rb +19 -0
- data/vendor/plugins/haml/lib/sass/tree/for_node.rbc +1145 -0
- data/vendor/plugins/haml/lib/sass/tree/if_node.rb +26 -0
- data/vendor/plugins/haml/lib/sass/tree/if_node.rbc +1119 -0
- data/vendor/plugins/haml/lib/sass/tree/import_node.rb +64 -27
- data/vendor/plugins/haml/lib/sass/tree/import_node.rbc +2242 -0
- data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rb +31 -0
- data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rbc +1001 -0
- data/vendor/plugins/haml/lib/sass/tree/mixin_node.rb +82 -7
- data/vendor/plugins/haml/lib/sass/tree/mixin_node.rbc +3355 -0
- data/vendor/plugins/haml/lib/sass/tree/node.rb +291 -77
- data/vendor/plugins/haml/lib/sass/tree/node.rbc +5533 -0
- data/vendor/plugins/haml/lib/sass/tree/prop_node.rb +157 -58
- data/vendor/plugins/haml/lib/sass/tree/prop_node.rbc +3949 -0
- data/vendor/plugins/haml/lib/sass/tree/root_node.rb +157 -0
- data/vendor/plugins/haml/lib/sass/tree/root_node.rbc +3112 -0
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +178 -137
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rbc +5636 -0
- data/vendor/plugins/haml/lib/sass/tree/variable_node.rb +10 -5
- data/vendor/plugins/haml/lib/sass/tree/variable_node.rbc +845 -0
- data/vendor/plugins/haml/lib/sass/tree/warn_node.rb +42 -0
- data/vendor/plugins/haml/lib/sass/tree/warn_node.rbc +1043 -0
- data/vendor/plugins/haml/lib/sass/tree/while_node.rb +17 -0
- data/vendor/plugins/haml/lib/sass/tree/while_node.rbc +722 -0
- data/vendor/plugins/haml/test/benchmark.rb +5 -5
- data/vendor/plugins/haml/test/haml/engine_test.rb +530 -19
- data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_1.rhtml → erb/_av_partial_1.erb} +1 -1
- data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_2.rhtml → erb/_av_partial_2.erb} +1 -1
- data/vendor/plugins/haml/test/haml/{rhtml/action_view.rhtml → erb/action_view.erb} +1 -1
- data/vendor/plugins/haml/test/haml/{rhtml/standard.rhtml → erb/standard.erb} +0 -0
- data/vendor/plugins/haml/test/haml/helper_test.rb +124 -7
- data/vendor/plugins/haml/test/haml/html2haml/erb_tests.rb +426 -0
- data/vendor/plugins/haml/test/haml/html2haml_test.rb +250 -66
- data/vendor/plugins/haml/test/haml/results/filters.xhtml +1 -1
- data/vendor/plugins/haml/test/haml/results/helpers.xhtml +0 -23
- data/vendor/plugins/haml/test/haml/results/just_stuff.xhtml +2 -0
- data/vendor/plugins/haml/test/haml/spec/LICENSE +14 -0
- data/vendor/plugins/haml/test/haml/spec/README.md +106 -0
- data/vendor/plugins/haml/test/haml/spec/lua_haml_spec.lua +38 -0
- data/vendor/plugins/haml/test/haml/spec/perl_haml_test.pl +81 -0
- data/vendor/plugins/haml/test/haml/spec/ruby_haml_test.rb +19 -0
- data/vendor/plugins/haml/test/haml/spec/tests.json +603 -0
- data/vendor/plugins/haml/test/haml/spec_test.rb +44 -0
- data/vendor/plugins/haml/test/haml/template_test.rb +33 -3
- data/vendor/plugins/haml/test/haml/templates/helpers.haml +0 -66
- data/vendor/plugins/haml/test/haml/templates/just_stuff.haml +2 -0
- data/vendor/plugins/haml/test/haml/util/subset_map_test.rb +91 -0
- data/vendor/plugins/haml/test/haml/util_test.rb +161 -0
- data/vendor/plugins/haml/test/linked_rails.rb +22 -1
- data/vendor/plugins/haml/test/sass/callbacks_test.rb +61 -0
- data/vendor/plugins/haml/test/sass/conversion_test.rb +1218 -0
- data/vendor/plugins/haml/test/sass/css2sass_test.rb +130 -18
- data/vendor/plugins/haml/test/sass/data/hsl-rgb.txt +319 -0
- data/vendor/plugins/haml/test/sass/engine_test.rb +1427 -139
- data/vendor/plugins/haml/test/sass/extend_test.rb +1348 -0
- data/vendor/plugins/haml/test/sass/functions_test.rb +429 -47
- data/vendor/plugins/haml/test/sass/less_conversion_test.rb +653 -0
- data/vendor/plugins/haml/test/sass/more_results/more_import.css +1 -1
- data/vendor/plugins/haml/test/sass/more_templates/more_import.sass +3 -3
- data/vendor/plugins/haml/test/sass/plugin_test.rb +246 -56
- data/vendor/plugins/haml/test/sass/results/compact.css +1 -1
- data/vendor/plugins/haml/test/sass/results/complex.css +5 -6
- data/vendor/plugins/haml/test/sass/results/compressed.css +1 -1
- data/vendor/plugins/haml/test/sass/results/expanded.css +1 -1
- data/vendor/plugins/haml/test/sass/results/import.css +3 -1
- data/vendor/plugins/haml/test/sass/results/import_charset.css +4 -0
- data/vendor/plugins/haml/test/sass/results/import_charset_1_8.css +4 -0
- data/vendor/plugins/haml/test/sass/results/import_charset_ibm866.css +4 -0
- data/vendor/plugins/haml/test/sass/results/mixins.css +12 -12
- data/vendor/plugins/haml/test/sass/results/nested.css +1 -1
- data/vendor/plugins/haml/test/sass/results/options.css +1 -0
- data/vendor/plugins/haml/test/sass/results/parent_ref.css +4 -4
- data/vendor/plugins/haml/test/sass/results/script.css +4 -4
- data/vendor/plugins/haml/test/sass/results/scss_import.css +31 -0
- data/vendor/plugins/haml/test/sass/results/scss_importee.css +2 -0
- data/vendor/plugins/haml/test/sass/results/warn.css +0 -0
- data/vendor/plugins/haml/test/sass/results/warn_imported.css +0 -0
- data/vendor/plugins/haml/test/sass/script_conversion_test.rb +314 -0
- data/vendor/plugins/haml/test/sass/script_test.rb +281 -78
- data/vendor/plugins/haml/test/sass/scss/css_test.rb +916 -0
- data/vendor/plugins/haml/test/sass/scss/rx_test.rb +156 -0
- data/vendor/plugins/haml/test/sass/scss/scss_test.rb +1088 -0
- data/vendor/plugins/haml/test/sass/scss/test_helper.rb +37 -0
- data/vendor/plugins/haml/test/sass/templates/_imported_charset_ibm866.sass +4 -0
- data/vendor/plugins/haml/test/sass/templates/_imported_charset_utf8.sass +4 -0
- data/vendor/plugins/haml/test/sass/templates/alt.sass +2 -2
- data/vendor/plugins/haml/test/sass/templates/basic.sass +1 -1
- data/vendor/plugins/haml/test/sass/templates/bork1.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/bork3.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/bork4.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/complex.sass +0 -2
- data/vendor/plugins/haml/test/sass/templates/import.sass +5 -4
- data/vendor/plugins/haml/test/sass/templates/import_charset.sass +7 -0
- data/vendor/plugins/haml/test/sass/templates/import_charset_1_8.sass +4 -0
- data/vendor/plugins/haml/test/sass/templates/import_charset_ibm866.sass +9 -0
- data/vendor/plugins/haml/test/sass/templates/importee.less +2 -0
- data/vendor/plugins/haml/test/sass/templates/importee.sass +3 -3
- data/vendor/plugins/haml/test/sass/templates/line_numbers.sass +1 -1
- data/vendor/plugins/haml/test/sass/templates/mixin_bork.sass +5 -0
- data/vendor/plugins/haml/test/sass/templates/mixins.sass +2 -2
- data/vendor/plugins/haml/test/sass/templates/nested_bork1.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/nested_bork2.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/nested_bork3.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/nested_bork4.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/nested_mixin_bork.sass +6 -0
- data/vendor/plugins/haml/test/sass/templates/options.sass +2 -0
- data/vendor/plugins/haml/test/sass/templates/parent_ref.sass +2 -2
- data/vendor/plugins/haml/test/sass/templates/script.sass +69 -69
- data/vendor/plugins/haml/test/sass/templates/scss_import.scss +11 -0
- data/vendor/plugins/haml/test/sass/templates/scss_importee.scss +1 -0
- data/vendor/plugins/haml/test/sass/templates/units.sass +10 -10
- data/vendor/plugins/haml/test/sass/templates/warn.sass +3 -0
- data/vendor/plugins/haml/test/sass/templates/warn_imported.sass +4 -0
- data/vendor/plugins/haml/test/test_helper.rb +52 -4
- data/vendor/plugins/haml/vendor/fssm/LICENSE +20 -0
- data/vendor/plugins/haml/vendor/fssm/README.markdown +55 -0
- data/vendor/plugins/haml/vendor/fssm/Rakefile +59 -0
- data/vendor/plugins/haml/vendor/fssm/VERSION.yml +5 -0
- data/vendor/plugins/haml/vendor/fssm/example.rb +9 -0
- data/vendor/plugins/haml/vendor/fssm/fssm.gemspec +77 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm.rb +33 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/fsevents.rb +36 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/inotify.rb +26 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/polling.rb +25 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +131 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/monitor.rb +26 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/path.rb +91 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/pathname.rb +502 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/directory.rb +57 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/file.rb +24 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/support.rb +63 -0
- data/vendor/plugins/haml/vendor/fssm/lib/fssm/tree.rb +176 -0
- data/vendor/plugins/haml/vendor/fssm/profile/prof-cache.rb +40 -0
- data/vendor/plugins/haml/vendor/fssm/profile/prof-fssm-pathname.html +1231 -0
- data/vendor/plugins/haml/vendor/fssm/profile/prof-pathname.rb +68 -0
- data/vendor/plugins/haml/vendor/fssm/profile/prof-plain-pathname.html +988 -0
- data/vendor/plugins/haml/vendor/fssm/profile/prof.html +2379 -0
- data/vendor/plugins/haml/vendor/fssm/spec/path_spec.rb +75 -0
- 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 +14 -0
- data/vendor/plugins/haml/yard/callbacks.rb +29 -0
- data/vendor/plugins/haml/yard/default/fulldoc/html/css/common.sass +5 -1
- data/vendor/rails/Rakefile +83 -0
- data/vendor/rails/actionmailer/CHANGELOG +3 -4
- data/vendor/rails/actionmailer/Rakefile +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/base.rb +34 -1
- data/vendor/rails/actionmailer/lib/action_mailer/helpers.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak +1 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~ +10 -0
- data/vendor/rails/actionpack/CHANGELOG +11 -0
- data/vendor/rails/actionpack/Rakefile +1 -1
- data/vendor/rails/actionpack/lib/action_controller/base.rb +4 -2
- data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/cookies.rb +8 -2
- data/vendor/rails/actionpack/lib/action_controller/integration.rb +19 -7
- data/vendor/rails/actionpack/lib/action_controller/request.rb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb +9 -6
- data/vendor/rails/actionpack/lib/action_controller/rescue.rb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/resources.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/routing.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/routing/route.rb +3 -3
- data/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +143 -55
- data/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +48 -35
- data/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb +10 -1
- data/vendor/rails/actionpack/lib/action_controller/test_process.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +11 -1
- data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers.rb +2 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +1 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/csrf_helper.rb +14 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +21 -14
- data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +3 -3
- data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +27 -17
- data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +2 -1
- data/vendor/rails/actionpack/lib/action_view/locale/en.yml +14 -14
- data/vendor/rails/actionpack/lib/action_view/renderable_partial.rb +7 -1
- data/vendor/rails/actionpack/lib/action_view/template.rb +2 -2
- data/vendor/rails/actionpack/test/abstract_unit.rb +17 -0
- data/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb +65 -18
- data/vendor/rails/actionpack/test/controller/cookie_test.rb +38 -0
- data/vendor/rails/actionpack/test/controller/integration_test.rb +44 -0
- data/vendor/rails/actionpack/test/controller/reloader_test.rb +1 -0
- data/vendor/rails/actionpack/test/controller/render_test.rb +12 -0
- data/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb +15 -0
- data/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb +92 -124
- data/vendor/rails/actionpack/test/controller/rescue_test.rb +5 -6
- data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +101 -7
- data/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb +71 -11
- data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +9 -3
- data/vendor/rails/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb +10 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world.erb~ +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.en.html.erb~ +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.erb~ +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.html.erb~ +1 -0
- data/vendor/rails/actionpack/test/template/form_options_helper_test.rb +4 -0
- data/vendor/rails/actionpack/test/template/text_helper_test.rb +47 -18
- data/vendor/rails/actionpack/test/template/url_helper_test.rb +4 -4
- data/vendor/rails/activemodel/CHANGES +12 -0
- data/vendor/rails/activemodel/README +21 -0
- data/vendor/rails/activemodel/Rakefile +24 -0
- data/vendor/rails/activemodel/lib/active_model.rb +5 -0
- data/vendor/rails/activemodel/lib/active_model/base.rb +8 -0
- data/vendor/rails/activemodel/lib/active_model/callbacks.rb +7 -0
- data/vendor/rails/activemodel/lib/active_model/core.rb +7 -0
- data/vendor/rails/activemodel/lib/active_model/deprecated_error_methods.rb +38 -0
- data/vendor/rails/activemodel/lib/active_model/errors.rb +82 -0
- data/vendor/rails/activemodel/lib/active_model/observing.rb +98 -0
- data/vendor/rails/activemodel/lib/active_model/state_machine.rb +68 -0
- data/vendor/rails/activemodel/lib/active_model/state_machine/event.rb +64 -0
- data/vendor/rails/activemodel/lib/active_model/state_machine/machine.rb +78 -0
- data/vendor/rails/activemodel/lib/active_model/state_machine/state.rb +47 -0
- data/vendor/rails/activemodel/lib/active_model/state_machine/state_transition.rb +40 -0
- data/vendor/rails/activemodel/lib/active_model/validations.rb +126 -0
- data/vendor/rails/activemodel/lib/active_model/validations/acceptance.rb +45 -0
- data/vendor/rails/activemodel/lib/active_model/validations/associated.rb +46 -0
- data/vendor/rails/activemodel/lib/active_model/validations/confirmation.rb +44 -0
- data/vendor/rails/activemodel/lib/active_model/validations/exclusion.rb +37 -0
- data/vendor/rails/activemodel/lib/active_model/validations/format.rb +39 -0
- data/vendor/rails/activemodel/lib/active_model/validations/inclusion.rb +37 -0
- data/vendor/rails/activemodel/lib/active_model/validations/length.rb +95 -0
- data/vendor/rails/activemodel/lib/active_model/validations/numericality.rb +80 -0
- data/vendor/rails/activemodel/lib/active_model/validations/presence.rb +42 -0
- data/vendor/rails/activemodel/lib/active_model/validations/uniqueness.rb +104 -0
- data/vendor/rails/activemodel/test/observing_test.rb +121 -0
- data/vendor/rails/activemodel/test/state_machine/event_test.rb +49 -0
- data/vendor/rails/activemodel/test/state_machine/machine_test.rb +43 -0
- data/vendor/rails/activemodel/test/state_machine/state_test.rb +72 -0
- data/vendor/rails/activemodel/test/state_machine/state_transition_test.rb +84 -0
- data/vendor/rails/activemodel/test/state_machine_test.rb +312 -0
- data/vendor/rails/activemodel/test/test_helper.rb +21 -0
- data/vendor/rails/activerecord/CHANGELOG +5 -2
- data/vendor/rails/activerecord/MIT-LICENSE +20 -0
- data/vendor/rails/activerecord/Rakefile +1 -1
- data/vendor/rails/activerecord/examples/performance.rb +39 -3
- data/vendor/rails/activerecord/lib/active_record/association_preload.rb +12 -2
- data/vendor/rails/activerecord/lib/active_record/associations.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +60 -6
- data/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +0 -4
- data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/base.rb +28 -16
- data/vendor/rails/activerecord/lib/active_record/calculations.rb +19 -12
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +3 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +6 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +2 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +2 -1
- data/vendor/rails/activerecord/lib/active_record/dirty.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/locale/en.yml +11 -11
- data/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb +1 -0
- data/vendor/rails/activerecord/lib/active_record/migration.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/named_scope.rb +15 -10
- data/vendor/rails/activerecord/lib/active_record/serialization.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/session_store.rb +9 -1
- data/vendor/rails/activerecord/lib/active_record/validations.rb +12 -12
- data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
- data/vendor/rails/activerecord/test/cases/adapter_test.rb +7 -8
- data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +7 -7
- data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_polymorphic_include.rb +19 -0
- data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +12 -0
- data/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +5 -0
- data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +108 -4
- data/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +14 -0
- data/vendor/rails/activerecord/test/cases/associations_test.rb +10 -0
- data/vendor/rails/activerecord/test/cases/base_test.rb +35 -75
- data/vendor/rails/activerecord/test/cases/calculations_test.rb +13 -0
- data/vendor/rails/activerecord/test/cases/connection_test_mysql.rb +1 -0
- data/vendor/rails/activerecord/test/cases/counter_cache_test.rb +84 -0
- data/vendor/rails/activerecord/test/cases/locking_test.rb +2 -1
- data/vendor/rails/activerecord/test/cases/migration_test.rb +11 -0
- data/vendor/rails/activerecord/test/cases/named_scope_test.rb +12 -1
- data/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +28 -1
- data/vendor/rails/activerecord/test/cases/reflection_test.rb +5 -5
- data/vendor/rails/activerecord/test/cases/sp_test_mysql.rb +16 -0
- data/vendor/rails/activerecord/test/cases/transactions_test.rb +22 -1
- data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +12 -12
- data/vendor/rails/activerecord/test/cases/validations_test.rb +42 -30
- data/vendor/rails/activerecord/test/fixtures/polymorphic_designs.yml +19 -0
- data/vendor/rails/activerecord/test/fixtures/polymorphic_prices.yml +19 -0
- data/vendor/rails/activerecord/test/fixtures/tees.yml +4 -0
- data/vendor/rails/activerecord/test/fixtures/ties.yml +4 -0
- data/vendor/rails/activerecord/test/models/author.rb +2 -0
- data/vendor/rails/activerecord/test/models/company.rb +2 -0
- data/vendor/rails/activerecord/test/models/event_author.rb +3 -0
- data/vendor/rails/activerecord/test/models/pirate.rb +2 -2
- data/vendor/rails/activerecord/test/models/polymorphic_design.rb +3 -0
- data/vendor/rails/activerecord/test/models/polymorphic_price.rb +3 -0
- data/vendor/rails/activerecord/test/models/post.rb +2 -0
- data/vendor/rails/activerecord/test/models/tee.rb +4 -0
- data/vendor/rails/activerecord/test/models/tie.rb +4 -0
- data/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb +7 -0
- data/vendor/rails/activerecord/test/schema/schema.rb +16 -0
- data/vendor/rails/activeresource/CHANGELOG +3 -4
- data/vendor/rails/activeresource/MIT-LICENSE +20 -0
- data/vendor/rails/activeresource/Rakefile +1 -1
- data/vendor/rails/activeresource/lib/active_resource/http_mock.rb +104 -9
- data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
- data/vendor/rails/activeresource/test/http_mock_test.rb +155 -0
- data/vendor/rails/activesupport/CHANGELOG +16 -0
- data/vendor/rails/activesupport/MIT-LICENSE +20 -0
- data/vendor/rails/activesupport/Rakefile +175 -0
- data/vendor/rails/activesupport/bin/generate_tables +147 -0
- data/vendor/rails/activesupport/install.rb +30 -0
- data/vendor/rails/activesupport/lib/active_support/basic_object.rb +7 -10
- data/vendor/rails/activesupport/lib/active_support/buffered_logger.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/grouping.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/random_access.rb +24 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/class.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute.rb +67 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb +13 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/remove_method.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb +3 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb +0 -11
- data/vendor/rails/activesupport/lib/active_support/dependencies.rb +38 -12
- data/vendor/rails/activesupport/lib/active_support/deprecation.rb +7 -0
- data/vendor/rails/activesupport/lib/active_support/json/backends/yajl.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/locale/en.yml +4 -1
- data/vendor/rails/activesupport/lib/active_support/memoizable.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/testing/performance.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb +2 -2
- data/vendor/rails/activesupport/lib/active_support/values/time_zone.rb +5 -1
- data/vendor/rails/activesupport/lib/active_support/vendor.rb +2 -2
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n.rb +92 -105
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend.rb +5 -4
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb +61 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/missing.rb +4 -6
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/store_procs.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/translation.rb +8 -3
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/base.rb +55 -84
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cache.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cascade.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/chain.rb +3 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cldr.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/fallbacks.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb +113 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/gettext.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/interpolation_compiler.rb +8 -4
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb +102 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb +48 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/metadata.rb +5 -13
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/pluralization.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb +87 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb +98 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb +84 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb +28 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/core_ext/string/interpolate.rb +3 -4
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/exceptions.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7/i18n/helpers/gettext.rb → i18n-0.4.1/i18n/gettext/helpers.rb} +2 -2
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext/po_parser.rb +7 -7
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/fallbacks.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/parents.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/rfc4646.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/simple.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb +3 -0
- data/vendor/rails/activesupport/lib/active_support/version.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/whiny_nil.rb +1 -1
- data/vendor/rails/activesupport/test/abstract_unit.rb +37 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/b.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/d.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/e/f.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/application.rb +1 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder.rb +3 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb +3 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb +7 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/conflict.rb +1 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/counting_loader.rb +5 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/cross_site_dependency.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/e.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb +4 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb +1 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/multiple_constant_file.rb +2 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/raises_name_error.rb +3 -0
- data/vendor/rails/activesupport/test/autoloading_fixtures/raises_no_method_error.rb +3 -0
- data/vendor/rails/activesupport/test/buffered_logger_test.rb +146 -0
- data/vendor/rails/activesupport/test/caching_test.rb +355 -0
- data/vendor/rails/activesupport/test/callbacks_test.rb +188 -0
- data/vendor/rails/activesupport/test/clean_backtrace_test.rb +47 -0
- data/vendor/rails/activesupport/test/clean_logger_test.rb +57 -0
- data/vendor/rails/activesupport/test/core_ext/array_ext_test.rb +394 -0
- data/vendor/rails/activesupport/test/core_ext/base64_ext_test.rb +8 -0
- data/vendor/rails/activesupport/test/core_ext/bigdecimal.rb +10 -0
- data/vendor/rails/activesupport/test/core_ext/blank_test.rb +21 -0
- data/vendor/rails/activesupport/test/core_ext/cgi_ext_test.rb +14 -0
- data/vendor/rails/activesupport/test/core_ext/class/attribute_accessor_test.rb +38 -0
- data/vendor/rails/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb +224 -0
- data/vendor/rails/activesupport/test/core_ext/class/delegating_attributes_test.rb +115 -0
- data/vendor/rails/activesupport/test/core_ext/class_test.rb +46 -0
- data/vendor/rails/activesupport/test/core_ext/date_ext_test.rb +286 -0
- data/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb +363 -0
- data/vendor/rails/activesupport/test/core_ext/duplicable_test.rb +22 -0
- data/vendor/rails/activesupport/test/core_ext/duration_test.rb +121 -0
- data/vendor/rails/activesupport/test/core_ext/enumerable_test.rb +102 -0
- data/vendor/rails/activesupport/test/core_ext/exception_test.rb +68 -0
- data/vendor/rails/activesupport/test/core_ext/file_test.rb +67 -0
- data/vendor/rails/activesupport/test/core_ext/float_ext_test.rb +25 -0
- data/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb +1016 -0
- data/vendor/rails/activesupport/test/core_ext/integer_ext_test.rb +37 -0
- data/vendor/rails/activesupport/test/core_ext/kernel_test.rb +43 -0
- data/vendor/rails/activesupport/test/core_ext/load_error_test.rb +16 -0
- data/vendor/rails/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb +30 -0
- data/vendor/rails/activesupport/test/core_ext/module/attr_internal_test.rb +52 -0
- data/vendor/rails/activesupport/test/core_ext/module/attribute_accessor_test.rb +39 -0
- data/vendor/rails/activesupport/test/core_ext/module/attribute_aliasing_test.rb +58 -0
- data/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb +27 -0
- data/vendor/rails/activesupport/test/core_ext/module/synchronization_test.rb +86 -0
- data/vendor/rails/activesupport/test/core_ext/module_test.rb +363 -0
- data/vendor/rails/activesupport/test/core_ext/name_error_test.rb +20 -0
- data/vendor/rails/activesupport/test/core_ext/numeric_ext_test.rb +168 -0
- data/vendor/rails/activesupport/test/core_ext/object_and_class_ext_test.rb +294 -0
- data/vendor/rails/activesupport/test/core_ext/object_ext_test.rb +8 -0
- data/vendor/rails/activesupport/test/core_ext/pathname_test.rb +9 -0
- data/vendor/rails/activesupport/test/core_ext/proc_test.rb +11 -0
- data/vendor/rails/activesupport/test/core_ext/range_ext_test.rb +63 -0
- data/vendor/rails/activesupport/test/core_ext/string_ext_test.rb +402 -0
- data/vendor/rails/activesupport/test/core_ext/symbol_test.rb +9 -0
- data/vendor/rails/activesupport/test/core_ext/time_ext_test.rb +771 -0
- data/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb +851 -0
- data/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb +12 -0
- data/vendor/rails/activesupport/test/dependencies/check_warnings.rb +2 -0
- data/vendor/rails/activesupport/test/dependencies/conflict.rb +1 -0
- data/vendor/rails/activesupport/test/dependencies/cross_site_depender.rb +3 -0
- data/vendor/rails/activesupport/test/dependencies/mutual_one.rb +4 -0
- data/vendor/rails/activesupport/test/dependencies/mutual_two.rb +4 -0
- data/vendor/rails/activesupport/test/dependencies/raises_exception.rb +3 -0
- data/vendor/rails/activesupport/test/dependencies/requires_nonexistent0.rb +1 -0
- data/vendor/rails/activesupport/test/dependencies/requires_nonexistent1.rb +1 -0
- data/vendor/rails/activesupport/test/dependencies/service_one.rb +5 -0
- data/vendor/rails/activesupport/test/dependencies/service_two.rb +2 -0
- data/vendor/rails/activesupport/test/dependencies_test.rb +789 -0
- data/vendor/rails/activesupport/test/deprecation/proxy_wrappers_test.rb +22 -0
- data/vendor/rails/activesupport/test/deprecation_test.rb +167 -0
- data/vendor/rails/activesupport/test/empty_bool.rb +7 -0
- data/vendor/rails/activesupport/test/flush_cache_on_private_memoization_test.rb +43 -0
- data/vendor/rails/activesupport/test/gzip_test.rb +7 -0
- data/vendor/rails/activesupport/test/i18n_test.rb +98 -0
- data/vendor/rails/activesupport/test/inflector_test.rb +298 -0
- data/vendor/rails/activesupport/test/inflector_test_cases.rb +262 -0
- data/vendor/rails/activesupport/test/json/decoding_test.rb +79 -0
- data/vendor/rails/activesupport/test/json/encoding_test.rb +162 -0
- data/vendor/rails/activesupport/test/memoizable_test.rb +261 -0
- data/vendor/rails/activesupport/test/message_encryptor_test.rb +55 -0
- data/vendor/rails/activesupport/test/message_verifier_test.rb +31 -0
- data/vendor/rails/activesupport/test/multibyte_chars_test.rb +606 -0
- data/vendor/rails/activesupport/test/multibyte_conformance.rb +129 -0
- data/vendor/rails/activesupport/test/multibyte_test_helpers.rb +19 -0
- data/vendor/rails/activesupport/test/multibyte_unicode_database_test.rb +22 -0
- data/vendor/rails/activesupport/test/multibyte_utils_test.rb +137 -0
- data/vendor/rails/activesupport/test/option_merger_test.rb +85 -0
- data/vendor/rails/activesupport/test/ordered_hash_test.rb +237 -0
- data/vendor/rails/activesupport/test/ordered_options_test.rb +53 -0
- data/vendor/rails/activesupport/test/rescuable_test.rb +75 -0
- data/vendor/rails/activesupport/test/safe_buffer_test.rb +36 -0
- data/vendor/rails/activesupport/test/secure_random_test.rb +19 -0
- data/vendor/rails/activesupport/test/string_inquirer_test.rb +15 -0
- data/vendor/rails/activesupport/test/test_case_test.rb +57 -0
- data/vendor/rails/activesupport/test/test_test.rb +188 -0
- data/vendor/rails/activesupport/test/time_zone_test.rb +285 -0
- data/vendor/rails/activesupport/test/whiny_nil_test.rb +50 -0
- data/vendor/rails/activesupport/test/xml_mini/jdom_engine_test.rb +153 -0
- data/vendor/rails/activesupport/test/xml_mini/libxml_engine_test.rb +204 -0
- data/vendor/rails/activesupport/test/xml_mini/libxmlsax_engine_test.rb +181 -0
- data/vendor/rails/activesupport/test/xml_mini/nokogiri_engine_test.rb +204 -0
- data/vendor/rails/activesupport/test/xml_mini/nokogirisax_engine_test.rb +217 -0
- data/vendor/rails/activesupport/test/xml_mini/rexml_engine_test.rb +15 -0
- data/vendor/rails/railties/CHANGELOG +7 -2
- data/vendor/rails/railties/Rakefile +6 -7
- data/vendor/rails/railties/builtin/rails_info/rails/info.rb +1 -1
- data/vendor/rails/railties/environments/boot.rb +6 -2
- data/vendor/rails/railties/environments/environment.rb +1 -1
- data/vendor/rails/railties/guides/rails_guides.rb +13 -24
- data/vendor/rails/railties/guides/rails_guides/generator.rb +169 -49
- data/vendor/rails/railties/guides/rails_guides/indexer.rb +24 -11
- data/vendor/rails/railties/guides/rails_guides/levenshtein.rb +31 -0
- data/vendor/rails/railties/guides/source/action_mailer_basics.textile +29 -12
- data/vendor/rails/railties/guides/source/{credits.erb.textile → credits.html.erb} +4 -4
- data/vendor/rails/railties/guides/source/{index.erb.textile → index.html.erb} +13 -12
- data/vendor/rails/railties/guides/source/plugins.textile +1 -1
- data/vendor/rails/railties/guides/source/security.textile +1 -1
- data/vendor/rails/railties/lib/initializer.rb +44 -20
- data/vendor/rails/railties/lib/rails/gem_dependency.rb +4 -2
- data/vendor/rails/railties/lib/rails/plugin.rb +1 -1
- data/vendor/rails/railties/lib/rails/plugin/loader.rb +3 -3
- data/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +2 -2
- data/vendor/rails/railties/lib/rails/version.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb +18 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/migration/migration_generator.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/test_helper.rb +2 -1
- data/vendor/rails/railties/lib/tasks/databases.rake +9 -9
- data/vendor/rails/railties/lib/tasks/tmp.rake +37 -0
- data/vendor/rails/railties/test/abstract_unit.rb +27 -0
- data/vendor/rails/railties/test/backtrace_cleaner_test.rb +61 -0
- data/vendor/rails/railties/test/boot_test.rb +178 -0
- data/vendor/rails/railties/test/console_app_test.rb +42 -0
- data/vendor/rails/railties/test/fcgi_dispatcher_test.rb +266 -0
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/about.yml +1 -0
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb +1 -0
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb +1 -0
- data/vendor/rails/railties/test/fixtures/eager/zoo.rb +3 -0
- data/vendor/rails/railties/test/fixtures/eager/zoo/reptile_house.rb +2 -0
- data/vendor/rails/railties/test/fixtures/environment_with_constant.rb +1 -0
- data/vendor/rails/railties/test/fixtures/lib/generators/missing_class/missing_class_generator.rb +0 -0
- data/vendor/rails/railties/test/fixtures/lib/generators/working/working_generator.rb +2 -0
- data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +5 -0
- data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +5 -0
- data/vendor/rails/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb +5 -0
- data/vendor/rails/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb +5 -0
- data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb +7 -0
- data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb +7 -0
- data/vendor/rails/railties/test/fixtures/plugins/alternate/a/generators/a_generator/a_generator.rb +4 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/init.rb +1 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/rails/init.rb +7 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/plugin_with_no_lib_dir/init.rb +0 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/about.yml +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/generators/stubby_generator/stubby_generator.rb +4 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/init.rb +7 -0
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/lib/stubby_mixin.rb +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/controllers/engine_controller.rb +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb +9 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/models/engine_model.rb +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml +2 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/routes.rb +3 -0
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/init.rb +3 -0
- data/vendor/rails/railties/test/fixtures/public/foo/bar.html +1 -0
- data/vendor/rails/railties/test/fixtures/public/foo/index.html +1 -0
- data/vendor/rails/railties/test/fixtures/public/index.html +1 -0
- data/vendor/rails/railties/test/gem_dependency_test.rb +227 -0
- data/vendor/rails/railties/test/generator_lookup_test.rb +40 -0
- data/vendor/rails/railties/test/generators/generated_attribute_test.rb +38 -0
- data/vendor/rails/railties/test/generators/generator_test_helper.rb +322 -0
- data/vendor/rails/railties/test/generators/rails_controller_generator_test.rb +44 -0
- data/vendor/rails/railties/test/generators/rails_helper_generator_test.rb +36 -0
- data/vendor/rails/railties/test/generators/rails_mailer_generator_test.rb +29 -0
- data/vendor/rails/railties/test/generators/rails_model_generator_test.rb +96 -0
- data/vendor/rails/railties/test/generators/rails_resource_generator_test.rb +29 -0
- data/vendor/rails/railties/test/generators/rails_scaffold_generator_test.rb +151 -0
- data/vendor/rails/railties/test/generators/rails_template_runner_test.rb +216 -0
- data/vendor/rails/railties/test/initializer_test.rb +437 -0
- data/vendor/rails/railties/test/metal_test.rb +72 -0
- data/vendor/rails/railties/test/mocks/routes.rb +6 -0
- data/vendor/rails/railties/test/plugin_loader_test.rb +172 -0
- data/vendor/rails/railties/test/plugin_locator_test.rb +62 -0
- data/vendor/rails/railties/test/plugin_test.rb +162 -0
- data/vendor/rails/railties/test/plugin_test_helper.rb +29 -0
- data/vendor/rails/railties/test/rack_static_test.rb +47 -0
- data/vendor/rails/railties/test/rails_generator_test.rb +145 -0
- data/vendor/rails/railties/test/rails_info_controller_test.rb +52 -0
- data/vendor/rails/railties/test/rails_info_test.rb +99 -0
- data/vendor/rails/railties/test/secret_key_generation_test.rb +38 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-a-0.4.0/lib/dummy-gem-a.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.4.0/lib/dummy-gem-b.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.6.0/lib/dummy-gem-b.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.4.0/lib/dummy-gem-c.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.6.0/lib/dummy-gem-c.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-d-1.0.0/lib/dummy-gem-d.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-e-1.0.0/lib/dummy-gem-e.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-f-1.0.0/lib/dummy-gem-f.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-g-1.0.0/lib/dummy-gem-g.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-h-1.0.0/lib/dummy-gem-h.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/ext/dummy-gem-i/Makefile +0 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/lib/dummy-gem-i.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-j-1.0.0/lib/dummy-gem-j.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-k-1.0.0/lib/dummy-gem-k.rb +1 -0
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-l-1.0.0-x86-mswin32/lib/dummy-gem-l.rb +1 -0
- metadata +1156 -125
- data/app/controllers/admin/export_controller.rb +0 -5
- data/app/helpers/admin/abstract_model_helper.rb +0 -2
- data/app/models/radiant/exporter.rb +0 -11
- data/db/templates/roasters.yml +0 -1210
- data/db/templates/simple-blog.yml +0 -197
- data/db/templates/styled-blog.yml +0 -472
- data/lib/radiant/legacy_routes.rb +0 -72
- data/public/images/admin/buttons_background.png +0 -0
- data/public/images/admin/login_shadow.png +0 -0
- data/public/images/admin/navigation_background.gif +0 -0
- data/public/images/admin/navigation_secondary_background.png +0 -0
- data/public/images/admin/navigation_shadow.png +0 -0
- data/public/images/admin/navigation_tabs.png +0 -0
- data/public/images/admin/new_homepage.png +0 -0
- data/public/images/admin/new_layout.png +0 -0
- data/public/images/admin/new_snippet.png +0 -0
- data/public/images/admin/new_user.png +0 -0
- data/public/images/admin/shadow.png +0 -0
- data/public/images/admin/shadow_grey.png +0 -0
- data/public/images/admin/spacer.gif +0 -0
- data/public/images/admin/vertical_tan_gradient.png +0 -0
- data/public/images/admin/view_site.png +0 -0
- data/public/stylesheets/sass/admin/modules/_grid.sass +0 -56
- data/public/stylesheets/sass/admin/modules/_opacity.sass +0 -7
- data/public/stylesheets/sass/admin/modules/_rounded.sass +0 -41
- data/public/stylesheets/sass/admin/modules/_shadow.sass +0 -9
- data/public/stylesheets/sass/admin/partials/_reset.sass +0 -36
- data/rerun.txt +0 -1
- data/spec/helpers/admin/abstract_model_helper_spec.rb +0 -4
- data/spec/lib/radiant/legacy_routes_spec.rb +0 -14
- data/spec/models/radiant/exporter_spec.rb +0 -25
- data/vendor/extensions/archive/test/fixtures/pages.yml +0 -397
- data/vendor/extensions/archive/test/functional/archive_extension_test.rb +0 -16
- data/vendor/extensions/archive/test/helpers/archive_index_test_helper.rb +0 -37
- data/vendor/extensions/archive/test/test_helper.rb +0 -26
- data/vendor/extensions/archive/test/unit/archive_day_index_page_test.rb +0 -22
- data/vendor/extensions/archive/test/unit/archive_month_index_page_test.rb +0 -22
- data/vendor/extensions/archive/test/unit/archive_page_test.rb +0 -40
- data/vendor/extensions/archive/test/unit/archive_year_index_page_test.rb +0 -22
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.html +0 -8
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.text +0 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.html +0 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.options +0 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.text +0 -1
- data/vendor/plugins/haml/test/sass/templates/bork.sass +0 -2
- data/vendor/rails/activerecord/examples/performance.sql +0 -85
- data/vendor/rails/activerecord/test/cases/encoding_test.rb +0 -6
- data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 +0 -0
- data/vendor/rails/activeresource/test/debug.log +0 -80350
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb +0 -66
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb +0 -69
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb +0 -68
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/links.rb +0 -34
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/simple.rb +0 -22
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/except.rb +0 -8
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/slice.rb +0 -8
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/object/meta_class.rb +0 -5
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/helpers.rb +0 -5
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/version.rb +0 -3
@@ -8,60 +8,46 @@ module Haml
|
|
8
8
|
include Haml::Util
|
9
9
|
|
10
10
|
# Designates an XHTML/XML element.
|
11
|
-
# @private
|
12
11
|
ELEMENT = ?%
|
13
12
|
|
14
13
|
# Designates a `<div>` element with the given class.
|
15
|
-
# @private
|
16
14
|
DIV_CLASS = ?.
|
17
15
|
|
18
16
|
# Designates a `<div>` element with the given id.
|
19
|
-
# @private
|
20
17
|
DIV_ID = ?#
|
21
18
|
|
22
19
|
# Designates an XHTML/XML comment.
|
23
|
-
# @private
|
24
20
|
COMMENT = ?/
|
25
21
|
|
26
22
|
# Designates an XHTML doctype or script that is never HTML-escaped.
|
27
|
-
# @private
|
28
23
|
DOCTYPE = ?!
|
29
24
|
|
30
25
|
# Designates script, the result of which is output.
|
31
|
-
# @private
|
32
26
|
SCRIPT = ?=
|
33
27
|
|
34
28
|
# Designates script that is always HTML-escaped.
|
35
|
-
# @private
|
36
29
|
SANITIZE = ?&
|
37
30
|
|
38
31
|
# Designates script, the result of which is flattened and output.
|
39
|
-
# @private
|
40
32
|
FLAT_SCRIPT = ?~
|
41
33
|
|
42
34
|
# Designates script which is run but not output.
|
43
|
-
# @private
|
44
35
|
SILENT_SCRIPT = ?-
|
45
36
|
|
46
37
|
# When following SILENT_SCRIPT, designates a comment that is not output.
|
47
|
-
# @private
|
48
38
|
SILENT_COMMENT = ?#
|
49
39
|
|
50
40
|
# Designates a non-parsed line.
|
51
|
-
# @private
|
52
41
|
ESCAPE = ?\\
|
53
42
|
|
54
43
|
# Designates a block of filtered text.
|
55
|
-
# @private
|
56
44
|
FILTER = ?:
|
57
45
|
|
58
46
|
# Designates a non-parsed line. Not actually a character.
|
59
|
-
# @private
|
60
47
|
PLAIN_TEXT = -1
|
61
48
|
|
62
49
|
# Keeps track of the ASCII values of the characters that begin a
|
63
50
|
# specially-interpreted line.
|
64
|
-
# @private
|
65
51
|
SPECIAL_CHARACTERS = [
|
66
52
|
ELEMENT,
|
67
53
|
DIV_CLASS,
|
@@ -78,7 +64,6 @@ module Haml
|
|
78
64
|
|
79
65
|
# The value of the character that designates that a line is part
|
80
66
|
# of a multiline string.
|
81
|
-
# @private
|
82
67
|
MULTILINE_CHAR_VALUE = ?|
|
83
68
|
|
84
69
|
# Regex to match keywords that appear in the middle of a Ruby block
|
@@ -94,15 +79,12 @@ module Haml
|
|
94
79
|
#
|
95
80
|
# The block is ended after `%p no!`, because `else`
|
96
81
|
# is a member of this array.
|
97
|
-
# @private
|
98
82
|
MID_BLOCK_KEYWORD_REGEX = /^-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
|
99
83
|
|
100
84
|
# The Regex that matches a Doctype command.
|
101
|
-
# @private
|
102
85
|
DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)/i
|
103
86
|
|
104
87
|
# The Regex that matches a literal string or symbol value
|
105
|
-
# @private
|
106
88
|
LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
|
107
89
|
|
108
90
|
private
|
@@ -136,8 +118,8 @@ END
|
|
136
118
|
|
137
119
|
names.map do |name|
|
138
120
|
# Can't use || because someone might explicitly pass in false with a symbol
|
139
|
-
sym_local = "_haml_locals[#{name.to_sym
|
140
|
-
str_local = "_haml_locals[#{name.to_s
|
121
|
+
sym_local = "_haml_locals[#{inspect_obj(name.to_sym)}]"
|
122
|
+
str_local = "_haml_locals[#{inspect_obj(name.to_s)}]"
|
141
123
|
"#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local}"
|
142
124
|
end.join(';') + ';'
|
143
125
|
end
|
@@ -253,35 +235,35 @@ You don't need to use "- end" in Haml. Un-indent to close a block:
|
|
253
235
|
%p This line is un-indented, so it isn't part of the "if" block
|
254
236
|
END
|
255
237
|
|
238
|
+
text = handle_ruby_multiline(text)
|
256
239
|
push_silent(text[1..-1], true)
|
257
240
|
newline_now
|
258
241
|
|
259
242
|
# Handle stuff like - end.join("|")
|
260
243
|
@to_close_stack.last << false if text =~ /^-\s*end\b/ && !block_opened?
|
261
244
|
|
262
|
-
case_stmt = text =~ /^-\s*case\b/
|
263
245
|
keyword = mid_block_keyword?(text)
|
264
246
|
block = block_opened? && !keyword
|
265
247
|
|
266
248
|
# It's important to preserve tabulation modification for keywords
|
267
249
|
# that involve choosing between posible blocks of code.
|
268
250
|
if %w[else elsif when].include?(keyword)
|
269
|
-
#
|
270
|
-
|
271
|
-
if
|
251
|
+
# Whether a script block has already been opened immediately above this line
|
252
|
+
was_opened = @to_close_stack.last && @to_close_stack.last.first == :script
|
253
|
+
if was_opened
|
272
254
|
@dont_indent_next_line, @dont_tab_up_next_text = @to_close_stack.last[1..2]
|
273
|
-
else
|
274
|
-
push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
|
275
255
|
end
|
276
256
|
|
277
257
|
# when is unusual in that either it will be indented twice,
|
278
|
-
# or the case won't have created its own indentation
|
279
|
-
if
|
280
|
-
|
258
|
+
# or the case won't have created its own indentation.
|
259
|
+
# Also, if no block has been opened yet, we need to make sure we add an end
|
260
|
+
# once we de-indent.
|
261
|
+
if !was_opened || keyword == "when"
|
262
|
+
push_and_tabulate([
|
263
|
+
:script, @dont_indent_next_line, @dont_tab_up_next_text,
|
264
|
+
!was_opened])
|
281
265
|
end
|
282
|
-
elsif block ||
|
283
|
-
push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
|
284
|
-
elsif block && case_stmt
|
266
|
+
elsif block || text =~ /^-\s*(case|if)\b/
|
285
267
|
push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
|
286
268
|
end
|
287
269
|
when FILTER; start_filtered(text[1..-1].downcase)
|
@@ -332,26 +314,37 @@ END
|
|
332
314
|
def flush_merged_text
|
333
315
|
return if @to_merge.empty?
|
334
316
|
|
335
|
-
|
317
|
+
str = ""
|
318
|
+
mtabs = 0
|
319
|
+
newlines = 0
|
320
|
+
@to_merge.each do |type, val, tabs|
|
336
321
|
case type
|
337
322
|
when :text
|
338
|
-
|
323
|
+
str << inspect_obj(val)[1...-1]
|
324
|
+
mtabs += tabs
|
339
325
|
when :script
|
340
326
|
if mtabs != 0 && !@options[:ugly]
|
341
327
|
val = "_hamlout.adjust_tabs(#{mtabs}); " + val
|
342
328
|
end
|
343
|
-
|
329
|
+
str << "\#{#{"\n" * newlines}#{val}}"
|
330
|
+
mtabs = 0
|
331
|
+
newlines = 0
|
332
|
+
when :newlines
|
333
|
+
newlines += val
|
344
334
|
else
|
345
335
|
raise SyntaxError.new("[HAML BUG] Undefined entry in Haml::Precompiler@to_merge.")
|
346
336
|
end
|
347
337
|
end
|
348
338
|
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
339
|
+
unless str.empty?
|
340
|
+
@precompiled <<
|
341
|
+
if @options[:ugly]
|
342
|
+
"_hamlout.buffer << \"#{str}\";"
|
343
|
+
else
|
344
|
+
"_hamlout.push_text(\"#{str}\", #{mtabs}, #{@dont_tab_up_next_text.inspect});"
|
345
|
+
end
|
346
|
+
end
|
347
|
+
@precompiled << "\n" * newlines
|
355
348
|
@to_merge = []
|
356
349
|
@dont_tab_up_next_text = false
|
357
350
|
end
|
@@ -387,6 +380,7 @@ END
|
|
387
380
|
# the result before it is added to `@buffer`
|
388
381
|
def push_script(text, opts = {})
|
389
382
|
raise SyntaxError.new("There's no Ruby code for = to evaluate.") if text.empty?
|
383
|
+
text = handle_ruby_multiline(text)
|
390
384
|
return if options[:suppress_eval]
|
391
385
|
opts[:escape_html] = options[:escape_html] if opts[:escape_html].nil?
|
392
386
|
|
@@ -396,14 +390,14 @@ END
|
|
396
390
|
|
397
391
|
no_format = @options[:ugly] &&
|
398
392
|
!(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
|
399
|
-
|
400
|
-
|
393
|
+
output_expr = "(#{text}\n)"
|
394
|
+
static_method = "_hamlout.#{static_method_name(:format_script, *args)}"
|
401
395
|
|
402
396
|
# Prerender tabulation unless we're in a tag
|
403
397
|
push_merged_text '' unless opts[:in_tag]
|
404
398
|
|
405
399
|
unless block_opened?
|
406
|
-
@to_merge << [:script, no_format ? "#{text}\n" : "
|
400
|
+
@to_merge << [:script, no_format ? "#{text}\n" : "#{static_method}(#{output_expr});"]
|
407
401
|
concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
|
408
402
|
@newlines -= 1
|
409
403
|
return
|
@@ -413,7 +407,7 @@ END
|
|
413
407
|
|
414
408
|
push_silent "haml_temp = #{text}"
|
415
409
|
newline_now
|
416
|
-
push_and_tabulate([:loud, "_hamlout.buffer << #{no_format ? "
|
410
|
+
push_and_tabulate([:loud, "_hamlout.buffer << #{no_format ? "haml_temp.to_s;" : "#{static_method}(haml_temp);"}",
|
417
411
|
!(opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly])])
|
418
412
|
end
|
419
413
|
|
@@ -491,12 +485,14 @@ END
|
|
491
485
|
@template_tabs -= 1
|
492
486
|
end
|
493
487
|
|
488
|
+
# This is a class method so it can be accessed from {Haml::Helpers}.
|
489
|
+
#
|
494
490
|
# Iterates through the classes and ids supplied through `.`
|
495
491
|
# and `#` syntax, and returns a hash with them as attributes,
|
496
492
|
# that can then be merged with another attributes hash.
|
497
|
-
def parse_class_and_id(list)
|
493
|
+
def self.parse_class_and_id(list)
|
498
494
|
attributes = {}
|
499
|
-
list.scan(/([#.])([
|
495
|
+
list.scan(/([#.])([-:_a-zA-Z0-9]+)/) do |type, property|
|
500
496
|
case type
|
501
497
|
when '.'
|
502
498
|
if attributes['class']
|
@@ -531,9 +527,18 @@ END
|
|
531
527
|
quote_escape = attr_wrapper == '"' ? """ : "'"
|
532
528
|
other_quote_char = attr_wrapper == '"' ? "'" : '"'
|
533
529
|
|
530
|
+
if attributes['data'].is_a?(Hash)
|
531
|
+
attributes = attributes.dup
|
532
|
+
attributes =
|
533
|
+
Haml::Util.map_keys(attributes.delete('data')) {|name| "data-#{name}"}.merge(attributes)
|
534
|
+
end
|
535
|
+
|
534
536
|
result = attributes.collect do |attr, value|
|
535
537
|
next if value.nil?
|
536
538
|
|
539
|
+
value = filter_and_join(value, ' ') if attr == 'class'
|
540
|
+
value = filter_and_join(value, '_') if attr == 'id'
|
541
|
+
|
537
542
|
if value == true
|
538
543
|
next " #{attr}" if is_html
|
539
544
|
next " #{attr}=#{attr_wrapper}#{attr}#{attr_wrapper}"
|
@@ -557,6 +562,13 @@ END
|
|
557
562
|
result.compact.sort.join
|
558
563
|
end
|
559
564
|
|
565
|
+
def self.filter_and_join(value, separator)
|
566
|
+
return "" if value == ""
|
567
|
+
value = [value] unless value.is_a?(Array)
|
568
|
+
value = value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
|
569
|
+
return !value.empty? && value
|
570
|
+
end
|
571
|
+
|
560
572
|
def prerender_tag(name, self_close, attributes)
|
561
573
|
attributes_string = Precompiler.build_attributes(html?, @options[:attr_wrapper], attributes)
|
562
574
|
"<#{name}#{attributes_string}#{self_close && xhtml? ? ' /' : ''}>"
|
@@ -564,20 +576,20 @@ END
|
|
564
576
|
|
565
577
|
# Parses a line into tag_name, attributes, attributes_hash, object_ref, action, value
|
566
578
|
def parse_tag(line)
|
567
|
-
raise SyntaxError.new("Invalid tag: \"#{line}\".") unless match = line.scan(/%([-:\w]+)([
|
579
|
+
raise SyntaxError.new("Invalid tag: \"#{line}\".") unless match = line.scan(/%([-:\w]+)([-:\w\.\#]*)(.*)/)[0]
|
568
580
|
tag_name, attributes, rest = match
|
569
581
|
new_attributes_hash = old_attributes_hash = last_line = object_ref = nil
|
570
|
-
attributes_hashes =
|
582
|
+
attributes_hashes = {}
|
571
583
|
while rest
|
572
584
|
case rest[0]
|
573
585
|
when ?{
|
574
586
|
break if old_attributes_hash
|
575
587
|
old_attributes_hash, rest, last_line = parse_old_attributes(rest)
|
576
|
-
attributes_hashes
|
588
|
+
attributes_hashes[:old] = old_attributes_hash
|
577
589
|
when ?(
|
578
590
|
break if new_attributes_hash
|
579
591
|
new_attributes_hash, rest, last_line = parse_new_attributes(rest)
|
580
|
-
attributes_hashes
|
592
|
+
attributes_hashes[:new] = new_attributes_hash
|
581
593
|
when ?[
|
582
594
|
break if object_ref
|
583
595
|
object_ref, rest = balance(rest, ?[, ?])
|
@@ -650,7 +662,7 @@ END
|
|
650
662
|
if type == :static
|
651
663
|
static_attributes[name] = val
|
652
664
|
else
|
653
|
-
dynamic_attributes << name
|
665
|
+
dynamic_attributes << inspect_obj(name) << " => " << val << ","
|
654
666
|
end
|
655
667
|
end
|
656
668
|
dynamic_attributes << "}"
|
@@ -685,7 +697,7 @@ END
|
|
685
697
|
|
686
698
|
return name, [:static, content.first[1]] if content.size == 1
|
687
699
|
return name, [:dynamic,
|
688
|
-
'"' + content.map {|(t, v)| t == :str ? v
|
700
|
+
'"' + content.map {|(t, v)| t == :str ? inspect_obj(v)[1...-1] : "\#{#{v}}"}.join + '"']
|
689
701
|
end
|
690
702
|
|
691
703
|
# Parses a line that will render as an XHTML tag, and adds the code that will
|
@@ -744,24 +756,32 @@ END
|
|
744
756
|
|
745
757
|
object_ref = "nil" if object_ref.nil? || @options[:suppress_eval]
|
746
758
|
|
747
|
-
attributes = parse_class_and_id(attributes)
|
748
|
-
|
749
|
-
|
750
|
-
|
751
|
-
|
752
|
-
|
753
|
-
|
754
|
-
|
759
|
+
attributes = Precompiler.parse_class_and_id(attributes)
|
760
|
+
attributes_list = []
|
761
|
+
|
762
|
+
if attributes_hashes[:new]
|
763
|
+
static_attributes, attributes_hash = attributes_hashes[:new]
|
764
|
+
Buffer.merge_attrs(attributes, static_attributes) if static_attributes
|
765
|
+
attributes_list << attributes_hash
|
766
|
+
end
|
767
|
+
|
768
|
+
if attributes_hashes[:old]
|
769
|
+
static_attributes = parse_static_hash(attributes_hashes[:old])
|
755
770
|
Buffer.merge_attrs(attributes, static_attributes) if static_attributes
|
756
|
-
|
757
|
-
end
|
771
|
+
attributes_list << attributes_hashes[:old] unless static_attributes || @options[:suppress_eval]
|
772
|
+
end
|
773
|
+
|
774
|
+
attributes_list.compact!
|
758
775
|
|
759
776
|
raise SyntaxError.new("Illegal nesting: nesting within a self-closing tag is illegal.", @next_line.index) if block_opened? && self_closing
|
760
|
-
raise SyntaxError.new("Illegal nesting: content can't be both given on the same line as %#{tag_name} and nested within it.", @next_line.index) if block_opened? && !value.empty?
|
761
777
|
raise SyntaxError.new("There's no Ruby code for #{action} to evaluate.", last_line - 1) if parse && value.empty?
|
762
778
|
raise SyntaxError.new("Self-closing tags can't have content.", last_line - 1) if self_closing && !value.empty?
|
763
779
|
|
764
|
-
|
780
|
+
if block_opened? && !value.empty? && !is_ruby_multiline?(value)
|
781
|
+
raise SyntaxError.new("Illegal nesting: content can't be both given on the same line as %#{tag_name} and nested within it.", @next_line.index)
|
782
|
+
end
|
783
|
+
|
784
|
+
self_closing ||= !!(!block_opened? && value.empty? && @options[:autoclose].any? {|t| t === tag_name})
|
765
785
|
value = nil if value.empty? && (block_opened? || self_closing)
|
766
786
|
|
767
787
|
dont_indent_next_line =
|
@@ -769,7 +789,7 @@ END
|
|
769
789
|
(nuke_inner_whitespace && block_opened?)
|
770
790
|
|
771
791
|
# Check if we can render the tag directly to text and not process it in the buffer
|
772
|
-
if object_ref == "nil" &&
|
792
|
+
if object_ref == "nil" && attributes_list.empty? && !preserve_script
|
773
793
|
tag_closed = !block_opened? && !self_closing && !parse
|
774
794
|
|
775
795
|
open_tag = prerender_tag(tag_name, self_closing, attributes)
|
@@ -787,19 +807,19 @@ END
|
|
787
807
|
return if tag_closed
|
788
808
|
else
|
789
809
|
flush_merged_text
|
790
|
-
content = parse ? 'nil' : value
|
791
|
-
if
|
792
|
-
|
793
|
-
elsif
|
794
|
-
|
810
|
+
content = parse ? 'nil' : inspect_obj(value)
|
811
|
+
if attributes_list.empty?
|
812
|
+
attributes_list = ''
|
813
|
+
elsif attributes_list.size == 1
|
814
|
+
attributes_list = ", #{attributes_list.first}"
|
795
815
|
else
|
796
|
-
|
816
|
+
attributes_list = ", (#{attributes_list.join(").merge(")})"
|
797
817
|
end
|
798
818
|
|
799
819
|
args = [tag_name, self_closing, !block_opened?, preserve_tag, escape_html,
|
800
820
|
attributes, nuke_outer_whitespace, nuke_inner_whitespace
|
801
|
-
].map {
|
802
|
-
push_silent "_hamlout.open_tag(#{args}, #{object_ref}, #{content}#{
|
821
|
+
].map {|v| inspect_obj(v)}.join(', ')
|
822
|
+
push_silent "_hamlout.open_tag(#{args}, #{object_ref}, #{content}#{attributes_list})"
|
803
823
|
@dont_tab_up_next_text = @dont_indent_next_line = dont_indent_next_line
|
804
824
|
end
|
805
825
|
|
@@ -881,6 +901,7 @@ END
|
|
881
901
|
when "strict"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
|
882
902
|
when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'
|
883
903
|
when "mobile"; '<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">'
|
904
|
+
when "rdfa"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">'
|
884
905
|
when "basic"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">'
|
885
906
|
else '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
|
886
907
|
end
|
@@ -959,18 +980,17 @@ END
|
|
959
980
|
end
|
960
981
|
|
961
982
|
def handle_multiline(line)
|
962
|
-
|
963
|
-
|
964
|
-
|
965
|
-
|
966
|
-
|
967
|
-
|
968
|
-
|
969
|
-
|
970
|
-
end
|
971
|
-
un_next_line new_line
|
972
|
-
resolve_newlines
|
983
|
+
return unless is_multiline?(line.text)
|
984
|
+
line.text.slice!(-1)
|
985
|
+
while new_line = raw_next_line.first
|
986
|
+
break if new_line == :eod
|
987
|
+
newline and next if new_line.strip.empty?
|
988
|
+
break unless is_multiline?(new_line.strip)
|
989
|
+
line.text << new_line.strip[0...-1]
|
990
|
+
newline
|
973
991
|
end
|
992
|
+
un_next_line new_line
|
993
|
+
resolve_newlines
|
974
994
|
end
|
975
995
|
|
976
996
|
# Checks whether or not +line+ is in a multiline sequence.
|
@@ -978,20 +998,40 @@ END
|
|
978
998
|
text && text.length > 1 && text[-1] == MULTILINE_CHAR_VALUE && text[-2] == ?\s
|
979
999
|
end
|
980
1000
|
|
1001
|
+
def handle_ruby_multiline(text)
|
1002
|
+
text = text.rstrip
|
1003
|
+
return text unless is_ruby_multiline?(text)
|
1004
|
+
un_next_line @next_line.full
|
1005
|
+
begin
|
1006
|
+
new_line = raw_next_line.first
|
1007
|
+
break if new_line == :eod
|
1008
|
+
newline and next if new_line.strip.empty?
|
1009
|
+
text << " " << new_line.strip
|
1010
|
+
newline
|
1011
|
+
end while is_ruby_multiline?(new_line.strip)
|
1012
|
+
next_line
|
1013
|
+
resolve_newlines
|
1014
|
+
text
|
1015
|
+
end
|
1016
|
+
|
1017
|
+
def is_ruby_multiline?(text)
|
1018
|
+
text && text.length > 1 && text[-1] == ?, && text[-2] != ?? && text[-3..-2] != "?\\"
|
1019
|
+
end
|
1020
|
+
|
981
1021
|
def contains_interpolation?(str)
|
982
1022
|
str.include?('#{')
|
983
1023
|
end
|
984
1024
|
|
985
1025
|
def unescape_interpolation(str, opts = {})
|
986
1026
|
res = ''
|
987
|
-
rest = Haml::Shared.handle_interpolation str
|
1027
|
+
rest = Haml::Shared.handle_interpolation inspect_obj(str) do |scan|
|
988
1028
|
escapes = (scan[2].size - 1) / 2
|
989
1029
|
res << scan.matched[0...-3 - escapes]
|
990
1030
|
if escapes % 2 == 1
|
991
1031
|
res << '#{'
|
992
1032
|
else
|
993
1033
|
content = eval('"' + balance(scan, ?{, ?}, 1)[0][0...-1] + '"')
|
994
|
-
content = "Haml::Helpers.html_escape(#{content})" if opts[:escape_html]
|
1034
|
+
content = "Haml::Helpers.html_escape((#{content}))" if opts[:escape_html]
|
995
1035
|
res << '#{' + content + "}"# Use eval to get rid of string escapes
|
996
1036
|
end
|
997
1037
|
end
|
@@ -1030,8 +1070,7 @@ END
|
|
1030
1070
|
|
1031
1071
|
def resolve_newlines
|
1032
1072
|
return unless @newlines > 0
|
1033
|
-
|
1034
|
-
@precompiled << "\n" * @newlines
|
1073
|
+
@to_merge << [:newlines, @newlines]
|
1035
1074
|
@newlines = 0
|
1036
1075
|
end
|
1037
1076
|
|
@@ -1055,6 +1094,8 @@ END
|
|
1055
1094
|
when :script
|
1056
1095
|
last[1].gsub!(/\(haml_temp, (.*?)\);$/, '(haml_temp.rstrip, \1);')
|
1057
1096
|
rstrip_buffer! index - 1
|
1097
|
+
when :newlines
|
1098
|
+
rstrip_buffer! index - 1
|
1058
1099
|
else
|
1059
1100
|
raise SyntaxError.new("[HAML BUG] Undefined entry in Haml::Precompiler@to_merge.")
|
1060
1101
|
end
|