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
@@ -0,0 +1,19 @@
|
|
1
|
+
module I18n
|
2
|
+
module Backend
|
3
|
+
autoload :ActiveRecord, 'i18n/backend/active_record'
|
4
|
+
autoload :Base, 'i18n/backend/base'
|
5
|
+
autoload :Cache, 'i18n/backend/cache'
|
6
|
+
autoload :Cascade, 'i18n/backend/cascade'
|
7
|
+
autoload :Chain, 'i18n/backend/chain'
|
8
|
+
autoload :Cldr, 'i18n/backend/cldr'
|
9
|
+
autoload :Fallbacks, 'i18n/backend/fallbacks'
|
10
|
+
autoload :Fast, 'i18n/backend/fast'
|
11
|
+
autoload :Gettext, 'i18n/backend/gettext'
|
12
|
+
autoload :Helpers, 'i18n/backend/helpers'
|
13
|
+
autoload :Links, 'i18n/backend/links'
|
14
|
+
autoload :InterpolationCompiler, 'i18n/backend/interpolation_compiler'
|
15
|
+
autoload :Metadata, 'i18n/backend/metadata'
|
16
|
+
autoload :Pluralization, 'i18n/backend/pluralization'
|
17
|
+
autoload :Simple, 'i18n/backend/simple'
|
18
|
+
end
|
19
|
+
end
|
data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb
ADDED
@@ -0,0 +1,66 @@
|
|
1
|
+
require 'i18n/backend/base'
|
2
|
+
require 'i18n/backend/active_record/translation'
|
3
|
+
|
4
|
+
module I18n
|
5
|
+
module Backend
|
6
|
+
class ActiveRecord
|
7
|
+
autoload :Missing, 'i18n/backend/active_record/missing'
|
8
|
+
autoload :StoreProcs, 'i18n/backend/active_record/store_procs'
|
9
|
+
autoload :Translation, 'i18n/backend/active_record/translation'
|
10
|
+
|
11
|
+
include Base, Links
|
12
|
+
|
13
|
+
def reload!
|
14
|
+
end
|
15
|
+
|
16
|
+
def store_translations(locale, data, options = {})
|
17
|
+
separator = options[:separator] || I18n.default_separator
|
18
|
+
wind_keys(data, separator).each do |key, value|
|
19
|
+
store_link(locale, key, value) if value.is_a?(Symbol)
|
20
|
+
Translation.locale(locale).lookup(expand_keys(key, separator), separator).delete_all
|
21
|
+
Translation.create(:locale => locale.to_s, :key => key.to_s, :value => value)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
def available_locales
|
26
|
+
begin
|
27
|
+
Translation.available_locales
|
28
|
+
rescue ::ActiveRecord::StatementInvalid
|
29
|
+
[]
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
protected
|
34
|
+
|
35
|
+
def lookup(locale, key, scope = [], options = {})
|
36
|
+
return unless key
|
37
|
+
|
38
|
+
separator = options[:separator] || I18n.default_separator
|
39
|
+
|
40
|
+
key = resolve_link(locale, key)
|
41
|
+
key = (Array(scope) + Array(key)).join(separator)
|
42
|
+
result = Translation.locale(locale).lookup(key, separator).all
|
43
|
+
|
44
|
+
if result.empty?
|
45
|
+
return nil
|
46
|
+
elsif result.first.key == key
|
47
|
+
return result.first.value
|
48
|
+
else
|
49
|
+
chop_range = (key.size + separator.size)..-1
|
50
|
+
result = result.inject({}) do |hash, r|
|
51
|
+
hash[r.key.slice(chop_range)] = r.value
|
52
|
+
hash
|
53
|
+
end
|
54
|
+
deep_symbolize_keys(unwind_keys(result, separator))
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
# For a key :'foo.bar.baz' return ['foo', 'foo.bar', 'foo.bar.baz']
|
59
|
+
def expand_keys(key, separator = I18n.default_separator)
|
60
|
+
key.to_s.split(separator).inject([]) do |keys, key|
|
61
|
+
keys << [keys.last, key].compact.join(separator)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
@@ -0,0 +1,67 @@
|
|
1
|
+
# This extension stores translation stub records for missing translations to
|
2
|
+
# the database.
|
3
|
+
#
|
4
|
+
# This is useful if you have a web based translation tool. It will populate
|
5
|
+
# the database with untranslated keys as the application is being used. A
|
6
|
+
# translator can then go through these and add missing translations.
|
7
|
+
#
|
8
|
+
# Example usage:
|
9
|
+
#
|
10
|
+
# I18n::Backend::Chain.send(:include, I18n::Backend::ActiveRecord::Missing)
|
11
|
+
# I18n.backend = I18nChainBackend.new(I18n::Backend::ActiveRecord.new, I18n::Backend::Simple.new)
|
12
|
+
#
|
13
|
+
# Stub records for pluralizations will also be created for each key defined
|
14
|
+
# in i18n.plural.keys.
|
15
|
+
#
|
16
|
+
# For example:
|
17
|
+
#
|
18
|
+
# # en.yml
|
19
|
+
# en:
|
20
|
+
# i18n:
|
21
|
+
# plural:
|
22
|
+
# keys: [:zero, :one, :other]
|
23
|
+
#
|
24
|
+
# # pl.yml
|
25
|
+
# pl:
|
26
|
+
# i18n:
|
27
|
+
# plural:
|
28
|
+
# keys: [:zero, :one, :few, :other]
|
29
|
+
#
|
30
|
+
# It will also persist interpolation keys in Translation#interpolations so
|
31
|
+
# translators will be able to review and use them.
|
32
|
+
module I18n
|
33
|
+
module Backend
|
34
|
+
class ActiveRecord
|
35
|
+
module Missing
|
36
|
+
def store_default_translations(locale, key, options = {})
|
37
|
+
count, scope, default, separator = options.values_at(:count, *Base::RESERVED_KEYS)
|
38
|
+
separator ||= I18n.default_separator
|
39
|
+
|
40
|
+
keys = I18n.normalize_keys(locale, key, scope, separator)[1..-1]
|
41
|
+
key = keys.join(separator || I18n.default_separator)
|
42
|
+
|
43
|
+
unless ActiveRecord::Translation.locale(locale).lookup(key, separator).exists?
|
44
|
+
interpolations = options.reject { |name, value| Base::RESERVED_KEYS.include?(name) }.keys
|
45
|
+
keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(separator) } : [key]
|
46
|
+
keys.each { |key| store_default_translation(locale, key, interpolations) }
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def store_default_translation(locale, key, interpolations)
|
51
|
+
translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
|
52
|
+
translation.interpolations = interpolations
|
53
|
+
translation.save
|
54
|
+
end
|
55
|
+
|
56
|
+
def translate(locale, key, options = {})
|
57
|
+
super
|
58
|
+
|
59
|
+
rescue I18n::MissingTranslationData => e
|
60
|
+
self.store_default_translations(locale, key, options)
|
61
|
+
|
62
|
+
raise e
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
# This module is intended to be mixed into the ActiveRecord backend to allow
|
2
|
+
# storing Ruby Procs as translation values in the database.
|
3
|
+
#
|
4
|
+
# I18n.backend = I18n::Backend::ActiveRecord.new
|
5
|
+
# I18n::Backend::ActiveRecord::Translation.send(:include, I18n::Backend::ActiveRecord::StoreProcs)
|
6
|
+
#
|
7
|
+
# The StoreProcs module requires the ParseTree and ruby2ruby gems and therefor
|
8
|
+
# was extracted from the original backend.
|
9
|
+
#
|
10
|
+
# ParseTree is not compatible with Ruby 1.9.
|
11
|
+
|
12
|
+
begin
|
13
|
+
require 'ruby2ruby'
|
14
|
+
require 'parse_tree'
|
15
|
+
require 'parse_tree_extensions'
|
16
|
+
rescue LoadError => e
|
17
|
+
puts "can't use StoreProcs because: #{e.message}"
|
18
|
+
end
|
19
|
+
|
20
|
+
module I18n
|
21
|
+
module Backend
|
22
|
+
class ActiveRecord
|
23
|
+
module StoreProcs
|
24
|
+
def value=(v)
|
25
|
+
case v
|
26
|
+
when Proc
|
27
|
+
write_attribute(:value, v.to_ruby)
|
28
|
+
write_attribute(:is_proc, true)
|
29
|
+
else
|
30
|
+
write_attribute(:value, v)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
Translation.send(:include, self) if method(:to_s).respond_to?(:to_ruby)
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -0,0 +1,88 @@
|
|
1
|
+
require 'active_record'
|
2
|
+
|
3
|
+
module I18n
|
4
|
+
module Backend
|
5
|
+
# ActiveRecord model used to store actual translations to the database.
|
6
|
+
#
|
7
|
+
# This model expects a table like the following to be already set up in
|
8
|
+
# your the database:
|
9
|
+
#
|
10
|
+
# create_table :translations do |t|
|
11
|
+
# t.string :locale
|
12
|
+
# t.string :key
|
13
|
+
# t.text :value
|
14
|
+
# t.text :interpolations
|
15
|
+
# t.boolean :is_proc, :default => false
|
16
|
+
# end
|
17
|
+
#
|
18
|
+
# This model supports to named scopes :locale and :lookup. The :locale
|
19
|
+
# scope simply adds a condition for a given locale:
|
20
|
+
#
|
21
|
+
# I18n::Backend::ActiveRecord::Translation.locale(:en).all
|
22
|
+
# # => all translation records that belong to the :en locale
|
23
|
+
#
|
24
|
+
# The :lookup scope adds a condition for looking up all translations
|
25
|
+
# that either start with the given keys (joined by an optionally given
|
26
|
+
# separator or I18n.default_separator) or that exactly have this key.
|
27
|
+
#
|
28
|
+
# # with translations present for :"foo.bar" and :"foo.baz"
|
29
|
+
# I18n::Backend::ActiveRecord::Translation.lookup(:foo)
|
30
|
+
# # => an array with both translation records :"foo.bar" and :"foo.baz"
|
31
|
+
#
|
32
|
+
# I18n::Backend::ActiveRecord::Translation.lookup([:foo, :bar])
|
33
|
+
# I18n::Backend::ActiveRecord::Translation.lookup(:"foo.bar")
|
34
|
+
# # => an array with the translation record :"foo.bar"
|
35
|
+
#
|
36
|
+
# When the StoreProcs module was mixed into this model then Procs will
|
37
|
+
# be stored to the database as Ruby code and evaluated when :value is
|
38
|
+
# called.
|
39
|
+
#
|
40
|
+
# Translation = I18n::Backend::ActiveRecord::Translation
|
41
|
+
# Translation.create \
|
42
|
+
# :locale => 'en'
|
43
|
+
# :key => 'foo'
|
44
|
+
# :value => lambda { |key, options| 'FOO' }
|
45
|
+
# Translation.find_by_locale_and_key('en', 'foo').value
|
46
|
+
# # => 'FOO'
|
47
|
+
class ActiveRecord
|
48
|
+
class Translation < ::ActiveRecord::Base
|
49
|
+
set_table_name 'translations'
|
50
|
+
attr_protected :is_proc, :interpolations
|
51
|
+
|
52
|
+
serialize :value
|
53
|
+
serialize :interpolations, Array
|
54
|
+
|
55
|
+
scope_method = ::ActiveRecord::VERSION::MAJOR == 2 ? :named_scope : :scope
|
56
|
+
|
57
|
+
send scope_method, :locale, lambda { |locale|
|
58
|
+
{ :conditions => { :locale => locale.to_s } }
|
59
|
+
}
|
60
|
+
|
61
|
+
send scope_method, :lookup, lambda { |keys, *separator|
|
62
|
+
column_name = connection.quote_column_name('key')
|
63
|
+
keys = Array(keys).map! { |key| key.to_s }
|
64
|
+
separator = separator.first || I18n.default_separator
|
65
|
+
namespace = "#{keys.last}#{separator}%"
|
66
|
+
{ :conditions => ["#{column_name} IN (?) OR #{column_name} LIKE ?", keys, namespace] }
|
67
|
+
}
|
68
|
+
|
69
|
+
def self.available_locales
|
70
|
+
Translation.find(:all, :select => 'DISTINCT locale').map { |t| t.locale.to_sym }
|
71
|
+
end
|
72
|
+
|
73
|
+
def interpolates?(key)
|
74
|
+
self.interpolations.include?(key) if self.interpolations
|
75
|
+
end
|
76
|
+
|
77
|
+
def value
|
78
|
+
if is_proc
|
79
|
+
Kernel.eval(read_attribute(:value))
|
80
|
+
else
|
81
|
+
value = read_attribute(:value)
|
82
|
+
value == 'f' ? false : value
|
83
|
+
end
|
84
|
+
end
|
85
|
+
end
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
@@ -0,0 +1,266 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
|
3
|
+
require 'yaml'
|
4
|
+
require 'i18n/core_ext/hash/except'
|
5
|
+
|
6
|
+
module I18n
|
7
|
+
module Backend
|
8
|
+
module Base
|
9
|
+
include I18n::Backend::Helpers
|
10
|
+
|
11
|
+
RESERVED_KEYS = [:scope, :default, :separator, :resolve]
|
12
|
+
INTERPOLATION_SYNTAX_PATTERN = /(\\)?\{\{([^\}]+)\}\}/
|
13
|
+
|
14
|
+
# Accepts a list of paths to translation files. Loads translations from
|
15
|
+
# plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
|
16
|
+
# for details.
|
17
|
+
def load_translations(*filenames)
|
18
|
+
filenames.each { |filename| load_file(filename) }
|
19
|
+
end
|
20
|
+
|
21
|
+
# Stores translations for the given locale in memory.
|
22
|
+
# This uses a deep merge for the translations hash, so existing
|
23
|
+
# translations will be overwritten by new ones only at the deepest
|
24
|
+
# level of the hash.
|
25
|
+
def store_translations(locale, data, options = {})
|
26
|
+
merge_translations(locale, data, options)
|
27
|
+
end
|
28
|
+
|
29
|
+
def translate(locale, key, options = {})
|
30
|
+
raise InvalidLocale.new(locale) unless locale
|
31
|
+
return key.map { |k| translate(locale, k, options) } if key.is_a?(Array)
|
32
|
+
|
33
|
+
if options.empty?
|
34
|
+
entry = resolve(locale, key, lookup(locale, key), options)
|
35
|
+
raise(I18n::MissingTranslationData.new(locale, key, options)) if entry.nil?
|
36
|
+
else
|
37
|
+
count, scope, default = options.values_at(:count, :scope, :default)
|
38
|
+
values = options.reject { |name, value| RESERVED_KEYS.include?(name) }
|
39
|
+
|
40
|
+
entry = lookup(locale, key, scope, options)
|
41
|
+
entry = entry.nil? && default ? default(locale, key, default, options) : resolve(locale, key, entry, options)
|
42
|
+
raise(I18n::MissingTranslationData.new(locale, key, options)) if entry.nil?
|
43
|
+
|
44
|
+
entry = pluralize(locale, entry, count) if count
|
45
|
+
entry = interpolate(locale, entry, values) if values
|
46
|
+
end
|
47
|
+
|
48
|
+
entry
|
49
|
+
end
|
50
|
+
|
51
|
+
# Acts the same as +strftime+, but uses a localized version of the
|
52
|
+
# format string. Takes a key from the date/time formats translations as
|
53
|
+
# a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).
|
54
|
+
def localize(locale, object, format = :default, options = {})
|
55
|
+
raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
|
56
|
+
|
57
|
+
if Symbol === format
|
58
|
+
key = format
|
59
|
+
type = object.respond_to?(:sec) ? 'time' : 'date'
|
60
|
+
format = I18n.t(:"#{type}.formats.#{key}", :locale => locale, :raise => true)
|
61
|
+
end
|
62
|
+
|
63
|
+
# format = resolve(locale, object, format, options)
|
64
|
+
format = format.to_s.gsub(/%[aAbBp]/) do |match|
|
65
|
+
case match
|
66
|
+
when '%a' then I18n.t(:"date.abbr_day_names", :locale => locale, :format => format)[object.wday]
|
67
|
+
when '%A' then I18n.t(:"date.day_names", :locale => locale, :format => format)[object.wday]
|
68
|
+
when '%b' then I18n.t(:"date.abbr_month_names", :locale => locale, :format => format)[object.mon]
|
69
|
+
when '%B' then I18n.t(:"date.month_names", :locale => locale, :format => format)[object.mon]
|
70
|
+
when '%p' then I18n.t(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format) if object.respond_to? :hour
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
object.strftime(format)
|
75
|
+
end
|
76
|
+
|
77
|
+
def initialized?
|
78
|
+
@initialized ||= false
|
79
|
+
end
|
80
|
+
|
81
|
+
# Returns an array of locales for which translations are available
|
82
|
+
# ignoring the reserved translation meta data key :i18n.
|
83
|
+
def available_locales
|
84
|
+
init_translations unless initialized?
|
85
|
+
translations.inject([]) do |locales, (locale, data)|
|
86
|
+
locales << locale unless (data.keys - [:i18n]).empty?
|
87
|
+
locales
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
def reload!
|
92
|
+
@initialized = false
|
93
|
+
@translations = nil
|
94
|
+
end
|
95
|
+
|
96
|
+
protected
|
97
|
+
def init_translations
|
98
|
+
load_translations(*I18n.load_path.flatten)
|
99
|
+
@initialized = true
|
100
|
+
end
|
101
|
+
|
102
|
+
def translations
|
103
|
+
@translations ||= {}
|
104
|
+
end
|
105
|
+
|
106
|
+
# Looks up a translation from the translations hash. Returns nil if
|
107
|
+
# eiher key is nil, or locale, scope or key do not exist as a key in the
|
108
|
+
# nested translations hash. Splits keys or scopes containing dots
|
109
|
+
# into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
|
110
|
+
# <tt>%w(currency format)</tt>.
|
111
|
+
def lookup(locale, key, scope = [], options = {})
|
112
|
+
return unless key
|
113
|
+
init_translations unless initialized?
|
114
|
+
keys = I18n.normalize_keys(locale, key, scope, options[:separator])
|
115
|
+
keys.inject(translations) do |result, key|
|
116
|
+
key = key.to_sym
|
117
|
+
return nil unless result.is_a?(Hash) && result.has_key?(key)
|
118
|
+
result = result[key]
|
119
|
+
result = resolve(locale, key, result, options) if result.is_a?(Symbol)
|
120
|
+
String === result ? result.dup : result
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
# Evaluates defaults.
|
125
|
+
# If given subject is an Array, it walks the array and returns the
|
126
|
+
# first translation that can be resolved. Otherwise it tries to resolve
|
127
|
+
# the translation directly.
|
128
|
+
def default(locale, object, subject, options = {})
|
129
|
+
options = options.dup.reject { |key, value| key == :default }
|
130
|
+
case subject
|
131
|
+
when Array
|
132
|
+
subject.each do |item|
|
133
|
+
result = resolve(locale, object, item, options) and return result
|
134
|
+
end and nil
|
135
|
+
else
|
136
|
+
resolve(locale, object, subject, options)
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|
140
|
+
# Resolves a translation.
|
141
|
+
# If the given subject is a Symbol, it will be translated with the
|
142
|
+
# given options. If it is a Proc then it will be evaluated. All other
|
143
|
+
# subjects will be returned directly.
|
144
|
+
def resolve(locale, object, subject, options = nil)
|
145
|
+
return subject if options[:resolve] == false
|
146
|
+
case subject
|
147
|
+
when Symbol
|
148
|
+
I18n.translate(subject, (options || {}).merge(:locale => locale, :raise => true))
|
149
|
+
when Proc
|
150
|
+
resolve(locale, object, subject.call(object, options), options = {})
|
151
|
+
else
|
152
|
+
subject
|
153
|
+
end
|
154
|
+
rescue MissingTranslationData
|
155
|
+
nil
|
156
|
+
end
|
157
|
+
|
158
|
+
# Picks a translation from an array according to English pluralization
|
159
|
+
# rules. It will pick the first translation if count is not equal to 1
|
160
|
+
# and the second translation if it is equal to 1. Other backends can
|
161
|
+
# implement more flexible or complex pluralization rules.
|
162
|
+
def pluralize(locale, entry, count)
|
163
|
+
return entry unless entry.is_a?(Hash) and count
|
164
|
+
|
165
|
+
key = :zero if count == 0 && entry.has_key?(:zero)
|
166
|
+
key ||= count == 1 ? :one : :other
|
167
|
+
raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
|
168
|
+
entry[key]
|
169
|
+
end
|
170
|
+
|
171
|
+
# Interpolates values into a given string.
|
172
|
+
#
|
173
|
+
# interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'
|
174
|
+
# # => "file test.txt opened by {{user}}"
|
175
|
+
#
|
176
|
+
# Note that you have to double escape the <tt>\\</tt> when you want to escape
|
177
|
+
# the <tt>{{...}}</tt> key in a string (once for the string and once for the
|
178
|
+
# interpolation).
|
179
|
+
def interpolate(locale, string, values = {})
|
180
|
+
return string unless string.is_a?(::String) && !values.empty?
|
181
|
+
|
182
|
+
preserve_encoding(string) do
|
183
|
+
s = string.gsub(INTERPOLATION_SYNTAX_PATTERN) do
|
184
|
+
escaped, key = $1, $2.to_sym
|
185
|
+
if escaped
|
186
|
+
"{{#{key}}}"
|
187
|
+
elsif RESERVED_KEYS.include?(key)
|
188
|
+
raise ReservedInterpolationKey.new(key, string)
|
189
|
+
else
|
190
|
+
"%{#{key}}"
|
191
|
+
end
|
192
|
+
end
|
193
|
+
|
194
|
+
values.each do |key, value|
|
195
|
+
value = value.call(values) if interpolate_lambda?(value, s, key)
|
196
|
+
value = value.to_s unless value.is_a?(::String)
|
197
|
+
values[key] = value
|
198
|
+
end
|
199
|
+
|
200
|
+
s % values
|
201
|
+
end
|
202
|
+
|
203
|
+
rescue KeyError => e
|
204
|
+
raise MissingInterpolationArgument.new(values, string)
|
205
|
+
end
|
206
|
+
|
207
|
+
def preserve_encoding(string)
|
208
|
+
if string.respond_to?(:encoding)
|
209
|
+
encoding = string.encoding
|
210
|
+
result = yield
|
211
|
+
result.force_encoding(encoding) if result.respond_to?(:force_encoding)
|
212
|
+
result
|
213
|
+
else
|
214
|
+
yield
|
215
|
+
end
|
216
|
+
end
|
217
|
+
|
218
|
+
# returns true when the given value responds to :call and the key is
|
219
|
+
# an interpolation placeholder in the given string
|
220
|
+
def interpolate_lambda?(object, string, key)
|
221
|
+
object.respond_to?(:call) && string =~ /%\{#{key}\}|%\<#{key}>.*?\d*\.?\d*[bBdiouxXeEfgGcps]\}/
|
222
|
+
end
|
223
|
+
|
224
|
+
# Loads a single translations file by delegating to #load_rb or
|
225
|
+
# #load_yml depending on the file extension and directly merges the
|
226
|
+
# data to the existing translations. Raises I18n::UnknownFileType
|
227
|
+
# for all other file extensions.
|
228
|
+
def load_file(filename)
|
229
|
+
type = File.extname(filename).tr('.', '').downcase
|
230
|
+
raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}")
|
231
|
+
data = send(:"load_#{type}", filename) # TODO raise a meaningful exception if this does not yield a Hash
|
232
|
+
data.each { |locale, d| merge_translations(locale, d) }
|
233
|
+
end
|
234
|
+
|
235
|
+
# Loads a plain Ruby translations file. eval'ing the file must yield
|
236
|
+
# a Hash containing translation data with locales as toplevel keys.
|
237
|
+
def load_rb(filename)
|
238
|
+
eval(IO.read(filename), binding, filename)
|
239
|
+
end
|
240
|
+
|
241
|
+
# Loads a YAML translations file. The data must have locales as
|
242
|
+
# toplevel keys.
|
243
|
+
def load_yml(filename)
|
244
|
+
YAML::load(IO.read(filename))
|
245
|
+
end
|
246
|
+
|
247
|
+
# Deep merges the given translations hash with the existing translations
|
248
|
+
# for the given locale
|
249
|
+
def merge_translations(locale, data, options = {})
|
250
|
+
locale = locale.to_sym
|
251
|
+
translations[locale] ||= {}
|
252
|
+
separator = options[:separator] || I18n.default_separator
|
253
|
+
data = unwind_keys(data, separator)
|
254
|
+
data = deep_symbolize_keys(data)
|
255
|
+
|
256
|
+
# deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
|
257
|
+
merger = proc do |key, v1, v2|
|
258
|
+
# TODO should probably be:
|
259
|
+
# raise TypeError.new("can't merge #{v1.inspect} and #{v2.inspect}") unless Hash === v1 && Hash === v2
|
260
|
+
Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : (v2 || v1)
|
261
|
+
end
|
262
|
+
translations[locale].merge!(data, &merger)
|
263
|
+
end
|
264
|
+
end
|
265
|
+
end
|
266
|
+
end
|