radiant 0.9.0.rc2 → 0.9.1
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/CHANGELOG +18 -6
- data/CONTRIBUTORS +7 -1
- data/INSTALL +0 -5
- data/README +21 -0
- data/app/controllers/admin/layouts_controller.rb +1 -0
- data/app/controllers/admin/preferences_controller.rb +4 -3
- data/app/controllers/admin/resource_controller.rb +62 -8
- data/app/controllers/admin/snippets_controller.rb +1 -0
- data/app/controllers/admin/users_controller.rb +1 -0
- data/app/controllers/application_controller.rb +0 -17
- data/app/controllers/site_controller.rb +6 -4
- data/app/helpers/application_helper.rb +19 -0
- data/app/models/standard_tags.rb +212 -18
- data/app/models/status.rb +1 -1
- data/app/models/user.rb +2 -2
- data/app/views/admin/extensions/index.html.haml +1 -1
- data/app/views/admin/layouts/_form.html.haml +4 -4
- data/app/views/admin/layouts/index.html.haml +2 -2
- data/app/views/admin/page_parts/_page_part.html.haml +2 -2
- data/app/views/admin/pages/_fields.html.haml +5 -5
- data/app/views/admin/preferences/edit.html.haml +3 -3
- data/app/views/admin/snippets/_form.html.haml +5 -5
- data/app/views/admin/snippets/index.html.haml +3 -3
- data/app/views/admin/users/_form.html.haml +3 -4
- data/app/views/admin/users/index.html.haml +2 -1
- data/app/views/layouts/application.html.haml +1 -1
- data/config/environment.rb +2 -2
- data/config/environments/cucumber.rb +3 -3
- data/config/locales/en.yml +10 -10
- data/config/locales/en_available_tags.yml +80 -1
- data/db/migrate/20081203140407_add_indexes.rb +10 -10
- data/db/schema.rb +1 -1
- data/features/admin/resource_pagination.feature +27 -0
- data/features/admin/user_preferences.feature +17 -0
- data/features/step_definitions/admin/pagination_steps.rb +46 -0
- data/features/step_definitions/web_steps.rb +13 -3
- data/features/support/env.rb +7 -3
- data/features/support/paths.rb +1 -1
- data/lib/generators/instance/templates/instance_environment.rb +2 -2
- data/lib/generators/language_extension/templates/lang.yml +6 -6
- data/lib/plugins/active_record_extensions/lib/active_record_extensions.rb +0 -29
- data/lib/radiant.rb +3 -3
- data/lib/radiant/admin_ui.rb +1 -1
- data/lib/radiant/extension/script.rb +20 -5
- data/lib/radiant/extension_loader.rb +1 -1
- data/lib/radiant/initializer.rb +9 -3
- data/lib/radiant/pagination/controller.rb +34 -0
- data/lib/radiant/pagination/link_renderer.rb +7 -4
- data/lib/task_support.rb +6 -1
- data/lib/tasks/cucumber.rake +1 -1
- data/lib/tasks/framework.rake +1 -2
- data/lib/tasks/release.rake +11 -3
- data/lib/tasks/rspec.rake +1 -1
- data/public/images/admin/shadow.png +0 -0
- data/public/images/admin/shadow_grey.png +0 -0
- data/public/javascripts/admin/application.js +4 -1
- data/public/javascripts/admin/cookie.js +2 -2
- data/public/javascripts/admin/validationerror.js +18 -0
- data/public/stylesheets/admin/main.css +110 -37
- data/public/stylesheets/sass/admin/main.sass +3 -2
- data/public/stylesheets/sass/admin/modules/_grid.sass +56 -0
- data/public/stylesheets/sass/admin/partials/_actions.sass +74 -34
- data/public/stylesheets/sass/admin/partials/{_depreciated.sass → _deprecated.sass} +1 -1
- data/public/stylesheets/sass/admin/partials/_popup.sass +1 -1
- data/public/stylesheets/sass/admin/partials/_validations.sass +21 -0
- data/spec/controllers/admin/paginated_controller_spec.rb +26 -0
- data/spec/controllers/admin/preferences_controller_spec.rb +14 -0
- data/spec/controllers/application_controller_spec.rb +1 -11
- data/spec/controllers/site_controller_spec.rb +9 -0
- data/spec/datasets/users_dataset.rb +1 -1
- data/spec/generators/instance_generator_spec.rb +1 -1
- data/spec/helpers/application_helper_spec.rb +38 -0
- data/spec/lib/radiant/extension/script_spec.rb +5 -1
- data/spec/lib/radiant/initializer_spec.rb +7 -0
- data/spec/lib/radiant_spec.rb +1 -1
- data/spec/lib/task_support_spec.rb +14 -0
- data/spec/matchers/render_matcher.rb +14 -1
- data/spec/models/layout_spec.rb +3 -3
- data/spec/models/page_part_spec.rb +3 -3
- data/spec/models/page_spec.rb +8 -9
- data/spec/models/snippet_spec.rb +3 -3
- data/spec/models/standard_tags_spec.rb +99 -5
- data/spec/models/user_spec.rb +11 -11
- data/vendor/extensions/archive/app/models/archive_finder.rb +5 -0
- data/vendor/extensions/french_language_pack/config/locales/fr.yml +31 -25
- data/vendor/extensions/german_language_pack/README +2 -1
- data/vendor/extensions/german_language_pack/config/locales/de.yml +47 -45
- data/vendor/extensions/german_language_pack/config/locales/de_available_tags.yml +375 -304
- data/vendor/extensions/german_language_pack/german_language_pack_extension.rb +2 -2
- data/vendor/extensions/markdown_filter/README +1 -1
- data/vendor/extensions/markdown_filter/lib/markdown_filter.rb +4 -4
- data/vendor/extensions/markdown_filter/lib/markdown_tags.rb +0 -15
- data/vendor/extensions/markdown_filter/markdown_filter_extension.rb +1 -10
- data/vendor/extensions/markdown_filter/spec/models/markdown_filter_spec.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/CONTRIBUTERS +4 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/ChangeLog +1332 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/README +10 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/Rakefile +97 -38
- data/vendor/extensions/markdown_filter/vendor/kramdown/VERSION +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/generate_data.rb +6 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/historic-jruby-1.4.0.dat +7 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/historic-ruby-1.8.6.dat +7 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/historic-ruby-1.8.7.dat +7 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/historic-ruby-1.9.1p243.dat +7 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/historic-ruby-1.9.2dev.dat +7 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/benchmark/testing.sh +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/bin/kramdown +11 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/data/kramdown/document.html +9 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/data/kramdown/document.latex +43 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.less.css +510 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.template +26 -33
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/documentation.page +72 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/index.page +21 -49
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/installation.page +6 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/links.markdown +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/news.page +3 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/quickref.page +140 -127
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/syntax.page +501 -431
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/tests.page +3 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/compatibility.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter.rb +8 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/base.rb +40 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/html.rb +99 -27
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/latex.rb +57 -18
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/document.rb +32 -13
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/error.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/options.rb +34 -14
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser.rb +9 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/base.rb +95 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/html.rb +387 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown.rb +74 -65
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/abbreviation.rb +65 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/attribute_list.rb +3 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/autolink.rb +8 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/blank_line.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/blockquote.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/codeblock.rb +3 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/codespan.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/emphasis.rb +4 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/eob.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/escaped_chars.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/extension.rb +47 -55
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/footnote.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/header.rb +3 -18
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/horizontal_rule.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html.rb +69 -149
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html_entity.rb +4 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/line_break.rb +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/link.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/list.rb +12 -9
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/math.rb +53 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/paragraph.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/smart_quotes.rb +5 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/table.rb +4 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/typographic_symbol.rb +7 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/version.rb +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/man/man1/kramdown.1 +222 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb +68 -7
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.options +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.text +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.html +9 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/mixed.html +9 -3
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.html +49 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.text +29 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.html +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.text +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/content_model/tables.html +2 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.html +10 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.text +9 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/comment.html +7 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/comment.text +8 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/entity.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/entity.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.html +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.options +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.text +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_dl.html +8 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_dl.text +8 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ol.html +15 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ol.text +17 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ul.html +19 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ul.text +22 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/options +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/paragraph.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/paragraph.text +4 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_normal.html +13 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_normal.text +12 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.html +10 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.text +14 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/typography.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/typography.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_raw.html +3 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_raw.text +0 -1
- 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/auto_id_and_ial.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/simple.html +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/simple.text +7 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.text +5 -5
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.html +0 -2
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.text +3 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.text +4 -4
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.text +5 -6
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options2.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options3.text +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.html +19 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.text +18 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/02_emphasis/errors.html +1 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/02_emphasis/nesting.html +4 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/02_emphasis/nesting.text +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.latex +18 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/footnote_nr.latex +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/markers.latex +32 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/invalid.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/invalid.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/abbreviations/abbrev.html +8 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/abbreviations/abbrev.text +15 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/abbreviations/abbrev_defs.html +2 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/abbreviations/abbrev_defs.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/autolinks/url_links.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/autolinks/url_links.text +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/comment.html +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/comment.text +6 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/ignored.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/ignored.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/nomarkdown.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/nomarkdown.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/options.html +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/options.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/ial/simple.html +2 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/ial/simple.text +1 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/math/normal.html +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/math/normal.text +5 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html +3 -0
- data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.text +3 -0
- data/vendor/extensions/smarty_pants_filter/README +1 -0
- data/vendor/extensions/smarty_pants_filter/Rakefile +136 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/lib/smarty_pants_filter.rb +0 -0
- data/vendor/extensions/smarty_pants_filter/lib/smarty_pants_tags.rb +18 -0
- data/vendor/extensions/smarty_pants_filter/lib/tasks/smarty_pants_filter_extension_tasks.rake +28 -0
- data/vendor/extensions/smarty_pants_filter/smarty_pants_filter_extension.rb +18 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/smartypants.html +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/spec/models/smarty_pants_filter_spec.rb +0 -0
- data/vendor/extensions/smarty_pants_filter/spec/spec.opts +6 -0
- data/vendor/extensions/smarty_pants_filter/spec/spec_helper.rb +36 -0
- data/vendor/extensions/smarty_pants_filter/test/test_helper.rb +19 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/test/unit/smarty_pants_filter_test.rb +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/vendor/rubypants/README +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/vendor/rubypants/Rakefile +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/vendor/rubypants/install.rb +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/vendor/rubypants/rubypants.rb +0 -0
- data/vendor/extensions/{markdown_filter → smarty_pants_filter}/vendor/rubypants/test_rubypants.rb +0 -0
- data/vendor/plugins/haml/Rakefile +84 -52
- data/vendor/plugins/haml/VERSION +1 -1
- data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md +77 -0
- data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md +60 -0
- data/vendor/plugins/haml/extra/haml-mode.el +15 -12
- data/vendor/plugins/haml/extra/sass-mode.el +2 -2
- data/vendor/plugins/haml/haml.gemspec +16 -7
- data/vendor/plugins/haml/init.rb +3 -1
- data/vendor/plugins/haml/lib/haml.rb +1 -0
- data/vendor/plugins/haml/lib/haml/filters.rb +14 -2
- data/vendor/plugins/haml/lib/haml/helpers.rb +34 -14
- data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rb +6 -4
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +74 -34
- data/vendor/plugins/haml/lib/haml/helpers/xss_mods.rb +37 -8
- data/vendor/plugins/haml/lib/haml/html.rb +1 -1
- data/vendor/plugins/haml/lib/haml/precompiler.rb +3 -2
- data/vendor/plugins/haml/lib/haml/railtie.rb +18 -0
- data/vendor/plugins/haml/lib/haml/template.rb +15 -4
- data/vendor/plugins/haml/lib/haml/template/plugin.rb +37 -2
- data/vendor/plugins/haml/lib/haml/util.rb +56 -2
- data/vendor/plugins/haml/lib/haml/version.rb +29 -14
- data/vendor/plugins/haml/lib/sass/files.rb +10 -2
- data/vendor/plugins/haml/lib/sass/plugin.rb +7 -2
- data/vendor/plugins/haml/lib/sass/plugin/rack.rb +2 -2
- data/vendor/plugins/haml/lib/sass/plugin/rails.rb +2 -1
- data/vendor/plugins/haml/lib/sass/script/number.rb +2 -2
- data/vendor/plugins/haml/lib/sass/tree/if_node.rb +1 -0
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +9 -1
- data/vendor/plugins/haml/test/haml/engine_test.rb +24 -2
- data/vendor/plugins/haml/test/haml/helper_test.rb +60 -9
- data/vendor/plugins/haml/test/haml/template_test.rb +80 -3
- data/vendor/plugins/haml/test/haml/templates/helpers.haml +26 -0
- data/vendor/plugins/haml/test/haml/templates/partial_layout.haml +6 -2
- data/vendor/plugins/haml/test/sass/engine_test.rb +6 -1
- data/vendor/plugins/haml/test/test_helper.rb +16 -1
- data/vendor/radius/LICENSE +19 -0
- data/vendor/radius/QUICKSTART.rdoc +7 -7
- data/vendor/radius/README.rdoc +9 -25
- data/vendor/radius/Rakefile +4 -27
- data/vendor/radius/VERSION +1 -0
- data/vendor/radius/lib/radius/parser.rb +4 -4
- data/vendor/radius/lib/radius/parser/scan.rb +371 -940
- data/vendor/radius/lib/radius/parser/scan.rl +2 -1
- data/vendor/radius/lib/radius/version.rb +5 -11
- data/vendor/radius/radius.gemspec +55 -22
- data/vendor/radius/tasks/jeweler.rake +21 -0
- data/vendor/radius/tasks/rdoc.rake +13 -0
- data/vendor/radius/tasks/test.rake +7 -0
- data/vendor/radius/test/parser_test.rb +5 -0
- data/vendor/radius/test/test_helper.rb +1 -0
- data/vendor/rails/actionmailer/CHANGELOG +18 -0
- data/vendor/rails/actionmailer/MIT-LICENSE +1 -1
- data/vendor/rails/actionmailer/Rakefile +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/base.rb +2 -2
- data/vendor/rails/actionmailer/lib/action_mailer/quoting.rb +1 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail.rb +1 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/Makefile +18 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/address.rb +4 -38
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/attachments.rb +65 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/base64.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/compat.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/config.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/core_extensions.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/encode.rb +9 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/header.rb +4 -2
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/index.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/interface.rb +33 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/loader.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/mail.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/mailbox.rb +3 -2
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/main.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/mbox.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/net.rb +3 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/obsolete.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/parser.rb +1060 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/parser.y +416 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/port.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/quoting.rb +47 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/require_arch.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/scanner.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/scanner_r.rb +2 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/stringio.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/utils.rb +50 -25
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/COPYING +504 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/README +12 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet.rb +67 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5freq.rb +927 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5prober.rb +42 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/chardistribution.rb +238 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetgroupprober.rb +112 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetprober.rb +75 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/codingstatemachine.rb +64 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/constants.rb +42 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escprober.rb +89 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escsm.rb +244 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/eucjpprober.rb +88 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrfreq.rb +596 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrprober.rb +42 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwfreq.rb +430 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwprober.rb +42 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312freq.rb +474 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312prober.rb +42 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/hebrewprober.rb +289 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jisfreq.rb +570 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jpcntx.rb +229 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langbulgarianmodel.rb +229 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langcyrillicmodel.rb +330 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langgreekmodel.rb +227 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhebrewmodel.rb +202 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhungarianmodel.rb +226 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langthaimodel.rb +201 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/latin1prober.rb +147 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcharsetprober.rb +89 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcsgroupprober.rb +45 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcssm.rb +542 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcharsetprober.rb +124 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcsgroupprober.rb +56 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sjisprober.rb +88 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/universaldetector.rb +168 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/utf8prober.rb +87 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/version.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb +2 -2
- data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
- data/vendor/rails/actionmailer/test/abstract_unit.rb +4 -4
- data/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb +1 -1
- data/vendor/rails/actionmailer/test/mail_service_test.rb +66 -2
- data/vendor/rails/actionmailer/test/quoting_test.rb +10 -4
- data/vendor/rails/actionpack/CHANGELOG +55 -0
- data/vendor/rails/actionpack/MIT-LICENSE +1 -1
- data/vendor/rails/actionpack/README +7 -7
- data/vendor/rails/actionpack/Rakefile +2 -2
- data/vendor/rails/actionpack/lib/action_controller.rb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb +18 -9
- data/vendor/rails/actionpack/lib/action_controller/base.rb +14 -14
- data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb +6 -6
- data/vendor/rails/actionpack/lib/action_controller/cookies.rb +96 -0
- data/vendor/rails/actionpack/lib/action_controller/failsafe.rb +1 -0
- data/vendor/rails/actionpack/lib/action_controller/flash.rb +42 -0
- data/vendor/rails/actionpack/lib/action_controller/integration.rb +5 -1
- data/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/rack_lint_patch.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/rescue.rb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/response.rb +4 -7
- data/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb +1 -0
- data/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +6 -0
- data/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +6 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/_trace.erb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +4 -1
- data/vendor/rails/actionpack/lib/action_pack.rb +1 -1
- data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view.rb +3 -3
- data/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb +11 -11
- data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb +12 -11
- data/vendor/rails/actionpack/lib/action_view/helpers/debug_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +49 -12
- data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +3 -4
- data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +7 -4
- data/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/raw_output_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb +2 -10
- data/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb +6 -5
- data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +5 -5
- data/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb +37 -9
- data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +9 -11
- data/vendor/rails/actionpack/lib/action_view/partials.rb +2 -1
- data/vendor/rails/actionpack/lib/action_view/paths.rb +8 -0
- data/vendor/rails/actionpack/lib/action_view/renderable.rb +16 -2
- data/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb +7 -4
- data/vendor/rails/actionpack/lib/action_view/test_case.rb +1 -1
- data/vendor/rails/actionpack/test/abstract_unit.rb +8 -8
- data/vendor/rails/actionpack/test/active_record_unit.rb +1 -1
- data/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb +3 -1
- data/vendor/rails/actionpack/test/controller/assert_select_test.rb +6 -5
- data/vendor/rails/actionpack/test/controller/caching_test.rb +16 -2
- data/vendor/rails/actionpack/test/controller/capture_test.rb +1 -1
- data/vendor/rails/actionpack/test/controller/cookie_test.rb +37 -1
- data/vendor/rails/actionpack/test/controller/flash_test.rb +28 -1
- data/vendor/rails/actionpack/test/controller/helper_test.rb +1 -1
- data/vendor/rails/actionpack/test/controller/integration_test.rb +0 -1
- data/vendor/rails/actionpack/test/controller/localized_templates_test.rb +24 -0
- data/vendor/rails/actionpack/test/controller/output_escaping_test.rb +19 -0
- data/vendor/rails/actionpack/test/controller/rack_test.rb +1 -4
- data/vendor/rails/actionpack/test/controller/render_test.rb +11 -2
- data/vendor/rails/actionpack/test/controller/rescue_test.rb +8 -2
- data/vendor/rails/actionpack/test/controller/routing_test.rb +1 -0
- data/vendor/rails/actionpack/test/controller/send_file_test.rb +1 -1
- data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +2 -2
- data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +10 -6
- data/vendor/rails/actionpack/test/fixtures/localized/hello_world.de.html +1 -0
- data/vendor/rails/actionpack/test/fixtures/localized/hello_world.en.html +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_customer_counter_with_as.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_utf8_partial.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_utf8_partial_magic.html.erb +2 -0
- data/vendor/rails/actionpack/test/fixtures/test/array_translation.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/capturing.erb +2 -2
- data/vendor/rails/actionpack/test/fixtures/test/scoped_array_translation.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/translation.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb +4 -2
- data/vendor/rails/actionpack/test/fixtures/test/utf8_magic.html.erb +5 -0
- data/vendor/rails/actionpack/test/fixtures/test/utf8_magic_with_bare_partial.html.erb +5 -0
- data/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb +9 -2
- data/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb +0 -1
- data/vendor/rails/actionpack/test/template/date_helper_test.rb +118 -0
- data/vendor/rails/actionpack/test/template/erb_util_test.rb +12 -0
- data/vendor/rails/actionpack/test/template/form_helper_test.rb +57 -3
- data/vendor/rails/actionpack/test/template/form_tag_helper_test.rb +21 -9
- data/vendor/rails/actionpack/test/template/render_test.rb +47 -8
- data/vendor/rails/actionpack/test/template/text_helper_test.rb +26 -1
- data/vendor/rails/actionpack/test/template/translation_helper_test.rb +72 -9
- data/vendor/rails/actionpack/test/template/url_helper_test.rb +20 -1
- data/vendor/rails/actionpack/test/view/test_case_test.rb +2 -2
- data/vendor/rails/activerecord/CHANGELOG +43 -0
- data/vendor/rails/activerecord/Rakefile +1 -1
- data/vendor/rails/activerecord/examples/performance.sql +85 -0
- data/vendor/rails/activerecord/lib/active_record.rb +1 -2
- data/vendor/rails/activerecord/lib/active_record/association_preload.rb +9 -2
- data/vendor/rails/activerecord/lib/active_record/associations.rb +48 -38
- data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +15 -11
- data/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb +16 -6
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb +11 -1
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb +34 -10
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb +5 -0
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb +5 -5
- data/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb +10 -1
- data/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +5 -1
- data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +66 -35
- data/vendor/rails/activerecord/lib/active_record/base.rb +77 -36
- data/vendor/rails/activerecord/lib/active_record/batches.rb +13 -9
- data/vendor/rails/activerecord/lib/active_record/calculations.rb +6 -3
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +3 -3
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_limits.rb +57 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +3 -7
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +64 -10
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +2 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +31 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +31 -66
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +5 -5
- data/vendor/rails/activerecord/lib/active_record/dirty.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/fixtures.rb +1 -0
- data/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb +34 -1
- data/vendor/rails/activerecord/lib/active_record/migration.rb +5 -0
- data/vendor/rails/activerecord/lib/active_record/nested_attributes.rb +64 -52
- data/vendor/rails/activerecord/lib/active_record/reflection.rb +66 -1
- data/vendor/rails/activerecord/lib/active_record/schema.rb +5 -1
- data/vendor/rails/activerecord/lib/active_record/schema_dumper.rb +3 -0
- data/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/validations.rb +13 -1
- data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
- data/vendor/rails/activerecord/test/cases/active_schema_test_mysql.rb +22 -0
- data/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb +13 -0
- data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +8 -7
- data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +7 -1
- data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +26 -0
- data/vendor/rails/activerecord/test/cases/associations/inverse_associations_test.rb +566 -0
- data/vendor/rails/activerecord/test/cases/associations_test.rb +10 -0
- data/vendor/rails/activerecord/test/cases/autosave_association_test.rb +86 -10
- data/vendor/rails/activerecord/test/cases/base_test.rb +29 -0
- data/vendor/rails/activerecord/test/cases/batches_test.rb +20 -0
- data/vendor/rails/activerecord/test/cases/calculations_test.rb +2 -3
- data/vendor/rails/activerecord/test/cases/encoding_test.rb +6 -0
- data/vendor/rails/activerecord/test/cases/finder_test.rb +19 -3
- data/vendor/rails/activerecord/test/cases/fixtures_test.rb +5 -0
- data/vendor/rails/activerecord/test/cases/json_serialization_test.rb +14 -0
- data/vendor/rails/activerecord/test/cases/locking_test.rb +48 -3
- data/vendor/rails/activerecord/test/cases/migration_test.rb +115 -0
- data/vendor/rails/activerecord/test/cases/modules_test.rb +28 -0
- data/vendor/rails/activerecord/test/cases/named_scope_test.rb +1 -1
- data/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +239 -7
- data/vendor/rails/activerecord/test/cases/query_cache_test.rb +7 -1
- data/vendor/rails/activerecord/test/cases/reflection_test.rb +47 -7
- data/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb +2 -2
- data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +6 -36
- data/vendor/rails/activerecord/test/cases/validations_test.rb +33 -1
- data/vendor/rails/activerecord/test/cases/yaml_serialization_test.rb +11 -0
- data/vendor/rails/activerecord/test/fixtures/faces.yml +11 -0
- data/vendor/rails/{pkg/rails-3.0.pre.gem → 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/activerecord/test/fixtures/interests.yml +33 -0
- data/vendor/rails/activerecord/test/fixtures/men.yml +5 -0
- data/vendor/rails/activerecord/test/fixtures/zines.yml +5 -0
- data/vendor/rails/activerecord/test/models/author.rb +3 -0
- data/vendor/rails/activerecord/test/models/bird.rb +6 -0
- data/vendor/rails/activerecord/test/models/company_in_module.rb +17 -0
- data/vendor/rails/activerecord/test/models/event_author.rb +5 -0
- data/vendor/rails/activerecord/test/models/face.rb +7 -0
- data/vendor/rails/activerecord/test/models/interest.rb +5 -0
- data/vendor/rails/activerecord/test/models/invoice.rb +4 -0
- data/vendor/rails/activerecord/test/models/line_item.rb +3 -0
- data/vendor/rails/activerecord/test/models/man.rb +9 -0
- data/vendor/rails/activerecord/test/models/parrot.rb +6 -0
- data/vendor/rails/activerecord/test/models/pirate.rb +10 -0
- data/vendor/rails/activerecord/test/models/ship.rb +10 -1
- data/vendor/rails/activerecord/test/models/ship_part.rb +3 -1
- data/vendor/rails/activerecord/test/models/zine.rb +3 -0
- data/vendor/rails/activerecord/test/schema/schema.rb +41 -0
- data/vendor/rails/activeresource/CHANGELOG +15 -0
- data/vendor/rails/activeresource/Rakefile +1 -1
- data/vendor/rails/activeresource/lib/active_resource/base.rb +11 -2
- data/vendor/rails/activeresource/lib/active_resource/http_mock.rb +2 -2
- data/vendor/rails/activeresource/lib/active_resource/validations.rb +3 -3
- data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
- data/vendor/rails/activeresource/test/abstract_unit.rb +2 -2
- data/vendor/rails/activeresource/test/base_errors_test.rb +13 -0
- data/vendor/rails/activeresource/test/base_test.rb +49 -0
- data/vendor/rails/activeresource/test/debug.log +80350 -0
- data/vendor/rails/activesupport/CHANGELOG +37 -0
- data/vendor/rails/activesupport/lib/active_support.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/buffered_logger.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/cache/memory_store.rb +7 -1
- data/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/random_access.rb +11 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb +35 -28
- data/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb +14 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb +14 -3
- data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb +2 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb +33 -26
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric/conversions.rb +2 -2
- data/vendor/rails/activesupport/lib/active_support/core_ext/object.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/blank.rb +20 -2
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/metaclass.rb +6 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/singleton_class.rb +13 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb +108 -44
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb +2 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/time.rb +8 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb +12 -3
- data/vendor/rails/activesupport/lib/active_support/deprecation.rb +3 -2
- data/vendor/rails/activesupport/lib/active_support/inflections.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/inflector.rb +5 -2
- data/vendor/rails/activesupport/lib/active_support/json/backends/yajl.rb +40 -0
- data/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb +10 -7
- data/vendor/rails/activesupport/lib/active_support/json/decoding.rb +16 -1
- data/vendor/rails/activesupport/lib/active_support/json/encoding.rb +11 -2
- data/vendor/rails/activesupport/lib/active_support/memoizable.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb +2 -2
- data/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb +6 -7
- data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +28 -11
- data/vendor/rails/activesupport/lib/active_support/testing/assertions.rb +14 -0
- data/vendor/rails/activesupport/lib/active_support/values/time_zone.rb +84 -76
- data/vendor/rails/activesupport/lib/active_support/vendor.rb +10 -2
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.3/lib → i18n-0.3.7}/i18n.rb +175 -39
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend.rb +19 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb +66 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/missing.rb +67 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/store_procs.rb +38 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/translation.rb +88 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/base.rb +266 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/cache.rb +76 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/cascade.rb +58 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/chain.rb +75 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/cldr.rb +100 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fallbacks.rb +69 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb +69 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/gettext.rb +75 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb +68 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/interpolation_compiler.rb +119 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/links.rb +34 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/metadata.rb +73 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/pluralization.rb +57 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/simple.rb +22 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/except.rb +8 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/slice.rb +8 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/object/meta_class.rb +5 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/string/interpolate.rb +99 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.1.3/lib → i18n-0.3.7}/i18n/exceptions.rb +15 -7
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/gettext.rb +25 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/gettext/po_parser.rb +329 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/helpers.rb +5 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/helpers/gettext.rb +65 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale/fallbacks.rb +98 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag.rb +28 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/parents.rb +24 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/rfc4646.rb +76 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/simple.rb +41 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/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/lib/active_support/xml_mini/libxml.rb +23 -83
- data/vendor/rails/activesupport/lib/active_support/xml_mini/libxmlsax.rb +74 -0
- data/vendor/rails/activesupport/lib/active_support/xml_mini/nokogiri.rb +25 -22
- data/vendor/rails/activesupport/lib/active_support/xml_mini/nokogirisax.rb +73 -0
- data/vendor/rails/railties/CHANGELOG +18 -2
- data/vendor/rails/railties/MIT-LICENSE +1 -1
- data/vendor/rails/railties/Rakefile +5 -5
- data/vendor/rails/railties/bin/rails +6 -5
- data/vendor/rails/railties/builtin/rails_info/rails/info.rb +1 -1
- data/vendor/rails/railties/configs/initializers/cookie_verification_secret.rb +7 -0
- data/vendor/rails/railties/guides/source/getting_started.textile +2 -2
- data/vendor/rails/railties/lib/commands/dbconsole.rb +1 -1
- data/vendor/rails/railties/lib/commands/runner.rb +1 -1
- data/vendor/rails/railties/lib/dispatcher.rb +1 -1
- data/vendor/rails/railties/lib/rails/gem_dependency.rb +11 -4
- data/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +1 -1
- data/vendor/rails/railties/lib/rails/version.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator.rb +5 -2
- data/vendor/rails/railties/lib/rails_generator/generated_attribute.rb +7 -6
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb +3 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml +9 -5
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb +2 -4
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb +1 -1
- data/vendor/rails/railties/lib/tasks/databases.rake +14 -14
- data/vendor/rails/railties/lib/tasks/framework.rake +4 -1
- data/vendor/rails/railties/lib/tasks/rails.rb +6 -1
- metadata +276 -321
- data/config/initializers/pagination.rb +0 -1
- data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.css +0 -293
- data/vendor/plugins/haml/FAQ +0 -138
- data/vendor/plugins/haml/README.rdoc +0 -319
- data/vendor/plugins/haml/REVISION +0 -1
- data/vendor/plugins/haml/lib/sass/constant.rb +0 -216
- data/vendor/plugins/haml/lib/sass/constant/color.rb +0 -101
- data/vendor/plugins/haml/lib/sass/constant/literal.rb +0 -54
- data/vendor/plugins/haml/lib/sass/constant/nil.rb +0 -9
- data/vendor/plugins/haml/lib/sass/constant/number.rb +0 -87
- data/vendor/plugins/haml/lib/sass/constant/operation.rb +0 -30
- data/vendor/plugins/haml/lib/sass/constant/string.rb +0 -22
- data/vendor/plugins/haml/lib/sass/tree/attr_node.rb +0 -57
- data/vendor/plugins/haml/lib/sass/tree/value_node.rb +0 -20
- data/vendor/plugins/haml/test/sass/results/constants.css +0 -16
- data/vendor/plugins/haml/test/sass/templates/constants.sass +0 -100
- data/vendor/radius/Manifest.txt +0 -21
- data/vendor/rails/Rakefile +0 -81
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb +0 -46
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb +0 -1478
- data/vendor/rails/actionmailer/pkg/actionmailer-3.0.pre.gem +0 -0
- data/vendor/rails/actionpack/lib/action_view/erb/util.rb +0 -44
- data/vendor/rails/actionpack/lib/action_view/safe_buffer.rb +0 -28
- data/vendor/rails/actionpack/pkg/actionpack-3.0.pre.gem +0 -0
- data/vendor/rails/actionpack/test/view/safe_buffer_test.rb +0 -36
- data/vendor/rails/activemodel/CHANGES +0 -12
- data/vendor/rails/activemodel/README +0 -21
- data/vendor/rails/activemodel/Rakefile +0 -24
- data/vendor/rails/activemodel/lib/active_model.rb +0 -5
- data/vendor/rails/activemodel/lib/active_model/base.rb +0 -8
- data/vendor/rails/activemodel/lib/active_model/callbacks.rb +0 -7
- data/vendor/rails/activemodel/lib/active_model/core.rb +0 -7
- data/vendor/rails/activemodel/lib/active_model/deprecated_error_methods.rb +0 -38
- data/vendor/rails/activemodel/lib/active_model/errors.rb +0 -82
- data/vendor/rails/activemodel/lib/active_model/observing.rb +0 -98
- data/vendor/rails/activemodel/lib/active_model/state_machine.rb +0 -68
- data/vendor/rails/activemodel/lib/active_model/state_machine/event.rb +0 -64
- data/vendor/rails/activemodel/lib/active_model/state_machine/machine.rb +0 -78
- data/vendor/rails/activemodel/lib/active_model/state_machine/state.rb +0 -47
- data/vendor/rails/activemodel/lib/active_model/state_machine/state_transition.rb +0 -40
- data/vendor/rails/activemodel/lib/active_model/validations.rb +0 -126
- data/vendor/rails/activemodel/lib/active_model/validations/acceptance.rb +0 -45
- data/vendor/rails/activemodel/lib/active_model/validations/associated.rb +0 -46
- data/vendor/rails/activemodel/lib/active_model/validations/confirmation.rb +0 -44
- data/vendor/rails/activemodel/lib/active_model/validations/exclusion.rb +0 -37
- data/vendor/rails/activemodel/lib/active_model/validations/format.rb +0 -39
- data/vendor/rails/activemodel/lib/active_model/validations/inclusion.rb +0 -37
- data/vendor/rails/activemodel/lib/active_model/validations/length.rb +0 -95
- data/vendor/rails/activemodel/lib/active_model/validations/numericality.rb +0 -80
- data/vendor/rails/activemodel/lib/active_model/validations/presence.rb +0 -42
- data/vendor/rails/activemodel/lib/active_model/validations/uniqueness.rb +0 -104
- data/vendor/rails/activemodel/pkg/activemodel-3.0.pre.gem +0 -0
- data/vendor/rails/activemodel/test/observing_test.rb +0 -121
- data/vendor/rails/activemodel/test/state_machine/event_test.rb +0 -49
- data/vendor/rails/activemodel/test/state_machine/machine_test.rb +0 -43
- data/vendor/rails/activemodel/test/state_machine/state_test.rb +0 -72
- data/vendor/rails/activemodel/test/state_machine/state_transition_test.rb +0 -84
- data/vendor/rails/activemodel/test/state_machine_test.rb +0 -312
- data/vendor/rails/activemodel/test/test_helper.rb +0 -21
- data/vendor/rails/activerecord/MIT-LICENSE +0 -20
- data/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb +0 -26
- data/vendor/rails/activerecord/pkg/activerecord-3.0.pre.gem +0 -0
- data/vendor/rails/activeresource/MIT-LICENSE +0 -20
- data/vendor/rails/activeresource/pkg/activeresource-3.0.pre.gem +0 -0
- data/vendor/rails/activesupport/MIT-LICENSE +0 -20
- data/vendor/rails/activesupport/Rakefile +0 -175
- data/vendor/rails/activesupport/bin/generate_tables +0 -147
- data/vendor/rails/activesupport/install.rb +0 -30
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE +0 -20
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile +0 -20
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile +0 -5
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec +0 -27
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb +0 -214
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb +0 -5
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb +0 -99
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb +0 -124
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml +0 -3
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb +0 -567
- data/vendor/rails/activesupport/pkg/activesupport-3.0.pre.gem +0 -0
- data/vendor/rails/activesupport/test/abstract_unit.rb +0 -36
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/b.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/d.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/e/f.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/application.rb +0 -1
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder.rb +0 -3
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb +0 -3
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb +0 -7
- data/vendor/rails/activesupport/test/autoloading_fixtures/conflict.rb +0 -1
- data/vendor/rails/activesupport/test/autoloading_fixtures/counting_loader.rb +0 -5
- data/vendor/rails/activesupport/test/autoloading_fixtures/cross_site_dependency.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/e.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb +0 -4
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb +0 -1
- data/vendor/rails/activesupport/test/autoloading_fixtures/multiple_constant_file.rb +0 -2
- data/vendor/rails/activesupport/test/autoloading_fixtures/raises_name_error.rb +0 -3
- data/vendor/rails/activesupport/test/autoloading_fixtures/raises_no_method_error.rb +0 -3
- data/vendor/rails/activesupport/test/buffered_logger_test.rb +0 -146
- data/vendor/rails/activesupport/test/caching_test.rb +0 -348
- data/vendor/rails/activesupport/test/callbacks_test.rb +0 -188
- data/vendor/rails/activesupport/test/clean_backtrace_test.rb +0 -47
- data/vendor/rails/activesupport/test/clean_logger_test.rb +0 -57
- data/vendor/rails/activesupport/test/core_ext/array_ext_test.rb +0 -363
- data/vendor/rails/activesupport/test/core_ext/base64_ext_test.rb +0 -8
- data/vendor/rails/activesupport/test/core_ext/bigdecimal.rb +0 -10
- data/vendor/rails/activesupport/test/core_ext/blank_test.rb +0 -24
- data/vendor/rails/activesupport/test/core_ext/cgi_ext_test.rb +0 -14
- data/vendor/rails/activesupport/test/core_ext/class/attribute_accessor_test.rb +0 -31
- data/vendor/rails/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb +0 -224
- data/vendor/rails/activesupport/test/core_ext/class/delegating_attributes_test.rb +0 -115
- data/vendor/rails/activesupport/test/core_ext/class_test.rb +0 -46
- data/vendor/rails/activesupport/test/core_ext/date_ext_test.rb +0 -278
- data/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb +0 -359
- data/vendor/rails/activesupport/test/core_ext/duplicable_test.rb +0 -22
- data/vendor/rails/activesupport/test/core_ext/duration_test.rb +0 -121
- data/vendor/rails/activesupport/test/core_ext/enumerable_test.rb +0 -97
- data/vendor/rails/activesupport/test/core_ext/exception_test.rb +0 -68
- data/vendor/rails/activesupport/test/core_ext/file_test.rb +0 -67
- data/vendor/rails/activesupport/test/core_ext/float_ext_test.rb +0 -25
- data/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb +0 -1014
- data/vendor/rails/activesupport/test/core_ext/integer_ext_test.rb +0 -37
- data/vendor/rails/activesupport/test/core_ext/kernel_test.rb +0 -43
- data/vendor/rails/activesupport/test/core_ext/load_error_test.rb +0 -16
- data/vendor/rails/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb +0 -30
- data/vendor/rails/activesupport/test/core_ext/module/attr_internal_test.rb +0 -52
- data/vendor/rails/activesupport/test/core_ext/module/attribute_accessor_test.rb +0 -33
- data/vendor/rails/activesupport/test/core_ext/module/attribute_aliasing_test.rb +0 -58
- data/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb +0 -27
- data/vendor/rails/activesupport/test/core_ext/module/synchronization_test.rb +0 -85
- data/vendor/rails/activesupport/test/core_ext/module_test.rb +0 -363
- data/vendor/rails/activesupport/test/core_ext/name_error_test.rb +0 -20
- data/vendor/rails/activesupport/test/core_ext/numeric_ext_test.rb +0 -162
- data/vendor/rails/activesupport/test/core_ext/object_and_class_ext_test.rb +0 -282
- data/vendor/rails/activesupport/test/core_ext/object_ext_test.rb +0 -8
- data/vendor/rails/activesupport/test/core_ext/pathname_test.rb +0 -9
- data/vendor/rails/activesupport/test/core_ext/proc_test.rb +0 -11
- data/vendor/rails/activesupport/test/core_ext/range_ext_test.rb +0 -63
- data/vendor/rails/activesupport/test/core_ext/string_ext_test.rb +0 -369
- data/vendor/rails/activesupport/test/core_ext/symbol_test.rb +0 -9
- data/vendor/rails/activesupport/test/core_ext/time_ext_test.rb +0 -744
- data/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb +0 -845
- data/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb +0 -12
- data/vendor/rails/activesupport/test/dependencies/check_warnings.rb +0 -2
- data/vendor/rails/activesupport/test/dependencies/conflict.rb +0 -1
- data/vendor/rails/activesupport/test/dependencies/cross_site_depender.rb +0 -3
- data/vendor/rails/activesupport/test/dependencies/mutual_one.rb +0 -4
- data/vendor/rails/activesupport/test/dependencies/mutual_two.rb +0 -4
- data/vendor/rails/activesupport/test/dependencies/raises_exception.rb +0 -3
- data/vendor/rails/activesupport/test/dependencies/requires_nonexistent0.rb +0 -1
- data/vendor/rails/activesupport/test/dependencies/requires_nonexistent1.rb +0 -1
- data/vendor/rails/activesupport/test/dependencies/service_one.rb +0 -5
- data/vendor/rails/activesupport/test/dependencies/service_two.rb +0 -2
- data/vendor/rails/activesupport/test/dependencies_test.rb +0 -782
- data/vendor/rails/activesupport/test/deprecation_test.rb +0 -167
- data/vendor/rails/activesupport/test/flush_cache_on_private_memoization_test.rb +0 -43
- data/vendor/rails/activesupport/test/gzip_test.rb +0 -7
- data/vendor/rails/activesupport/test/i18n_test.rb +0 -98
- data/vendor/rails/activesupport/test/inflector_test.rb +0 -298
- data/vendor/rails/activesupport/test/inflector_test_cases.rb +0 -252
- data/vendor/rails/activesupport/test/json/decoding_test.rb +0 -73
- data/vendor/rails/activesupport/test/json/encoding_test.rb +0 -160
- data/vendor/rails/activesupport/test/memoizable_test.rb +0 -247
- data/vendor/rails/activesupport/test/message_encryptor_test.rb +0 -46
- data/vendor/rails/activesupport/test/message_verifier_test.rb +0 -31
- data/vendor/rails/activesupport/test/multibyte_chars_test.rb +0 -606
- data/vendor/rails/activesupport/test/multibyte_conformance.rb +0 -129
- data/vendor/rails/activesupport/test/multibyte_test_helpers.rb +0 -19
- data/vendor/rails/activesupport/test/multibyte_unicode_database_test.rb +0 -22
- data/vendor/rails/activesupport/test/multibyte_utils_test.rb +0 -137
- data/vendor/rails/activesupport/test/option_merger_test.rb +0 -85
- data/vendor/rails/activesupport/test/ordered_hash_test.rb +0 -201
- data/vendor/rails/activesupport/test/ordered_options_test.rb +0 -53
- data/vendor/rails/activesupport/test/rescuable_test.rb +0 -75
- data/vendor/rails/activesupport/test/secure_random_test.rb +0 -19
- data/vendor/rails/activesupport/test/string_inquirer_test.rb +0 -15
- data/vendor/rails/activesupport/test/test_test.rb +0 -148
- data/vendor/rails/activesupport/test/time_zone_test.rb +0 -266
- data/vendor/rails/activesupport/test/whiny_nil_test.rb +0 -50
- data/vendor/rails/activesupport/test/xml_mini/jdom_engine_test.rb +0 -153
- data/vendor/rails/activesupport/test/xml_mini/nokogiri_engine_test.rb +0 -168
- data/vendor/rails/activesupport/test/xml_mini/rexml_engine_test.rb +0 -15
- data/vendor/rails/ci/ci_build.rb +0 -119
- data/vendor/rails/ci/ci_setup_notes.txt +0 -131
- data/vendor/rails/ci/cruise_config.rb +0 -9
- data/vendor/rails/ci/geminstaller.yml +0 -24
- data/vendor/rails/ci/site.css +0 -13
- data/vendor/rails/ci/site_config.rb +0 -72
- data/vendor/rails/doc/template/horo.rb +0 -613
- data/vendor/rails/pushgems.rb +0 -14
- data/vendor/rails/railties/pkg/railties-3.0.pre.gem +0 -0
- data/vendor/rails/railties/test/abstract_unit.rb +0 -27
- data/vendor/rails/railties/test/backtrace_cleaner_test.rb +0 -61
- data/vendor/rails/railties/test/boot_test.rb +0 -178
- data/vendor/rails/railties/test/console_app_test.rb +0 -42
- data/vendor/rails/railties/test/fcgi_dispatcher_test.rb +0 -266
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/about.yml +0 -1
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb +0 -1
- data/vendor/rails/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb +0 -1
- data/vendor/rails/railties/test/fixtures/eager/zoo.rb +0 -3
- data/vendor/rails/railties/test/fixtures/eager/zoo/reptile_house.rb +0 -2
- data/vendor/rails/railties/test/fixtures/environment_with_constant.rb +0 -1
- 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 +0 -2
- data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +0 -5
- data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +0 -5
- data/vendor/rails/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb +0 -5
- data/vendor/rails/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb +0 -5
- data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb +0 -7
- data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb +0 -7
- data/vendor/rails/railties/test/fixtures/plugins/alternate/a/generators/a_generator/a_generator.rb +0 -4
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/init.rb +0 -1
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/rails/init.rb +0 -7
- 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 +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/generators/stubby_generator/stubby_generator.rb +0 -4
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/init.rb +0 -7
- data/vendor/rails/railties/test/fixtures/plugins/default/stubby/lib/stubby_mixin.rb +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/controllers/engine_controller.rb +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb +0 -10
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/models/engine_model.rb +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml +0 -2
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/routes.rb +0 -3
- data/vendor/rails/railties/test/fixtures/plugins/engines/engine/init.rb +0 -3
- data/vendor/rails/railties/test/fixtures/public/foo/bar.html +0 -1
- data/vendor/rails/railties/test/fixtures/public/foo/index.html +0 -1
- data/vendor/rails/railties/test/fixtures/public/index.html +0 -1
- data/vendor/rails/railties/test/gem_dependency_test.rb +0 -219
- data/vendor/rails/railties/test/generator_lookup_test.rb +0 -40
- data/vendor/rails/railties/test/generators/generator_test_helper.rb +0 -310
- data/vendor/rails/railties/test/generators/rails_controller_generator_test.rb +0 -44
- data/vendor/rails/railties/test/generators/rails_helper_generator_test.rb +0 -36
- data/vendor/rails/railties/test/generators/rails_mailer_generator_test.rb +0 -29
- data/vendor/rails/railties/test/generators/rails_model_generator_test.rb +0 -96
- data/vendor/rails/railties/test/generators/rails_resource_generator_test.rb +0 -29
- data/vendor/rails/railties/test/generators/rails_scaffold_generator_test.rb +0 -151
- data/vendor/rails/railties/test/generators/rails_template_runner_test.rb +0 -216
- data/vendor/rails/railties/test/initializer_test.rb +0 -416
- data/vendor/rails/railties/test/metal_test.rb +0 -72
- data/vendor/rails/railties/test/mocks/routes.rb +0 -6
- data/vendor/rails/railties/test/plugin_loader_test.rb +0 -172
- data/vendor/rails/railties/test/plugin_locator_test.rb +0 -62
- data/vendor/rails/railties/test/plugin_test.rb +0 -162
- data/vendor/rails/railties/test/plugin_test_helper.rb +0 -29
- data/vendor/rails/railties/test/rack_static_test.rb +0 -46
- data/vendor/rails/railties/test/rails_generator_test.rb +0 -145
- data/vendor/rails/railties/test/rails_info_controller_test.rb +0 -52
- data/vendor/rails/railties/test/rails_info_test.rb +0 -99
- data/vendor/rails/railties/test/secret_key_generation_test.rb +0 -38
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-a-0.4.0/lib/dummy-gem-a.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.4.0/lib/dummy-gem-b.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.6.0/lib/dummy-gem-b.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.4.0/lib/dummy-gem-c.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.6.0/lib/dummy-gem-c.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-d-1.0.0/lib/dummy-gem-d.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-e-1.0.0/lib/dummy-gem-e.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-f-1.0.0/lib/dummy-gem-f.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-g-1.0.0/lib/dummy-gem-g.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-h-1.0.0/lib/dummy-gem-h.rb +0 -1
- 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 +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-j-1.0.0/lib/dummy-gem-j.rb +0 -1
- data/vendor/rails/railties/test/vendor/gems/dummy-gem-k-1.0.0/lib/dummy-gem-k.rb +0 -1
- data/vendor/rails/release.rb +0 -25
@@ -23,7 +23,6 @@ If you believe you have found a bug in the implementation, please follow these s
|
|
23
23
|
fashion, please open a bug report and attach two files: one with the text and one with the HTML
|
24
24
|
conversion you think is correct.
|
25
25
|
|
26
|
-
^
|
27
26
|
|
28
27
|
# Benchmark
|
29
28
|
|
@@ -31,7 +30,7 @@ kramdown comes with a small benchmark to test how fast it is in regard to four o
|
|
31
30
|
implementations: Maruku, BlueFeather, BlueCloth and RDiscount. The first two are written using only
|
32
31
|
Ruby, the latter two use the C discount library for the actual hard work (which makes them really
|
33
32
|
fast but they do not provide additional syntax elements). As one can see below, kramdown is
|
34
|
-
currently (
|
33
|
+
currently (June 2010) ~4x faster than Maruku, ~9x faster than BlueFeather but ~30x slower than
|
35
34
|
BlueCloth and rdiscount:
|
36
35
|
|
37
36
|
<pre><code>
|
@@ -39,7 +38,8 @@ BlueCloth and rdiscount:
|
|
39
38
|
</code>
|
40
39
|
</pre>
|
41
40
|
|
42
|
-
And here are some graphs which show the execution times
|
41
|
+
And here are some graphs which show the execution times of the various kramdown releases on
|
42
|
+
different Ruby interpreters:
|
43
43
|
|
44
44
|
![ruby 1.8.6]({relocatable: img/graph-ruby-1.8.6.png})
|
45
45
|
![ruby 1.8.7]({relocatable: img/graph-ruby-1.8.7.png})
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
#
|
3
3
|
#--
|
4
|
-
# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
|
4
|
+
# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
|
5
5
|
#
|
6
6
|
# This file is part of kramdown.
|
7
7
|
#
|
@@ -22,9 +22,14 @@
|
|
22
22
|
|
23
23
|
module Kramdown
|
24
24
|
|
25
|
+
# == Converter Module
|
26
|
+
#
|
25
27
|
# This module contains all available converters, i.e. classes that take a document and convert the
|
26
|
-
# document tree to a
|
27
|
-
#
|
28
|
+
# document tree to a specific output format, normally a string. For example, the Html module
|
29
|
+
# converts the document tree into HTML.
|
30
|
+
#
|
31
|
+
# Converters use the Base class for common functionality (like applying a template to the output)-
|
32
|
+
# see its API documentation for how to create a converter class.
|
28
33
|
module Converter
|
29
34
|
|
30
35
|
autoload :Base, 'kramdown/converter/base'
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
#
|
3
3
|
#--
|
4
|
-
# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
|
4
|
+
# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
|
5
5
|
#
|
6
6
|
# This file is part of kramdown.
|
7
7
|
#
|
@@ -26,7 +26,26 @@ module Kramdown
|
|
26
26
|
|
27
27
|
module Converter
|
28
28
|
|
29
|
-
#
|
29
|
+
# == Base class for converters
|
30
|
+
#
|
31
|
+
# This class serves as base class for all converters. It provides methods that can/should be
|
32
|
+
# used by all converters (like #generate_id) as well as common functionality that is
|
33
|
+
# automatically applied to the result (for example, embedding the output into a template).
|
34
|
+
#
|
35
|
+
# == Implementing a converter
|
36
|
+
#
|
37
|
+
# Implementing a new converter is rather easy: just create a new sub class from this class and
|
38
|
+
# put it in the Kramdown::Converter module (the latter is only needed if auto-detection should
|
39
|
+
# work properly). Then you need to implement the #convert(tree) method which takes a document
|
40
|
+
# tree and should return the converted output.
|
41
|
+
#
|
42
|
+
# The document instance is automatically set as @doc in Base#initialize. Furthermore, the
|
43
|
+
# document instance provides a hash called `conversion_infos` that is also automatically cleared
|
44
|
+
# and can be used to store information about the conversion process.
|
45
|
+
#
|
46
|
+
# The actual transformation of the document tree can be done in any way. However, writing one
|
47
|
+
# method per tree element type is a straight forward way to do it - this is how the Html and
|
48
|
+
# Latex converters do the transformation.
|
30
49
|
class Base
|
31
50
|
|
32
51
|
# Initialize the converter with the given Kramdown document +doc+.
|
@@ -50,13 +69,16 @@ module Kramdown
|
|
50
69
|
# Apply the template specified in the +doc+ options, using +body+ as the body string.
|
51
70
|
def self.apply_template(doc, body)
|
52
71
|
erb = ERB.new(get_template(doc.options[:template]))
|
53
|
-
|
72
|
+
obj = Object.new
|
73
|
+
obj.instance_variable_set(:@doc, doc)
|
74
|
+
obj.instance_variable_set(:@body, body)
|
75
|
+
erb.result(obj.instance_eval{binding})
|
54
76
|
end
|
55
77
|
|
56
78
|
# Return the template specified by +template+.
|
57
79
|
def self.get_template(template)
|
58
80
|
format_ext = '.' + self.name.split(/::/).last.downcase
|
59
|
-
shipped = File.join(Kramdown.data_dir, template + format_ext)
|
81
|
+
shipped = File.join(::Kramdown.data_dir, template + format_ext)
|
60
82
|
if File.exist?(template)
|
61
83
|
File.read(template)
|
62
84
|
elsif File.exist?(template + format_ext)
|
@@ -68,6 +90,20 @@ module Kramdown
|
|
68
90
|
end
|
69
91
|
end
|
70
92
|
|
93
|
+
|
94
|
+
# Generate an unique alpha-numeric ID from the the string +str+ for use as header ID.
|
95
|
+
def generate_id(str)
|
96
|
+
gen_id = str.gsub(/[^a-zA-Z0-9 -]/, '').gsub(/^[^a-zA-Z]*/, '').gsub(' ', '-').downcase
|
97
|
+
gen_id = 'section' if gen_id.length == 0
|
98
|
+
@used_ids ||= {}
|
99
|
+
if @used_ids.has_key?(gen_id)
|
100
|
+
gen_id += '-' + (@used_ids[gen_id] += 1).to_s
|
101
|
+
else
|
102
|
+
@used_ids[gen_id] = 0
|
103
|
+
end
|
104
|
+
@doc.options[:auto_id_prefix] + gen_id
|
105
|
+
end
|
106
|
+
|
71
107
|
end
|
72
108
|
|
73
109
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
#
|
3
3
|
#--
|
4
|
-
# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
|
4
|
+
# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
|
5
5
|
#
|
6
6
|
# This file is part of kramdown.
|
7
7
|
#
|
@@ -48,6 +48,8 @@ module Kramdown
|
|
48
48
|
super
|
49
49
|
@footnote_counter = @footnote_start = @doc.options[:footnote_nr]
|
50
50
|
@footnotes = []
|
51
|
+
@toc = []
|
52
|
+
@toc_code = nil
|
51
53
|
end
|
52
54
|
|
53
55
|
def convert(el, indent = -INDENTATION, opts = {})
|
@@ -80,7 +82,7 @@ module Kramdown
|
|
80
82
|
end
|
81
83
|
|
82
84
|
def convert_codeblock(el, indent, opts)
|
83
|
-
if el.options[:attr] && el.options[:attr]['lang'] && HIGHLIGHTING_AVAILABLE
|
85
|
+
if el.value && el.options[:attr] && el.options[:attr]['lang'] && HIGHLIGHTING_AVAILABLE
|
84
86
|
el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
|
85
87
|
opts = {:wrap => @doc.options[:coderay_wrap], :line_numbers => @doc.options[:coderay_line_numbers],
|
86
88
|
:line_number_start => @doc.options[:coderay_line_number_start], :tab_width => @doc.options[:coderay_tab_width],
|
@@ -88,7 +90,7 @@ module Kramdown
|
|
88
90
|
result = CodeRay.scan(el.value, el.options[:attr].delete('lang').to_sym).html(opts).chomp + "\n"
|
89
91
|
"#{' '*indent}<div#{options_for_element(el)}>#{result}#{' '*indent}</div>\n"
|
90
92
|
else
|
91
|
-
result = escape_html(el.value)
|
93
|
+
result = (el.value ? escape_html(el.value) : inner(el, indent, opts))
|
92
94
|
if el.options[:attr] && el.options[:attr].has_key?('class') && el.options[:attr]['class'] =~ /\bshow-whitespaces\b/
|
93
95
|
result.gsub!(/(?:(^[ \t]+)|([ \t]+$)|([ \t]+))/) do |m|
|
94
96
|
suffix = ($1 ? '-l' : ($2 ? '-r' : ''))
|
@@ -109,6 +111,11 @@ module Kramdown
|
|
109
111
|
end
|
110
112
|
|
111
113
|
def convert_header(el, indent, opts)
|
114
|
+
el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
|
115
|
+
if @doc.options[:auto_ids] && !(el.options[:attr] && el.options[:attr]['id'])
|
116
|
+
(el.options[:attr] ||= {})['id'] = generate_id(el.options[:raw_text])
|
117
|
+
end
|
118
|
+
@toc << [el.options[:level], el.options[:attr]['id'], el.children] if el.options[:attr] && el.options[:attr]['id']
|
112
119
|
"#{' '*indent}<h#{el.options[:level]}#{options_for_element(el)}>#{inner(el, indent, opts)}</h#{el.options[:level]}>\n"
|
113
120
|
end
|
114
121
|
|
@@ -117,7 +124,12 @@ module Kramdown
|
|
117
124
|
end
|
118
125
|
|
119
126
|
def convert_ul(el, indent, opts)
|
120
|
-
|
127
|
+
if !@toc_code && (el.options[:ial][:refs].include?('toc') rescue nil) && (el.type == :ul || el.type == :ol)
|
128
|
+
@toc_code = [el.type, el.options[:attr], (0..128).to_a.map{|a| rand(36).to_s(36)}.join]
|
129
|
+
@toc_code.last
|
130
|
+
else
|
131
|
+
"#{' '*indent}<#{el.type}#{options_for_element(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
|
132
|
+
end
|
121
133
|
end
|
122
134
|
alias :convert_ol :convert_ul
|
123
135
|
alias :convert_dl :convert_ul
|
@@ -125,10 +137,10 @@ module Kramdown
|
|
125
137
|
def convert_li(el, indent, opts)
|
126
138
|
output = ' '*indent << "<#{el.type}" << options_for_element(el) << ">"
|
127
139
|
res = inner(el, indent, opts)
|
128
|
-
if el.options[:
|
129
|
-
output << "\n" << res << ' '*indent
|
130
|
-
else
|
140
|
+
if el.children.empty? || el.children.first.options[:category] != :block
|
131
141
|
output << res << (res =~ /\n\Z/ ? ' '*indent : '')
|
142
|
+
else
|
143
|
+
output << "\n" << res << ' '*indent
|
132
144
|
end
|
133
145
|
output << "</#{el.type}>\n"
|
134
146
|
end
|
@@ -143,12 +155,13 @@ module Kramdown
|
|
143
155
|
def convert_html_element(el, indent, opts)
|
144
156
|
res = inner(el, indent, opts)
|
145
157
|
if @doc.options[:filter_html].include?(el.value)
|
146
|
-
|
147
|
-
|
158
|
+
warn("The filter_html option is deprecated and will be removed in the next release")
|
159
|
+
res.chomp + (el.options[:category] == :block ? "\n" : '')
|
160
|
+
elsif el.options[:category] == :span
|
148
161
|
"<#{el.value}#{options_for_element(el)}" << (!res.empty? ? ">#{res}</#{el.value}>" : " />")
|
149
162
|
else
|
150
163
|
output = ''
|
151
|
-
output << ' '*indent if
|
164
|
+
output << ' '*indent if !el.options[:parent_is_raw]
|
152
165
|
output << "<#{el.value}#{options_for_element(el)}"
|
153
166
|
if !res.empty? && el.options[:parse_type] != :block
|
154
167
|
output << ">#{res}</#{el.value}>"
|
@@ -159,19 +172,20 @@ module Kramdown
|
|
159
172
|
else
|
160
173
|
output << " />"
|
161
174
|
end
|
162
|
-
output << "\n" if el.options[:outer_element] ||
|
175
|
+
output << "\n" if el.options[:outer_element] || !el.options[:parent_is_raw]
|
163
176
|
output
|
164
177
|
end
|
165
178
|
end
|
166
179
|
|
167
|
-
def convert_html_text(el, indent, opts)
|
168
|
-
escape_html(el.value, :text)
|
169
|
-
end
|
170
|
-
|
171
180
|
def convert_xml_comment(el, indent, opts)
|
172
|
-
|
181
|
+
if el.options[:category] == :block && !el.options[:parent_is_raw]
|
182
|
+
' '*indent + el.value + "\n"
|
183
|
+
else
|
184
|
+
el.value
|
185
|
+
end
|
173
186
|
end
|
174
187
|
alias :convert_xml_pi :convert_xml_comment
|
188
|
+
alias :convert_html_doctype :convert_xml_comment
|
175
189
|
|
176
190
|
def convert_table(el, indent, opts)
|
177
191
|
if el.options[:alignment].all? {|a| a == :default}
|
@@ -185,11 +199,6 @@ module Kramdown
|
|
185
199
|
end
|
186
200
|
|
187
201
|
def convert_thead(el, indent, opts)
|
188
|
-
opts[:cell_type] = case el.type
|
189
|
-
when :thead then 'th'
|
190
|
-
when :tbody, :tfoot then 'td'
|
191
|
-
else opts[:cell_type]
|
192
|
-
end
|
193
202
|
"#{' '*indent}<#{el.type}#{options_for_element(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
|
194
203
|
end
|
195
204
|
alias :convert_tbody :convert_thead
|
@@ -198,22 +207,24 @@ module Kramdown
|
|
198
207
|
|
199
208
|
def convert_td(el, indent, opts)
|
200
209
|
res = inner(el, indent, opts)
|
201
|
-
"#{' '*indent}<#{
|
210
|
+
"#{' '*indent}<#{el.type}#{options_for_element(el)}>#{res.empty? ? " " : res}</#{el.type}>\n"
|
202
211
|
end
|
212
|
+
alias :convert_th :convert_td
|
203
213
|
|
204
214
|
def convert_br(el, indent, opts)
|
205
215
|
"<br />"
|
206
216
|
end
|
207
217
|
|
208
218
|
def convert_a(el, indent, opts)
|
209
|
-
|
219
|
+
do_obfuscation = el.options[:attr]['href'] =~ /^mailto:/
|
220
|
+
if do_obfuscation
|
210
221
|
el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
|
211
222
|
href = obfuscate(el.options[:attr]['href'].sub(/^mailto:/, ''))
|
212
223
|
mailto = obfuscate('mailto')
|
213
224
|
el.options[:attr]['href'] = "#{mailto}:#{href}"
|
214
225
|
end
|
215
226
|
res = inner(el, indent, opts)
|
216
|
-
res = obfuscate(res) if
|
227
|
+
res = obfuscate(res) if do_obfuscation
|
217
228
|
"<a#{options_for_element(el)}>#{res}</a>"
|
218
229
|
end
|
219
230
|
|
@@ -222,7 +233,7 @@ module Kramdown
|
|
222
233
|
end
|
223
234
|
|
224
235
|
def convert_codespan(el, indent, opts)
|
225
|
-
"<code#{options_for_element(el)}>#{escape_html(el.value)}</code>"
|
236
|
+
"<code#{options_for_element(el)}>#{el.value ? escape_html(el.value) : inner(el, indent, opts)}</code>"
|
226
237
|
end
|
227
238
|
|
228
239
|
def convert_footnote(el, indent, opts)
|
@@ -246,7 +257,7 @@ module Kramdown
|
|
246
257
|
end
|
247
258
|
|
248
259
|
TYPOGRAPHIC_SYMS = {
|
249
|
-
:mdash => '—', :ndash => '–', :
|
260
|
+
:mdash => '—', :ndash => '–', :hellip => '…',
|
250
261
|
:laquo_space => '« ', :raquo_space => ' »',
|
251
262
|
:laquo => '«', :raquo => '»'
|
252
263
|
}
|
@@ -258,8 +269,68 @@ module Kramdown
|
|
258
269
|
"&#{el.value};"
|
259
270
|
end
|
260
271
|
|
272
|
+
def convert_math(el, indent, opts)
|
273
|
+
el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
|
274
|
+
el.options[:attr] ||= {}
|
275
|
+
el.options[:attr]['class'] ||= ''
|
276
|
+
el.options[:attr]['class'] += (el.options[:attr]['class'].empty? ? '' : ' ') + 'math'
|
277
|
+
type = 'span'
|
278
|
+
type = 'div' if el.options[:category] == :block
|
279
|
+
"<#{type}#{options_for_element(el)}>#{escape_html(el.value, :text)}</#{type}>#{type == 'div' ? "\n" : ''}"
|
280
|
+
end
|
281
|
+
|
282
|
+
def convert_abbreviation(el, indent, opts)
|
283
|
+
title = @doc.parse_infos[:abbrev_defs][el.value]
|
284
|
+
title = nil if title.empty?
|
285
|
+
"<abbr#{title ? " title=\"#{title}\"" : ''}>#{el.value}</abbr>"
|
286
|
+
end
|
287
|
+
|
261
288
|
def convert_root(el, indent, opts)
|
262
|
-
inner(el, indent, opts)
|
289
|
+
result = inner(el, indent, opts)
|
290
|
+
result << footnote_content
|
291
|
+
if @toc_code
|
292
|
+
toc_tree = generate_toc_tree(@toc, @toc_code[0], @toc_code[1] || {})
|
293
|
+
text = if toc_tree.children.size > 0
|
294
|
+
convert(toc_tree, 0)
|
295
|
+
else
|
296
|
+
''
|
297
|
+
end
|
298
|
+
result.sub!(/#{@toc_code.last}/, text)
|
299
|
+
end
|
300
|
+
result
|
301
|
+
end
|
302
|
+
|
303
|
+
def generate_toc_tree(toc, type, attr)
|
304
|
+
sections = Element.new(type, nil, {:attr => {'id' => 'markdown-toc'}.merge(attr)})
|
305
|
+
stack = []
|
306
|
+
toc.each do |level, id, children|
|
307
|
+
li = Element.new(:li, nil, {:level => level})
|
308
|
+
a = Element.new(:a, nil, {:attr => {:href => "##{id}"}})
|
309
|
+
a.children += children
|
310
|
+
li.children << a
|
311
|
+
li.children << Element.new(type)
|
312
|
+
|
313
|
+
success = false
|
314
|
+
while !success
|
315
|
+
if stack.empty?
|
316
|
+
sections.children << li
|
317
|
+
stack << li
|
318
|
+
success = true
|
319
|
+
elsif stack.last.options[:level] < li.options[:level]
|
320
|
+
stack.last.children.last.children << li
|
321
|
+
stack << li
|
322
|
+
success = true
|
323
|
+
else
|
324
|
+
item = stack.pop
|
325
|
+
item.children.pop unless item.children.last.children.size > 0
|
326
|
+
end
|
327
|
+
end
|
328
|
+
end
|
329
|
+
while !stack.empty?
|
330
|
+
item = stack.pop
|
331
|
+
item.children.pop unless item.children.last.children.size > 0
|
332
|
+
end
|
333
|
+
sections
|
263
334
|
end
|
264
335
|
|
265
336
|
# Helper method for obfuscating the +text+ by using HTML entities.
|
@@ -268,6 +339,7 @@ module Kramdown
|
|
268
339
|
text.each_byte do |b|
|
269
340
|
result += (b > 128 ? b.chr : "&#%03d;" % b)
|
270
341
|
end
|
342
|
+
result.force_encoding(text.encoding) if RUBY_VERSION >= '1.9'
|
271
343
|
result
|
272
344
|
end
|
273
345
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
#
|
3
3
|
#--
|
4
|
-
# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
|
4
|
+
# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
|
5
5
|
#
|
6
6
|
# This file is part of kramdown.
|
7
7
|
#
|
@@ -20,6 +20,8 @@
|
|
20
20
|
#++
|
21
21
|
#
|
22
22
|
|
23
|
+
require 'set'
|
24
|
+
|
23
25
|
module Kramdown
|
24
26
|
|
25
27
|
module Converter
|
@@ -35,7 +37,7 @@ module Kramdown
|
|
35
37
|
super
|
36
38
|
#TODO: set the footnote counter at the beginning of the document
|
37
39
|
@doc.options[:footnote_nr]
|
38
|
-
@doc.conversion_infos[:packages] =
|
40
|
+
@doc.conversion_infos[:packages] = Set.new
|
39
41
|
end
|
40
42
|
|
41
43
|
def convert(el, opts = {})
|
@@ -71,6 +73,10 @@ module Kramdown
|
|
71
73
|
end
|
72
74
|
|
73
75
|
def convert_codeblock(el, opts)
|
76
|
+
if !el.value
|
77
|
+
@doc.warnings << "Cannot convert codeblock with entity references"
|
78
|
+
return ''
|
79
|
+
end
|
74
80
|
show_whitespace = el.options[:attr] && el.options[:attr]['class'].to_s =~ /\bshow-whitespaces\b/
|
75
81
|
lang = el.options[:attr] && el.options[:attr]['lang']
|
76
82
|
if show_whitespace || lang
|
@@ -101,8 +107,9 @@ module Kramdown
|
|
101
107
|
}
|
102
108
|
def convert_header(el, opts)
|
103
109
|
type = HEADER_TYPES[el.options[:level]]
|
104
|
-
if el.options[:attr] && (id = el.options[:attr]['id'])
|
105
|
-
|
110
|
+
if (el.options[:attr] && (id = el.options[:attr]['id'])) ||
|
111
|
+
(@doc.options[:auto_ids] && (id = generate_id(el.options[:raw_text])))
|
112
|
+
"\\hypertarget{#{id}}{}\\#{type}{#{inner(el, opts)}}\\label{#{id}}\n\n"
|
106
113
|
else
|
107
114
|
"\\#{type}*{#{inner(el, opts)}}\n\n"
|
108
115
|
end
|
@@ -113,12 +120,14 @@ module Kramdown
|
|
113
120
|
end
|
114
121
|
|
115
122
|
def convert_ul(el, opts)
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
123
|
+
if !@doc.conversion_infos[:has_toc] && (el.options[:ial][:refs].include?('toc') rescue nil)
|
124
|
+
@doc.conversion_infos[:has_toc] = true
|
125
|
+
'\tableofcontents'
|
126
|
+
else
|
127
|
+
latex_environment(el.type == :ul ? 'itemize' : 'enumerate', inner(el, opts))
|
128
|
+
end
|
121
129
|
end
|
130
|
+
alias :convert_ol :convert_ul
|
122
131
|
|
123
132
|
def convert_dl(el, opts)
|
124
133
|
latex_environment('description', inner(el, opts))
|
@@ -137,17 +146,25 @@ module Kramdown
|
|
137
146
|
end
|
138
147
|
|
139
148
|
def convert_html_element(el, opts)
|
140
|
-
|
149
|
+
if el.value == 'i'
|
150
|
+
"\\emph{#{inner(el, opts)}}"
|
151
|
+
elsif el.value == 'b'
|
152
|
+
"\\emph{#{inner(el, opts)}}"
|
153
|
+
else
|
154
|
+
@doc.warnings << "Can't convert HTML element"
|
155
|
+
''
|
156
|
+
end
|
141
157
|
end
|
142
158
|
|
143
|
-
def
|
144
|
-
|
159
|
+
def convert_xml_comment(el, opts)
|
160
|
+
el.value.split(/\n/).map {|l| "% #{l}"}.join("\n") + "\n"
|
145
161
|
end
|
146
162
|
|
147
|
-
def
|
163
|
+
def convert_xml_pi(el, opts)
|
164
|
+
@doc.warnings << "Can't convert XML PI/HTML document type"
|
148
165
|
''
|
149
166
|
end
|
150
|
-
alias :
|
167
|
+
alias :convert_html_doctype :convert_xml_pi
|
151
168
|
|
152
169
|
TABLE_ALIGNMENT_CHAR = {:default => 'l', :left => 'l', :center => 'c', :right => 'r'}
|
153
170
|
|
@@ -175,6 +192,7 @@ module Kramdown
|
|
175
192
|
def convert_td(el, opts)
|
176
193
|
inner(el, opts)
|
177
194
|
end
|
195
|
+
alias :convert_th :convert_td
|
178
196
|
|
179
197
|
def convert_br(el, opts)
|
180
198
|
"\\newline\n"
|
@@ -193,18 +211,22 @@ module Kramdown
|
|
193
211
|
if el.options[:attr]['src'] =~ /^(https?|ftps?):\/\//
|
194
212
|
@doc.warnings << "Cannot include non-local image"
|
195
213
|
''
|
196
|
-
|
214
|
+
elsif !el.options[:attr]['src'].empty?
|
197
215
|
@doc.conversion_infos[:packages] << 'graphicx'
|
198
216
|
"\\includegraphics{#{el.options[:attr]['src']}}"
|
217
|
+
else
|
218
|
+
@doc.warnings << "Cannot include image with empty path"
|
219
|
+
''
|
199
220
|
end
|
200
221
|
end
|
201
222
|
|
202
223
|
def convert_codespan(el, opts)
|
203
|
-
"{\\tt #{escape(el.value)}}"
|
224
|
+
"{\\tt #{el.value ? escape(el.value) : inner(el, opts)}}"
|
204
225
|
end
|
205
226
|
|
206
227
|
def convert_footnote(el, opts)
|
207
|
-
|
228
|
+
@doc.conversion_infos[:packages] << 'fancyvrb'
|
229
|
+
"\\footnote{#{inner(@doc.parse_infos[:footnotes][el.options[:name]][:content], opts)}}"
|
208
230
|
end
|
209
231
|
|
210
232
|
def convert_raw(el, opts)
|
@@ -483,7 +505,7 @@ EOF
|
|
483
505
|
end
|
484
506
|
|
485
507
|
TYPOGRAPHIC_SYMS = {
|
486
|
-
:mdash => '---', :ndash => '--', :
|
508
|
+
:mdash => '---', :ndash => '--', :hellip => '\ldots{}',
|
487
509
|
:laquo_space => '\guillemotleft{}~', :raquo_space => '~\guillemotright{}',
|
488
510
|
:laquo => '\guillemotleft{}', :raquo => '\guillemotright{}'
|
489
511
|
}
|
@@ -496,6 +518,23 @@ EOF
|
|
496
518
|
SMART_QUOTE_SYMS[el.value]
|
497
519
|
end
|
498
520
|
|
521
|
+
def convert_math(el, opts)
|
522
|
+
@doc.conversion_infos[:packages] += %w[amssymb amsmath amsthm amsfonts]
|
523
|
+
if el.options[:category] == :block
|
524
|
+
if el.value =~ /\A\s*\\begin\{/
|
525
|
+
el.value
|
526
|
+
else
|
527
|
+
latex_environment('displaymath', el.value)
|
528
|
+
end
|
529
|
+
else
|
530
|
+
"$#{el.value}$"
|
531
|
+
end
|
532
|
+
end
|
533
|
+
|
534
|
+
def convert_abbreviation(el, opts)
|
535
|
+
el.value
|
536
|
+
end
|
537
|
+
|
499
538
|
ESCAPE_MAP = {
|
500
539
|
"^" => "\\^{}",
|
501
540
|
"\\" => "\\textbackslash{}",
|