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,593 @@
|
|
1
|
+
require 'rubygems'
|
2
|
+
require 'test/unit'
|
3
|
+
require 'test/zentest_assertions'
|
4
|
+
|
5
|
+
$TESTING = true
|
6
|
+
$TESTING_CM = true
|
7
|
+
|
8
|
+
RAILS_ENV = 'production'
|
9
|
+
|
10
|
+
module Rails; end
|
11
|
+
module Rails::VERSION
|
12
|
+
MAJOR = 1
|
13
|
+
MINOR = 1
|
14
|
+
TINY = 2
|
15
|
+
end
|
16
|
+
|
17
|
+
module ActiveRecord; end
|
18
|
+
|
19
|
+
class ActiveRecord::Base
|
20
|
+
|
21
|
+
@count = 1000
|
22
|
+
|
23
|
+
attr_accessor :id, :attributes
|
24
|
+
|
25
|
+
def self.abstract_class=(arg)
|
26
|
+
@abstract_class = arg
|
27
|
+
end
|
28
|
+
|
29
|
+
def self.abstract_class?
|
30
|
+
@abstract_class ||= false
|
31
|
+
return !!@abstract_class
|
32
|
+
end
|
33
|
+
|
34
|
+
##
|
35
|
+
# Need doco, blech
|
36
|
+
|
37
|
+
def self.find(*args)
|
38
|
+
args.flatten!
|
39
|
+
case args.first
|
40
|
+
when :first then
|
41
|
+
return find(:all, *args).first
|
42
|
+
when :all then
|
43
|
+
return find_by_sql("SELECT * FROM #{table_name} WHERE (#{table_name}.#{primary_key} = '#{args.last}') LIMIT 1")
|
44
|
+
else
|
45
|
+
case args.length
|
46
|
+
when 1 then
|
47
|
+
return find(:first, *args) if Fixnum === args.first
|
48
|
+
raise "Dunno what to do"
|
49
|
+
when 2 then
|
50
|
+
return find(args.first) if Hash === args.last
|
51
|
+
return new
|
52
|
+
when 3 then
|
53
|
+
return [new, new, new]
|
54
|
+
else
|
55
|
+
raise "Dunno what to do"
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.find_by_sql(query)
|
61
|
+
return [] if query =~ /concrete\.id = -1/
|
62
|
+
return [new]
|
63
|
+
end
|
64
|
+
|
65
|
+
def self.next_id
|
66
|
+
@count += 1
|
67
|
+
return @count
|
68
|
+
end
|
69
|
+
|
70
|
+
def self.table_name
|
71
|
+
name.downcase
|
72
|
+
end
|
73
|
+
|
74
|
+
def self.transaction(*a)
|
75
|
+
yield
|
76
|
+
end
|
77
|
+
|
78
|
+
def self.primary_key
|
79
|
+
'id'
|
80
|
+
end
|
81
|
+
|
82
|
+
def initialize
|
83
|
+
@id = ActiveRecord::Base.next_id
|
84
|
+
@attributes = { :data => 'data' }
|
85
|
+
end
|
86
|
+
|
87
|
+
def ==(other)
|
88
|
+
self.class == other.class and
|
89
|
+
id == other.id and
|
90
|
+
attributes_before_type_cast == other.attributes_before_type_cast
|
91
|
+
end
|
92
|
+
|
93
|
+
def attributes_before_type_cast
|
94
|
+
{ :data => @attributes[:data] }
|
95
|
+
end
|
96
|
+
|
97
|
+
def destroy
|
98
|
+
end
|
99
|
+
|
100
|
+
def reload
|
101
|
+
@attributes[:data].succ!
|
102
|
+
@attributes[:extra] = nil
|
103
|
+
end
|
104
|
+
|
105
|
+
def save
|
106
|
+
update
|
107
|
+
end
|
108
|
+
|
109
|
+
def transaction(*a, &b)
|
110
|
+
self.class.transaction(*a, &b)
|
111
|
+
end
|
112
|
+
|
113
|
+
def update
|
114
|
+
end
|
115
|
+
|
116
|
+
end
|
117
|
+
|
118
|
+
require 'cached_model'
|
119
|
+
|
120
|
+
class Concrete < CachedModel; end
|
121
|
+
class STILameness < Concrete; end
|
122
|
+
|
123
|
+
module Cache
|
124
|
+
|
125
|
+
@cache = {}
|
126
|
+
@ttl = {}
|
127
|
+
|
128
|
+
class << self; attr_accessor :cache, :ttl; end
|
129
|
+
|
130
|
+
def self.delete(key)
|
131
|
+
@cache.delete key
|
132
|
+
@ttl.delete key
|
133
|
+
return nil
|
134
|
+
end
|
135
|
+
|
136
|
+
def self.get(key)
|
137
|
+
@cache[key]
|
138
|
+
end
|
139
|
+
|
140
|
+
def self.put(key, value, ttl)
|
141
|
+
value = Marshal.load Marshal.dump(value)
|
142
|
+
@cache[key] = value
|
143
|
+
@ttl[key] = ttl
|
144
|
+
end
|
145
|
+
|
146
|
+
end
|
147
|
+
|
148
|
+
class << CachedModel
|
149
|
+
|
150
|
+
attr_writer :cache_local
|
151
|
+
attr_writer :cache_delay_commit
|
152
|
+
|
153
|
+
end
|
154
|
+
|
155
|
+
class TestCachedModel < Test::Unit::TestCase
|
156
|
+
|
157
|
+
DEFAULT_USE_LOCAL_CACHE = CachedModel.use_local_cache?
|
158
|
+
DEFAULT_USE_MEMCACHE = CachedModel.use_memcache?
|
159
|
+
|
160
|
+
def setup
|
161
|
+
@model = Concrete.new
|
162
|
+
Cache.cache = {}
|
163
|
+
Cache.ttl = {}
|
164
|
+
CachedModel.cache_delay_commit = {}
|
165
|
+
CachedModel.cache_local = {}
|
166
|
+
CachedModel.use_local_cache = DEFAULT_USE_LOCAL_CACHE
|
167
|
+
CachedModel.use_memcache = DEFAULT_USE_MEMCACHE
|
168
|
+
end
|
169
|
+
|
170
|
+
def teardown
|
171
|
+
CachedModel.use_local_cache = DEFAULT_USE_LOCAL_CACHE
|
172
|
+
CachedModel.use_memcache = DEFAULT_USE_MEMCACHE
|
173
|
+
end
|
174
|
+
|
175
|
+
def test_class_abstract_class_eh
|
176
|
+
assert_equal true, CachedModel.abstract_class?, 'CachedModel is abstract'
|
177
|
+
assert_equal false, Concrete.abstract_class?, 'Concrete is not abstract'
|
178
|
+
end
|
179
|
+
|
180
|
+
def test_class_cache_delete
|
181
|
+
CachedModel.use_local_cache = true
|
182
|
+
CachedModel.use_memcache = true
|
183
|
+
util_set
|
184
|
+
|
185
|
+
CachedModel.cache_delete @model.class, @model.id
|
186
|
+
|
187
|
+
assert_empty CachedModel.cache_local
|
188
|
+
assert_empty Cache.cache
|
189
|
+
end
|
190
|
+
|
191
|
+
def test_class_cache_delete_without_local_cache
|
192
|
+
CachedModel.use_local_cache = false
|
193
|
+
CachedModel.use_memcache = true
|
194
|
+
util_set
|
195
|
+
|
196
|
+
CachedModel.cache_delete @model.class, @model.id
|
197
|
+
|
198
|
+
deny_empty CachedModel.cache_local
|
199
|
+
assert_empty Cache.cache
|
200
|
+
end
|
201
|
+
|
202
|
+
def test_class_cache_delete_without_memcache
|
203
|
+
CachedModel.use_local_cache = true
|
204
|
+
CachedModel.use_memcache = false
|
205
|
+
util_set
|
206
|
+
|
207
|
+
CachedModel.cache_delete @model.class, @model.id
|
208
|
+
|
209
|
+
assert_empty CachedModel.cache_local
|
210
|
+
deny_empty Cache.cache
|
211
|
+
end
|
212
|
+
|
213
|
+
def test_class_cache_reset
|
214
|
+
CachedModel.use_local_cache = true
|
215
|
+
CachedModel.use_memcache = true
|
216
|
+
util_set
|
217
|
+
|
218
|
+
CachedModel.cache_reset
|
219
|
+
|
220
|
+
assert_empty CachedModel.cache_local
|
221
|
+
deny_empty Cache.cache
|
222
|
+
end
|
223
|
+
|
224
|
+
def test_class_cache_reset_without_local_cache
|
225
|
+
CachedModel.use_local_cache = false
|
226
|
+
CachedModel.use_memcache = true
|
227
|
+
util_set
|
228
|
+
|
229
|
+
CachedModel.cache_reset
|
230
|
+
|
231
|
+
deny_empty CachedModel.cache_local
|
232
|
+
deny_empty Cache.cache
|
233
|
+
end
|
234
|
+
|
235
|
+
def test_class_cache_reset_without_memcache
|
236
|
+
CachedModel.use_local_cache = true
|
237
|
+
CachedModel.use_memcache = false
|
238
|
+
util_set
|
239
|
+
|
240
|
+
CachedModel.cache_reset
|
241
|
+
|
242
|
+
assert_empty CachedModel.cache_local
|
243
|
+
deny_empty Cache.cache
|
244
|
+
end
|
245
|
+
|
246
|
+
def test_class_find_complex
|
247
|
+
CachedModel.use_local_cache = true
|
248
|
+
CachedModel.use_memcache = true
|
249
|
+
|
250
|
+
record = Concrete.find(1, :order => 'lock_version')
|
251
|
+
|
252
|
+
assert_equal @model.id + 1, record.id
|
253
|
+
|
254
|
+
assert_equal record, util_local(record)
|
255
|
+
assert_equal record, util_memcache(record)
|
256
|
+
end
|
257
|
+
|
258
|
+
def test_class_find_complex_without_local_cache
|
259
|
+
CachedModel.use_local_cache = false
|
260
|
+
CachedModel.use_memcache = true
|
261
|
+
|
262
|
+
record = Concrete.find(1, :order => 'lock_version')
|
263
|
+
|
264
|
+
assert_equal @model.id + 1, record.id
|
265
|
+
|
266
|
+
assert_equal nil, util_local(record)
|
267
|
+
assert_equal record, util_memcache(record)
|
268
|
+
end
|
269
|
+
|
270
|
+
def test_class_find_complex_without_memcache
|
271
|
+
CachedModel.use_local_cache = true
|
272
|
+
CachedModel.use_memcache = false
|
273
|
+
|
274
|
+
record = Concrete.find(1, :order => 'lock_version')
|
275
|
+
|
276
|
+
assert_equal @model.id + 1, record.id
|
277
|
+
|
278
|
+
assert_equal record, util_local(record)
|
279
|
+
assert_equal nil, util_memcache(record)
|
280
|
+
end
|
281
|
+
|
282
|
+
def test_class_find_in_local_cache
|
283
|
+
CachedModel.use_local_cache = true
|
284
|
+
util_set
|
285
|
+
|
286
|
+
record = Concrete.find(1, :order => 'lock_version')
|
287
|
+
assert_equal @model.id + 1, record.id
|
288
|
+
|
289
|
+
assert_equal record, util_local(record)
|
290
|
+
end
|
291
|
+
|
292
|
+
def test_class_find_in_memcache
|
293
|
+
CachedModel.use_local_cache = true
|
294
|
+
CachedModel.use_memcache = true
|
295
|
+
util_set
|
296
|
+
CachedModel.cache_reset
|
297
|
+
|
298
|
+
record = Concrete.find @model.id
|
299
|
+
|
300
|
+
assert_equal @model, record
|
301
|
+
|
302
|
+
assert_equal record, util_local(record)
|
303
|
+
end
|
304
|
+
|
305
|
+
def test_class_find_multiple
|
306
|
+
CachedModel.use_local_cache = true
|
307
|
+
ids = [@model.id + 1, @model.id + 2, @model.id + 3]
|
308
|
+
records = Concrete.find(*ids)
|
309
|
+
assert_equal ids, records.map { |r| r.id }
|
310
|
+
|
311
|
+
assert_equal ids.map { |i| "#{@model.class}:#{i}" }.sort,
|
312
|
+
CachedModel.cache_local.keys.sort
|
313
|
+
assert_equal ids.map { |i| "active_record:#{@model.class}:#{i}" }.sort,
|
314
|
+
Cache.cache.keys.sort
|
315
|
+
end
|
316
|
+
|
317
|
+
def test_class_find_not_cached
|
318
|
+
CachedModel.use_local_cache = true
|
319
|
+
record = Concrete.find @model.id + 1
|
320
|
+
assert_equal @model.id + 1, record.id
|
321
|
+
|
322
|
+
assert_equal record, util_local(record)
|
323
|
+
assert_equal record, util_memcache(record)
|
324
|
+
end
|
325
|
+
|
326
|
+
def test_class_find_by_sql
|
327
|
+
CachedModel.use_local_cache = true
|
328
|
+
q = "SELECT * FROM concrete WHERE (concrete.id = #{@model.id + 1}) LIMIT 1"
|
329
|
+
record = Concrete.find_by_sql(q).first
|
330
|
+
assert_equal @model.id + 1, record.id
|
331
|
+
|
332
|
+
assert_equal record, util_local(record)
|
333
|
+
assert_equal record, util_memcache(record)
|
334
|
+
end
|
335
|
+
|
336
|
+
def test_class_find_by_sql_extra_space
|
337
|
+
CachedModel.use_local_cache = true
|
338
|
+
q = "SELECT * FROM concrete WHERE (concrete.id = #{@model.id + 1}) LIMIT 1"
|
339
|
+
record = Concrete.find_by_sql(q).first
|
340
|
+
assert_equal @model.id + 1, record.id
|
341
|
+
|
342
|
+
assert_equal record, util_local(record)
|
343
|
+
assert_equal record, util_memcache(record)
|
344
|
+
end
|
345
|
+
|
346
|
+
def test_class_find_by_sql_no_record
|
347
|
+
q = "SELECT * FROM concrete WHERE (concrete.id = -1) LIMIT 1"
|
348
|
+
|
349
|
+
records = Concrete.find_by_sql q
|
350
|
+
|
351
|
+
assert_equal [], records
|
352
|
+
end
|
353
|
+
|
354
|
+
def test_class_ttl
|
355
|
+
assert_equal 900, CachedModel.ttl
|
356
|
+
CachedModel.ttl = 800
|
357
|
+
assert_equal 800, CachedModel.ttl
|
358
|
+
end
|
359
|
+
|
360
|
+
def test_class_use_local_cache_eh
|
361
|
+
CachedModel.use_local_cache = true
|
362
|
+
assert_equal true, CachedModel.use_local_cache?
|
363
|
+
CachedModel.use_local_cache = false
|
364
|
+
assert_equal false, CachedModel.use_local_cache?
|
365
|
+
end
|
366
|
+
|
367
|
+
def test_class_use_memcache_eh
|
368
|
+
CachedModel.use_memcache = true
|
369
|
+
assert_equal true, CachedModel.use_memcache?
|
370
|
+
CachedModel.use_memcache = false
|
371
|
+
assert_equal false, CachedModel.use_memcache?
|
372
|
+
end
|
373
|
+
|
374
|
+
def test_cache_delete
|
375
|
+
CachedModel.use_local_cache = true
|
376
|
+
util_set
|
377
|
+
|
378
|
+
@model.cache_delete
|
379
|
+
|
380
|
+
assert_empty CachedModel.cache_local
|
381
|
+
assert_empty Cache.cache
|
382
|
+
end
|
383
|
+
|
384
|
+
def test_cache_key_local
|
385
|
+
assert_equal "#{@model.class}:#{@model.id}", @model.cache_key_local
|
386
|
+
end
|
387
|
+
|
388
|
+
def test_cache_key_memcache
|
389
|
+
assert_equal "active_record:#{@model.class}:#{@model.id}",
|
390
|
+
@model.cache_key_memcache
|
391
|
+
end
|
392
|
+
|
393
|
+
def test_cache_local
|
394
|
+
assert_same CachedModel.cache_local, @model.cache_local
|
395
|
+
end
|
396
|
+
|
397
|
+
def test_cache_store
|
398
|
+
CachedModel.use_local_cache = true
|
399
|
+
CachedModel.use_memcache = true
|
400
|
+
|
401
|
+
@model.cache_store
|
402
|
+
|
403
|
+
deny_empty CachedModel.cache_local
|
404
|
+
deny_empty Cache.cache
|
405
|
+
|
406
|
+
assert_equal @model, util_local(@model)
|
407
|
+
assert_equal @model, util_memcache(@model)
|
408
|
+
assert_equal CachedModel.ttl, Cache.ttl[@model.cache_key_memcache]
|
409
|
+
end
|
410
|
+
|
411
|
+
def test_cache_store_in_transaction
|
412
|
+
CachedModel.use_local_cache = true
|
413
|
+
CachedModel.use_memcache = true
|
414
|
+
CachedModel.cache_delay_commit[0] = []
|
415
|
+
|
416
|
+
@model.cache_store
|
417
|
+
|
418
|
+
deny_empty CachedModel.cache_delay_commit
|
419
|
+
assert_empty CachedModel.cache_local
|
420
|
+
assert_empty Cache.cache
|
421
|
+
end
|
422
|
+
|
423
|
+
def test_cache_store_without_local_cache
|
424
|
+
CachedModel.use_local_cache = false
|
425
|
+
CachedModel.use_memcache = true
|
426
|
+
|
427
|
+
@model.cache_store
|
428
|
+
|
429
|
+
assert_empty CachedModel.cache_local
|
430
|
+
deny_empty Cache.cache
|
431
|
+
|
432
|
+
assert_equal nil, util_local(@model)
|
433
|
+
assert_equal @model, util_memcache(@model)
|
434
|
+
assert_equal CachedModel.ttl, Cache.ttl[@model.cache_key_memcache]
|
435
|
+
end
|
436
|
+
|
437
|
+
def test_cache_store_without_memcache
|
438
|
+
CachedModel.use_local_cache = true
|
439
|
+
CachedModel.use_memcache = false
|
440
|
+
|
441
|
+
@model.cache_store
|
442
|
+
|
443
|
+
deny_empty CachedModel.cache_local
|
444
|
+
assert_empty Cache.cache
|
445
|
+
|
446
|
+
assert_equal @model, util_local(@model)
|
447
|
+
assert_equal nil, util_memcache(@model)
|
448
|
+
end
|
449
|
+
|
450
|
+
def test_cache_store_with_attributes
|
451
|
+
CachedModel.use_local_cache = true
|
452
|
+
@model.attributes[:extra] = 'extra'
|
453
|
+
@model.cache_store
|
454
|
+
|
455
|
+
deny_empty CachedModel.cache_local
|
456
|
+
deny_empty Cache.cache
|
457
|
+
|
458
|
+
local_model = util_local(@model)
|
459
|
+
mem_model = util_memcache(@model)
|
460
|
+
assert_equal @model, local_model
|
461
|
+
assert_equal @model, mem_model
|
462
|
+
assert_equal CachedModel.ttl, Cache.ttl[@model.cache_key_memcache]
|
463
|
+
|
464
|
+
expected = {:data => 'data'}
|
465
|
+
|
466
|
+
assert_equal expected, local_model.attributes
|
467
|
+
assert_equal expected, mem_model.attributes
|
468
|
+
end
|
469
|
+
|
470
|
+
def test_destroy
|
471
|
+
CachedModel.use_local_cache = true
|
472
|
+
util_set
|
473
|
+
|
474
|
+
@model.destroy
|
475
|
+
|
476
|
+
assert_empty CachedModel.cache_local
|
477
|
+
assert_empty Cache.cache
|
478
|
+
end
|
479
|
+
|
480
|
+
def test_reload
|
481
|
+
util_set
|
482
|
+
|
483
|
+
@model.reload
|
484
|
+
|
485
|
+
deny_empty CachedModel.cache_local
|
486
|
+
deny_empty Cache.cache
|
487
|
+
|
488
|
+
assert_equal 'datb',
|
489
|
+
util_local(@model).attributes[:data]
|
490
|
+
assert_equal 'datb',
|
491
|
+
util_memcache(@model).attributes[:data]
|
492
|
+
end
|
493
|
+
|
494
|
+
def test_transaction_fail
|
495
|
+
CachedModel.use_local_cache = true
|
496
|
+
|
497
|
+
e = assert_raise RuntimeError do
|
498
|
+
@model.transaction do
|
499
|
+
@model.attributes[:data] = 'atad'
|
500
|
+
@model.save
|
501
|
+
raise 'Oh nos!'
|
502
|
+
end
|
503
|
+
end
|
504
|
+
|
505
|
+
assert_equal 'Oh nos!', e.message
|
506
|
+
assert_equal nil, util_local(@model)
|
507
|
+
assert_equal nil, util_memcache(@model)
|
508
|
+
end
|
509
|
+
|
510
|
+
def test_transaction_nested
|
511
|
+
CachedModel.use_local_cache = true
|
512
|
+
|
513
|
+
@model.transaction do
|
514
|
+
@model.transaction do
|
515
|
+
@model.attributes[:data] = 'value1'
|
516
|
+
@model.save
|
517
|
+
|
518
|
+
assert_equal nil, util_local(@model), 'in t1 local'
|
519
|
+
assert_equal nil, util_memcache(@model), 'in t1 memcache'
|
520
|
+
end
|
521
|
+
|
522
|
+
assert_equal 'value1', util_local(@model).attributes[:data],
|
523
|
+
'completed t1 local'
|
524
|
+
assert_equal 'value1', util_memcache(@model).attributes[:data],
|
525
|
+
'completed t1 memcache'
|
526
|
+
|
527
|
+
@model.attributes[:data] = 'value2'
|
528
|
+
@model.save
|
529
|
+
|
530
|
+
assert_equal 'value1', util_local(@model).attributes[:data],
|
531
|
+
'in t2 local'
|
532
|
+
assert_equal 'value1', util_memcache(@model).attributes[:data],
|
533
|
+
'in t2 memcache'
|
534
|
+
end
|
535
|
+
|
536
|
+
assert_equal 'value2', util_local(@model).attributes[:data],
|
537
|
+
'completed t2 local'
|
538
|
+
assert_equal 'value2', util_memcache(@model).attributes[:data],
|
539
|
+
'completed t2 local'
|
540
|
+
end
|
541
|
+
|
542
|
+
def test_transaction_pass
|
543
|
+
CachedModel.use_local_cache = true
|
544
|
+
|
545
|
+
result = @model.transaction do
|
546
|
+
@model.attributes[:data] = 'atad'
|
547
|
+
@model.save
|
548
|
+
|
549
|
+
assert_equal nil, util_local(@model)
|
550
|
+
assert_equal nil, util_memcache(@model)
|
551
|
+
|
552
|
+
:some_value
|
553
|
+
end
|
554
|
+
|
555
|
+
assert_equal :some_value, result
|
556
|
+
|
557
|
+
assert_equal 'atad', util_local(@model).attributes[:data]
|
558
|
+
assert_equal 'atad',
|
559
|
+
util_memcache(@model).attributes[:data]
|
560
|
+
|
561
|
+
end
|
562
|
+
|
563
|
+
def test_update
|
564
|
+
util_set
|
565
|
+
|
566
|
+
@model.attributes[:data] = 'atad'
|
567
|
+
assert_equal true, @model.update, "Updates should return true"
|
568
|
+
|
569
|
+
deny_empty CachedModel.cache_local
|
570
|
+
deny_empty Cache.cache
|
571
|
+
|
572
|
+
assert_equal 'atad',
|
573
|
+
util_local(@model).attributes[:data]
|
574
|
+
assert_equal 'atad',
|
575
|
+
util_memcache(@model).attributes[:data]
|
576
|
+
end
|
577
|
+
|
578
|
+
def util_local(model)
|
579
|
+
CachedModel.cache_local[model.cache_key_local]
|
580
|
+
end
|
581
|
+
|
582
|
+
def util_memcache(model)
|
583
|
+
Cache.cache[model.cache_key_memcache]
|
584
|
+
end
|
585
|
+
|
586
|
+
def util_set(klass = @model.class, id = @model.id, data = @model)
|
587
|
+
key = "#{klass}:#{id}"
|
588
|
+
CachedModel.cache_local[key] = data
|
589
|
+
Cache.cache["active_record:#{key}"] = data
|
590
|
+
end
|
591
|
+
|
592
|
+
end
|
593
|
+
|