publify_core 9.0.0.pre5 → 9.2.0
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 +102 -6
- 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 +22 -17
- 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 -24
- 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 -65
- data/app/models/content_base.rb +7 -14
- data/app/models/feedback.rb +91 -66
- 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/helpers/blog_helper.rb
CHANGED
@@ -1,12 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module BlogHelper
|
2
4
|
# The base URL for this request, calculated by looking up the URL for the main
|
3
5
|
# blog index page.
|
4
6
|
def blog_base_url
|
5
|
-
url_for(controller:
|
7
|
+
url_for(controller: "/articles", action: "index").gsub(%r{/$}, "")
|
6
8
|
end
|
7
9
|
|
8
10
|
# Find the blog whose base_url matches the current location.
|
9
11
|
def this_blog
|
10
|
-
@
|
12
|
+
@this_blog ||= Blog.find_blog(blog_base_url)
|
11
13
|
end
|
12
14
|
end
|
data/app/helpers/xml_helper.rb
CHANGED
@@ -1,14 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module XmlHelper
|
2
4
|
def collection_lastmod(collection)
|
3
|
-
article_updated = collection.
|
4
|
-
article_published = collection.
|
5
|
+
article_updated = collection.contents.order(updated_at: :desc).first
|
6
|
+
article_published = collection.contents.order(published_at: :desc).first
|
5
7
|
|
6
8
|
times = []
|
7
9
|
times.push article_updated.updated_at if article_updated
|
8
10
|
times.push article_published.updated_at if article_published
|
9
11
|
|
10
12
|
if times.empty?
|
11
|
-
Time.at(0).xmlschema
|
13
|
+
Time.zone.at(0).xmlschema
|
12
14
|
else
|
13
15
|
times.max.xmlschema
|
14
16
|
end
|
@@ -1,4 +1,6 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class NotificationMailer < ApplicationMailer
|
2
4
|
helper :base
|
3
5
|
layout nil
|
4
6
|
|
@@ -20,7 +22,7 @@ class NotificationMailer < ActionMailer::Base
|
|
20
22
|
@user = user
|
21
23
|
# TODO: Make user blog-dependent
|
22
24
|
@blog = Blog.first
|
23
|
-
build_mail @blog, @user,
|
25
|
+
build_mail @blog, @user, "Welcome to Publify"
|
24
26
|
end
|
25
27
|
|
26
28
|
private
|
@@ -30,7 +32,7 @@ class NotificationMailer < ActionMailer::Base
|
|
30
32
|
end
|
31
33
|
|
32
34
|
def build_mail(blog, user, subject)
|
33
|
-
headers[
|
35
|
+
headers["X-Mailer"] = "Publify #{PublifyCore::VERSION}"
|
34
36
|
mail(from: blog.email_from,
|
35
37
|
to: user.email,
|
36
38
|
subject: make_subject(blog, subject))
|
data/app/models/ability.rb
CHANGED
@@ -1,4 +1,6 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "cancancan"
|
2
4
|
|
3
5
|
class Ability
|
4
6
|
include CanCan::Ability
|
@@ -7,14 +9,14 @@ class Ability
|
|
7
9
|
return unless user
|
8
10
|
|
9
11
|
case user.profile
|
10
|
-
when
|
12
|
+
when "admin"
|
11
13
|
add_admin_abilities
|
12
14
|
add_publisher_abilities
|
13
15
|
add_contributor_abilities
|
14
|
-
when
|
16
|
+
when "publisher"
|
15
17
|
add_publisher_abilities
|
16
18
|
add_contributor_abilities
|
17
|
-
when
|
19
|
+
when "contributor"
|
18
20
|
add_contributor_abilities
|
19
21
|
end
|
20
22
|
end
|
@@ -22,31 +24,30 @@ class Ability
|
|
22
24
|
private
|
23
25
|
|
24
26
|
def add_admin_abilities
|
25
|
-
can :manage,
|
26
|
-
can :manage,
|
27
|
-
can :manage,
|
28
|
-
can :manage,
|
29
|
-
can :manage,
|
30
|
-
can :manage,
|
31
|
-
can :manage,
|
32
|
-
can :manage, 'admin/users'
|
27
|
+
can :manage, "admin/migrations"
|
28
|
+
can :manage, "admin/seo"
|
29
|
+
can :manage, "admin/settings"
|
30
|
+
can :manage, "admin/sidebar"
|
31
|
+
can :manage, "admin/textfilters"
|
32
|
+
can :manage, "admin/themes"
|
33
|
+
can :manage, "admin/users"
|
33
34
|
end
|
34
35
|
|
35
36
|
def add_publisher_abilities
|
36
|
-
can :manage,
|
37
|
-
can :manage,
|
38
|
-
can :manage,
|
39
|
-
can :manage,
|
40
|
-
can :manage,
|
41
|
-
can :manage,
|
42
|
-
can :manage,
|
43
|
-
can :manage,
|
44
|
-
|
45
|
-
can :manage,
|
37
|
+
can :manage, "admin/content"
|
38
|
+
can :manage, "admin/feedback"
|
39
|
+
can :manage, "admin/notes"
|
40
|
+
can :manage, "admin/pages"
|
41
|
+
can :manage, "admin/post_types"
|
42
|
+
can :manage, "admin/redirects"
|
43
|
+
can :manage, "admin/resources"
|
44
|
+
can :manage, "admin/tags"
|
45
|
+
|
46
|
+
can :manage, "articles"
|
46
47
|
end
|
47
48
|
|
48
49
|
def add_contributor_abilities
|
49
|
-
can :manage,
|
50
|
-
can :manage,
|
50
|
+
can :manage, "admin/dashboard"
|
51
|
+
can :manage, "admin/profiles"
|
51
52
|
end
|
52
53
|
end
|
@@ -1,21 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ArchivesSidebar < Sidebar
|
2
|
-
description
|
3
|
-
setting :title,
|
4
|
-
setting :show_count, true, label:
|
5
|
-
setting :count, 10, label:
|
4
|
+
description "Displays links to monthly archives"
|
5
|
+
setting :title, "Archives"
|
6
|
+
setting :show_count, true, label: "Show article counts", input_type: :checkbox
|
7
|
+
setting :count, 10, label: "Number of Months"
|
6
8
|
|
7
9
|
attr_accessor :archives
|
8
10
|
|
9
|
-
def self.
|
10
|
-
@
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
end
|
17
|
-
rescue NameError
|
18
|
-
'extract(year from published_at) as year,extract(month from published_at) as month'
|
11
|
+
def self.date_funcs
|
12
|
+
@date_funcs ||=
|
13
|
+
if /SQLite3Adapter/.match?(Content.connection.class.name)
|
14
|
+
["strftime('%Y', published_at) as year", "strftime('%m', published_at) as month"]
|
15
|
+
else
|
16
|
+
["extract(year from published_at) as year",
|
17
|
+
"extract(month from published_at) as month"]
|
19
18
|
end
|
20
19
|
end
|
21
20
|
|
@@ -25,18 +24,19 @@ class ArchivesSidebar < Sidebar
|
|
25
24
|
# Unfortunately, there's no universally-supported way to do this
|
26
25
|
# across all three of our supported DBs. So, we resort to a bit of
|
27
26
|
# DB-specific code.
|
28
|
-
|
27
|
+
date_funcs = self.class.date_funcs
|
29
28
|
|
30
|
-
article_counts =
|
29
|
+
article_counts = Article.published.select("count(*) as count", *date_funcs).
|
30
|
+
group(:year, :month).reorder("year desc", "month desc").limit(count.to_i)
|
31
31
|
|
32
32
|
@archives = article_counts.map do |entry|
|
33
33
|
month = entry.month.to_i
|
34
34
|
year = entry.year.to_i
|
35
35
|
{
|
36
|
-
name: I18n.l(Date.new(year, month), format:
|
36
|
+
name: I18n.l(Date.new(year, month), format: "%B %Y"),
|
37
37
|
month: month,
|
38
38
|
year: year,
|
39
|
-
article_count: entry.count
|
39
|
+
article_count: entry.count,
|
40
40
|
}
|
41
41
|
end
|
42
42
|
end
|
data/app/models/article.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
|
-
#
|
2
|
-
|
3
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "aasm"
|
4
|
+
require "uri"
|
5
|
+
require "net/http"
|
4
6
|
|
5
7
|
class Article < Content
|
6
8
|
include PublifyGuid
|
@@ -16,52 +18,68 @@ class Article < Content
|
|
16
18
|
has_many :pings, dependent: :destroy
|
17
19
|
has_many :trackbacks, dependent: :destroy
|
18
20
|
has_many :feedback
|
19
|
-
has_many :resources, inverse_of: :article, dependent: :nullify
|
20
21
|
has_many :triggers, as: :pending_item
|
21
22
|
has_many :comments, dependent: :destroy
|
22
23
|
|
23
|
-
|
24
|
-
|
24
|
+
before_save :set_permalink
|
25
25
|
before_create :create_guid
|
26
|
-
|
27
|
-
after_save :post_trigger, :keywords_to_tags, :shorten_url
|
28
|
-
after_save :send_pings
|
29
|
-
after_save :send_notifications
|
26
|
+
after_save :keywords_to_tags, :shorten_url
|
30
27
|
|
31
|
-
scope :drafts, -> { where(state: 'draft').order('created_at DESC') }
|
32
28
|
scope :child_of, ->(article_id) { where(parent_id: article_id) }
|
33
|
-
scope :
|
34
|
-
scope :
|
35
|
-
scope :
|
36
|
-
scope :pending, -> { where('state = ? and published_at > ?', 'publication_pending', Time.now).order('published_at DESC') }
|
29
|
+
scope :published_since, ->(time) { published.where("published_at > ?", time) }
|
30
|
+
scope :withdrawn, -> { where(state: "withdrawn").order(default_order) }
|
31
|
+
scope :pending, -> { where(state: "publication_pending").order(default_order) }
|
37
32
|
|
38
33
|
scope :bestof, lambda {
|
39
34
|
joins(:feedback).
|
40
|
-
where(
|
41
|
-
|
42
|
-
group(
|
43
|
-
|
44
|
-
|
35
|
+
where("feedback.type" => "Comment",
|
36
|
+
"contents.state" => "published").
|
37
|
+
group("contents.id").
|
38
|
+
select("contents.*, count(feedback.id) as comment_count").
|
39
|
+
order("comment_count DESC").
|
45
40
|
limit(5)
|
46
41
|
}
|
47
42
|
|
48
|
-
setting :password, :string,
|
43
|
+
setting :password, :string, ""
|
49
44
|
|
50
45
|
attr_accessor :draft, :keywords
|
51
46
|
|
52
|
-
include
|
47
|
+
include AASM
|
48
|
+
|
49
|
+
aasm column: :state do
|
50
|
+
state :draft, initial: true
|
51
|
+
# TODO: Disallow if published_at in past
|
52
|
+
state :publication_pending, after_enter: :trigger_publication
|
53
|
+
state :published, after_enter: :really_send_notifications
|
54
|
+
state :withdrawn
|
55
|
+
|
56
|
+
event :withdraw do
|
57
|
+
transitions from: :published, to: :withdrawn
|
58
|
+
transitions from: :publication_pending, to: :draft
|
59
|
+
end
|
60
|
+
|
61
|
+
event :publish do
|
62
|
+
before do
|
63
|
+
self.published_at ||= Time.zone.now
|
64
|
+
end
|
53
65
|
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
66
|
+
transitions from: [:new, :draft], to: :publication_pending do
|
67
|
+
guard do
|
68
|
+
published_at > Time.zone.now
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
transitions from: [:new, :draft, :publication_pending], to: :published do
|
73
|
+
guard do
|
74
|
+
published_at <= Time.zone.now
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
62
79
|
|
63
80
|
def set_permalink
|
64
|
-
return if
|
81
|
+
return if draft? || permalink.present?
|
82
|
+
|
65
83
|
self.permalink = title.to_permalink
|
66
84
|
end
|
67
85
|
|
@@ -71,7 +89,7 @@ class Article < Content
|
|
71
89
|
|
72
90
|
def post_type
|
73
91
|
post_type = self[:post_type]
|
74
|
-
post_type =
|
92
|
+
post_type = "read" if post_type.blank?
|
75
93
|
post_type
|
76
94
|
end
|
77
95
|
|
@@ -88,28 +106,27 @@ class Article < Content
|
|
88
106
|
scoped = scoped.send(params[:state])
|
89
107
|
end
|
90
108
|
|
91
|
-
scoped.order(
|
109
|
+
scoped.order("created_at DESC")
|
92
110
|
end
|
93
111
|
|
94
112
|
# FIXME: Use keyword params to clean up call sites.
|
95
113
|
def permalink_url(anchor = nil, only_path = false)
|
114
|
+
return unless published?
|
115
|
+
|
96
116
|
@cached_permalink_url ||= {}
|
97
|
-
@cached_permalink_url["#{anchor}#{only_path}"] ||=
|
117
|
+
@cached_permalink_url["#{anchor}#{only_path}"] ||=
|
118
|
+
blog.url_for(permalink_url_options, anchor: anchor, only_path: only_path)
|
98
119
|
end
|
99
120
|
|
100
121
|
def save_attachments!(files)
|
101
122
|
files ||= {}
|
102
|
-
files.
|
123
|
+
files.each_value { |f| save_attachment!(f) }
|
103
124
|
end
|
104
125
|
|
105
126
|
def save_attachment!(file)
|
106
127
|
resources.create!(upload: file, blog: blog)
|
107
128
|
end
|
108
129
|
|
109
|
-
def trackback_url
|
110
|
-
blog.url_for("trackbacks?article_id=#{id}", only_path: false)
|
111
|
-
end
|
112
|
-
|
113
130
|
def comment_url
|
114
131
|
blog.url_for("comments?article_id=#{id}", only_path: true)
|
115
132
|
end
|
@@ -119,48 +136,30 @@ class Article < Content
|
|
119
136
|
end
|
120
137
|
|
121
138
|
def feed_url(format)
|
122
|
-
"#{permalink_url}.#{format.gsub(/\d/,
|
123
|
-
end
|
124
|
-
|
125
|
-
def really_send_pings
|
126
|
-
return unless blog.send_outbound_pings
|
127
|
-
|
128
|
-
blog.urls_to_ping_for(self).each do |url_to_ping|
|
129
|
-
begin
|
130
|
-
url_to_ping.send_weblogupdatesping(blog.base_url, permalink_url)
|
131
|
-
rescue => e
|
132
|
-
logger.error(e)
|
133
|
-
# in case the remote server doesn't respond or gives an error,
|
134
|
-
# we should throw an xmlrpc error here.
|
135
|
-
end
|
136
|
-
end
|
137
|
-
|
138
|
-
html_urls_to_ping.each do |url_to_ping|
|
139
|
-
begin
|
140
|
-
url_to_ping.send_pingback_or_trackback(permalink_url)
|
141
|
-
rescue => e
|
142
|
-
logger.error(e)
|
143
|
-
# in case the remote server doesn't respond or gives an error,
|
144
|
-
# we should throw an xmlrpc error here.
|
145
|
-
end
|
146
|
-
end
|
139
|
+
"#{permalink_url}.#{format.gsub(/\d/, "")}"
|
147
140
|
end
|
148
141
|
|
149
142
|
def next
|
150
|
-
Article.where(
|
143
|
+
Article.where("published_at > ?", published_at).order("published_at asc").
|
144
|
+
limit(1).first
|
151
145
|
end
|
152
146
|
|
153
147
|
def previous
|
154
|
-
Article.where(
|
148
|
+
Article.where("published_at < ?", published_at).order("published_at desc").
|
149
|
+
limit(1).first
|
150
|
+
end
|
151
|
+
|
152
|
+
def publication_month
|
153
|
+
published_at.strftime("%Y-%m")
|
155
154
|
end
|
156
155
|
|
157
156
|
def self.publication_months
|
158
|
-
result = select(
|
159
|
-
result.map { |
|
157
|
+
result = select("published_at").where("published_at is not NULL").where(type: "Article")
|
158
|
+
result.map { |it| [it.publication_month] }.uniq
|
160
159
|
end
|
161
160
|
|
162
|
-
# Finds one article which was posted on a certain date and matches the
|
163
|
-
# params is a Hash
|
161
|
+
# Finds one article which was posted on a certain date and matches the
|
162
|
+
# supplied dashed-title params is a Hash
|
164
163
|
def self.requested_article(params)
|
165
164
|
date_range = PublifyTime.delta(params[:year], params[:month], params[:day])
|
166
165
|
|
@@ -169,6 +168,7 @@ class Article < Content
|
|
169
168
|
req_params[:published_at] = date_range if date_range
|
170
169
|
|
171
170
|
return if req_params.empty? # no search if no params send
|
171
|
+
|
172
172
|
article = published.find_by(req_params)
|
173
173
|
return article if article
|
174
174
|
|
@@ -210,9 +210,7 @@ class Article < Content
|
|
210
210
|
def html_urls
|
211
211
|
urls = []
|
212
212
|
html.gsub(/<a\s+[^>]*>/) do |tag|
|
213
|
-
if tag =~ /\bhref=(["']?)([^ >"]+)\1/
|
214
|
-
urls.push(Regexp.last_match[2].strip)
|
215
|
-
end
|
213
|
+
urls.push(Regexp.last_match[2].strip) if tag =~ /\bhref=(["']?)([^ >"]+)\1/
|
216
214
|
end
|
217
215
|
urls.uniq
|
218
216
|
end
|
@@ -238,7 +236,7 @@ class Article < Content
|
|
238
236
|
if extended.blank?
|
239
237
|
body
|
240
238
|
else
|
241
|
-
body
|
239
|
+
"#{body}\n<!--more-->\n#{extended}"
|
242
240
|
end
|
243
241
|
end
|
244
242
|
|
@@ -247,11 +245,11 @@ class Article < Content
|
|
247
245
|
def body_and_extended=(value)
|
248
246
|
parts = value.split(/\n?<!--more-->\n?/, 2)
|
249
247
|
self.body = parts[0]
|
250
|
-
self.extended = parts[1] ||
|
248
|
+
self.extended = parts[1] || ""
|
251
249
|
end
|
252
250
|
|
253
251
|
def password_protected?
|
254
|
-
|
252
|
+
password.present?
|
255
253
|
end
|
256
254
|
|
257
255
|
def add_comment(params)
|
@@ -262,17 +260,15 @@ class Article < Content
|
|
262
260
|
user.admin? || user_id == user.id
|
263
261
|
end
|
264
262
|
|
265
|
-
def already_ping?(url)
|
266
|
-
pings.map(&:url).include?(url)
|
267
|
-
end
|
268
|
-
|
269
263
|
def allow_comments?
|
270
264
|
return allow_comments unless allow_comments.nil?
|
265
|
+
|
271
266
|
blog.default_allow_comments
|
272
267
|
end
|
273
268
|
|
274
269
|
def allow_pings?
|
275
270
|
return allow_pings unless allow_pings.nil?
|
271
|
+
|
276
272
|
blog.default_allow_pings
|
277
273
|
end
|
278
274
|
|
@@ -288,34 +284,23 @@ class Article < Content
|
|
288
284
|
feedback.published.oldest_first
|
289
285
|
end
|
290
286
|
|
291
|
-
protected
|
292
|
-
|
293
|
-
def set_published_at
|
294
|
-
if published && self[:published_at].nil?
|
295
|
-
self[:published_at] = created_at || Time.now
|
296
|
-
end
|
297
|
-
end
|
298
|
-
|
299
287
|
private
|
300
288
|
|
301
289
|
def permalink_url_options
|
302
290
|
format_url = blog.permalink_format.dup
|
303
|
-
format_url.gsub!(
|
304
|
-
format_url.gsub!(
|
305
|
-
format_url.gsub!(
|
306
|
-
format_url.gsub!(
|
307
|
-
if format_url[0, 1] ==
|
291
|
+
format_url.gsub!("%year%", published_at.year.to_s)
|
292
|
+
format_url.gsub!("%month%", sprintf("%<month>.2d", month: published_at.month))
|
293
|
+
format_url.gsub!("%day%", sprintf("%<day>.2d", day: published_at.day))
|
294
|
+
format_url.gsub!("%title%", URI::DEFAULT_PARSER.escape(permalink.to_s))
|
295
|
+
if format_url[0, 1] == "/"
|
308
296
|
format_url[1..-1]
|
309
297
|
else
|
310
298
|
format_url
|
311
299
|
end
|
312
300
|
end
|
313
301
|
|
314
|
-
def
|
315
|
-
|
316
|
-
|
317
|
-
urls_to_ping << pings.build('url' => url_to_ping)
|
318
|
-
end
|
319
|
-
urls_to_ping
|
302
|
+
def trigger_publication
|
303
|
+
# TODO: Skip if already published, update when published_at changes
|
304
|
+
Trigger.post_action(published_at, self, "publish!")
|
320
305
|
end
|
321
306
|
end
|