publify_core 9.0.0.pre6 → 9.2.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of publify_core might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/CHANGELOG.md +103 -8
- data/README.md +9 -0
- data/app/assets/javascripts/bootstrap-sprockets.js +8 -0
- data/app/assets/javascripts/bootstrap/affix.js +164 -0
- data/app/assets/javascripts/bootstrap/alert.js +95 -0
- data/app/assets/javascripts/bootstrap/button.js +125 -0
- data/app/assets/javascripts/bootstrap/collapse.js +212 -0
- data/app/assets/javascripts/bootstrap/dropdown.js +165 -0
- data/app/assets/javascripts/bootstrap/modal.js +358 -0
- data/app/assets/javascripts/bootstrap/tab.js +155 -0
- data/app/assets/javascripts/bootstrap/transition.js +59 -0
- data/app/assets/javascripts/lightbox.js +4 -4
- data/app/assets/javascripts/publify_admin.js +1 -35
- data/app/assets/stylesheets/_bootstrap-compass.scss +9 -0
- data/app/assets/stylesheets/_bootstrap-mincer.scss +19 -0
- data/app/assets/stylesheets/_bootstrap-sprockets.scss +9 -0
- data/app/assets/stylesheets/_bootstrap.scss +42 -0
- data/app/assets/stylesheets/administration_structure.css.scss +1 -45
- data/app/assets/stylesheets/bootstrap/_alerts.scss +73 -0
- data/app/assets/stylesheets/bootstrap/_button-groups.scss +242 -0
- data/app/assets/stylesheets/bootstrap/_buttons.scss +168 -0
- data/app/assets/stylesheets/bootstrap/_close.scss +37 -0
- data/app/assets/stylesheets/bootstrap/_code.scss +69 -0
- data/app/assets/stylesheets/bootstrap/_component-animations.scss +38 -0
- data/app/assets/stylesheets/bootstrap/_dropdowns.scss +213 -0
- data/app/assets/stylesheets/bootstrap/_forms.scss +586 -0
- data/app/assets/stylesheets/bootstrap/_grid.scss +94 -0
- data/app/assets/stylesheets/bootstrap/_labels.scss +66 -0
- data/app/assets/stylesheets/bootstrap/_media.scss +66 -0
- data/app/assets/stylesheets/bootstrap/_mixins.scss +37 -0
- data/app/assets/stylesheets/bootstrap/_modals.scss +150 -0
- data/app/assets/stylesheets/bootstrap/_navbar.scss +479 -0
- data/app/assets/stylesheets/bootstrap/_navs.scss +242 -0
- data/app/assets/stylesheets/bootstrap/_normalize.scss +427 -0
- data/app/assets/stylesheets/bootstrap/_pagination.scss +86 -0
- data/app/assets/stylesheets/bootstrap/_panels.scss +222 -0
- data/app/assets/stylesheets/bootstrap/_print.scss +99 -0
- data/app/assets/stylesheets/bootstrap/_scaffolding.scss +160 -0
- data/app/assets/stylesheets/bootstrap/_tables.scss +234 -0
- data/app/assets/stylesheets/bootstrap/_theme.scss +224 -0
- data/app/assets/stylesheets/bootstrap/_type.scss +296 -0
- data/app/assets/stylesheets/bootstrap/_utilities.scss +55 -0
- data/app/assets/stylesheets/bootstrap/_variables.scss +638 -0
- data/app/assets/stylesheets/bootstrap/_wells.scss +29 -0
- data/app/assets/stylesheets/bootstrap/mixins/_alerts.scss +15 -0
- data/app/assets/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
- data/app/assets/stylesheets/bootstrap/mixins/_buttons.scss +56 -0
- data/app/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
- data/app/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
- data/app/assets/stylesheets/bootstrap/mixins/_forms.scss +82 -0
- data/app/assets/stylesheets/bootstrap/mixins/_gradients.scss +56 -0
- data/app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
- data/app/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
- data/app/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
- data/app/assets/stylesheets/bootstrap/mixins/_image.scss +28 -0
- data/app/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
- data/app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
- data/app/assets/stylesheets/bootstrap/mixins/_opacity.scss +7 -0
- data/app/assets/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
- data/app/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
- data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
- data/app/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
- data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +17 -0
- data/app/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
- data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
- data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
- data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
- data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
- data/app/assets/stylesheets/lightbox.css +3 -3
- data/app/assets/stylesheets/publify_admin.css.scss +0 -1
- data/app/controllers/accounts_controller.rb +2 -0
- data/app/controllers/admin/base_controller.rb +8 -22
- data/app/controllers/admin/content_controller.rb +69 -48
- data/app/controllers/admin/dashboard_controller.rb +20 -74
- data/app/controllers/admin/feedback_controller.rb +45 -36
- data/app/controllers/admin/notes_controller.rb +16 -10
- data/app/controllers/admin/pages_controller.rb +20 -34
- data/app/controllers/admin/post_types_controller.rb +7 -5
- data/app/controllers/admin/profiles_controller.rb +15 -5
- data/app/controllers/admin/redirects_controller.rb +9 -5
- data/app/controllers/admin/resources_controller.rb +7 -4
- data/app/controllers/admin/seo_controller.rb +12 -10
- data/app/controllers/admin/settings_controller.rb +7 -5
- data/app/controllers/admin/sidebar_controller.rb +7 -5
- data/app/controllers/admin/tags_controller.rb +7 -3
- data/app/controllers/admin/themes_controller.rb +10 -7
- data/app/controllers/admin/users_controller.rb +10 -7
- data/app/controllers/articles_controller.rb +92 -81
- data/app/controllers/authors_controller.rb +6 -3
- data/app/controllers/base_controller.rb +9 -11
- data/app/controllers/comments_controller.rb +15 -16
- data/app/controllers/content_controller.rb +12 -19
- data/app/controllers/feedback_controller.rb +7 -39
- data/app/controllers/notes_controller.rb +6 -6
- data/app/controllers/setup_controller.rb +25 -26
- data/app/controllers/tags_controller.rb +16 -16
- data/app/controllers/text_controller.rb +2 -4
- data/app/controllers/textfilter_controller.rb +2 -0
- data/app/controllers/theme_controller.rb +23 -16
- data/app/controllers/xml_controller.rb +13 -59
- data/app/helpers/admin/base_helper.rb +28 -29
- data/app/helpers/admin/feedback_helper.rb +34 -24
- data/app/helpers/articles_helper.rb +4 -2
- data/app/helpers/authors_helper.rb +9 -18
- data/app/helpers/base_helper.rb +66 -55
- data/app/helpers/blog_helper.rb +4 -2
- data/app/helpers/xml_helper.rb +5 -3
- data/app/jobs/application_job.rb +4 -0
- data/app/mailers/notification_mailer.rb +5 -3
- data/app/models/ability.rb +25 -23
- data/app/models/archives_sidebar.rb +18 -18
- data/app/models/article.rb +84 -99
- data/app/models/article/factory.rb +14 -6
- data/app/models/blog.rb +98 -110
- data/app/models/comment.rb +14 -10
- data/app/models/config_manager.rb +4 -2
- data/app/models/content.rb +45 -61
- data/app/models/content_base.rb +7 -6
- data/app/models/feedback.rb +91 -65
- data/app/models/meta_sidebar.rb +5 -3
- data/app/models/note.rb +31 -23
- data/app/models/page.rb +16 -10
- data/app/models/page_sidebar.rb +4 -2
- data/app/models/ping.rb +2 -113
- data/app/models/post_type.rb +4 -3
- data/app/models/redirect.rb +13 -7
- data/app/models/redirection.rb +3 -1
- data/app/models/resource.rb +6 -22
- data/app/models/search_sidebar.rb +4 -2
- data/app/models/sidebar.rb +12 -7
- data/app/models/static_sidebar.rb +15 -13
- data/app/models/tag.rb +23 -15
- data/app/models/tag_sidebar.rb +10 -7
- data/app/models/text_filter.rb +85 -11
- data/app/models/trackback.rb +7 -18
- data/app/models/trigger.rb +8 -19
- data/app/models/user.rb +46 -52
- data/app/services/title_builder.rb +52 -45
- data/app/uploaders/resource_uploader.rb +35 -2
- data/app/views/accounts/confirm.html.erb +3 -4
- data/app/views/admin/content/_article_list.html.erb +24 -9
- data/app/views/admin/content/_form.html.erb +71 -51
- data/app/views/admin/content/autosave.js.erb +2 -2
- data/app/views/admin/content/edit.html.erb +1 -1
- data/app/views/admin/content/index.html.erb +25 -15
- data/app/views/admin/content/new.html.erb +2 -2
- data/app/views/admin/dashboard/_comment.html.erb +5 -5
- data/app/views/admin/dashboard/_comments.html.erb +2 -2
- data/app/views/admin/dashboard/_drafts.html.erb +5 -5
- data/app/views/admin/dashboard/_overview.html.erb +7 -9
- data/app/views/admin/dashboard/_welcome.html.erb +11 -11
- data/app/views/admin/dashboard/index.html.erb +12 -7
- data/app/views/admin/feedback/_button.html.erb +6 -6
- data/app/views/admin/feedback/_feedback.html.erb +3 -3
- data/app/views/admin/feedback/_ham.html.erb +27 -9
- data/app/views/admin/feedback/_spam.html.erb +26 -16
- data/app/views/admin/feedback/article.html.erb +20 -21
- data/app/views/admin/feedback/edit.html.erb +14 -15
- data/app/views/admin/feedback/{ham.js → ham.js.erb} +0 -0
- data/app/views/admin/feedback/index.html.erb +25 -23
- data/app/views/admin/feedback/{spam.js → spam.js.erb} +0 -0
- data/app/views/admin/migrations/show.html.erb +10 -11
- data/app/views/admin/notes/_form.html.erb +13 -13
- data/app/views/admin/notes/_list.html.erb +19 -8
- data/app/views/admin/notes/_note.html.erb +12 -7
- data/app/views/admin/notes/edit.html.erb +6 -1
- data/app/views/admin/notes/index.html.erb +5 -1
- data/app/views/admin/notes/show.html.erb +2 -2
- data/app/views/admin/pages/_form.html.erb +86 -77
- data/app/views/admin/pages/_pages.html.erb +11 -4
- data/app/views/admin/pages/edit.html.erb +3 -1
- data/app/views/admin/pages/index.html.erb +10 -6
- data/app/views/admin/pages/new.html.erb +3 -1
- data/app/views/admin/post_types/_index_and_form.html.erb +15 -16
- data/app/views/admin/post_types/edit.html.erb +1 -1
- data/app/views/admin/post_types/index.html.erb +1 -1
- data/app/views/admin/profiles/index.html.erb +2 -3
- data/app/views/admin/redirects/_index_and_form.html.erb +10 -11
- data/app/views/admin/redirects/edit.html.erb +1 -1
- data/app/views/admin/redirects/index.html.erb +1 -1
- data/app/views/admin/resources/index.html.erb +19 -16
- data/app/views/admin/seo/_general.html.erb +40 -59
- data/app/views/admin/seo/_permalinks.html.erb +17 -17
- data/app/views/admin/seo/_titles.html.erb +81 -82
- data/app/views/admin/seo/show.html.erb +14 -19
- data/app/views/admin/settings/display.html.erb +42 -52
- data/app/views/admin/settings/feedback.html.erb +59 -67
- data/app/views/admin/settings/index.html.erb +30 -31
- data/app/views/admin/settings/write.html.erb +27 -46
- data/app/views/admin/shared/_edit.html.erb +3 -3
- data/app/views/admin/shared/_menu.html.erb +26 -26
- data/app/views/admin/shared/_twitter_alert.html.erb +1 -1
- data/app/views/admin/sidebar/_config.html.erb +5 -5
- data/app/views/admin/sidebar/_target_sidebar.html.erb +4 -4
- data/app/views/admin/sidebar/index.html.erb +7 -7
- data/app/views/admin/tags/_index_and_form.html.erb +11 -12
- data/app/views/admin/tags/edit.html.erb +1 -1
- data/app/views/admin/tags/index.html.erb +1 -1
- data/app/views/admin/themes/index.html.erb +5 -6
- data/app/views/admin/users/_form.html.erb +34 -34
- data/app/views/admin/users/edit.html.erb +2 -2
- data/app/views/admin/users/index.html.erb +10 -12
- data/app/views/admin/users/new.html.erb +2 -2
- data/app/views/archives_sidebar/_content.html.erb +2 -2
- data/app/views/articles/_archives_article.html.erb +9 -0
- data/app/views/articles/_article.html.erb +9 -9
- data/app/views/articles/_article_author.html.erb +4 -0
- data/app/views/articles/_article_collection.html.erb +1 -1
- data/app/views/articles/_article_content.html.erb +2 -2
- data/app/views/articles/_article_excerpt.html.erb +11 -9
- data/app/views/articles/_article_links.html.erb +5 -3
- data/app/views/articles/_comment_errors.html.erb +1 -1
- data/app/views/articles/_comment_form.html.erb +12 -12
- data/app/views/articles/_comment_list.html.erb +5 -5
- data/app/views/articles/_comment_preview.html.erb +3 -3
- data/app/views/articles/_full_article_content.html.erb +4 -2
- data/app/views/articles/_password_form.html.erb +4 -4
- data/app/views/articles/_trackback.html.erb +2 -2
- data/app/views/articles/archives.html.erb +11 -21
- data/app/views/articles/feedback_atom_feed.atom.builder +7 -5
- data/app/views/articles/feedback_rss_feed.rss.builder +11 -11
- data/app/views/articles/index_atom_feed.atom.builder +5 -4
- data/app/views/articles/index_rss_feed.rss.builder +8 -8
- data/app/views/articles/live_search.html.erb +3 -3
- data/app/views/articles/read.html.erb +19 -37
- data/app/views/articles/search.html.erb +3 -3
- data/app/views/articles/trackback.xml.builder +3 -1
- data/app/views/articles/view_page.html.erb +2 -2
- data/app/views/authors/show.html.erb +18 -28
- data/app/views/authors/show_atom_feed.atom.builder +5 -4
- data/app/views/authors/show_rss_feed.rss.builder +8 -8
- data/app/views/comments/_comment.html.erb +17 -16
- data/app/views/devise/mailer/reset_password_instructions.html.erb +7 -9
- data/app/views/devise/passwords/edit.html.erb +4 -4
- data/app/views/devise/passwords/new.html.erb +1 -1
- data/app/views/devise/registrations/new.html.erb +5 -5
- data/app/views/devise/sessions/new.html.erb +3 -3
- data/app/views/errors/404.html.erb +2 -2
- data/app/views/feedback/index.atom.builder +9 -0
- data/app/views/feedback/index.rss.builder +20 -0
- data/app/views/layouts/accounts.html.erb +26 -26
- data/app/views/layouts/administration.html.erb +31 -31
- data/app/views/layouts/default.html.erb +4 -3
- data/app/views/layouts/editor.html.erb +5 -19
- data/app/views/meta_sidebar/_content.html.erb +2 -2
- data/app/views/notes/_note.html.erb +16 -15
- data/app/views/notes/index.html.erb +2 -2
- data/app/views/notes/show_in_reply.html.erb +1 -1
- data/app/views/notification_mailer/_mail_footer.html.erb +3 -5
- data/app/views/notification_mailer/_mail_header.html.erb +2 -0
- data/app/views/notification_mailer/article.html.erb +5 -4
- data/app/views/notification_mailer/comment.html.erb +9 -8
- data/app/views/notification_mailer/notif_user.html.erb +4 -9
- data/app/views/page_sidebar/_content.html.erb +1 -1
- data/app/views/search_sidebar/_content.html.erb +2 -2
- data/app/views/settings/install.html.erb +2 -2
- data/app/views/setup/index.html.erb +9 -5
- data/app/views/shared/_atom_header.atom.builder +4 -4
- data/app/views/shared/_atom_item_article.atom.builder +19 -22
- data/app/views/shared/_atom_item_comment.atom.builder +5 -5
- data/app/views/shared/_atom_item_trackback.atom.builder +5 -4
- data/app/views/shared/_google_analytics.html.erb +8 -0
- data/app/views/shared/_page_header.html.erb +10 -13
- data/app/views/shared/_rss_item_article.rss.builder +12 -15
- data/app/views/shared/_rss_item_comment.rss.builder +2 -1
- data/app/views/shared/_rss_item_trackback.rss.builder +2 -0
- data/app/views/sidebar/display_plugins.html.erb +1 -1
- data/app/views/tag_sidebar/_content.html.erb +1 -1
- data/app/views/tags/index.html.erb +2 -2
- data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder +2 -0
- data/app/views/xml/sitemap.googlesitemap.builder +9 -0
- data/config/i18n-tasks.yml +0 -5
- data/config/initializers/devise.rb +10 -4
- data/config/initializers/mime_types.rb +3 -2
- data/config/locales/da.yml +140 -108
- data/config/locales/de.yml +147 -111
- data/config/locales/en.yml +133 -102
- data/config/locales/es-MX.yml +141 -106
- data/config/locales/fr.yml +172 -122
- data/config/locales/he.yml +132 -105
- data/config/locales/it.yml +141 -108
- data/config/locales/ja.yml +115 -100
- data/config/locales/lt.yml +158 -110
- data/config/locales/nb-NO.yml +128 -101
- data/config/locales/nl.yml +147 -113
- data/config/locales/pl.yml +335 -275
- data/config/locales/pt-BR.yml +143 -107
- data/config/locales/ro.yml +155 -108
- data/config/locales/ru.yml +166 -105
- data/config/locales/zh-CN.yml +112 -96
- data/config/locales/zh-TW.yml +116 -99
- data/config/routes.rb +70 -87
- data/db/migrate/113_initial_schema.rb +6 -6
- data/db/migrate/114_fixes_buggy_articles_and_notes.rb +8 -6
- data/db/migrate/115_drops_categories_for_tags.rb +7 -6
- data/db/migrate/20150207131657_add_missing_indexes.rb +3 -1
- data/db/migrate/20150807134129_simplify_redirect_relations.rb +6 -1
- data/db/migrate/20150808052637_add_blog_ids.rb +11 -7
- data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +3 -1
- data/db/migrate/20150810094754_add_blog_id_to_tags.rb +3 -1
- data/db/migrate/20160108111120_add_devise_to_users.rb +3 -1
- data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +3 -1
- data/db/migrate/20160110094906_remove_profiles_rights.rb +3 -1
- data/db/migrate/20160605103918_replace_profile_id_with_string.rb +3 -3
- data/db/migrate/20160605154632_remove_profiles.rb +12 -7
- data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +3 -1
- data/db/migrate/20160701062604_add_blog_id_to_resources.rb +3 -1
- data/db/migrate/20170528093024_move_resources_to_content.rb +7 -0
- data/db/migrate/20170528094923_move_tags_to_content.rb +8 -0
- data/db/migrate/20170528201606_remove_separate_published_flag.rb +7 -0
- data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +8 -0
- data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +7 -0
- data/db/migrate/20190208151235_add_text_filter_name_fields.rb +9 -0
- data/db/migrate/20190208152646_move_text_filter_to_name.rb +97 -0
- data/db/migrate/20190209155717_remove_text_filter_ids.rb +19 -0
- data/db/migrate/20190209160610_remove_text_filters.rb +17 -0
- data/db/migrate/20200413140440_add_unique_indexes.rb +10 -0
- data/db/seeds.rb +8 -20
- data/lib/email_notify.rb +3 -1
- data/lib/format.rb +4 -12
- data/lib/publify_core.rb +36 -36
- data/lib/publify_core/engine.rb +11 -4
- data/lib/publify_core/lang.rb +5 -1
- data/lib/publify_core/testing_support/dns_mock.rb +15 -0
- data/lib/publify_core/testing_support/factories.rb +240 -0
- data/lib/publify_core/testing_support/feed_assertions.rb +48 -0
- data/lib/publify_core/testing_support/fixtures/exploit.svg +4 -0
- data/lib/publify_core/testing_support/fixtures/fakepng.png +1 -0
- data/lib/publify_core/testing_support/fixtures/otherfile.txt +1 -0
- data/lib/publify_core/testing_support/fixtures/testfile.png +0 -0
- data/lib/publify_core/testing_support/fixtures/testfile.txt +1 -0
- data/lib/publify_core/testing_support/upload_fixtures.rb +15 -0
- data/lib/publify_core/version.rb +3 -1
- data/lib/publify_guid.rb +4 -2
- data/lib/publify_plugins.rb +10 -5
- data/lib/publify_textfilter_markdown.rb +38 -25
- data/lib/publify_textfilter_none.rb +5 -3
- data/lib/publify_textfilter_smartypants.rb +5 -3
- data/lib/publify_textfilter_textile.rb +7 -4
- data/lib/publify_textfilter_twitterfilter.rb +13 -7
- data/lib/publify_time.rb +6 -2
- data/lib/sidebar_field.rb +29 -20
- data/lib/sidebar_registry.rb +5 -3
- data/lib/spam_protection.rb +19 -17
- data/lib/tasks/i18n.rake +9 -0
- data/lib/tasks/manifest.rake +30 -0
- data/lib/tasks/publify_core_tasks.rake +2 -0
- data/lib/text_filter_plugin.rb +30 -29
- data/lib/theme.rb +5 -5
- data/lib/transforms.rb +22 -20
- data/{app/assets/stylesheets/publify_core/.keep → themes/plain/javascripts/theme.js} +0 -0
- metadata +304 -130
- data/.gitignore +0 -13
- data/.rspec +0 -2
- data/.rubocop.yml +0 -84
- data/.rubocop_todo.yml +0 -148
- data/.travis.yml +0 -27
- data/Gemfile +0 -17
- data/README.rdoc +0 -3
- data/Rakefile +0 -35
- data/app/assets/javascripts/widearea.js +0 -486
- data/app/assets/stylesheets/widearea.css +0 -133
- data/app/controllers/.keep +0 -0
- data/app/controllers/admin/migrations_controller.rb +0 -19
- data/app/controllers/admin/textfilters_controller.rb +0 -6
- data/app/controllers/concerns/.keep +0 -0
- data/app/controllers/trackbacks_controller.rb +0 -36
- data/app/helpers/.keep +0 -0
- data/app/mailers/.keep +0 -0
- data/app/models/.keep +0 -0
- data/app/models/article/states.rb +0 -179
- data/app/models/concerns/.keep +0 -0
- data/app/models/feedback/states.rb +0 -256
- data/app/services/migrator.rb +0 -25
- data/app/views/.keep +0 -0
- data/app/views/admin/dashboard/_inbound.html.erb +0 -31
- data/app/views/admin/notes/_header.html.erb +0 -6
- data/app/views/articles/_protected_article_content.html.erb +0 -6
- data/app/views/comments/index.html.erb +0 -1
- data/app/views/comments/index_atom_feed.atom.builder +0 -8
- data/app/views/comments/index_rss_feed.rss.builder +0 -20
- data/app/views/trackbacks/index_atom_feed.atom.builder +0 -7
- data/app/views/trackbacks/index_rss_feed.rss.builder +0 -20
- data/app/views/trackbacks/trackback.xml.builder +0 -4
- data/app/views/xml/feed.googlesitemap.builder +0 -7
- data/app/views/xml/rsd.rsd.builder +0 -8
- data/lib/stateful.rb +0 -106
- data/publify_core.gemspec +0 -54
data/app/models/content.rb
CHANGED
@@ -1,35 +1,40 @@
|
|
1
|
-
|
2
|
-
require 'uri'
|
1
|
+
# frozen_string_literal: true
|
3
2
|
|
4
|
-
|
5
|
-
|
3
|
+
require "set"
|
4
|
+
require "uri"
|
6
5
|
|
6
|
+
class Content < ApplicationRecord
|
7
7
|
include ContentBase
|
8
8
|
|
9
|
-
belongs_to :
|
10
|
-
belongs_to :user, optional: true
|
9
|
+
belongs_to :user, optional: true, touch: true
|
11
10
|
belongs_to :blog
|
12
11
|
|
13
12
|
validates :blog, presence: true
|
14
13
|
|
15
|
-
has_one :redirect, dependent: :destroy, inverse_of: :
|
14
|
+
has_one :redirect, dependent: :destroy, inverse_of: :content
|
16
15
|
|
17
16
|
has_many :triggers, as: :pending_item, dependent: :delete_all
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
scope :
|
22
|
-
scope :
|
23
|
-
scope :
|
24
|
-
|
17
|
+
has_many :resources, inverse_of: :content, dependent: :nullify
|
18
|
+
has_and_belongs_to_many :tags
|
19
|
+
|
20
|
+
scope :user_id, ->(user_id) { where("user_id = ?", user_id) }
|
21
|
+
scope :published, -> { where(state: "published").order(default_order) }
|
22
|
+
scope :published_at, lambda { |time_params|
|
23
|
+
published.where(published_at: PublifyTime.delta(*time_params))
|
24
|
+
}
|
25
|
+
scope :not_published, -> { where.not(state: "published") }
|
26
|
+
scope :drafts, -> { where(state: "draft").order("created_at DESC") }
|
27
|
+
scope :no_draft, -> { where.not(state: "draft").order("published_at DESC") }
|
25
28
|
scope :searchstring, lambda { |search_string|
|
26
|
-
tokens = search_string.split(
|
27
|
-
|
28
|
-
|
29
|
+
tokens = search_string.split(" ").map { |c| "%#{c.downcase}%" }
|
30
|
+
matcher = "(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)"
|
31
|
+
template = "state = ? AND #{([matcher] * tokens.size).join(" AND ")}"
|
32
|
+
where(template, "published", *tokens.map { |token| [token] * 3 }.flatten)
|
29
33
|
}
|
30
|
-
scope :already_published, -> { where('published = ? AND published_at < ?', true, Time.now).order(default_order) }
|
31
34
|
|
32
|
-
scope :published_at_like,
|
35
|
+
scope :published_at_like, lambda { |date_at|
|
36
|
+
where(published_at: PublifyTime.delta_like(date_at))
|
37
|
+
}
|
33
38
|
|
34
39
|
serialize :whiteboard
|
35
40
|
|
@@ -42,28 +47,20 @@ class Content < ActiveRecord::Base
|
|
42
47
|
end
|
43
48
|
end
|
44
49
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
filter
|
52
|
-
else
|
53
|
-
TextFilter.find_or_default(filter)
|
54
|
-
end
|
55
|
-
self.text_filter_id = if filter_object
|
56
|
-
filter_object.id
|
57
|
-
else
|
58
|
-
filter.to_i
|
59
|
-
end
|
50
|
+
def author_name
|
51
|
+
if user.present? && user.name.present?
|
52
|
+
user.name
|
53
|
+
else
|
54
|
+
author
|
55
|
+
end
|
60
56
|
end
|
61
57
|
|
62
58
|
def shorten_url
|
63
|
-
return unless published
|
59
|
+
return unless published?
|
64
60
|
|
65
61
|
if redirect.present?
|
66
62
|
return if redirect.to_path == permalink_url
|
63
|
+
|
67
64
|
redirect.to_path = permalink_url
|
68
65
|
redirect.save
|
69
66
|
else
|
@@ -74,16 +71,15 @@ class Content < ActiveRecord::Base
|
|
74
71
|
end
|
75
72
|
end
|
76
73
|
|
77
|
-
|
78
|
-
|
74
|
+
# TODO: Inline this method
|
75
|
+
def self.find_already_published(limit)
|
76
|
+
published.limit(limit)
|
79
77
|
end
|
80
78
|
|
81
79
|
def self.search_with(params)
|
82
80
|
params ||= {}
|
83
81
|
scoped = unscoped
|
84
|
-
if params[:searchstring].present?
|
85
|
-
scoped = scoped.searchstring(params[:searchstring])
|
86
|
-
end
|
82
|
+
scoped = scoped.searchstring(params[:searchstring]) if params[:searchstring].present?
|
87
83
|
|
88
84
|
if params[:published_at].present? && /(\d\d\d\d)-(\d\d)/ =~ params[:published_at]
|
89
85
|
scoped = scoped.published_at_like(params[:published_at])
|
@@ -94,8 +90,8 @@ class Content < ActiveRecord::Base
|
|
94
90
|
end
|
95
91
|
|
96
92
|
if params[:published].present?
|
97
|
-
scoped = scoped.published if params[:published].to_s ==
|
98
|
-
scoped = scoped.not_published if params[:published].to_s ==
|
93
|
+
scoped = scoped.published if params[:published].to_s == "1"
|
94
|
+
scoped = scoped.not_published if params[:published].to_s == "0"
|
99
95
|
end
|
100
96
|
|
101
97
|
scoped
|
@@ -105,30 +101,18 @@ class Content < ActiveRecord::Base
|
|
105
101
|
self[:whiteboard] ||= {}
|
106
102
|
end
|
107
103
|
|
108
|
-
def
|
109
|
-
|
110
|
-
save!
|
111
|
-
end
|
112
|
-
|
113
|
-
def link_to_author?
|
114
|
-
!user.email.blank? && blog.link_to_author
|
115
|
-
end
|
116
|
-
|
117
|
-
def get_rss_description
|
118
|
-
return '' unless blog.rss_description
|
119
|
-
return '' unless respond_to?(:user) && user && user.name
|
104
|
+
def rss_description
|
105
|
+
return "" unless blog.rss_description
|
120
106
|
|
121
107
|
rss_desc = blog.rss_description_text
|
122
|
-
rss_desc.gsub!(
|
123
|
-
rss_desc.gsub!(
|
124
|
-
rss_desc.gsub!(
|
125
|
-
rss_desc.gsub!(
|
108
|
+
rss_desc.gsub!("%author%", author_name)
|
109
|
+
rss_desc.gsub!("%blog_url%", blog.base_url)
|
110
|
+
rss_desc.gsub!("%blog_name%", blog.blog_name)
|
111
|
+
rss_desc.gsub!("%permalink_url%", permalink_url)
|
126
112
|
rss_desc
|
127
113
|
end
|
128
114
|
|
129
115
|
def short_url
|
130
|
-
|
131
|
-
return unless published && redirect.present?
|
132
|
-
redirect.from_url
|
116
|
+
redirect.from_url if redirect.present?
|
133
117
|
end
|
134
118
|
end
|
data/app/models/content_base.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ContentBase
|
2
4
|
def self.included(base)
|
3
5
|
base.extend ClassMethods
|
@@ -52,7 +54,7 @@ module ContentBase
|
|
52
54
|
end
|
53
55
|
|
54
56
|
def excerpt_text(length = 160)
|
55
|
-
text = if respond_to?(:excerpt) && (excerpt ||
|
57
|
+
text = if respond_to?(:excerpt) && (excerpt || "") != ""
|
56
58
|
generate_html(:excerpt, excerpt)
|
57
59
|
else
|
58
60
|
html(:all)
|
@@ -61,12 +63,11 @@ module ContentBase
|
|
61
63
|
text = text.strip_html
|
62
64
|
|
63
65
|
text.slice(0, length) +
|
64
|
-
(text.length > length ?
|
66
|
+
(text.length > length ? "..." : "")
|
65
67
|
end
|
66
68
|
|
67
|
-
def
|
68
|
-
|
69
|
-
save!
|
69
|
+
def text_filter
|
70
|
+
TextFilter.make_filter(text_filter_name)
|
70
71
|
end
|
71
72
|
|
72
73
|
# The default text filter. Generally, this is the filter specified by blog.text_filter,
|
@@ -81,7 +82,7 @@ module ContentBase
|
|
81
82
|
end
|
82
83
|
|
83
84
|
def default_order
|
84
|
-
|
85
|
+
"published_at DESC"
|
85
86
|
end
|
86
87
|
end
|
87
88
|
end
|
data/app/models/feedback.rb
CHANGED
@@ -1,16 +1,15 @@
|
|
1
|
-
|
2
|
-
require 'akismet'
|
1
|
+
# frozen_string_literal: true
|
3
2
|
|
4
|
-
|
5
|
-
|
3
|
+
require "aasm"
|
4
|
+
require "akismet"
|
6
5
|
|
7
|
-
|
8
|
-
|
6
|
+
class Feedback < ApplicationRecord
|
7
|
+
self.table_name = "feedback"
|
8
|
+
|
9
|
+
belongs_to :article, touch: true
|
9
10
|
|
10
11
|
include PublifyGuid
|
11
|
-
include Stateful
|
12
12
|
include ContentBase
|
13
|
-
include States
|
14
13
|
|
15
14
|
class ContentTextHelpers
|
16
15
|
include ActionView::Helpers::UrlHelper
|
@@ -21,53 +20,71 @@ class Feedback < ActiveRecord::Base
|
|
21
20
|
validate :feedback_not_closed, on: :create
|
22
21
|
validates :article, presence: true
|
23
22
|
|
23
|
+
before_save :correct_url, :classify_content
|
24
24
|
before_create :create_guid, :article_allows_this_feedback
|
25
|
-
before_save :correct_url, :before_save_handler
|
26
|
-
after_save :post_trigger, :report_classification
|
27
|
-
after_initialize :after_initialize_handler
|
28
25
|
|
26
|
+
# TODO: Rename so it doesn't sound like only approved ham
|
29
27
|
scope :ham, -> { where(state: %w(presumed_ham ham)) }
|
30
|
-
scope :spam, -> { where(state: 'spam') }
|
31
|
-
scope :published_since, ->(time) { ham.where('published_at > ?', time) }
|
32
|
-
scope :presumed_ham, -> { where(state: 'presumed_ham') }
|
33
|
-
scope :presumed_spam, -> { where(state: 'presumed_spam') }
|
34
|
-
scope :unapproved, -> { where(status_confirmed: false) }
|
35
28
|
|
36
|
-
scope :
|
29
|
+
scope :spam, -> { where(state: "spam") }
|
30
|
+
scope :created_since, ->(time) { ham.where("created_at > ?", time) }
|
31
|
+
scope :presumed_ham, -> { where(state: "presumed_ham") }
|
32
|
+
scope :presumed_spam, -> { where(state: "presumed_spam") }
|
33
|
+
scope :unapproved, -> { where(state: ["presumed_spam", "presumed_ham"]) }
|
34
|
+
|
35
|
+
scope :published, -> { ham }
|
37
36
|
scope :oldest_first, -> { order(:created_at) }
|
37
|
+
scope :newest_first, -> { order(created_at: :desc) }
|
38
38
|
|
39
|
-
|
40
|
-
valid_states: [:unclassified, :presumed_spam, :just_marked_as_spam, :spam, :just_presumed_ham, :presumed_ham, :just_marked_as_ham, :ham],
|
41
|
-
handles: [:published?, :status_confirmed?, :just_published?,
|
42
|
-
:mark_as_ham, :mark_as_spam, :confirm_classification,
|
43
|
-
:withdraw,
|
44
|
-
:before_save_handler, :after_initialize_handler,
|
45
|
-
:send_notifications, :post_trigger, :report_classification])
|
39
|
+
include AASM
|
46
40
|
|
47
|
-
|
48
|
-
|
49
|
-
|
41
|
+
aasm column: :state do
|
42
|
+
state :unclassified, initial: true
|
43
|
+
state :presumed_ham
|
44
|
+
state :presumed_spam
|
45
|
+
state :spam, after_enter: [:send_notifications, :report_as_spam]
|
46
|
+
state :ham, after_enter: [:send_notifications, :report_as_ham]
|
50
47
|
|
51
|
-
|
52
|
-
|
53
|
-
|
48
|
+
event :presume_ham do
|
49
|
+
transitions from: :unclassified, to: :ham, if: ->() { user_id.present? }
|
50
|
+
transitions from: :unclassified, to: :presumed_ham
|
51
|
+
end
|
54
52
|
|
55
|
-
|
56
|
-
|
57
|
-
|
53
|
+
event :presume_spam do
|
54
|
+
transitions from: :unclassified, to: :presumed_spam
|
55
|
+
end
|
58
56
|
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
57
|
+
event :mark_as_ham do
|
58
|
+
transitions to: :ham
|
59
|
+
end
|
60
|
+
|
61
|
+
event :mark_as_spam do
|
62
|
+
transitions to: :spam
|
64
63
|
end
|
64
|
+
|
65
|
+
event :withdraw do
|
66
|
+
transitions from: [:presumed_ham, :ham], to: :spam
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
# FIXME: Inline this method
|
71
|
+
def self.paginated(page, per_page)
|
72
|
+
page(page).per(per_page)
|
65
73
|
end
|
66
74
|
|
67
75
|
def parent
|
68
76
|
article
|
69
77
|
end
|
70
78
|
|
79
|
+
def classify_content
|
80
|
+
return unless unclassified?
|
81
|
+
|
82
|
+
case classify
|
83
|
+
when :ham then presume_ham
|
84
|
+
else presume_spam
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
71
88
|
def permalink_url(_anchor = :ignored, only_path = false)
|
72
89
|
article.permalink_url("#{self.class.to_s.downcase}-#{id}", only_path)
|
73
90
|
end
|
@@ -79,7 +96,8 @@ class Feedback < ActiveRecord::Base
|
|
79
96
|
|
80
97
|
def correct_url
|
81
98
|
return if url.blank?
|
82
|
-
|
99
|
+
|
100
|
+
self.url = "http://#{url}" unless %r{^https?://}.match?(url)
|
83
101
|
end
|
84
102
|
|
85
103
|
def article_allows_this_feedback
|
@@ -139,30 +157,33 @@ class Feedback < ActiveRecord::Base
|
|
139
157
|
end
|
140
158
|
|
141
159
|
def change_state!
|
142
|
-
result =
|
143
|
-
if
|
144
|
-
mark_as_ham
|
145
|
-
result =
|
160
|
+
result = ""
|
161
|
+
if spam? || presumed_spam?
|
162
|
+
mark_as_ham!
|
163
|
+
result = "ham"
|
146
164
|
else
|
147
|
-
mark_as_spam
|
148
|
-
result =
|
165
|
+
mark_as_spam!
|
166
|
+
result = "spam"
|
149
167
|
end
|
150
|
-
save!
|
151
168
|
result
|
152
169
|
end
|
153
170
|
|
154
|
-
def
|
155
|
-
|
171
|
+
def confirm_classification!
|
172
|
+
confirm_classification
|
156
173
|
save!
|
157
174
|
end
|
158
175
|
|
159
|
-
def
|
160
|
-
|
161
|
-
|
176
|
+
def confirm_classification
|
177
|
+
if presumed_spam?
|
178
|
+
mark_as_spam
|
179
|
+
elsif presumed_ham?
|
180
|
+
mark_as_ham
|
181
|
+
end
|
162
182
|
end
|
163
183
|
|
164
184
|
def report_as_spam
|
165
185
|
return if akismet.nil?
|
186
|
+
|
166
187
|
begin
|
167
188
|
Timeout.timeout(5) do
|
168
189
|
akismet.submit_spam(ip, user_agent, akismet_options)
|
@@ -174,6 +195,7 @@ class Feedback < ActiveRecord::Base
|
|
174
195
|
|
175
196
|
def report_as_ham
|
176
197
|
return if akismet.nil?
|
198
|
+
|
177
199
|
begin
|
178
200
|
Timeout.timeout(5) do
|
179
201
|
akismet.ham(ip, user_agent, akismet_options)
|
@@ -183,36 +205,40 @@ class Feedback < ActiveRecord::Base
|
|
183
205
|
end
|
184
206
|
end
|
185
207
|
|
186
|
-
def
|
187
|
-
|
188
|
-
save!
|
208
|
+
def feedback_not_closed
|
209
|
+
errors.add(:article_id, "Comment are closed") if article.comments_closed?
|
189
210
|
end
|
190
211
|
|
191
|
-
def
|
192
|
-
|
193
|
-
save
|
212
|
+
def send_notifications
|
213
|
+
nil
|
194
214
|
end
|
195
215
|
|
196
|
-
def
|
197
|
-
|
216
|
+
def published?
|
217
|
+
ham? || presumed_ham?
|
218
|
+
end
|
219
|
+
|
220
|
+
def status_confirmed?
|
221
|
+
ham? || spam?
|
222
|
+
end
|
223
|
+
|
224
|
+
def spammy?
|
225
|
+
spam? || presumed_spam?
|
198
226
|
end
|
199
227
|
|
200
228
|
delegate :blog, to: :article
|
201
229
|
|
202
230
|
private
|
203
231
|
|
204
|
-
@@akismet = nil
|
205
|
-
|
206
232
|
def akismet
|
207
|
-
|
208
|
-
@@akismet == false ? nil : @@akismet
|
233
|
+
@akismet ||= akismet_client
|
209
234
|
end
|
210
235
|
|
211
236
|
def akismet_client
|
212
|
-
return
|
237
|
+
return nil if blog.sp_akismet_key.blank?
|
238
|
+
|
213
239
|
client = Akismet::Client.new(blog.sp_akismet_key, blog.base_url)
|
214
240
|
begin
|
215
|
-
|
241
|
+
client.verify_key ? client : nil
|
216
242
|
rescue SocketError
|
217
243
|
nil
|
218
244
|
end
|
data/app/models/meta_sidebar.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
|
-
#
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
2
3
|
class MetaSidebar < Sidebar
|
3
|
-
description "This widget just displays links to Publify main site,
|
4
|
+
description "This widget just displays links to Publify main site," \
|
5
|
+
" this blog's admin and RSS."
|
4
6
|
|
5
|
-
setting :title,
|
7
|
+
setting :title, "Meta"
|
6
8
|
end
|
7
9
|
|
8
10
|
SidebarRegistry.register_sidebar MetaSidebar
|