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
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class Admin::TagsController < Admin::BaseController
|
2
4
|
before_action :fetch_tags, only: [:index, :edit]
|
3
5
|
before_action :set_tag, only: [:edit, :update, :destroy]
|
@@ -12,7 +14,7 @@ class Admin::TagsController < Admin::BaseController
|
|
12
14
|
@tag = this_blog.tags.new(tag_params)
|
13
15
|
|
14
16
|
if @tag.save
|
15
|
-
redirect_to admin_tags_url, notice:
|
17
|
+
redirect_to admin_tags_url, notice: "Tag was successfully created."
|
16
18
|
else
|
17
19
|
fetch_tags
|
18
20
|
render :index
|
@@ -22,8 +24,9 @@ class Admin::TagsController < Admin::BaseController
|
|
22
24
|
def update
|
23
25
|
old_name = @tag.name
|
24
26
|
if @tag.update(tag_params)
|
27
|
+
# TODO: Check whether these redirects are useful or ignored.
|
25
28
|
Redirect.create(from_path: "/tag/#{old_name}", to_path: @tag.permalink_url(nil, true))
|
26
|
-
redirect_to admin_tags_url, notice: I18n.t(
|
29
|
+
redirect_to admin_tags_url, notice: I18n.t("admin.tags.edit.success")
|
27
30
|
else
|
28
31
|
render :edit
|
29
32
|
end
|
@@ -46,6 +49,7 @@ class Admin::TagsController < Admin::BaseController
|
|
46
49
|
end
|
47
50
|
|
48
51
|
def fetch_tags
|
49
|
-
@tags = Tag.order(
|
52
|
+
@tags = Tag.order("display_name").page(params[:page]).
|
53
|
+
per(this_blog.admin_display_elements)
|
50
54
|
end
|
51
55
|
end
|
@@ -1,28 +1,31 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "open-uri"
|
4
|
+
require "time"
|
5
|
+
require "rexml/document"
|
4
6
|
|
5
7
|
class Admin::ThemesController < Admin::BaseController
|
6
8
|
def index
|
7
9
|
@themes = Theme.find_all
|
8
10
|
@themes.each do |theme|
|
9
11
|
# TODO: Move to Theme
|
10
|
-
theme.description_html = TextFilter.filter_text(theme.description,
|
12
|
+
theme.description_html = TextFilter.filter_text(theme.description,
|
13
|
+
[:markdown, :smartypants])
|
11
14
|
end
|
12
15
|
@active = this_blog.current_theme
|
13
16
|
end
|
14
17
|
|
15
18
|
def preview
|
16
19
|
theme = Theme.find(params[:theme])
|
17
|
-
send_file File.join(theme.path,
|
18
|
-
type:
|
20
|
+
send_file File.join(theme.path, "preview.png"),
|
21
|
+
type: "image/png", disposition: "inline", stream: false
|
19
22
|
end
|
20
23
|
|
21
24
|
def switchto
|
22
25
|
this_blog.theme = params[:theme]
|
23
26
|
this_blog.save
|
24
27
|
this_blog.current_theme(:reload)
|
25
|
-
flash[:success] = I18n.t(
|
28
|
+
flash[:success] = I18n.t("admin.themes.switchto.success")
|
26
29
|
redirect_to admin_themes_url
|
27
30
|
end
|
28
31
|
end
|
@@ -1,13 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class Admin::UsersController < Admin::BaseController
|
2
4
|
before_action :set_user, only: [:edit, :update, :destroy]
|
3
5
|
|
4
6
|
def index
|
5
|
-
@users = User.order(
|
7
|
+
@users = User.order("login asc").page(params[:page]).
|
8
|
+
per(this_blog.admin_display_elements)
|
6
9
|
end
|
7
10
|
|
8
11
|
def new
|
9
12
|
@user = User.new
|
10
|
-
@user.
|
13
|
+
@user.text_filter_name = this_blog.text_filter
|
11
14
|
end
|
12
15
|
|
13
16
|
def edit
|
@@ -18,7 +21,7 @@ class Admin::UsersController < Admin::BaseController
|
|
18
21
|
@user = User.new(user_params)
|
19
22
|
@user.name = @user.login
|
20
23
|
if @user.save
|
21
|
-
redirect_to admin_users_url, notice: I18n.t(
|
24
|
+
redirect_to admin_users_url, notice: I18n.t("admin.users.new.success")
|
22
25
|
else
|
23
26
|
render :new
|
24
27
|
end
|
@@ -26,14 +29,14 @@ class Admin::UsersController < Admin::BaseController
|
|
26
29
|
|
27
30
|
def update
|
28
31
|
if @user.update(update_params)
|
29
|
-
redirect_to admin_users_url, notice:
|
32
|
+
redirect_to admin_users_url, notice: "User was successfully updated."
|
30
33
|
else
|
31
34
|
render :edit
|
32
35
|
end
|
33
36
|
end
|
34
37
|
|
35
38
|
def destroy
|
36
|
-
@user.destroy if User.where(
|
39
|
+
@user.destroy if User.where("profile = ? and id != ?", User::ADMIN, @user.id).count > 1
|
37
40
|
redirect_to admin_users_url
|
38
41
|
end
|
39
42
|
|
@@ -46,9 +49,9 @@ class Admin::UsersController < Admin::BaseController
|
|
46
49
|
def user_params
|
47
50
|
params.require(:user).permit(:login, :password, :password_confirmation,
|
48
51
|
:email, :firstname, :lastname, :nickname,
|
49
|
-
:
|
52
|
+
:name, :notify_via_email,
|
50
53
|
:notify_on_new_articles, :notify_on_comments,
|
51
|
-
:profile, :
|
54
|
+
:profile, :text_filter_name, :state,
|
52
55
|
:twitter_account, :twitter_oauth_token,
|
53
56
|
:twitter_oauth_token_secret, :description,
|
54
57
|
:url, :msn, :yahoo, :jabber, :aim, :twitter)
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ArticlesController < ContentController
|
2
4
|
before_action :login_required, only: [:preview, :preview_page]
|
3
5
|
before_action :auto_discovery_feed, only: [:show, :index]
|
@@ -8,50 +10,46 @@ class ArticlesController < ContentController
|
|
8
10
|
helper :'admin/base'
|
9
11
|
|
10
12
|
def index
|
11
|
-
|
13
|
+
wanted_types = this_blog.statuses_in_timeline ? ["Article", "Note"] : ["Article"]
|
12
14
|
|
13
15
|
limit = this_blog.per_page(params[:format])
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
@description = this_blog.home_desc_template
|
22
|
-
if params[:year]
|
23
|
-
@page_title = this_blog.archives_title_template
|
24
|
-
@description = this_blog.archives_desc_template
|
25
|
-
elsif params[:page]
|
26
|
-
@page_title = this_blog.paginated_title_template
|
27
|
-
@description = this_blog.paginated_desc_template
|
28
|
-
end
|
29
|
-
@page_title = @page_title.to_title(@articles, this_blog, params)
|
30
|
-
@description = @description.to_title(@articles, this_blog, params)
|
31
|
-
|
32
|
-
@keywords = this_blog.meta_keywords
|
16
|
+
articles_base = if params[:year].blank?
|
17
|
+
this_blog.contents.published
|
18
|
+
else
|
19
|
+
this_blog.contents.published_at(params.values_at(:year, :month, :day))
|
20
|
+
end
|
21
|
+
@articles = articles_base.includes(:user, :resources, :tags).
|
22
|
+
where(type: wanted_types).page(params[:page]).per(limit)
|
33
23
|
|
34
24
|
respond_to do |format|
|
35
|
-
format.html
|
25
|
+
format.html do
|
26
|
+
set_index_title_and_description(this_blog, params)
|
27
|
+
@keywords = this_blog.meta_keywords
|
28
|
+
|
29
|
+
render_paginated_index
|
30
|
+
end
|
36
31
|
format.atom do
|
37
|
-
render_articles_feed(
|
32
|
+
render_articles_feed("atom")
|
38
33
|
end
|
39
34
|
format.rss do
|
40
35
|
auto_discovery_feed(only_path: false)
|
41
|
-
render_articles_feed(
|
36
|
+
render_articles_feed("rss")
|
42
37
|
end
|
43
38
|
end
|
44
39
|
end
|
45
40
|
|
46
41
|
def search
|
47
|
-
@articles = this_blog.articles_matching(params[:q],
|
42
|
+
@articles = this_blog.articles_matching(params[:q],
|
43
|
+
page: params[:page],
|
44
|
+
per_page: this_blog.per_page(params[:format]))
|
48
45
|
return error! if @articles.empty?
|
46
|
+
|
49
47
|
@page_title = this_blog.search_title_template.to_title(@articles, this_blog, params)
|
50
48
|
@description = this_blog.search_desc_template.to_title(@articles, this_blog, params)
|
51
49
|
respond_to do |format|
|
52
|
-
format.html { render
|
53
|
-
format.rss {
|
54
|
-
format.atom {
|
50
|
+
format.html { render "search" }
|
51
|
+
format.rss { render_articles_feed "rss" }
|
52
|
+
format.atom { render_articles_feed "atom" }
|
55
53
|
end
|
56
54
|
end
|
57
55
|
|
@@ -64,16 +62,17 @@ class ArticlesController < ContentController
|
|
64
62
|
def preview
|
65
63
|
@article = Article.last_draft(params[:id])
|
66
64
|
@page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
|
67
|
-
render
|
65
|
+
render "read"
|
68
66
|
end
|
69
67
|
|
70
68
|
def check_password
|
71
69
|
return unless request.xhr?
|
70
|
+
|
72
71
|
@article = Article.find(params[:article][:id])
|
73
72
|
if @article.password == params[:article][:password]
|
74
|
-
render partial:
|
73
|
+
render partial: "articles/full_article_content", locals: { article: @article }
|
75
74
|
else
|
76
|
-
render partial:
|
75
|
+
render partial: "articles/password_form", locals: { article: @article }
|
77
76
|
end
|
78
77
|
end
|
79
78
|
|
@@ -86,54 +85,73 @@ class ArticlesController < ContentController
|
|
86
85
|
|
87
86
|
# Redirect old version with /:year/:month/:day/:title to new format,
|
88
87
|
# because it's changed
|
89
|
-
[
|
88
|
+
["%year%/%month%/%day%/%title%", "articles/%year%/%month%/%day%/%title%"].each do |part|
|
90
89
|
@article = factory.match_permalink_format(from, part)
|
91
|
-
|
90
|
+
if @article
|
91
|
+
return redirect_to URI.parse(@article.permalink_url).path,
|
92
|
+
status: :moved_permanently
|
93
|
+
end
|
92
94
|
end
|
93
95
|
|
94
|
-
r = Redirect.find_by(from_path: from)
|
95
|
-
|
96
|
-
|
97
|
-
|
96
|
+
r = Redirect.find_by!(from_path: from)
|
97
|
+
# TODO: If linked to article, directly redirect to the article.
|
98
|
+
# Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
|
99
|
+
redirect_to r.full_to_path, status: :moved_permanently if r
|
98
100
|
end
|
99
101
|
|
100
102
|
def archives
|
101
103
|
limit = this_blog.limit_archives_display
|
102
|
-
@articles = this_blog.published_articles.page(params[:page]).per(limit)
|
104
|
+
@articles = this_blog.published_articles.includes(:tags).page(params[:page]).per(limit)
|
103
105
|
@page_title = this_blog.archives_title_template.to_title(@articles, this_blog, params)
|
104
106
|
@keywords = this_blog.meta_keywords
|
105
107
|
@description = this_blog.archives_desc_template.to_title(@articles, this_blog, params)
|
106
108
|
end
|
107
109
|
|
108
110
|
def tag
|
109
|
-
redirect_to tags_path, status:
|
111
|
+
redirect_to tags_path, status: :moved_permanently
|
110
112
|
end
|
111
113
|
|
112
114
|
def preview_page
|
113
115
|
@page = Page.find(params[:id])
|
114
|
-
render
|
116
|
+
render "view_page"
|
115
117
|
end
|
116
118
|
|
117
119
|
def view_page
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
else
|
123
|
-
render 'errors/404', status: 404
|
124
|
-
end
|
120
|
+
@page = Page.published.find_by!(name: Array(params[:name]).join("/"))
|
121
|
+
@page_title = @page.title
|
122
|
+
@description = this_blog.meta_description
|
123
|
+
@keywords = this_blog.meta_keywords
|
125
124
|
end
|
126
125
|
|
127
|
-
# TODO: Move to TextfilterController
|
126
|
+
# TODO: Move to TextfilterController
|
128
127
|
def markup_help
|
129
|
-
|
128
|
+
filter = TextFilter.make_filter(params[:id])
|
129
|
+
if filter
|
130
|
+
render html: filter.commenthelp
|
131
|
+
else
|
132
|
+
render plain: "Unknown filter"
|
133
|
+
end
|
130
134
|
end
|
131
135
|
|
132
136
|
private
|
133
137
|
|
138
|
+
def set_index_title_and_description(blog, parameters)
|
139
|
+
@page_title = blog.home_title_template
|
140
|
+
@description = blog.home_desc_template
|
141
|
+
if parameters[:year]
|
142
|
+
@page_title = blog.archives_title_template
|
143
|
+
@description = blog.archives_desc_template
|
144
|
+
elsif parameters[:page]
|
145
|
+
@page_title = blog.paginated_title_template
|
146
|
+
@description = blog.paginated_desc_template
|
147
|
+
end
|
148
|
+
@page_title = @page_title.to_title(@articles, blog, parameters)
|
149
|
+
@description = @description.to_title(@articles, blog, parameters)
|
150
|
+
end
|
151
|
+
|
134
152
|
def verify_config
|
135
153
|
if !this_blog.configured?
|
136
|
-
redirect_to controller:
|
154
|
+
redirect_to controller: "setup", action: "index"
|
137
155
|
elsif User.count == 0
|
138
156
|
redirect_to new_user_registration_path
|
139
157
|
else
|
@@ -143,60 +161,53 @@ class ArticlesController < ContentController
|
|
143
161
|
|
144
162
|
# See an article We need define @article before
|
145
163
|
def show_article
|
146
|
-
@comment = Comment.new
|
147
|
-
@page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
|
148
|
-
@description = this_blog.article_desc_template.to_title(@article, this_blog, params)
|
149
|
-
groupings = @article.tags
|
150
|
-
@keywords = groupings.map(&:name).join(', ')
|
151
|
-
|
152
164
|
auto_discovery_feed
|
153
165
|
respond_to do |format|
|
154
|
-
format.html
|
155
|
-
|
156
|
-
|
157
|
-
|
166
|
+
format.html do
|
167
|
+
@comment = Comment.new
|
168
|
+
@page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
|
169
|
+
@description = this_blog.article_desc_template.to_title(@article, this_blog, params)
|
170
|
+
|
171
|
+
@keywords = @article.tags.map(&:name).join(", ")
|
172
|
+
render "articles/#{@article.post_type}"
|
173
|
+
end
|
174
|
+
format.atom { render_feedback_feed("atom") }
|
175
|
+
format.rss { render_feedback_feed("rss") }
|
176
|
+
format.xml { render_feedback_feed("atom") }
|
158
177
|
end
|
159
178
|
rescue ActiveRecord::RecordNotFound
|
160
179
|
error!
|
161
180
|
end
|
162
181
|
|
163
182
|
def render_articles_feed(format)
|
164
|
-
|
165
|
-
render "index_#{format}_feed", layout: false
|
166
|
-
else
|
167
|
-
redirect_to "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
|
168
|
-
end
|
183
|
+
render_cached_xml("index_#{format}_feed", @articles)
|
169
184
|
end
|
170
185
|
|
171
186
|
def render_feedback_feed(format)
|
172
|
-
|
173
|
-
render "feedback_#{format}_feed", layout: false
|
187
|
+
render_cached_xml("feedback_#{format}_feed", @article)
|
174
188
|
end
|
175
189
|
|
176
190
|
def render_paginated_index
|
177
191
|
return error! if @articles.empty?
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
@auto_discovery_url_rss = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
|
182
|
-
@auto_discovery_url_atom = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
|
183
|
-
end
|
184
|
-
render 'index'
|
192
|
+
|
193
|
+
auto_discovery_feed(only_path: false)
|
194
|
+
render "index"
|
185
195
|
end
|
186
196
|
|
187
197
|
def extract_feed_format(from)
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
198
|
+
case from
|
199
|
+
when /^.*\.rss$/
|
200
|
+
request.format = "rss"
|
201
|
+
from = from.gsub(/\.rss/, "")
|
202
|
+
when /^.*\.atom$/
|
203
|
+
request.format = "atom"
|
204
|
+
from = from.gsub(/\.atom$/, "")
|
194
205
|
end
|
195
206
|
from
|
196
207
|
end
|
197
208
|
|
198
209
|
def error!
|
199
|
-
@message = I18n.t(
|
200
|
-
render
|
210
|
+
@message = I18n.t("errors.no_posts_found")
|
211
|
+
render "articles/error", status: :ok
|
201
212
|
end
|
202
213
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class AuthorsController < ContentController
|
2
4
|
layout :theme_layout
|
3
5
|
|
@@ -5,7 +7,8 @@ class AuthorsController < ContentController
|
|
5
7
|
@author = User.find_by(login: params[:id])
|
6
8
|
raise ActiveRecord::RecordNotFound unless @author
|
7
9
|
|
8
|
-
@articles = @author.articles.published.page(params[:page]).
|
10
|
+
@articles = @author.articles.published.page(params[:page]).
|
11
|
+
per(this_blog.per_page(params[:format]))
|
9
12
|
@page_title = this_blog.author_title_template.to_title(@author, this_blog, params)
|
10
13
|
@keywords = this_blog.meta_keywords
|
11
14
|
@description = this_blog.author_desc_template.to_title(@author, this_blog, params)
|
@@ -13,8 +16,8 @@ class AuthorsController < ContentController
|
|
13
16
|
auto_discovery_feed(only_path: false)
|
14
17
|
|
15
18
|
respond_to do |format|
|
16
|
-
format.rss { render_feed
|
17
|
-
format.atom { render_feed
|
19
|
+
format.rss { render_feed "rss" }
|
20
|
+
format.atom { render_feed "atom" }
|
18
21
|
format.html
|
19
22
|
end
|
20
23
|
end
|
@@ -1,23 +1,19 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "cancancan"
|
2
4
|
|
3
5
|
class BaseController < ApplicationController
|
4
6
|
before_action :fire_triggers, :load_lang, :set_paths
|
5
|
-
before_action :configure_permitted_parameters, if: :devise_controller?
|
6
7
|
|
7
8
|
private
|
8
9
|
|
9
|
-
def configure_permitted_parameters
|
10
|
-
# TODO: Check if this is still needed
|
11
|
-
devise_parameter_sanitizer.permit(:sign_up, keys: [:email])
|
12
|
-
end
|
13
|
-
|
14
10
|
def login_required
|
15
11
|
authenticate_user! && authorize!(params[:action], params[:controller])
|
16
12
|
end
|
17
13
|
|
18
14
|
def set_paths
|
19
15
|
prepend_view_path this_blog.current_theme.view_path
|
20
|
-
Dir.glob(File.join(::Rails.root.to_s,
|
16
|
+
Dir.glob(File.join(::Rails.root.to_s, "lib", "*_sidebar/app/views")).select do |file|
|
21
17
|
append_view_path file
|
22
18
|
end
|
23
19
|
end
|
@@ -32,13 +28,15 @@ class BaseController < ApplicationController
|
|
32
28
|
elsif I18n.available_locales.include?(this_blog.lang[0..1].to_sym)
|
33
29
|
I18n.locale = this_blog.lang[0..1]
|
34
30
|
# for the same language used in different areas, e.g. zh_CN, zh_TW
|
35
|
-
elsif I18n.available_locales.include?(this_blog.lang.sub(
|
36
|
-
I18n.locale = this_blog.lang.sub(
|
31
|
+
elsif I18n.available_locales.include?(this_blog.lang.sub("_", "-").to_sym)
|
32
|
+
I18n.locale = this_blog.lang.sub("_", "-")
|
37
33
|
end
|
38
34
|
end
|
39
35
|
|
40
36
|
def add_to_cookies(name, value, path = nil, _expires = nil)
|
41
|
-
cookies[name] = { value: value,
|
37
|
+
cookies[name] = { value: value,
|
38
|
+
path: path || "/#{controller_name}",
|
39
|
+
expires: 6.weeks.from_now }
|
42
40
|
end
|
43
41
|
|
44
42
|
include BlogHelper
|