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
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'strscan'
|
2
2
|
require 'digest/sha1'
|
3
3
|
require 'sass/tree/node'
|
4
|
+
require 'sass/tree/root_node'
|
4
5
|
require 'sass/tree/rule_node'
|
5
6
|
require 'sass/tree/comment_node'
|
6
7
|
require 'sass/tree/prop_node'
|
@@ -8,13 +9,18 @@ require 'sass/tree/directive_node'
|
|
8
9
|
require 'sass/tree/variable_node'
|
9
10
|
require 'sass/tree/mixin_def_node'
|
10
11
|
require 'sass/tree/mixin_node'
|
12
|
+
require 'sass/tree/extend_node'
|
11
13
|
require 'sass/tree/if_node'
|
12
14
|
require 'sass/tree/while_node'
|
13
15
|
require 'sass/tree/for_node'
|
14
16
|
require 'sass/tree/debug_node'
|
17
|
+
require 'sass/tree/warn_node'
|
15
18
|
require 'sass/tree/import_node'
|
19
|
+
require 'sass/tree/charset_node'
|
20
|
+
require 'sass/selector'
|
16
21
|
require 'sass/environment'
|
17
22
|
require 'sass/script'
|
23
|
+
require 'sass/scss'
|
18
24
|
require 'sass/error'
|
19
25
|
require 'sass/files'
|
20
26
|
require 'haml/shared'
|
@@ -76,68 +82,63 @@ module Sass
|
|
76
82
|
end
|
77
83
|
|
78
84
|
# The character that begins a CSS property.
|
79
|
-
# @private
|
80
85
|
PROPERTY_CHAR = ?:
|
81
86
|
|
82
87
|
# The character that designates that
|
83
88
|
# a property should be assigned to a SassScript expression.
|
84
|
-
# @private
|
85
89
|
SCRIPT_CHAR = ?=
|
86
90
|
|
87
91
|
# The character that designates the beginning of a comment,
|
88
92
|
# either Sass or CSS.
|
89
|
-
# @private
|
90
93
|
COMMENT_CHAR = ?/
|
91
94
|
|
92
95
|
# The character that follows the general COMMENT_CHAR and designates a Sass comment,
|
93
96
|
# which is not output as a CSS comment.
|
94
|
-
# @private
|
95
97
|
SASS_COMMENT_CHAR = ?/
|
96
98
|
|
97
99
|
# The character that follows the general COMMENT_CHAR and designates a CSS comment,
|
98
100
|
# which is embedded in the CSS document.
|
99
|
-
# @private
|
100
101
|
CSS_COMMENT_CHAR = ?*
|
101
102
|
|
102
103
|
# The character used to denote a compiler directive.
|
103
|
-
# @private
|
104
104
|
DIRECTIVE_CHAR = ?@
|
105
105
|
|
106
106
|
# Designates a non-parsed rule.
|
107
|
-
# @private
|
108
107
|
ESCAPE_CHAR = ?\\
|
109
108
|
|
110
109
|
# Designates block as mixin definition rather than CSS rules to output
|
111
|
-
# @private
|
112
110
|
MIXIN_DEFINITION_CHAR = ?=
|
113
111
|
|
114
112
|
# Includes named mixin declared using MIXIN_DEFINITION_CHAR
|
115
|
-
# @private
|
116
113
|
MIXIN_INCLUDE_CHAR = ?+
|
117
114
|
|
118
115
|
# The regex that matches properties of the form `name: prop`.
|
119
|
-
# @private
|
120
116
|
PROPERTY_NEW_MATCHER = /^[^\s:"\[]+\s*[=:](\s|$)/
|
121
117
|
|
122
118
|
# The regex that matches and extracts data from
|
123
119
|
# properties of the form `name: prop`.
|
124
|
-
|
125
|
-
PROPERTY_NEW = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
|
120
|
+
PROPERTY_NEW = /^([^\s=:"]+)\s*(=|:)(?:\s+|$)(.*)/
|
126
121
|
|
127
122
|
# The regex that matches and extracts data from
|
128
123
|
# properties of the form `:name prop`.
|
129
|
-
# @private
|
130
124
|
PROPERTY_OLD = /^:([^\s=:"]+)\s*(=?)(?:\s+|$)(.*)/
|
131
125
|
|
132
126
|
# The default options for Sass::Engine.
|
127
|
+
# @api public
|
133
128
|
DEFAULT_OPTIONS = {
|
134
129
|
:style => :nested,
|
135
130
|
:load_paths => ['.'],
|
136
131
|
:cache => true,
|
137
132
|
:cache_location => './.sass-cache',
|
133
|
+
:syntax => :sass,
|
138
134
|
}.freeze
|
139
135
|
|
140
136
|
# @param template [String] The Sass template.
|
137
|
+
# This template can be encoded using any encoding
|
138
|
+
# that can be converted to Unicode.
|
139
|
+
# If the template contains an `@charset` declaration,
|
140
|
+
# that overrides the Ruby encoding
|
141
|
+
# (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
|
141
142
|
# @param options [{Symbol => Object}] An options hash;
|
142
143
|
# see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
|
143
144
|
def initialize(template, options={})
|
@@ -160,10 +161,13 @@ module Sass
|
|
160
161
|
#
|
161
162
|
# @return [String] The CSS
|
162
163
|
# @raise [Sass::SyntaxError] if there's an error in the document
|
164
|
+
# @raise [Encoding::UndefinedConversionError] if the source encoding
|
165
|
+
# cannot be converted to UTF-8
|
166
|
+
# @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
|
163
167
|
def render
|
164
|
-
|
168
|
+
return _render unless @options[:quiet]
|
169
|
+
Haml::Util.silence_haml_warnings {_render}
|
165
170
|
end
|
166
|
-
|
167
171
|
alias_method :to_css, :render
|
168
172
|
|
169
173
|
# Parses the document into its parse tree.
|
@@ -171,14 +175,62 @@ module Sass
|
|
171
175
|
# @return [Sass::Tree::Node] The root of the parse tree.
|
172
176
|
# @raise [Sass::SyntaxError] if there's an error in the document
|
173
177
|
def to_tree
|
174
|
-
|
175
|
-
|
178
|
+
return _to_tree unless @options[:quiet]
|
179
|
+
Haml::Util.silence_haml_warnings {_to_tree}
|
180
|
+
end
|
181
|
+
|
182
|
+
# Returns the original encoding of the document,
|
183
|
+
# or `nil` under Ruby 1.8.
|
184
|
+
#
|
185
|
+
# @return [Encoding, nil]
|
186
|
+
# @raise [Encoding::UndefinedConversionError] if the source encoding
|
187
|
+
# cannot be converted to UTF-8
|
188
|
+
# @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
|
189
|
+
def source_encoding
|
190
|
+
check_encoding!
|
191
|
+
@original_encoding
|
192
|
+
end
|
193
|
+
|
194
|
+
private
|
195
|
+
|
196
|
+
def _render
|
197
|
+
rendered = _to_tree.render
|
198
|
+
return rendered if ruby1_8?
|
199
|
+
begin
|
200
|
+
# Try to convert the result to the original encoding,
|
201
|
+
# but if that doesn't work fall back on UTF-8
|
202
|
+
rendered = rendered.encode(source_encoding)
|
203
|
+
rescue EncodingError
|
204
|
+
end
|
205
|
+
rendered.gsub(Regexp.new('\A@charset "(.*?)"'.encode(source_encoding)),
|
206
|
+
"@charset \"#{source_encoding.name}\"".encode(source_encoding))
|
207
|
+
end
|
208
|
+
|
209
|
+
def _to_tree
|
210
|
+
check_encoding!
|
211
|
+
|
212
|
+
if @options[:syntax] == :scss
|
213
|
+
root = Sass::SCSS::Parser.new(@template).parse
|
214
|
+
else
|
215
|
+
root = Tree::RootNode.new(@template)
|
216
|
+
append_children(root, tree(tabulate(@template)).first, true)
|
217
|
+
end
|
218
|
+
|
176
219
|
root.options = @options
|
177
220
|
root
|
178
|
-
rescue SyntaxError => e
|
221
|
+
rescue SyntaxError => e
|
222
|
+
e.modify_backtrace(:filename => @options[:filename], :line => @line)
|
223
|
+
e.sass_template = @template
|
224
|
+
raise e
|
179
225
|
end
|
180
226
|
|
181
|
-
|
227
|
+
def check_encoding!
|
228
|
+
return if @checked_encoding
|
229
|
+
@checked_encoding = true
|
230
|
+
@template, @original_encoding = check_sass_encoding(@template) do |msg, line|
|
231
|
+
raise Sass::SyntaxError.new(msg, :line => line)
|
232
|
+
end
|
233
|
+
end
|
182
234
|
|
183
235
|
def tabulate(string)
|
184
236
|
tab_str = nil
|
@@ -202,10 +254,11 @@ module Sass
|
|
202
254
|
|
203
255
|
tab_str ||= line_tab_str
|
204
256
|
|
205
|
-
raise SyntaxError.new("Indenting at the beginning of the document is illegal.",
|
206
|
-
|
207
|
-
|
208
|
-
|
257
|
+
raise SyntaxError.new("Indenting at the beginning of the document is illegal.",
|
258
|
+
:line => index) if first
|
259
|
+
|
260
|
+
raise SyntaxError.new("Indentation can't use both tabs and spaces.",
|
261
|
+
:line => index) if tab_str.include?(?\s) && tab_str.include?(?\t)
|
209
262
|
end
|
210
263
|
first &&= !tab_str.nil?
|
211
264
|
if tab_str.nil?
|
@@ -214,17 +267,21 @@ module Sass
|
|
214
267
|
end
|
215
268
|
|
216
269
|
comment_tab_str ||= line_tab_str
|
217
|
-
if try_comment(line, lines.last, tab_str *
|
270
|
+
if try_comment(line, lines.last, tab_str * lines.last.tabs, comment_tab_str, index)
|
218
271
|
next
|
219
272
|
else
|
220
273
|
comment_tab_str = nil
|
221
274
|
end
|
222
275
|
|
223
276
|
line_tabs = line_tab_str.scan(tab_str).size
|
224
|
-
|
277
|
+
if tab_str * line_tabs != line_tab_str
|
278
|
+
message = <<END.strip.gsub("\n", ' ')
|
225
279
|
Inconsistent indentation: #{Haml::Shared.human_indentation line_tab_str, true} used for indentation,
|
226
280
|
but the rest of the document was indented using #{Haml::Shared.human_indentation tab_str}.
|
227
281
|
END
|
282
|
+
raise SyntaxError.new(message, :line => index)
|
283
|
+
end
|
284
|
+
|
228
285
|
lines << Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
|
229
286
|
end
|
230
287
|
lines
|
@@ -232,9 +289,11 @@ END
|
|
232
289
|
|
233
290
|
def try_comment(line, last, tab_str, comment_tab_str, index)
|
234
291
|
return unless last && last.comment?
|
235
|
-
|
292
|
+
# Nested comment stuff must be at least one whitespace char deeper
|
293
|
+
# than the normal indentation
|
294
|
+
return unless line =~ /^#{tab_str}\s/
|
236
295
|
unless line =~ /^(?:#{comment_tab_str})(.*)$/
|
237
|
-
raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), index)
|
296
|
+
raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
|
238
297
|
Inconsistent indentation:
|
239
298
|
previous line was indented by #{Haml::Shared.human_indentation comment_tab_str},
|
240
299
|
but this line was indented by #{Haml::Shared.human_indentation line[/^\s*/]}.
|
@@ -252,9 +311,8 @@ MSG
|
|
252
311
|
nodes = []
|
253
312
|
while (line = arr[i]) && line.tabs >= base
|
254
313
|
if line.tabs > base
|
255
|
-
|
256
|
-
|
257
|
-
end
|
314
|
+
raise SyntaxError.new("The line was indented #{line.tabs - base} levels deeper than the previous line.",
|
315
|
+
:line => line.index) if line.tabs > base + 1
|
258
316
|
|
259
317
|
nodes.last.children, i = tree(arr, i)
|
260
318
|
else
|
@@ -276,11 +334,7 @@ MSG
|
|
276
334
|
node.line = line.index
|
277
335
|
node.filename = line.filename
|
278
336
|
|
279
|
-
|
280
|
-
node.lines = line.children
|
281
|
-
else
|
282
|
-
append_children(node, line.children, false)
|
283
|
-
end
|
337
|
+
append_children(node, line.children, false)
|
284
338
|
end
|
285
339
|
|
286
340
|
node_or_nodes
|
@@ -288,11 +342,13 @@ MSG
|
|
288
342
|
|
289
343
|
def append_children(parent, children, root)
|
290
344
|
continued_rule = nil
|
345
|
+
continued_comment = nil
|
291
346
|
children.each do |line|
|
292
347
|
child = build_tree(parent, line, root)
|
293
348
|
|
294
349
|
if child.is_a?(Tree::RuleNode) && child.continued?
|
295
|
-
raise SyntaxError.new("Rules can't end in commas.",
|
350
|
+
raise SyntaxError.new("Rules can't end in commas.",
|
351
|
+
:line => child.line) unless child.children.empty?
|
296
352
|
if continued_rule
|
297
353
|
continued_rule.add_rules child
|
298
354
|
else
|
@@ -302,31 +358,35 @@ MSG
|
|
302
358
|
end
|
303
359
|
|
304
360
|
if continued_rule
|
305
|
-
raise SyntaxError.new("Rules can't end in commas.",
|
361
|
+
raise SyntaxError.new("Rules can't end in commas.",
|
362
|
+
:line => continued_rule.line) unless child.is_a?(Tree::RuleNode)
|
306
363
|
continued_rule.add_rules child
|
307
364
|
continued_rule.children = child.children
|
308
365
|
continued_rule, child = nil, continued_rule
|
309
366
|
end
|
310
367
|
|
368
|
+
if child.is_a?(Tree::CommentNode) && child.silent
|
369
|
+
if continued_comment &&
|
370
|
+
child.line == continued_comment.line +
|
371
|
+
continued_comment.value.count("\n") + 1
|
372
|
+
continued_comment.value << "\n" << child.value
|
373
|
+
next
|
374
|
+
end
|
375
|
+
|
376
|
+
continued_comment = child
|
377
|
+
end
|
378
|
+
|
311
379
|
check_for_no_children(child)
|
312
380
|
validate_and_append_child(parent, child, line, root)
|
313
381
|
end
|
314
382
|
|
315
|
-
raise SyntaxError.new("Rules can't end in commas.",
|
383
|
+
raise SyntaxError.new("Rules can't end in commas.",
|
384
|
+
:line => continued_rule.line) if continued_rule
|
316
385
|
|
317
386
|
parent
|
318
387
|
end
|
319
388
|
|
320
389
|
def validate_and_append_child(parent, child, line, root)
|
321
|
-
unless root
|
322
|
-
case child
|
323
|
-
when Tree::MixinDefNode
|
324
|
-
raise SyntaxError.new("Mixins may only be defined at the root of a document.", line.index)
|
325
|
-
when Tree::ImportNode
|
326
|
-
raise SyntaxError.new("Import directives may only be used at the root of a document.", line.index)
|
327
|
-
end
|
328
|
-
end
|
329
|
-
|
330
390
|
case child
|
331
391
|
when Array
|
332
392
|
child.each {|c| validate_and_append_child(parent, c, line, root)}
|
@@ -337,18 +397,10 @@ MSG
|
|
337
397
|
|
338
398
|
def check_for_no_children(node)
|
339
399
|
return unless node.is_a?(Tree::RuleNode) && node.children.empty?
|
340
|
-
|
341
|
-
WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
|
342
|
-
Selector #{node.rules.first.inspect} doesn't have any properties and will not be rendered.
|
343
|
-
SHORT
|
344
|
-
|
400
|
+
Haml::Util.haml_warn(<<WARNING.strip)
|
345
401
|
WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
|
346
|
-
|
347
|
-
|
348
|
-
doesn't have any properties and will not be rendered.
|
349
|
-
LONG
|
350
|
-
|
351
|
-
warn(warning.strip)
|
402
|
+
This selector doesn't have any properties and will not be rendered.
|
403
|
+
WARNING
|
352
404
|
end
|
353
405
|
|
354
406
|
def parse_line(parent, line, root)
|
@@ -361,62 +413,100 @@ LONG
|
|
361
413
|
# which begin with ::,
|
362
414
|
# as well as pseudo-classes
|
363
415
|
# if we're using the new property syntax
|
364
|
-
Tree::RuleNode.new(line.text)
|
416
|
+
Tree::RuleNode.new(parse_interp(line.text))
|
365
417
|
else
|
366
|
-
|
418
|
+
name, eq, value = line.text.scan(PROPERTY_OLD)[0]
|
419
|
+
raise SyntaxError.new("Invalid property: \"#{line.text}\".",
|
420
|
+
:line => @line) if name.nil? || value.nil?
|
421
|
+
parse_property(name, parse_interp(name), eq, value, :old, line)
|
367
422
|
end
|
368
|
-
when
|
423
|
+
when ?!, ?$
|
369
424
|
parse_variable(line)
|
370
425
|
when COMMENT_CHAR
|
371
426
|
parse_comment(line.text)
|
372
427
|
when DIRECTIVE_CHAR
|
373
428
|
parse_directive(parent, line, root)
|
374
429
|
when ESCAPE_CHAR
|
375
|
-
Tree::RuleNode.new(line.text[1..-1])
|
430
|
+
Tree::RuleNode.new(parse_interp(line.text[1..-1]))
|
376
431
|
when MIXIN_DEFINITION_CHAR
|
377
432
|
parse_mixin_definition(line)
|
378
433
|
when MIXIN_INCLUDE_CHAR
|
379
434
|
if line.text[1].nil? || line.text[1] == ?\s
|
380
|
-
Tree::RuleNode.new(line.text)
|
435
|
+
Tree::RuleNode.new(parse_interp(line.text))
|
381
436
|
else
|
382
437
|
parse_mixin_include(line, root)
|
383
438
|
end
|
384
439
|
else
|
385
|
-
|
386
|
-
parse_property(line, PROPERTY_NEW)
|
387
|
-
else
|
388
|
-
Tree::RuleNode.new(line.text)
|
389
|
-
end
|
440
|
+
parse_property_or_rule(line)
|
390
441
|
end
|
391
442
|
end
|
392
443
|
|
393
|
-
def
|
394
|
-
|
444
|
+
def parse_property_or_rule(line)
|
445
|
+
scanner = StringScanner.new(line.text)
|
446
|
+
hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
|
447
|
+
parser = Sass::SCSS::SassParser.new(scanner, @line)
|
448
|
+
|
449
|
+
unless res = parser.parse_interp_ident
|
450
|
+
return Tree::RuleNode.new(parse_interp(line.text))
|
451
|
+
end
|
452
|
+
res.unshift(hack_char) if hack_char
|
453
|
+
if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
|
454
|
+
res << comment
|
455
|
+
end
|
395
456
|
|
396
|
-
|
397
|
-
|
457
|
+
name = line.text[0...scanner.pos]
|
458
|
+
if scanner.scan(/\s*([:=])(?:\s|$)/)
|
459
|
+
parse_property(name, res, scanner[1], scanner.rest, :new, line)
|
460
|
+
else
|
461
|
+
res.pop if comment
|
462
|
+
Tree::RuleNode.new(res + parse_interp(scanner.rest))
|
398
463
|
end
|
399
|
-
|
400
|
-
|
464
|
+
end
|
465
|
+
|
466
|
+
def parse_property(name, parsed_name, eq, value, prop, line)
|
467
|
+
if value.strip.empty?
|
468
|
+
expr = Sass::Script::String.new("")
|
401
469
|
else
|
402
|
-
value
|
470
|
+
expr = parse_script(value, :offset => line.offset + line.text.index(value))
|
471
|
+
|
472
|
+
if eq.strip[0] == SCRIPT_CHAR
|
473
|
+
expr.context = :equals
|
474
|
+
Script.equals_warning("properties", name,
|
475
|
+
Sass::Tree::PropNode.val_to_sass(expr, @options), false,
|
476
|
+
@line, line.offset + 1, @options[:filename])
|
477
|
+
end
|
403
478
|
end
|
404
|
-
Tree::PropNode.new(name, expr,
|
479
|
+
Tree::PropNode.new(parse_interp(name), expr, prop)
|
405
480
|
end
|
406
481
|
|
407
482
|
def parse_variable(line)
|
408
|
-
name, op, value = line.text.scan(Script::MATCH)[0]
|
409
|
-
|
410
|
-
raise SyntaxError.new("
|
483
|
+
name, op, value, default = line.text.scan(Script::MATCH)[0]
|
484
|
+
guarded = op =~ /^\|\|/
|
485
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.",
|
486
|
+
:line => @line + 1) unless line.children.empty?
|
487
|
+
raise SyntaxError.new("Invalid variable: \"#{line.text}\".",
|
488
|
+
:line => @line) unless name && value
|
489
|
+
Script.var_warning(name, @line, line.offset + 1, @options[:filename]) if line.text[0] == ?!
|
490
|
+
|
491
|
+
expr = parse_script(value, :offset => line.offset + line.text.index(value))
|
492
|
+
if op =~ /=$/
|
493
|
+
expr.context = :equals
|
494
|
+
type = guarded ? "variable defaults" : "variables"
|
495
|
+
Script.equals_warning(type, "$#{name}", expr.to_sass,
|
496
|
+
guarded, @line, line.offset + 1, @options[:filename])
|
497
|
+
end
|
411
498
|
|
412
|
-
Tree::VariableNode.new(name,
|
499
|
+
Tree::VariableNode.new(name, expr, default || guarded)
|
413
500
|
end
|
414
501
|
|
415
502
|
def parse_comment(line)
|
416
503
|
if line[1] == CSS_COMMENT_CHAR || line[1] == SASS_COMMENT_CHAR
|
417
|
-
|
504
|
+
silent = line[1] == SASS_COMMENT_CHAR
|
505
|
+
Tree::CommentNode.new(
|
506
|
+
format_comment_text(line[2..-1], silent),
|
507
|
+
silent)
|
418
508
|
else
|
419
|
-
Tree::RuleNode.new(line)
|
509
|
+
Tree::RuleNode.new(parse_interp(line))
|
420
510
|
end
|
421
511
|
end
|
422
512
|
|
@@ -426,9 +516,12 @@ LONG
|
|
426
516
|
|
427
517
|
# If value begins with url( or ",
|
428
518
|
# it's a CSS @import rule and we don't want to touch it.
|
429
|
-
if directive == "import"
|
430
|
-
|
431
|
-
|
519
|
+
if directive == "import"
|
520
|
+
parse_import(line, value)
|
521
|
+
elsif directive == "mixin"
|
522
|
+
parse_mixin_definition(line)
|
523
|
+
elsif directive == "include"
|
524
|
+
parse_mixin_include(line, root)
|
432
525
|
elsif directive == "for"
|
433
526
|
parse_for(line, root, value)
|
434
527
|
elsif directive == "else"
|
@@ -441,9 +534,28 @@ LONG
|
|
441
534
|
Tree::IfNode.new(parse_script(value, :offset => offset))
|
442
535
|
elsif directive == "debug"
|
443
536
|
raise SyntaxError.new("Invalid debug directive '@debug': expected expression.") unless value
|
444
|
-
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.",
|
537
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.",
|
538
|
+
:line => @line + 1) unless line.children.empty?
|
445
539
|
offset = line.offset + line.text.index(value).to_i
|
446
540
|
Tree::DebugNode.new(parse_script(value, :offset => offset))
|
541
|
+
elsif directive == "extend"
|
542
|
+
raise SyntaxError.new("Invalid extend directive '@extend': expected expression.") unless value
|
543
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath extend directives.",
|
544
|
+
:line => @line + 1) unless line.children.empty?
|
545
|
+
offset = line.offset + line.text.index(value).to_i
|
546
|
+
Tree::ExtendNode.new(parse_interp(value, offset))
|
547
|
+
elsif directive == "warn"
|
548
|
+
raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
|
549
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath warn directives.",
|
550
|
+
:line => @line + 1) unless line.children.empty?
|
551
|
+
offset = line.offset + line.text.index(value).to_i
|
552
|
+
Tree::WarnNode.new(parse_script(value, :offset => offset))
|
553
|
+
elsif directive == "charset"
|
554
|
+
name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
|
555
|
+
raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
|
556
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
|
557
|
+
:line => @line + 1) unless line.children.empty?
|
558
|
+
Tree::CharsetNode.new(name)
|
447
559
|
else
|
448
560
|
Tree::DirectiveNode.new(line.text)
|
449
561
|
end
|
@@ -460,22 +572,26 @@ LONG
|
|
460
572
|
else
|
461
573
|
expected = "'to <expr>' or 'through <expr>'"
|
462
574
|
end
|
463
|
-
raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}."
|
575
|
+
raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}.")
|
576
|
+
end
|
577
|
+
raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
|
578
|
+
if var.slice!(0) == ?!
|
579
|
+
offset = line.offset + line.text.index("!" + var) + 1
|
580
|
+
Script.var_warning(var, @line, offset, @options[:filename])
|
464
581
|
end
|
465
|
-
raise SyntaxError.new("Invalid variable \"#{var}\".", @line) unless var =~ Script::VALIDATE
|
466
582
|
|
467
583
|
parsed_from = parse_script(from_expr, :offset => line.offset + line.text.index(from_expr))
|
468
584
|
parsed_to = parse_script(to_expr, :offset => line.offset + line.text.index(to_expr))
|
469
|
-
Tree::ForNode.new(var
|
585
|
+
Tree::ForNode.new(var, parsed_from, parsed_to, to_name == 'to')
|
470
586
|
end
|
471
587
|
|
472
588
|
def parse_else(parent, line, text)
|
473
|
-
previous = parent.last
|
589
|
+
previous = parent.children.last
|
474
590
|
raise SyntaxError.new("@else must come after @if.") unless previous.is_a?(Tree::IfNode)
|
475
591
|
|
476
592
|
if text
|
477
593
|
if text !~ /^if\s+(.+)/
|
478
|
-
raise SyntaxError.new("Invalid else directive '@else #{text}': expected 'if <expr>'."
|
594
|
+
raise SyntaxError.new("Invalid else directive '@else #{text}': expected 'if <expr>'.")
|
479
595
|
end
|
480
596
|
expr = parse_script($1, :offset => line.offset + line.text.index($1))
|
481
597
|
end
|
@@ -486,30 +602,119 @@ LONG
|
|
486
602
|
nil
|
487
603
|
end
|
488
604
|
|
605
|
+
def parse_import(line, value)
|
606
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
|
607
|
+
:line => @line + 1) unless line.children.empty?
|
608
|
+
|
609
|
+
scanner = StringScanner.new(value)
|
610
|
+
values = []
|
611
|
+
|
612
|
+
loop do
|
613
|
+
unless node = parse_import_arg(scanner)
|
614
|
+
raise SyntaxError.new("Invalid @import: expected file to import, was #{scanner.rest.inspect}",
|
615
|
+
:line => @line)
|
616
|
+
end
|
617
|
+
values << node
|
618
|
+
break unless scanner.scan(/,\s*/)
|
619
|
+
end
|
620
|
+
|
621
|
+
return values
|
622
|
+
end
|
623
|
+
|
624
|
+
def parse_import_arg(scanner)
|
625
|
+
return if scanner.eos?
|
626
|
+
unless (str = scanner.scan(Sass::SCSS::RX::STRING)) ||
|
627
|
+
(uri = scanner.scan(Sass::SCSS::RX::URI))
|
628
|
+
return Tree::ImportNode.new(scanner.scan(/[^,]+/))
|
629
|
+
end
|
630
|
+
|
631
|
+
val = scanner[1] || scanner[2]
|
632
|
+
scanner.scan(/\s*/)
|
633
|
+
if media = scanner.scan(/[^,].*/)
|
634
|
+
Tree::DirectiveNode.new("@import #{str || uri} #{media}")
|
635
|
+
elsif uri
|
636
|
+
Tree::DirectiveNode.new("@import #{uri}")
|
637
|
+
elsif val =~ /^http:\/\//
|
638
|
+
Tree::DirectiveNode.new("@import url(#{val})")
|
639
|
+
else
|
640
|
+
Tree::ImportNode.new(val)
|
641
|
+
end
|
642
|
+
end
|
643
|
+
|
644
|
+
MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
|
489
645
|
def parse_mixin_definition(line)
|
490
|
-
name, arg_string = line.text.scan(
|
491
|
-
raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\"."
|
646
|
+
name, arg_string = line.text.scan(MIXIN_DEF_RE).first
|
647
|
+
raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\".") if name.nil?
|
492
648
|
|
493
649
|
offset = line.offset + line.text.size - arg_string.size
|
494
|
-
args = Script::Parser.new(arg_string.strip, @line, offset).
|
650
|
+
args = Script::Parser.new(arg_string.strip, @line, offset, @options).
|
651
|
+
parse_mixin_definition_arglist
|
495
652
|
default_arg_found = false
|
496
653
|
Tree::MixinDefNode.new(name, args)
|
497
654
|
end
|
498
655
|
|
656
|
+
MIXIN_INCLUDE_RE = /^(?:\+|@include)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
|
499
657
|
def parse_mixin_include(line, root)
|
500
|
-
name, arg_string = line.text.scan(
|
501
|
-
raise SyntaxError.new("Invalid mixin include \"#{line.text}\"."
|
658
|
+
name, arg_string = line.text.scan(MIXIN_INCLUDE_RE).first
|
659
|
+
raise SyntaxError.new("Invalid mixin include \"#{line.text}\".") if name.nil?
|
502
660
|
|
503
661
|
offset = line.offset + line.text.size - arg_string.size
|
504
|
-
args = Script::Parser.new(arg_string.strip, @line, offset).
|
505
|
-
|
662
|
+
args = Script::Parser.new(arg_string.strip, @line, offset, @options).
|
663
|
+
parse_mixin_include_arglist
|
664
|
+
raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath mixin directives.",
|
665
|
+
:line => @line + 1) unless line.children.empty?
|
506
666
|
Tree::MixinNode.new(name, args)
|
507
667
|
end
|
508
668
|
|
509
669
|
def parse_script(script, options = {})
|
510
670
|
line = options[:line] || @line
|
511
671
|
offset = options[:offset] || 0
|
512
|
-
Script.parse(script, line, offset, @options
|
672
|
+
Script.parse(script, line, offset, @options)
|
673
|
+
end
|
674
|
+
|
675
|
+
def format_comment_text(text, silent)
|
676
|
+
content = text.split("\n")
|
677
|
+
|
678
|
+
if content.first && content.first.strip.empty?
|
679
|
+
removed_first = true
|
680
|
+
content.shift
|
681
|
+
end
|
682
|
+
|
683
|
+
return silent ? "//" : "/* */" if content.empty?
|
684
|
+
content.last.gsub!(%r{ ?\*/ *$}, '')
|
685
|
+
content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
|
686
|
+
content.first.gsub!(/^ /, '') unless removed_first
|
687
|
+
if silent
|
688
|
+
"//" + content.join("\n//")
|
689
|
+
else
|
690
|
+
# The #gsub fixes the case of a trailing */
|
691
|
+
"/*" + content.join("\n *").gsub(/ \*\Z/, '') + " */"
|
692
|
+
end
|
693
|
+
end
|
694
|
+
|
695
|
+
def parse_interp(text, offset = 0)
|
696
|
+
self.class.parse_interp(text, @line, offset, :filename => @filename)
|
697
|
+
end
|
698
|
+
|
699
|
+
# It's important that this have strings (at least)
|
700
|
+
# at the beginning, the end, and between each Script::Node.
|
701
|
+
#
|
702
|
+
# @private
|
703
|
+
def self.parse_interp(text, line, offset, options)
|
704
|
+
res = []
|
705
|
+
rest = Haml::Shared.handle_interpolation text do |scan|
|
706
|
+
escapes = scan[2].size
|
707
|
+
res << scan.matched[0...-2 - escapes]
|
708
|
+
if escapes % 2 == 1
|
709
|
+
res << "\\" * (escapes - 1) << '#{'
|
710
|
+
else
|
711
|
+
res << "\\" * [0, escapes - 1].max
|
712
|
+
res << Script::Parser.new(
|
713
|
+
scan, line, offset + scan.pos - scan.matched_size, options).
|
714
|
+
parse_interpolated
|
715
|
+
end
|
716
|
+
end
|
717
|
+
res << rest
|
513
718
|
end
|
514
719
|
end
|
515
720
|
end
|