typo 4.0.3 → 4.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES-4.1 +83 -0
- data/MAINTAINERS +3 -7
- data/README +1 -1
- data/{components/sidebars/README → README.SIDEBARS} +3 -0
- data/Rakefile +1 -1
- data/TODO-4.1 +16 -0
- data/app/apis/blogger_service.rb +3 -3
- data/app/apis/meta_weblog_service.rb +4 -21
- data/app/apis/movable_type_service.rb +5 -5
- data/app/controllers/accounts_controller.rb +6 -3
- data/app/controllers/admin/blacklist_controller.rb +1 -1
- data/app/controllers/admin/cache_controller.rb +3 -7
- data/app/controllers/admin/content_controller.rb +46 -24
- data/app/controllers/admin/feedback_controller.rb +3 -3
- data/app/controllers/admin/general_controller.rb +3 -3
- data/app/controllers/admin/pages_controller.rb +7 -3
- data/app/controllers/admin/sidebar_controller.rb +19 -26
- data/app/controllers/admin/textfilters_controller.rb +3 -1
- data/app/controllers/admin/themes_controller.rb +1 -1
- data/app/controllers/admin/users_controller.rb +1 -1
- data/app/controllers/application.rb +25 -27
- data/app/controllers/articles_controller.rb +14 -18
- data/app/controllers/content_controller.rb +7 -7
- data/app/controllers/live_controller.rb +1 -1
- data/app/controllers/redirect_controller.rb +2 -0
- data/app/controllers/textfilter_controller.rb +0 -3
- data/app/controllers/theme_controller.rb +10 -5
- data/app/controllers/xml_controller.rb +7 -9
- data/app/helpers/admin/base_helper.rb +10 -5
- data/app/helpers/admin/content_helper.rb +6 -0
- data/app/helpers/admin/feedback_helper.rb +1 -1
- data/app/helpers/admin/pages_helper.rb +5 -0
- data/app/helpers/application_helper.rb +84 -51
- data/app/helpers/articles_helper.rb +29 -29
- data/app/helpers/mail_helper.rb +3 -2
- data/app/helpers/sidebar_helper.rb +25 -16
- data/app/helpers/xml_helper.rb +0 -16
- data/app/models/article.rb +90 -32
- data/app/models/blog.rb +82 -74
- data/app/models/blog_sweeper.rb +33 -8
- data/app/models/categorization.rb +4 -0
- data/app/models/category.rb +21 -4
- data/app/models/comment.rb +23 -21
- data/app/models/content.rb +106 -64
- data/app/models/content_state/base.rb +12 -3
- data/app/models/content_state/draft.rb +2 -3
- data/app/models/content_state/factory.rb +1 -1
- data/app/models/content_state/ham.rb +0 -1
- data/app/models/content_state/just_marked_as_ham.rb +8 -1
- data/app/models/content_state/just_marked_as_spam.rb +4 -1
- data/app/models/content_state/just_presumed_ham.rb +14 -14
- data/app/models/content_state/just_published.rb +11 -18
- data/app/models/content_state/just_withdrawn.rb +11 -0
- data/app/models/content_state/new.rb +0 -1
- data/app/models/content_state/presumed_ham.rb +9 -3
- data/app/models/content_state/presumed_spam.rb +4 -1
- data/app/models/content_state/publication_pending.rb +4 -4
- data/app/models/content_state/published.rb +7 -8
- data/app/models/content_state/spam.rb +0 -1
- data/app/models/content_state/unclassified.rb +12 -3
- data/app/models/content_state/withdrawn.rb +5 -6
- data/app/models/email_notifier.rb +1 -1
- data/app/models/feedback.rb +31 -11
- data/app/models/notification.rb +4 -0
- data/app/models/notification_mailer.rb +8 -8
- data/app/models/page.rb +19 -5
- data/app/models/ping.rb +27 -40
- data/app/models/sidebar.rb +241 -11
- data/app/models/tag.rb +12 -1
- data/app/models/text_filter.rb +33 -39
- data/app/models/theme.rb +9 -0
- data/app/models/trackback.rb +1 -5
- data/app/models/user.rb +7 -5
- data/app/views/accounts/login.rhtml +19 -15
- data/app/views/accounts/logout.rhtml +4 -4
- data/app/views/accounts/signup.rhtml +9 -9
- data/app/views/admin/base/_recent_comments.rhtml +2 -2
- data/app/views/admin/base/_recent_trackbacks.rhtml +2 -2
- data/app/views/admin/blacklist/_blacklist_patterns.rhtml +4 -4
- data/app/views/admin/blacklist/_form.rhtml +3 -3
- data/app/views/admin/blacklist/_quick_post.rhtml +7 -6
- data/app/views/admin/blacklist/destroy.rhtml +5 -5
- data/app/views/admin/blacklist/edit.rhtml +7 -7
- data/app/views/admin/blacklist/list.rhtml +2 -2
- data/app/views/admin/cache/list.rhtml +2 -2
- data/app/views/admin/categories/_categories.rhtml +3 -3
- data/app/views/admin/categories/_form.rhtml +1 -1
- data/app/views/admin/categories/_quick_post.rhtml +5 -5
- data/app/views/admin/categories/destroy.rhtml +7 -7
- data/app/views/admin/categories/edit.rhtml +6 -6
- data/app/views/admin/categories/list.rhtml +7 -4
- data/app/views/admin/categories/reorder.rhtml +1 -1
- data/app/views/admin/categories/show.rhtml +6 -6
- data/app/views/admin/comments/_form.rhtml +4 -4
- data/app/views/admin/comments/comments.rhtml +1 -1
- data/app/views/admin/comments/destroy.rhtml +6 -6
- data/app/views/admin/comments/edit.rhtml +8 -8
- data/app/views/admin/comments/list.rhtml +11 -11
- data/app/views/admin/comments/new.rhtml +7 -7
- data/app/views/admin/comments/show.rhtml +7 -7
- data/app/views/admin/content/_articles.rhtml +12 -10
- data/app/views/admin/content/_attachment.rhtml +15 -17
- data/app/views/admin/content/_form.rhtml +68 -45
- data/app/views/admin/content/_pages.rhtml +2 -2
- data/app/views/admin/content/_quick_post.rhtml +6 -6
- data/app/views/admin/content/_show_categories.rhtml +2 -2
- data/app/views/admin/content/_show_resources.rhtml +2 -2
- data/app/views/admin/content/destroy.rhtml +8 -8
- data/app/views/admin/content/edit.rhtml +8 -26
- data/app/views/admin/content/list.rhtml +4 -4
- data/app/views/admin/content/new.rhtml +5 -25
- data/app/views/admin/content/preview.rhtml +9 -2
- data/app/views/admin/content/show.rhtml +10 -9
- data/app/views/admin/feedback/_item.rhtml +2 -2
- data/app/views/admin/feedback/list.rhtml +21 -20
- data/app/views/admin/general/index.rhtml +261 -239
- data/app/views/admin/general/update_database.rhtml +15 -15
- data/app/views/admin/pages/_form.rhtml +32 -15
- data/app/views/admin/pages/_pages.rhtml +9 -8
- data/app/views/admin/pages/_quick_post.rhtml +2 -2
- data/app/views/admin/pages/destroy.rhtml +7 -7
- data/app/views/admin/pages/edit.rhtml +7 -26
- data/app/views/admin/pages/list.rhtml +4 -3
- data/app/views/admin/pages/new.rhtml +5 -22
- data/app/views/admin/pages/preview.rhtml +1 -1
- data/app/views/admin/pages/show.rhtml +5 -5
- data/app/views/admin/resources/_itunes_category_edit.rhtml +2 -2
- data/app/views/admin/resources/_metadata_add.rhtml +13 -13
- data/app/views/admin/resources/_metadata_edit.rhtml +14 -14
- data/app/views/admin/resources/_mime_edit.rhtml +5 -5
- data/app/views/admin/resources/_pages.rhtml +2 -2
- data/app/views/admin/resources/_resources.rhtml +8 -8
- data/app/views/admin/resources/destroy.rhtml +7 -7
- data/app/views/admin/resources/list.rhtml +6 -3
- data/app/views/admin/resources/new.rhtml +7 -3
- data/app/views/admin/shared/_edit.rhtml +17 -0
- data/app/views/admin/sidebar/_active.rhtml +5 -5
- data/app/views/admin/sidebar/_availables.rhtml +1 -1
- data/app/views/admin/sidebar/_publish.rhtml +1 -1
- data/app/views/admin/sidebar/_target.rhtml +1 -1
- data/app/views/admin/sidebar/index.rhtml +9 -5
- data/app/views/admin/textfilters/_form.rhtml +13 -5
- data/app/views/admin/textfilters/_macros.rhtml +4 -4
- data/app/views/admin/textfilters/_textfilters.rhtml +6 -6
- data/app/views/admin/textfilters/destroy.rhtml +5 -8
- data/app/views/admin/textfilters/edit.rhtml +2 -5
- data/app/views/admin/textfilters/list.rhtml +4 -2
- data/app/views/admin/textfilters/macro_help.rhtml +1 -1
- data/app/views/admin/textfilters/new.rhtml +9 -7
- data/app/views/admin/textfilters/show.rhtml +5 -5
- data/app/views/admin/textfilters/show_help.rhtml +3 -3
- data/app/views/admin/themes/index.rhtml +8 -2
- data/app/views/admin/trackbacks/_form.rhtml +4 -4
- data/app/views/admin/trackbacks/destroy.rhtml +4 -4
- data/app/views/admin/trackbacks/edit.rhtml +6 -6
- data/app/views/admin/trackbacks/list.rhtml +10 -10
- data/app/views/admin/trackbacks/new.rhtml +6 -6
- data/app/views/admin/trackbacks/show.rhtml +8 -8
- data/app/views/admin/users/_form.rhtml +10 -10
- data/app/views/admin/users/_user.rhtml +6 -6
- data/app/views/admin/users/destroy.rhtml +7 -7
- data/app/views/admin/users/edit.rhtml +9 -5
- data/app/views/admin/users/list.rhtml +2 -2
- data/app/views/admin/users/new.rhtml +9 -7
- data/app/views/admin/users/show.rhtml +10 -10
- data/app/views/articles/_article.rhtml +3 -3
- data/app/views/articles/_comment.rhtml +3 -3
- data/app/views/articles/_comment_box.rhtml +6 -6
- data/app/views/articles/_trackback.rhtml +1 -1
- data/app/views/articles/archives.rhtml +3 -3
- data/app/views/articles/comment_preview.rhtml +2 -2
- data/app/views/articles/groupings.rhtml +1 -1
- data/app/views/articles/index.rhtml +2 -2
- data/app/views/articles/read.rhtml +15 -15
- data/app/views/articles/view_page.rhtml +1 -1
- data/app/views/layouts/administration.rhtml +11 -17
- data/app/views/layouts/minimal.rhtml +13 -0
- data/app/views/live/search.rhtml +1 -1
- data/app/views/notification_mailer/_mail_footer.rhtml +2 -2
- data/app/views/notification_mailer/article.rhtml +1 -1
- data/app/views/notification_mailer/comment.rhtml +4 -4
- data/app/views/settings/done.rhtml +1 -1
- data/app/views/settings/install.rhtml +3 -3
- data/app/views/shared/_search.rhtml +4 -4
- data/app/views/xml/_atom10_item_article.rxml +9 -7
- data/app/views/xml/_atom10_item_comment.rxml +2 -3
- data/app/views/xml/_atom10_item_trackback.rxml +1 -1
- data/app/views/xml/_googlesitemap_item_article.rxml +2 -2
- data/app/views/xml/_googlesitemap_item_category.rxml +1 -1
- data/app/views/xml/_googlesitemap_item_page.rxml +2 -2
- data/app/views/xml/_googlesitemap_item_tag.rxml +2 -2
- data/app/views/xml/_itunes_item_resource.rxml +2 -4
- data/app/views/xml/_rss20_item_article.rxml +4 -10
- data/app/views/xml/_rss20_item_comment.rxml +2 -2
- data/app/views/xml/rsd.rxml +4 -4
- data/bin/typo +0 -1
- data/config/boot.rb +4 -3
- data/config/environment.rb +37 -28
- data/config/environments/test.rb +1 -1
- data/config/routes.rb +6 -5
- data/db/migrate/051_fix_canonical_server_url.rb +17 -0
- data/db/migrate/052_remove_cached_html.rb +11 -0
- data/db/migrate/053_promote_canonical_server_url.rb +22 -0
- data/db/migrate/054_upgrade_sidebar_objects.rb +26 -0
- data/db/migrate/055_link_sidebars_to_blog.rb +17 -0
- data/db/migrate/056_create_notifications.rb +32 -0
- data/db/migrate/057_add_categorization_model.rb +45 -0
- data/db/migrate/058_separate_entries_and_feedback.rb +68 -0
- data/db/migrate/059_cleanup_feedback_table.rb +25 -0
- data/db/migrate/060_cleanup_contents_table.rb +29 -0
- data/db/migrate/061_convert_title_prefix_setting.rb +25 -0
- data/db/schema.mysql.sql +139 -108
- data/db/schema.postgresql.sql +140 -108
- data/db/schema.rb +97 -75
- data/db/schema.sqlite.sql +140 -108
- data/db/schema.sqlserver.sql +144 -109
- data/db/schema_version +1 -1
- data/lang/fr_FR.rb +469 -0
- data/lib/email_notify.rb +4 -4
- data/lib/generators/sidebar/sidebar_generator.rb +15 -6
- data/lib/generators/sidebar/templates/Rakefile +22 -0
- data/lib/generators/sidebar/templates/content.rhtml +10 -0
- data/lib/generators/sidebar/templates/init.rb +4 -0
- data/lib/generators/sidebar/templates/sidebar.rb +16 -0
- data/lib/generators/sidebar/templates/unit_test.rb +8 -0
- data/lib/jabber_notify.rb +8 -7
- data/lib/memory_profiler.rb +60 -0
- data/lib/rails_patch/active_record.rb +0 -27
- data/lib/route_cache.rb +15 -0
- data/lib/sidebars/component_plugin.rb +3 -0
- data/lib/sidebars/consolidated_plugin.rb +26 -0
- data/lib/sidebars/plugin.rb +8 -13
- data/lib/spam_protection.rb +35 -23
- data/lib/tasks/release.rake +7 -7
- data/lib/text_filter_plugin.rb +55 -15
- data/lib/typo_deprecated.rb +19 -0
- data/lib/typo_version.rb +1 -1
- data/public/images/bracket.gif +0 -0
- data/public/images/cancel.png +0 -0
- data/public/images/checked.png +0 -0
- data/public/images/delete.png +0 -0
- data/public/images/edit.png +0 -0
- data/public/images/help.png +0 -0
- data/public/images/show.png +0 -0
- data/public/javascripts/codecollapse.js +8 -0
- data/public/javascripts/controls.js +41 -23
- data/public/javascripts/dragdrop.js +105 -76
- data/public/javascripts/effects.js +293 -163
- data/public/javascripts/prototype.js +900 -391
- data/public/stylesheets/administration.css +390 -318
- data/public/stylesheets/codecollapse.css +3 -0
- data/public/stylesheets/minimal.css +142 -0
- data/public/stylesheets/textmate/dawn.css +209 -0
- data/public/stylesheets/textmate/iplastic.css +142 -0
- data/public/stylesheets/textmate/space_cadet.css +99 -0
- data/public/stylesheets/textmate/textmate.css +48 -0
- data/public/stylesheets/textmate/twilight.css +227 -0
- data/script/process/inspector +3 -0
- data/spec/controllers/accounts_controller_spec.rb +184 -0
- data/spec/controllers/articles_controller_spec.rb +47 -0
- data/spec/fixtures/articles_tags.yml +19 -0
- data/spec/fixtures/blacklist_patterns.yml +10 -0
- data/spec/fixtures/blogs.yml +77 -0
- data/spec/fixtures/categories.yml +35 -0
- data/{test/fixtures/articles_categories.yml → spec/fixtures/categorizations.yml} +0 -0
- data/spec/fixtures/contents.yml +215 -0
- data/spec/fixtures/feedback.yml +159 -0
- data/spec/fixtures/notifications.yml +0 -0
- data/spec/fixtures/page_caches.yml +7 -0
- data/spec/fixtures/redirects.yml +13 -0
- data/spec/fixtures/resources.yml +24 -0
- data/spec/fixtures/sidebars.yml +12 -0
- data/spec/fixtures/tags.yml +13 -0
- data/spec/fixtures/text_filters.yml +42 -0
- data/spec/fixtures/triggers.yml +1 -0
- data/spec/fixtures/users.yml +56 -0
- data/spec/fixtures/whiteboards.yml +13 -0
- data/spec/helpers/admin_base_helper_spec.rb +13 -0
- data/spec/models/amazon_sidebar_spec.rb +40 -0
- data/spec/models/audioscrobbler_spec.rb +134 -0
- data/spec/models/blog_spec.rb +28 -0
- data/spec/models/cache_support_spec.rb +55 -0
- data/spec/models/category_spec.rb +48 -0
- data/spec/models/configuration_spec.rb +108 -0
- data/spec/models/content_state_spec.rb +1010 -0
- data/spec/models/delegate_to_content_state_spec.rb +126 -0
- data/spec/models/delicious_spec.rb +101 -0
- data/spec/models/flickr_spec.rb +128 -0
- data/spec/models/metafragment_spec.rb +65 -0
- data/spec/models/page_cache_spec.rb +35 -0
- data/spec/models/page_spec.rb +88 -0
- data/spec/models/ping_spec.rb +133 -0
- data/spec/models/redirect_spec.rb +17 -0
- data/spec/models/resource_spec.rb +43 -0
- data/spec/models/static_sidebar_spec.rb +17 -0
- data/spec/models/tag_spec.rb +54 -0
- data/spec/models/text_filter_spec.rb +38 -0
- data/spec/models/theme_spec.rb +45 -0
- data/spec/models/trackback_spec.rb +60 -0
- data/spec/models/trigger_spec.rb +41 -0
- data/spec/models/user_spec.rb +105 -0
- data/test/fixtures/blogs.yml +5 -4
- data/test/fixtures/categorizations.yml +31 -0
- data/test/fixtures/contents.yml +2 -160
- data/test/fixtures/feedback.yml +159 -0
- data/test/fixtures/sidebars.yml +11 -4
- data/test/functional/accounts_controller_test.rb +6 -10
- data/test/functional/admin/article_preview_test.rb +21 -6
- data/test/functional/admin/blacklist_controller_test.rb +11 -11
- data/test/functional/admin/categories_controller_test.rb +13 -13
- data/test/functional/admin/comments_controller_test.rb +21 -21
- data/test/functional/admin/content_controller_test.rb +30 -38
- data/test/functional/admin/feedback_controller_test.rb +12 -12
- data/test/functional/admin/general_controller_test.rb +2 -2
- data/test/functional/admin/pages_controller_test.rb +3 -18
- data/test/functional/admin/resources_controller_test.rb +7 -7
- data/test/functional/admin/textfilters_controller_test.rb +2 -2
- data/test/functional/admin/themes_controller_test.rb +1 -1
- data/test/functional/admin/trackbacks_controller_test.rb +21 -21
- data/test/functional/admin/users_controller_test.rb +21 -18
- data/test/functional/articles_controller_test.rb +62 -46
- data/test/functional/backend_controller_test.rb +6 -6
- data/test/functional/redirect_controller_test.rb +3 -3
- data/test/functional/textfilter_controller_test.rb +10 -12
- data/test/functional/theme_controller_test.rb +1 -1
- data/test/functional/xml_controller_test.rb +7 -5
- data/test/mocks/themes/azure/layouts/default.rhtml +2 -2
- data/test/test_helper.rb +75 -0
- data/test/unit/amazon_sidebar_test.rb +36 -0
- data/test/unit/article_test.rb +36 -4
- data/test/unit/blog_test.rb +5 -36
- data/test/unit/cache_support_test.rb +62 -0
- data/test/unit/category_test.rb +6 -1
- data/test/unit/comment_test.rb +34 -9
- data/test/unit/content_state/factory_test.rb +8 -0
- data/test/unit/content_state/feedback_states_test.rb +71 -0
- data/test/unit/magnolia_test.rb +1 -1
- data/test/unit/notification_test.rb +10 -0
- data/test/unit/page_test.rb +20 -0
- data/test/unit/ping_test.rb +1 -1
- data/test/unit/sidebar_test.rb +2 -7
- data/test/unit/static_sidebar_test.rb +19 -0
- data/test/unit/tag_test.rb +6 -1
- data/test/unit/text_filter_test.rb +21 -21
- data/test/unit/theme_test.rb +1 -1
- data/test/unit/trackback_test.rb +16 -1
- data/themes/azure/layouts/default.rhtml +2 -2
- data/themes/scribbish/layouts/default.rhtml +2 -2
- data/themes/scribbish/stylesheets/content.css +6 -8
- data/themes/scribbish/views/articles/_article.rhtml +10 -10
- data/themes/scribbish/views/articles/_comment.rhtml +16 -12
- data/themes/scribbish/views/articles/_comment_form.rhtml +25 -22
- data/themes/scribbish/views/articles/_search.rhtml +14 -13
- data/themes/scribbish/views/articles/comment_preview.rhtml +3 -3
- data/themes/scribbish/views/articles/index.rhtml +1 -1
- data/themes/scribbish/views/articles/read.rhtml +8 -8
- data/vendor/cached_model/History.txt +30 -0
- data/vendor/cached_model/LICENSE.txt +30 -0
- data/vendor/cached_model/Manifest.txt +7 -0
- data/vendor/cached_model/README.txt +96 -0
- data/vendor/cached_model/Rakefile +25 -0
- data/vendor/cached_model/lib/cached_model.rb +287 -0
- data/vendor/cached_model/test/test_cached_model.rb +593 -0
- data/vendor/flickr/flickr.rb +1 -1
- data/vendor/memcache-client/History.txt +25 -0
- data/vendor/memcache-client/LICENSE.txt +30 -0
- data/vendor/memcache-client/Manifest.txt +8 -0
- data/vendor/memcache-client/README.txt +46 -0
- data/vendor/memcache-client/Rakefile +23 -0
- data/vendor/memcache-client/lib/memcache.rb +491 -0
- data/vendor/memcache-client/lib/memcache_util.rb +71 -0
- data/vendor/memcache-client/test/test_mem_cache.rb +284 -0
- data/vendor/plugins/action_view_patch/Rakefile +22 -0
- data/vendor/plugins/action_view_patch/init.rb +1 -0
- data/vendor/plugins/action_view_patch/lib/action_view_patch.rb +18 -0
- data/vendor/plugins/action_view_patch/test/action_view_patch_test.rb +56 -0
- data/vendor/plugins/aimpresence_sidebar/Rakefile +22 -0
- data/vendor/plugins/aimpresence_sidebar/init.rb +4 -0
- data/vendor/plugins/aimpresence_sidebar/lib/aimpresence_sidebar.rb +21 -0
- data/vendor/plugins/aimpresence_sidebar/test/aimpresence_sidebar_test.rb +33 -0
- data/vendor/plugins/aimpresence_sidebar/views/content.rhtml +4 -0
- data/vendor/plugins/amazon_sidebar/init.rb +5 -0
- data/vendor/plugins/amazon_sidebar/lib/amazon_sidebar.rb +16 -0
- data/vendor/plugins/amazon_sidebar/views/content.rhtml +4 -0
- data/vendor/plugins/archives_sidebar/Rakefile +22 -0
- data/vendor/plugins/archives_sidebar/init.rb +5 -0
- data/{components/plugins/sidebars/archives_controller.rb → vendor/plugins/archives_sidebar/lib/archives_sidebar.rb} +7 -6
- data/vendor/plugins/archives_sidebar/test/archives_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/archives → vendor/plugins/archives_sidebar/views}/content.rhtml +2 -2
- data/vendor/plugins/audioscrobbler_sidebar/Rakefile +22 -0
- data/vendor/plugins/audioscrobbler_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/audioscrobbler_sidebar/lib}/audioscrobbler.rb +0 -0
- data/{components/plugins/sidebars/audioscrobbler_controller.rb → vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb} +7 -4
- data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/audioscrobbler → vendor/plugins/audioscrobbler_sidebar/views}/content.rhtml +4 -4
- data/vendor/plugins/backpack_sidebar/Rakefile +22 -0
- data/vendor/plugins/backpack_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/backpack_sidebar/lib}/backpack.rb +0 -0
- data/{components/plugins/sidebars/backpack_controller.rb → vendor/plugins/backpack_sidebar/lib/backpack_sidebar.rb} +6 -3
- data/vendor/plugins/backpack_sidebar/test/backpack_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/backpack → vendor/plugins/backpack_sidebar/views}/content.rhtml +4 -4
- data/vendor/plugins/category_sidebar/Rakefile +22 -0
- data/vendor/plugins/category_sidebar/init.rb +5 -0
- data/{components/plugins/sidebars/category_controller.rb → vendor/plugins/category_sidebar/lib/category_sidebar.rb} +3 -5
- data/vendor/plugins/category_sidebar/test/category_sidebar_test.rb +8 -0
- data/vendor/plugins/category_sidebar/views/content.rhtml +10 -0
- data/vendor/plugins/delicious_sidebar/Rakefile +22 -0
- data/vendor/plugins/delicious_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/delicious_sidebar/lib}/delicious.rb +0 -0
- data/{components/plugins/sidebars/delicious_controller.rb → vendor/plugins/delicious_sidebar/lib/delicious_sidebar.rb} +16 -10
- data/vendor/plugins/delicious_sidebar/test/delicious_sidebar_test.rb +8 -0
- data/vendor/plugins/delicious_sidebar/views/content.rhtml +20 -0
- data/vendor/plugins/flickr_sidebar/Rakefile +22 -0
- data/vendor/plugins/flickr_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/flickr_sidebar/lib}/flickr.rb +1 -1
- data/vendor/plugins/flickr_sidebar/lib/flickr_sidebar.rb +15 -0
- data/vendor/plugins/flickr_sidebar/test/flickr_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/flickr → vendor/plugins/flickr_sidebar/views}/content.rhtml +5 -5
- data/vendor/plugins/fortythree_sidebar/Rakefile +22 -0
- data/vendor/plugins/fortythree_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/fortythree_sidebar/lib}/fortythree.rb +0 -0
- data/{components/plugins/sidebars/fortythree_controller.rb → vendor/plugins/fortythree_sidebar/lib/fortythree_sidebar.rb} +5 -4
- data/vendor/plugins/fortythree_sidebar/test/fortythree_sidebar_test.rb +8 -0
- data/vendor/plugins/fortythree_sidebar/views/content.rhtml +8 -0
- data/vendor/plugins/fortythreeplaces_sidebar/Rakefile +22 -0
- data/vendor/plugins/fortythreeplaces_sidebar/init.rb +5 -0
- data/vendor/plugins/fortythreeplaces_sidebar/lib/fortythree.rb +62 -0
- data/{components/plugins/sidebars/fortythreeplaces_controller.rb → vendor/plugins/fortythreeplaces_sidebar/lib/fortythreeplaces_sidebar.rb} +5 -4
- data/vendor/plugins/fortythreeplaces_sidebar/test/fortythreeplaces_sidebar_test.rb +8 -0
- data/vendor/plugins/fortythreeplaces_sidebar/views/content.rhtml +8 -0
- data/vendor/plugins/haml/MIT-LICENSE +20 -0
- data/vendor/plugins/haml/REFERENCE +662 -0
- data/vendor/plugins/haml/Rakefile +171 -0
- data/vendor/plugins/haml/VERSION +1 -0
- data/vendor/plugins/haml/bin/haml +18 -0
- data/vendor/plugins/haml/init.rb +3 -0
- data/vendor/plugins/haml/lib/haml/buffer.rb +224 -0
- data/vendor/plugins/haml/lib/haml/engine.rb +557 -0
- data/vendor/plugins/haml/lib/haml/helpers.rb +220 -0
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +54 -0
- data/vendor/plugins/haml/lib/haml/template.rb +138 -0
- data/vendor/plugins/haml/test/benchmark.rb +62 -0
- data/vendor/plugins/haml/test/engine_test.rb +93 -0
- data/vendor/plugins/haml/test/helper_test.rb +105 -0
- data/vendor/plugins/haml/test/mocks/article.rb +6 -0
- data/vendor/plugins/haml/test/profile.rb +45 -0
- data/vendor/plugins/haml/test/results/content_for_layout.xhtml +16 -0
- data/vendor/plugins/haml/test/results/eval_suppressed.xhtml +2 -0
- data/vendor/plugins/haml/test/results/helpers.xhtml +50 -0
- data/vendor/plugins/haml/test/results/helpful.xhtml +5 -0
- data/vendor/plugins/haml/test/results/just_stuff.xhtml +38 -0
- data/vendor/plugins/haml/test/results/list.xhtml +12 -0
- data/vendor/plugins/haml/test/results/original_engine.xhtml +24 -0
- data/vendor/plugins/haml/test/results/partials.xhtml +20 -0
- data/vendor/plugins/haml/test/results/silent_script.xhtml +74 -0
- data/vendor/plugins/haml/test/results/standard.xhtml +42 -0
- data/vendor/plugins/haml/test/results/tag_parsing.xhtml +28 -0
- data/vendor/plugins/haml/test/results/very_basic.xhtml +7 -0
- data/vendor/plugins/haml/test/results/whitespace_handling.xhtml +51 -0
- data/vendor/plugins/haml/test/rhtml/standard.rhtml +51 -0
- data/vendor/plugins/haml/test/runner.rb +15 -0
- data/vendor/plugins/haml/test/template_test.rb +137 -0
- data/vendor/plugins/haml/test/templates/_partial.haml +7 -0
- data/vendor/plugins/haml/test/templates/_text_area.haml +3 -0
- data/vendor/plugins/haml/test/templates/content_for_layout.haml +10 -0
- data/vendor/plugins/haml/test/templates/eval_suppressed.haml +5 -0
- data/vendor/plugins/haml/test/templates/helpers.haml +39 -0
- data/vendor/plugins/haml/test/templates/helpful.haml +6 -0
- data/vendor/plugins/haml/test/templates/just_stuff.haml +34 -0
- data/vendor/plugins/haml/test/templates/list.haml +12 -0
- data/vendor/plugins/haml/test/templates/original_engine.haml +17 -0
- data/vendor/plugins/haml/test/templates/partialize.haml +1 -0
- data/vendor/plugins/haml/test/templates/partials.haml +12 -0
- data/vendor/plugins/haml/test/templates/silent_script.haml +40 -0
- data/vendor/plugins/haml/test/templates/standard.haml +40 -0
- data/vendor/plugins/haml/test/templates/tag_parsing.haml +24 -0
- data/vendor/plugins/haml/test/templates/very_basic.haml +4 -0
- data/vendor/plugins/haml/test/templates/whitespace_handling.haml +66 -0
- data/vendor/plugins/localization/CHANGELOG +1 -0
- data/vendor/plugins/localization/README +85 -0
- data/vendor/plugins/localization/init.rb +3 -0
- data/vendor/plugins/localization/lib/localization.rb +46 -0
- data/vendor/plugins/magnolia_sidebar/Rakefile +22 -0
- data/vendor/plugins/magnolia_sidebar/init.rb +5 -0
- data/{app/models/aggregations/magnolia.rb → vendor/plugins/magnolia_sidebar/lib/magnolia_aggregation.rb} +0 -0
- data/vendor/plugins/magnolia_sidebar/lib/magnolia_sidebar.rb +16 -0
- data/vendor/plugins/magnolia_sidebar/test/magnolia_sidebar_test.rb +8 -0
- data/vendor/plugins/magnolia_sidebar/views/content.rhtml +12 -0
- data/vendor/plugins/recent_comments_sidebar/Rakefile +22 -0
- data/vendor/plugins/recent_comments_sidebar/init.rb +5 -0
- data/vendor/plugins/recent_comments_sidebar/lib/recent_comments_sidebar.rb +16 -0
- data/vendor/plugins/recent_comments_sidebar/test/recent_comments_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/recent_comments → vendor/plugins/recent_comments_sidebar/views}/content.rhtml +2 -2
- data/vendor/plugins/static_sidebar/init.rb +4 -0
- data/{components/plugins/sidebars/static_controller.rb → vendor/plugins/static_sidebar/lib/static_sidebar.rb} +4 -7
- data/vendor/plugins/static_sidebar/views/content.rhtml +2 -0
- data/vendor/plugins/tada_sidebar/Rakefile +22 -0
- data/vendor/plugins/tada_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/tada_sidebar/lib}/tada.rb +0 -0
- data/{components/plugins/sidebars/tada_controller.rb → vendor/plugins/tada_sidebar/lib/tada_sidebar.rb} +8 -4
- data/vendor/plugins/tada_sidebar/test/tada_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/tada → vendor/plugins/tada_sidebar/views}/content.rhtml +4 -4
- data/vendor/plugins/tag_sidebar/Rakefile +22 -0
- data/vendor/plugins/tag_sidebar/init.rb +5 -0
- data/vendor/plugins/tag_sidebar/lib/tag_sidebar.rb +24 -0
- data/vendor/plugins/tag_sidebar/test/tag_sidebar_test.rb +8 -0
- data/vendor/plugins/tag_sidebar/views/content.rhtml +8 -0
- data/vendor/plugins/technorati_sidebar/Rakefile +22 -0
- data/vendor/plugins/technorati_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/technorati_sidebar/lib}/technorati.rb +0 -0
- data/{components/plugins/sidebars/technorati_controller.rb → vendor/plugins/technorati_sidebar/lib/technorati_sidebar.rb} +8 -4
- data/vendor/plugins/technorati_sidebar/test/technorati_sidebar_test.rb +8 -0
- data/vendor/plugins/technorati_sidebar/views/content.rhtml +8 -0
- data/vendor/plugins/typo_textfilter_amazon/README +5 -0
- data/vendor/plugins/typo_textfilter_amazon/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_amazon/init.rb +4 -0
- data/vendor/plugins/typo_textfilter_amazon/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_amazon/lib/typo_textfilter_amazon.rb +45 -0
- data/vendor/plugins/typo_textfilter_amazon/tasks/typo_textfilter_amazon_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_amazon/test/typo_textfilter_amazon_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_code/README +4 -0
- data/vendor/plugins/typo_textfilter_code/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_code/init.rb +4 -0
- data/vendor/plugins/typo_textfilter_code/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +62 -0
- data/vendor/plugins/typo_textfilter_code/tasks/typo_textfilter_code_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_code/test/typo_textfilter_code_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_flickr/README +4 -0
- data/vendor/plugins/typo_textfilter_flickr/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_flickr/init.rb +4 -0
- data/vendor/plugins/typo_textfilter_flickr/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb +79 -0
- data/vendor/plugins/typo_textfilter_flickr/tasks/typo_textfilter_flickr_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_flickr/test/typo_textfilter_flickr_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/README +4 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/lib/typo_textfilter_htmlfilter.rb +12 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/tasks/typo_textfilter_htmlfilter_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_htmlfilter/test/typo_textfilter_htmlfilter_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_lightbox/README +4 -0
- data/vendor/plugins/typo_textfilter_lightbox/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_lightbox/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_lightbox/install.rb +1 -0
- data/{components/plugins/textfilters/lightbox_controller.rb → vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb} +64 -61
- data/vendor/plugins/typo_textfilter_lightbox/tasks/typo_textfilter_lightbox_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_lightbox/test/typo_textfilter_lightbox_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_markdown/README +4 -0
- data/vendor/plugins/typo_textfilter_markdown/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_markdown/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_markdown/install.rb +1 -0
- data/{components/plugins/textfilters/markdown_controller.rb → vendor/plugins/typo_textfilter_markdown/lib/typo_textfilter_markdown.rb} +13 -9
- data/vendor/plugins/typo_textfilter_markdown/tasks/typo_textfilter_markdown_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_markdown/test/typo_textfilter_markdown_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_none/README +4 -0
- data/vendor/plugins/typo_textfilter_none/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_none/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_none/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_none/lib/typo_textfilter_none.rb +12 -0
- data/vendor/plugins/typo_textfilter_none/tasks/typo_textfilter_none_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_none/test/typo_textfilter_none_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_smartypants/README +4 -0
- data/vendor/plugins/typo_textfilter_smartypants/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_smartypants/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_smartypants/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_smartypants/lib/typo_textfilter_smartypants.rb +12 -0
- data/vendor/plugins/typo_textfilter_smartypants/tasks/typo_textfilter_smartypants_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_smartypants/test/typo_textfilter_smartypants_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_sparkline/README +4 -0
- data/vendor/plugins/typo_textfilter_sparkline/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_sparkline/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_sparkline/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_sparkline/lib/typo_textfilter_sparkline.rb +92 -0
- data/vendor/plugins/typo_textfilter_sparkline/tasks/typo_textfilter_sparkline_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_sparkline/test/typo_textfilter_sparkline_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_textile/README +4 -0
- data/vendor/plugins/typo_textfilter_textile/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_textile/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_textile/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_textile/lib/typo_textfilter_textile.rb +18 -0
- data/vendor/plugins/typo_textfilter_textile/tasks/typo_textfilter_textile_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_textile/test/typo_textfilter_textile_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/README +4 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/init.rb +2 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/lib/typo_textfilter_textile_and_markdown.rb +12 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/tasks/typo_textfilter_textile_and_markdown_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_textile_and_markdown/test/typo_textfilter_textile_and_markdown_test.rb +8 -0
- data/vendor/plugins/typo_textfilter_tmcode/README +4 -0
- data/vendor/plugins/typo_textfilter_tmcode/Rakefile +22 -0
- data/vendor/plugins/typo_textfilter_tmcode/init.rb +3 -0
- data/vendor/plugins/typo_textfilter_tmcode/install.rb +1 -0
- data/vendor/plugins/typo_textfilter_tmcode/lib/typo_textfilter_tmcode.rb +86 -0
- data/vendor/plugins/typo_textfilter_tmcode/tasks/typo_textfilter_tmcode_tasks.rake +4 -0
- data/vendor/plugins/typo_textfilter_tmcode/test/typo_textfilter_tmcode_test.rb +8 -0
- data/vendor/plugins/upcoming_sidebar/Rakefile +22 -0
- data/vendor/plugins/upcoming_sidebar/init.rb +5 -0
- data/{app/models/aggregations → vendor/plugins/upcoming_sidebar/lib}/upcoming.rb +0 -0
- data/vendor/plugins/upcoming_sidebar/lib/upcoming_sidebar.rb +15 -0
- data/vendor/plugins/upcoming_sidebar/test/upcoming_sidebar_test.rb +8 -0
- data/{components/plugins/sidebars/upcoming → vendor/plugins/upcoming_sidebar/views}/content.rhtml +3 -3
- data/vendor/plugins/xbox_sidebar/Rakefile +22 -0
- data/vendor/plugins/xbox_sidebar/init.rb +5 -0
- data/{components/plugins/sidebars/xbox_controller.rb → vendor/plugins/xbox_sidebar/lib/xbox_sidebar.rb} +1 -1
- data/vendor/plugins/xbox_sidebar/test/xbox_sidebar_test.rb +8 -0
- data/vendor/plugins/xbox_sidebar/views/content.rhtml +2 -0
- data/vendor/plugins/xml_sidebar/Rakefile +22 -0
- data/vendor/plugins/xml_sidebar/init.rb +5 -0
- data/{components/plugins/sidebars/xml_controller.rb → vendor/plugins/xml_sidebar/lib/xml_sidebar.rb} +1 -1
- data/vendor/plugins/xml_sidebar/test/xml_sidebar_test.rb +8 -0
- data/vendor/plugins/xml_sidebar/views/content.rhtml +12 -0
- metadata +505 -101
- data/app/controllers/sidebar_controller.rb +0 -50
- data/app/models/content_observer.rb +0 -5
- data/components/plugins/sidebars/aimpresence/content.rhtml +0 -4
- data/components/plugins/sidebars/aimpresence_controller.rb +0 -10
- data/components/plugins/sidebars/amazon/content.rhtml +0 -4
- data/components/plugins/sidebars/amazon_controller.rb +0 -17
- data/components/plugins/sidebars/category/content.rhtml +0 -10
- data/components/plugins/sidebars/delicious/content.rhtml +0 -20
- data/components/plugins/sidebars/flickr_controller.rb +0 -16
- data/components/plugins/sidebars/fortythree/content.rhtml +0 -8
- data/components/plugins/sidebars/fortythreeplaces/content.rhtml +0 -8
- data/components/plugins/sidebars/magnolia/content.rhtml +0 -12
- data/components/plugins/sidebars/magnolia_controller.rb +0 -17
- data/components/plugins/sidebars/recent_comments_controller.rb +0 -23
- data/components/plugins/sidebars/static/content.rhtml +0 -2
- data/components/plugins/sidebars/tag/content.rhtml +0 -8
- data/components/plugins/sidebars/tag_controller.rb +0 -18
- data/components/plugins/sidebars/technorati/content.rhtml +0 -8
- data/components/plugins/sidebars/upcoming_controller.rb +0 -11
- data/components/plugins/sidebars/xbox/content.rhtml +0 -2
- data/components/plugins/sidebars/xml/content.rhtml +0 -12
- data/components/plugins/textfilters/amazon_controller.rb +0 -39
- data/components/plugins/textfilters/code_controller.rb +0 -59
- data/components/plugins/textfilters/flickr_controller.rb +0 -75
- data/components/plugins/textfilters/htmlfilter_controller.rb +0 -8
- data/components/plugins/textfilters/macropost_controller.rb +0 -14
- data/components/plugins/textfilters/macropre_controller.rb +0 -14
- data/components/plugins/textfilters/none_controller.rb +0 -8
- data/components/plugins/textfilters/smartypants_controller.rb +0 -8
- data/components/plugins/textfilters/sparkline_controller.rb +0 -88
- data/components/plugins/textfilters/textile_and_markdown_controller.rb +0 -8
- data/components/plugins/textfilters/textile_controller.rb +0 -14
- data/db/schema.mysql-v3.sql +0 -218
- data/lib/generators/sidebar/templates/components/plugins/sidebars/controller_template.rb +0 -20
- data/lib/generators/sidebar/templates/components/plugins/sidebars/views/content_template.rhtml +0 -4
- data/lib/rails_patch/components.rb +0 -14
- data/public/images/checked.gif +0 -0
- data/test/unit/observer_test.rb +0 -40
@@ -0,0 +1,93 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
|
3
|
+
require 'test/unit'
|
4
|
+
require File.dirname(__FILE__) + '/../lib/haml/engine'
|
5
|
+
|
6
|
+
class EngineTest < Test::Unit::TestCase
|
7
|
+
|
8
|
+
def render(text, options = {})
|
9
|
+
Haml::Engine.new(text, options).to_html
|
10
|
+
end
|
11
|
+
|
12
|
+
def test_empty_render_should_remain_empty
|
13
|
+
assert_equal('', render(''))
|
14
|
+
end
|
15
|
+
|
16
|
+
# This is ugly because Hashes are unordered; we don't always know the order
|
17
|
+
# in which attributes will be returned.
|
18
|
+
# There is probably a better way to do this.
|
19
|
+
def test_attributes_should_render_correctly
|
20
|
+
assert_equal("<div class='atlantis' style='ugly'>\n</div>", render(".atlantis{:style => 'ugly'}").chomp)
|
21
|
+
rescue
|
22
|
+
assert_equal("<div style='ugly' class='atlantis'>\n</div>", render(".atlantis{:style => 'ugly'}").chomp)
|
23
|
+
end
|
24
|
+
|
25
|
+
def test_ruby_code_should_work_inside_attributes
|
26
|
+
author = 'hcatlin'
|
27
|
+
assert_equal("<p class='3'>foo</p>", render("%p{:class => 1+2} foo").chomp)
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_nil_should_render_empty_tag
|
31
|
+
assert_equal("<div class='no_attributes'>\n</div>",
|
32
|
+
render(".no_attributes{:nil => nil}").chomp)
|
33
|
+
end
|
34
|
+
|
35
|
+
def test_strings_should_get_stripped_inside_tags
|
36
|
+
assert_equal("<div class='stripped'>This should have no spaces in front of it</div>",
|
37
|
+
render(".stripped This should have no spaces in front of it").chomp)
|
38
|
+
end
|
39
|
+
|
40
|
+
def test_one_liner_should_be_one_line
|
41
|
+
assert_equal("<p>Hello</p>", render('%p Hello').chomp)
|
42
|
+
end
|
43
|
+
|
44
|
+
def test_long_liner_should_not_print_on_one_line
|
45
|
+
assert_equal("<div>\n #{'x' * 51}\n</div>", render("%div #{'x' * 51}").chomp)
|
46
|
+
end
|
47
|
+
|
48
|
+
def test_multi_render
|
49
|
+
engine = Haml::Engine.new("%strong Hi there!")
|
50
|
+
assert_equal("<strong>Hi there!</strong>\n", engine.to_html)
|
51
|
+
assert_equal("<strong>Hi there!</strong>\n", engine.to_html)
|
52
|
+
assert_equal("<strong>Hi there!</strong>\n", engine.to_html)
|
53
|
+
end
|
54
|
+
|
55
|
+
# Options tests
|
56
|
+
|
57
|
+
def test_stop_eval
|
58
|
+
assert_equal("", render("= 'Hello'", :suppress_eval => true))
|
59
|
+
end
|
60
|
+
|
61
|
+
def test_attr_wrapper
|
62
|
+
assert_equal("<p strange=*attrs*>\n</p>\n", render("%p{ :strange => 'attrs'}", :attr_wrapper => '*'))
|
63
|
+
assert_equal("<p escaped='quo\"te'>\n</p>\n", render("%p{ :escaped => 'quo\"te'}", :attr_wrapper => '"'))
|
64
|
+
assert_equal("<p escaped=\"q'uo"te\">\n</p>\n", render("%p{ :escaped => 'q\\'uo\"te'}", :attr_wrapper => '"'))
|
65
|
+
assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n", render("!!! XML", :attr_wrapper => '"'))
|
66
|
+
end
|
67
|
+
|
68
|
+
def test_locals
|
69
|
+
assert_equal("<p>Paragraph!</p>\n", render("%p= text", :locals => { :text => "Paragraph!" }))
|
70
|
+
end
|
71
|
+
|
72
|
+
def test_precompiled
|
73
|
+
precompiled = <<-END
|
74
|
+
def _haml_render
|
75
|
+
_hamlout = @haml_stack[-1]
|
76
|
+
_erbout = _hamlout.buffer
|
77
|
+
|
78
|
+
_hamlout.open_tag("p", 0, nil, true, "", nil, nil, false)
|
79
|
+
@haml_lineno = 1
|
80
|
+
haml_temp = "Haml Rocks Socks"
|
81
|
+
haml_temp = _hamlout.push_script(haml_temp, 1, false)
|
82
|
+
_hamlout.close_tag("p", 0)
|
83
|
+
end
|
84
|
+
END
|
85
|
+
|
86
|
+
assert_equal("<p>Haml Rocks Socks</p>\n", render("%h1 I shall not be rendered", :precompiled => precompiled))
|
87
|
+
end
|
88
|
+
|
89
|
+
def test_comps
|
90
|
+
assert_equal(-1, "foo" <=> nil)
|
91
|
+
assert_equal(1, nil <=> "foo")
|
92
|
+
end
|
93
|
+
end
|
@@ -0,0 +1,105 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
|
3
|
+
require 'test/unit'
|
4
|
+
require File.dirname(__FILE__) + '/../lib/haml/template'
|
5
|
+
|
6
|
+
class HelperTest < Test::Unit::TestCase
|
7
|
+
include Haml::Helpers
|
8
|
+
|
9
|
+
def setup
|
10
|
+
ActionView::Base.register_template_handler("haml", Haml::Template)
|
11
|
+
@base = ActionView::Base.new
|
12
|
+
@base.controller = ActionController::Base.new
|
13
|
+
end
|
14
|
+
|
15
|
+
def render(text, options = {})
|
16
|
+
if options == :action_view
|
17
|
+
@base.render :inline => text, :type => :haml
|
18
|
+
else
|
19
|
+
Haml::Engine.new(text, options).to_html
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def test_flatten
|
24
|
+
assert_equal(flatten("FooBar"), "FooBar")
|
25
|
+
|
26
|
+
assert_equal(flatten("Foo\rBar"), "FooBar")
|
27
|
+
|
28
|
+
assert_equal(flatten("Foo\nBar"), "Foo
Bar")
|
29
|
+
|
30
|
+
assert_equal(flatten("Hello\nWorld!\nYOU ARE \rFLAT?\n\rOMGZ!"),
|
31
|
+
"Hello
World!
YOU ARE FLAT?
OMGZ!")
|
32
|
+
end
|
33
|
+
|
34
|
+
def test_list_of_should_render_correctly
|
35
|
+
assert_equal("<li>1</li>\n<li>2</li>\n", render("= list_of([1, 2]) do |i|\n = i"))
|
36
|
+
assert_equal("<li>1</li>\n", render("= list_of([[1]]) do |i|\n = i.first"))
|
37
|
+
assert_equal("<li>\n <h1>Fee</h1>\n <p>A word!</p>\n</li>\n<li>\n <h1>Fi</h1>\n <p>A word!</p>\n</li>\n<li>\n <h1>Fo</h1>\n <p>A word!</p>\n</li>\n<li>\n <h1>Fum</h1>\n <p>A word!</p>\n</li>\n",
|
38
|
+
render("= list_of(['Fee', 'Fi', 'Fo', 'Fum']) do |title|\n %h1= title\n %p A word!"))
|
39
|
+
end
|
40
|
+
|
41
|
+
def test_buffer_access
|
42
|
+
assert(render("= buffer") =~ /#<Haml::Buffer:0x[a-z0-9]+>/)
|
43
|
+
assert_equal(render("= (buffer == _hamlout)"), "true\n")
|
44
|
+
end
|
45
|
+
|
46
|
+
def test_tabs
|
47
|
+
assert_equal(render("foo\n- tab_up\nbar\n- tab_down\nbaz"), "foo\n bar\nbaz\n")
|
48
|
+
end
|
49
|
+
|
50
|
+
def test_helpers_dont_leak
|
51
|
+
# Haml helpers shouldn't be accessible from ERB
|
52
|
+
render("foo")
|
53
|
+
proper_behavior = false
|
54
|
+
|
55
|
+
begin
|
56
|
+
ActionView::Base.new.render(:inline => "<%= flatten('Foo\\nBar') %>")
|
57
|
+
rescue NoMethodError
|
58
|
+
proper_behavior = true
|
59
|
+
end
|
60
|
+
assert(proper_behavior)
|
61
|
+
|
62
|
+
begin
|
63
|
+
ActionView::Base.new.render(:inline => "<%= concat('foo') %>")
|
64
|
+
rescue ArgumentError
|
65
|
+
proper_behavior = true
|
66
|
+
end
|
67
|
+
assert(proper_behavior)
|
68
|
+
end
|
69
|
+
|
70
|
+
def test_action_view_included
|
71
|
+
assert(Haml::Helpers.action_view?)
|
72
|
+
end
|
73
|
+
|
74
|
+
def test_action_view_not_included
|
75
|
+
#This is for 100% rcov, rather than any real testing purposes.
|
76
|
+
Kernel.module_eval do
|
77
|
+
alias_method :old_require, :require
|
78
|
+
def require(string)
|
79
|
+
raise LoadError if string == "action_view"
|
80
|
+
old_require string
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
load File.dirname(__FILE__) + '/../lib/haml/helpers/action_view_mods.rb'
|
85
|
+
|
86
|
+
Kernel.module_eval do
|
87
|
+
alias_method :require, :old_require
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
def test_form_tag
|
92
|
+
# Until the next Rails is released, form_tag with a block can have one of
|
93
|
+
# two behaviors.
|
94
|
+
|
95
|
+
result = render("- form_tag 'foo' do\n %p bar\n %strong baz", :action_view)
|
96
|
+
new_rails = "<form action=\"foo\" method=\"post\">\n <p>bar</p>\n <strong>baz</strong>\n</form>"
|
97
|
+
old_rails = ""
|
98
|
+
assert(result == new_rails || result == old_rails)
|
99
|
+
end
|
100
|
+
|
101
|
+
def test_capture_haml
|
102
|
+
assert_equal("\"<p>13</p>\\n\"\n", render("- foo = capture_haml(13) do |a|\n %p= a\n= foo.dump"))
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
@@ -0,0 +1,45 @@
|
|
1
|
+
require File.dirname(__FILE__) + '/../lib/haml/template'
|
2
|
+
require 'rubygems'
|
3
|
+
require 'active_support'
|
4
|
+
require 'action_view'
|
5
|
+
require 'profiler'
|
6
|
+
require 'stringio'
|
7
|
+
|
8
|
+
module Haml
|
9
|
+
# A profiler for HAML, mostly for development use. This simply implements
|
10
|
+
# the Ruby profiler for profiling HAML code.
|
11
|
+
class Profiler
|
12
|
+
|
13
|
+
# Creates a new profiler that looks for templates in the base
|
14
|
+
# directory.
|
15
|
+
def initialize(base = File.join(File.dirname(__FILE__), 'templates'))
|
16
|
+
ActionView::Base.register_template_handler("haml", Haml::Template)
|
17
|
+
unless base.class == ActionView::Base
|
18
|
+
@base = ActionView::Base.new(base)
|
19
|
+
else
|
20
|
+
@base = base
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
# Profiles HAML on the given template with the given number of runs.
|
25
|
+
# The template name shouldn't have a file extension; this will
|
26
|
+
# automatically look for a HAML template.
|
27
|
+
#
|
28
|
+
# Returns the results of the profiling as a string.
|
29
|
+
def profile(runs = 100, template_name = 'standard')
|
30
|
+
# Runs the profiler, collects information
|
31
|
+
Profiler__::start_profile
|
32
|
+
runs.times { @base.render template_name }
|
33
|
+
Profiler__::stop_profile
|
34
|
+
|
35
|
+
# Outputs information to a StringIO, returns result
|
36
|
+
io = StringIO.new
|
37
|
+
Profiler__::print_profile(io)
|
38
|
+
io.pos = 0
|
39
|
+
result = io.read
|
40
|
+
io.close
|
41
|
+
return result
|
42
|
+
end
|
43
|
+
|
44
|
+
end
|
45
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
2
|
+
<html>
|
3
|
+
<head>
|
4
|
+
</head>
|
5
|
+
<body>
|
6
|
+
<div id='content'>
|
7
|
+
Lorem ipsum dolor sit amet
|
8
|
+
</div>
|
9
|
+
<div id='yieldy'>
|
10
|
+
Lorem ipsum dolor sit amet
|
11
|
+
</div>
|
12
|
+
<div id='nosym'>
|
13
|
+
Lorem ipsum dolor sit amet
|
14
|
+
</div>
|
15
|
+
</body>
|
16
|
+
</html>
|
@@ -0,0 +1,50 @@
|
|
1
|
+
&&&&&&&&&&&
|
2
|
+
<div>
|
3
|
+
<p class='title'>Title</p>
|
4
|
+
<p class='text'>
|
5
|
+
Woah this is really crazy
|
6
|
+
I mean wow,
|
7
|
+
man.
|
8
|
+
</p>
|
9
|
+
</div>
|
10
|
+
<div>
|
11
|
+
<p class='title'>Title</p>
|
12
|
+
<p class='text'>
|
13
|
+
Woah this is really crazy
|
14
|
+
I mean wow,
|
15
|
+
man.
|
16
|
+
</p>
|
17
|
+
</div>
|
18
|
+
<div>
|
19
|
+
<p class='title'>Title</p>
|
20
|
+
<p class='text'>
|
21
|
+
Woah this is really crazy
|
22
|
+
I mean wow,
|
23
|
+
man.
|
24
|
+
</p>
|
25
|
+
</div>
|
26
|
+
<p>foo</p>
|
27
|
+
<p>
|
28
|
+
reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong
|
29
|
+
</p>
|
30
|
+
<div class='woah'>
|
31
|
+
<div id='funky'>
|
32
|
+
<div>
|
33
|
+
<h1>Big!</h1>
|
34
|
+
<p>Small</p>
|
35
|
+
<!-- Invisible -->
|
36
|
+
</div>
|
37
|
+
<div class='dilly'>
|
38
|
+
<p>foo</p>
|
39
|
+
<h1>bar</h1>
|
40
|
+
</div>
|
41
|
+
</div>
|
42
|
+
(<strong>parentheses!</strong>)
|
43
|
+
</div>
|
44
|
+
*<span class='small'>Not really</span>
|
45
|
+
click
|
46
|
+
<a href='thing'>here</a>.
|
47
|
+
<p>baz</p>
|
48
|
+
<p>boom</p>
|
49
|
+
foo
|
50
|
+
<li><a href='http://www.google.com'>google</a></li>
|
@@ -0,0 +1,38 @@
|
|
1
|
+
<?xml version='1.0' encoding='utf-8' ?>
|
2
|
+
<?xml version='1.0' encoding='iso-8859-1' ?>
|
3
|
+
<?xml version='1.0' encoding='utf-8' ?>
|
4
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
5
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
6
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
7
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
8
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
|
9
|
+
<strong apos="Foo's bar!">Boo!</strong>
|
10
|
+
<div class='render'><em>wow!</em></div>
|
11
|
+
stuff followed by whitespace
|
12
|
+
<strong>block with whitespace</strong>
|
13
|
+
<p>
|
14
|
+
Escape
|
15
|
+
- character
|
16
|
+
%p foo
|
17
|
+
yee\ha
|
18
|
+
</p>
|
19
|
+
<!-- Short comment -->
|
20
|
+
<!--
|
21
|
+
This is a really long comment look how long it is it should be on a line of its own don't you think?
|
22
|
+
-->
|
23
|
+
<!--
|
24
|
+
This is a block comment
|
25
|
+
cool, huh?
|
26
|
+
<strong>there can even be sub-tags!</strong>
|
27
|
+
Or script!
|
28
|
+
-->
|
29
|
+
<!--[if lte IE6]> conditional comment! <![endif]-->
|
30
|
+
<!--[if gte IE7]>
|
31
|
+
<p>Block conditional comment</p>
|
32
|
+
<div>
|
33
|
+
<h1>Cool, eh?</h1>
|
34
|
+
</div>
|
35
|
+
<![endif]-->
|
36
|
+
<!--[if gte IE5.2]>
|
37
|
+
Woah a period.
|
38
|
+
<![endif]-->
|
@@ -0,0 +1,24 @@
|
|
1
|
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
2
|
+
<html>
|
3
|
+
<head>
|
4
|
+
<title>Stop. HAML time</title>
|
5
|
+
<div id='content'>
|
6
|
+
<h1>This is a title!</h1>
|
7
|
+
<p>
|
8
|
+
Lorem ipsum dolor sit amet, consectetur adipisicing elit
|
9
|
+
</p>
|
10
|
+
<p class='foo'>Cigarettes!</p>
|
11
|
+
<h2>Man alive!</h2>
|
12
|
+
<ul class='things'>
|
13
|
+
<li>Slippers</li>
|
14
|
+
<li>Shoes</li>
|
15
|
+
<li>Bathrobe</li>
|
16
|
+
<li>Coffee</li>
|
17
|
+
</ul>
|
18
|
+
<pre>
|
19
|
+
This is some text that's in a pre block!
|
20
|
+
Let's see what happens when it's rendered! What about now, since we're on a new line?
|
21
|
+
</pre>
|
22
|
+
</div>
|
23
|
+
</head>
|
24
|
+
</html>
|
@@ -0,0 +1,74 @@
|
|
1
|
+
<div>
|
2
|
+
<h1>I can count!</h1>
|
3
|
+
1
|
4
|
+
2
|
5
|
+
3
|
6
|
+
4
|
7
|
+
5
|
8
|
+
6
|
9
|
+
7
|
10
|
+
8
|
11
|
+
9
|
12
|
+
10
|
13
|
+
11
|
14
|
+
12
|
15
|
+
13
|
16
|
+
14
|
17
|
+
15
|
18
|
+
16
|
19
|
+
17
|
20
|
+
18
|
21
|
+
19
|
22
|
+
20
|
23
|
+
<h1>I know my ABCs!</h1>
|
24
|
+
<ul>
|
25
|
+
<li>a</li>
|
26
|
+
<li>b</li>
|
27
|
+
<li>c</li>
|
28
|
+
<li>d</li>
|
29
|
+
<li>e</li>
|
30
|
+
<li>f</li>
|
31
|
+
<li>g</li>
|
32
|
+
<li>h</li>
|
33
|
+
<li>i</li>
|
34
|
+
<li>j</li>
|
35
|
+
<li>k</li>
|
36
|
+
<li>l</li>
|
37
|
+
<li>m</li>
|
38
|
+
<li>n</li>
|
39
|
+
<li>o</li>
|
40
|
+
<li>p</li>
|
41
|
+
<li>q</li>
|
42
|
+
<li>r</li>
|
43
|
+
<li>s</li>
|
44
|
+
<li>t</li>
|
45
|
+
<li>u</li>
|
46
|
+
<li>v</li>
|
47
|
+
<li>w</li>
|
48
|
+
<li>x</li>
|
49
|
+
<li>y</li>
|
50
|
+
<li>z</li>
|
51
|
+
</ul>
|
52
|
+
<h1>I can catch errors!</h1>
|
53
|
+
Oh no! "undefined method `silly' for String:Class" happened!
|
54
|
+
<p>
|
55
|
+
"false" is:
|
56
|
+
false
|
57
|
+
</p>
|
58
|
+
Even!
|
59
|
+
Odd!
|
60
|
+
Even!
|
61
|
+
Odd!
|
62
|
+
Even!
|
63
|
+
</div>
|
64
|
+
<div class='foo'>
|
65
|
+
<strong>foobar</strong>
|
66
|
+
</div>
|
67
|
+
<strong>0</strong>
|
68
|
+
<strong>1</strong>
|
69
|
+
<strong>2</strong>
|
70
|
+
<strong>3</strong>
|
71
|
+
<strong>4</strong>
|
72
|
+
<div class='test'>
|
73
|
+
<p>boom</p>
|
74
|
+
</div>
|