RubyGems - publify_core - Versions diffs - 9.0.0.pre5 → 9.2.0 - Mend

publify_core 9.0.0.pre5 → 9.2.0

Potentially problematic release.

This version of publify_core might be problematic. Click here for more details.

Files changed (395) hide show

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/views/notes/index.html.erb CHANGED

@@ -7,9 +7,9 @@
         <small><%= link_to_permalink(note, display_date_and_time(note.published_at)) %></small>
       </footer>
     </article>
-        <hr>
+        <hr />
   </div>
   <% end %>
 </div>
-<%= paginate @notes, :next_label => "#{t(".next_page")} &raquo;", :previous_label => "&laquo; #{t('.previous_page')}" %>
+<%= paginate @notes %>

data/app/views/notes/show_in_reply.html.erb CHANGED

@@ -2,7 +2,7 @@
   <div class='h-entry hentry h-as-note'>
     <article class=' well well-small'>
       <% if @reply['user']['profile_image_url'] %>
-        <%= image_tag(@reply['user']['profile_image_url'], class: "alignleft", alt: @reply['user']['name']) %>
+        <%= image_tag(@reply['user']['profile_image_url'], class: 'alignleft', alt: @reply['user']['name']) %>
       <% end %>
       <strong><%= get_reply_context_url(@reply) %></strong>
       <p><%= nofollowify_links(PublifyApp::Textfilter::Twitterfilter.filtertext(@reply['text'])) %></p>

data/app/views/notification_mailer/_mail_footer.html.erb CHANGED

@@ -1,7 +1,5 @@
-</div>
-<p><em>This is being sent to <%=h @user.name %> because you asked to be notified via email whenever
-new content is posted to  <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>
+<p><em>This is being sent to <%= h @user.name %> because you asked to be notified via email whenever
+new content is posted to  <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a>
 To unsubscribe, go to
-<a href="<%= @link_url = @blog.url_for(:controller => '/admin/users', :action => 'edit', :id => @user.id) %>"><%=h @link_url%></a>
+<a href="<%= @link_url = @blog.url_for(controller: '/admin/users', action: 'edit', id: @user.id) %>"><%= h @link_url %></a>
 and change your user settings.</p>

data/app/views/notification_mailer/_mail_header.html.erb CHANGED

@@ -1 +1,3 @@
 <div style="margin:1em;padding:4px;background:#eee;border:1px solid black">
+  <%= yield %>
+</div>

data/app/views/notification_mailer/article.html.erb CHANGED

@@ -1,6 +1,7 @@
-<p>A new article has been posted on <%=h @blog.blog_name %>:</p>
+<p>A new article has been posted on <%= h @blog.blog_name %>:</p>
-<%= render 'mail_header' %>
-<h2><%=h @article.title %></h2>
-<%= html @article, :body %>
+<%= render 'mail_header' do %>
+  <h2><%= h @article.title %></h2>
+  <%= html @article, :body %>
+<% end %>
 <%= render 'mail_footer' %>

data/app/views/notification_mailer/comment.html.erb CHANGED

@@ -1,11 +1,12 @@
 <p>A new comment has been posted on
-    <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>, responding to
-    <a href="<%= @comment.article.permalink_url %>"><%=h(@comment.article.title) %></a>.</p>
+    <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a>, responding to
+    <a href="<%= @comment.article.permalink_url %>"><%= h(@comment.article.title) %></a>.</p>
-<%= render 'mail_header' %>
-<h2><%=h @comment.title %></h2>
-<cite><strong><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
- <%= link_to('said', @comment.permalink_url) %>
- <%= display_date_and_time @comment.created_at %> <br>
-<%= html @comment %>
+<%= render 'mail_header' do %>
+  <h2><%= h @comment.title %></h2>
+  <cite><strong><%= @comment.url.blank? ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
+  <%= link_to('said', @comment.permalink_url) %>
+  <%= display_date_and_time @comment.created_at %> <br />
+  <%= html @comment %>
+<% end %>
 <%= render 'mail_footer' %>

data/app/views/notification_mailer/notif_user.html.erb CHANGED

@@ -1,14 +1,9 @@
 <html>
 <body>
-  <p>Your <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a> account has been created.</p>
+  <p>Your <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a> account has been created.</p>
-  <%= render 'mail_header' %>
-    <p>Your credentials appear below.</p>
-    <ul>
-      <li>Login: <%= h @user.login %></li>
-      <li>Password: <%= h @user.password %></li>
-    </ul>
-  </div>
+  <%= render 'mail_header' do %>
+    <p>Your can log in using your chosen login name, <%= h @user.login %>, and your password.</p>
+  <% end %>
 </body>
 </html>

data/app/views/page_sidebar/_content.html.erb CHANGED

@@ -1,5 +1,5 @@
 <% unless sidebar.pages.blank? %>
-  <h3 class="sidebar-title"><%= t(".pages")%></h3>
+  <h3 class="sidebar-title"><%= t('.pages') %></h3>
   <div class="sidebar-body">
     <ul>
       <% for page in sidebar.pages %>

data/app/views/search_sidebar/_content.html.erb CHANGED

@@ -2,9 +2,9 @@
   <label for="q"><%= sidebar.title %></label>
 </h3>
 <div class="sidebar-body">
-  <%= form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
+  <%= form_tag({ controller: 'articles', action: 'search' }, { method: 'get', id: 'sform' }) do %>
     <input type="text" id="q" name="q" value="" size="15" />
-    <input type="submit" value="<%= t(".search") %>" />
+    <input type="submit" value="<%= t('.search') %>" />
   <% end %>
 </div>
 <br style="clear: right" />

data/app/views/settings/install.html.erb CHANGED

@@ -3,8 +3,8 @@
 <% for field in @fields %>
-  <%= field.desc %><br>
-  <%= settings_field field %><br>
+  <%= field.desc %><br />
+  <%= settings_field field %><br />
   <% end %>
   <%= submit_tag %>

data/app/views/setup/index.html.erb CHANGED

@@ -1,13 +1,17 @@
-<%= form_tag :action=> 'index' do %>
+<%= form_tag action: 'index' do %>
   <div class='alert alert-info'>
-    <small><%= t(".welcome_to_your_blog_setup", publify: link_to("Publify", 'http://publify.co'))%></small>
+    <small><%= t('.welcome_to_your_blog_setup', publify: link_to('Publify', 'https://publify.github.io/')) %></small>
   </div>
   <div class='form-group'>
-    <%= text_field(:setting, :blog_name, { :class=> 'form-control', :placeholder => t(".blog_name")})%>
+    <%= text_field(:setting, :blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
   </div>
   <div class='form-group'>
-    <%= text_field(:setting, :email, { :class=> 'form-control', :placeholder => t(".your_mail")})%>
+    <%= text_field(:setting, :email, class: 'form-control', placeholder: t('.your_mail')) %>
+  </div>
+  <div class='form-group'>
+    <%= label_tag :setting_password, t('.password') %><br />
+    <%= password_field(:setting, :password, class: 'form-control') %>
   </div>
-  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save')%>">
+  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>" />
 <% end %>

data/app/views/shared/_atom_header.atom.builder CHANGED

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 feed.title(feed_title)
-unless this_blog.blog_subtitle.blank?
-  feed.subtitle(this_blog.blog_subtitle, "type" => "html")
-end
+feed.subtitle(this_blog.blog_subtitle, "type" => "html") if this_blog.blog_subtitle.present?
 feed.updated items.first.updated_at if items.first
-feed.generator "Publify", uri: "http://www.publify.co", version: PublifyCore::VERSION
+feed.generator "Publify", uri: "https://publify.github.io", version: PublifyCore::VERSION

data/app/views/shared/_atom_item_article.atom.builder CHANGED

@@ -1,39 +1,36 @@
-feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
+# frozen_string_literal: true
+feed.entry(item, id: "urn:uuid:#{item.guid}", published: item.published_at,
+                 url: item.permalink_url) do |entry|
   entry.author do
-    name = item.user.name rescue item.author
-    email = item.user.email rescue nil
-    entry.name name
-    entry.email email if this_blog.link_to_author unless email.blank?
+    entry.name item.author_name
   end
   if item.is_a?(Note)
-    entry.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...'), "type"=>"html"
+    truncated_body = truncate(item.html(:body).strip_html,
+                              length: 80, separator: " ", omissions: "...")
+    entry.title truncated_body, "type" => "html"
   else
-    entry.title item.title, "type"=>"html"
+    entry.title item.title, "type" => "html"
   end
   if item.is_a?(Article)
     item.tags.each do |tag|
-      entry.category "term" => tag.display_name, "scheme" => tag.permalink_url
+      entry.category "term" => tag.display_name, "scheme" => tag_url(tag.permalink)
     end
+    # TODO: Add tests for this
     item.resources.each do |resource|
-      if resource.size > 0  # The Atom spec disallows files with size=0
-        entry.tag! :link, "rel" => "enclosure",
-              :type => resource.mime,
-              :title => item.title,
-              :href => this_blog.file_url(resource.upload_url),
-              :length => resource.size
-      else
-        entry.tag! :link, "rel" => "enclosure",
-              :type => resource.mime,
-              :title => item.title,
-              :href => this_blog.file_url(resource.upload_url)
-      end
+      link_options = { rel: "enclosure",
+                       type: resource.mime,
+                       title: item.title,
+                       href: this_blog.file_url(resource.upload_url) }
+      # The Atom spec disallows files with size=0
+      link_options[:length] = resource.size if resource.size > 0
+      entry.tag! :link, link_options
     end
   end
   content_html = fetch_html_content_for_feeds(item, this_blog)
-  entry.content content_html + item.get_rss_description, "type"=>"html"
+  entry.content content_html + item.rss_description, "type" => "html"
 end

data/app/views/shared/_atom_item_comment.atom.builder CHANGED

@@ -1,10 +1,10 @@
-feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
+# frozen_string_literal: true
+feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
   entry.author do
     entry.name item.author
     entry.uri item.url
   end
-  entry.title item.feed_title, "type"=>"html"
-  entry.content html(item), "type"=>"html"
+  entry.title item.feed_title, "type" => "html"
+  entry.content html(item), "type" => "html"
 end

data/app/views/shared/_atom_item_trackback.atom.builder CHANGED

@@ -1,9 +1,10 @@
-feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
+# frozen_string_literal: true
+feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
   entry.author do
     entry.name item.blog_name
     entry.uri item.url
   end
-  entry.title item.feed_title, "type"=>"html"
-  entry.summary item.excerpt, "type"=>"html"
+  entry.title item.feed_title, "type" => "html"
+  entry.summary item.excerpt, "type" => "html"
 end

data/app/views/shared/_google_analytics.html.erb ADDED

@@ -0,0 +1,8 @@
+<script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+  var pageTracker = _gat._getTracker("<%= this_blog.google_analytics %>");
+  pageTracker._trackPageview();
+</script>

data/app/views/shared/_page_header.html.erb CHANGED

@@ -1,26 +1,23 @@
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <%= meta_tag 'ICBM', this_blog.geourl_location if this_blog.geourl_location.present? %>
-<%= meta_tag 'description', @description unless @description.blank? %>
+<%= meta_tag 'description', @description if @description.present? %>
 <%= meta_tag 'robots', 'noindex, follow' if stop_index_robots?(this_blog) %>
-<%= meta_tag 'google-site-verification', this_blog.google_verification unless this_blog.google_verification.blank?%>
-<meta name="generator" content="Publify <%=PublifyCore::VERSION%>">
+<%= meta_tag 'google-site-verification', this_blog.google_verification if this_blog.google_verification.present? %>
+<meta name="generator" content="Publify <%= PublifyCore::VERSION %>" />
 <%= show_meta_keyword %>
-<link rel="EditURI" type="application/rsd+xml" title="RSD" href="<%= url_for :controller => '/xml', :action => 'rsd' %>">
 <% if feed_atom %>
-  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>">
+  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>" />
 <% end %>
 <% if feed_rss %>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>">
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>" />
 <% end %>
 <%= javascript_include_tag :publify, async: Rails.env.production? %>
+<%= csrf_meta_tags %>
 <%= stylesheet_link_tag :publify %>
 <%= page_header_includes %>
-<% if this_blog.use_canonical_url %>
-  <link rel="canonical" href="<%= this_blog.base_url + request.fullpath %>" />
-<% end %>
-<%= raw this_blog.custom_tracking_field unless this_blog.custom_tracking_field.blank? %>
-<%= google_analytics %>
+<link rel="canonical" href="<%= this_blog.url_for request.fullpath %>" />
+<%= raw this_blog.custom_tracking_field if this_blog.custom_tracking_field.present? %>
+<%= render 'shared/google_analytics' if this_blog.google_analytics.present? %>
 <%= meta_tag 'og:site_name', this_blog.blog_name %>
 <%= meta_tag 'og:title', @article ? @article.title : @page_title %>
-<link ref='author' href="humans.txt">

data/app/views/shared/_rss_item_article.rss.builder CHANGED

@@ -1,35 +1,32 @@
+# frozen_string_literal: true
 xm.item do
   if item.is_a?(Note)
-    xm.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...')
+    xm.title truncate(item.html(:body).strip_html, length: 80, separator: " ",
+                                                   omissions: "...")
   else
     xm.title item.title
   end
   content_html = fetch_html_content_for_feeds(item, this_blog)
-  xm.description content_html + item.get_rss_description
+  xm.description content_html + item.rss_description
   xm.pubDate item.published_at.rfc822
   xm.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
-  if item.link_to_author?
-    xm.author "#{item.user.email} (#{item.user.name})"
-  end
+  xm.dc :creator, item.author_name
   if item.is_a?(Article)
     xm.comments(item.permalink_url("comments"))
-    for tag in item.tags
+    item.tags.each do |tag|
       xm.category tag.display_name
     end
     # RSS 2.0 only allows a single enclosure per item, so only include the first one here.
-    if not item.resources.empty?
+    unless item.resources.empty?
       resource = item.resources.first
       xm.enclosure(
-        :url => item.blog.file_url(resource.upload_url),
-        :length => resource.size,
-        :type => resource.mime)
-      end
+        url: item.blog.file_url(resource.upload_url),
+        length: resource.size,
+        type: resource.mime)
     end
-  if item.allow_pings?
-    xm.trackback :ping, item.trackback_url
   end
   xm.link item.permalink_url
 end

data/app/views/shared/_rss_item_comment.rss.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 feed.item do
   feed.title item.feed_title
   feed.description html(item)
@@ -5,4 +7,3 @@ feed.item do
   feed.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
   feed.link item.permalink_url
 end

data/app/views/shared/_rss_item_trackback.rss.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 feed.item do
   feed.title item.feed_title
   feed.description item.excerpt

data/app/views/sidebar/display_plugins.html.erb CHANGED

@@ -1,4 +1,4 @@
-<% benchmark "BENCHMARK: display_plugins" do %>
+<% benchmark 'BENCHMARK: display_plugins' do %>
   <% @sidebars.each do |sidebar| %>
     <%= render sidebar %>
   <% end %>

data/app/views/tag_sidebar/_content.html.erb CHANGED

@@ -1,5 +1,5 @@
 <% unless sidebar.tags.blank? %>
-  <h3 class="sidebar-title"><%= t(".tags")%></h3>
+  <h3 class="sidebar-title"><%= t('.tags') %></h3>
   <div class="sidebar-body">
     <p style="overflow:hidden">
     <% sidebar.tags.each do |tag| %>

data/app/views/tags/index.html.erb CHANGED

@@ -9,7 +9,7 @@
       <% end %>
     </ul>
   <% else %>
-    <p><%= t(".there_is_no_tags") %></p>
+    <p><%= t('.there_are_no_tags') %></p>
   <% end %>
 </div>
-<p><%= paginate(@tags, right: "#{t(".next_page")} &raquo;", left: "&laquo; #{t('.previous_page')}") %></p>
+<p><%= paginate @tags %></p>

data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod item.updated_at.xmlschema

data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod collection_lastmod(item)

data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod item.updated_at.xmlschema

data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod collection_lastmod(item)

data/app/views/xml/sitemap.googlesitemap.builder ADDED

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
+xml.urlset "xmlns" => "http://www.google.com/schemas/sitemap/0.84" do
+  @items.each do |item|
+    render "googlesitemap_item_#{item.class.name.to_s.downcase}",
+           item: item, xm: xml
+  end
+end

data/config/i18n-tasks.yml CHANGED

@@ -17,11 +17,6 @@ data:
     - ['*_sidebar.*', 'config/locales/sidebars.%{locale}.yml']
     - config/locales/%{locale}.yml
-  yaml:
-    write:
-      # do not wrap lines at 80 characters
-      line_width: -1
 # Find translate calls
 search:
   ## Paths or `File.find` patterns to search in:

data/config/initializers/devise.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -6,13 +8,15 @@ Devise.setup do |config|
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
   # by default. You can change it below and use your own secret key.
-  # config.secret_key = '99a1fd068906f7a32686e001fff91fdfb88703303de85657ab63ad5405ae7c3b215c144c0dd4eaf2e68f3e3dae8c43e132968dd0b32e4c78ac1e86b202e3c6ee'
+  # config.secret_key =
+  #   '99a1fd068906f7a32686e001fff91fdfb88703303de85657ab63ad5405ae7c3b' \
+  #   '215c144c0dd4eaf2e68f3e3dae8c43e132968dd0b32e4c78ac1e86b202e3c6ee'
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'default@publify.co'
+  config.mailer_sender = "change-me@example.com"
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -21,7 +25,7 @@ Devise.setup do |config|
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require 'devise/orm/active_record'
+  require "devise/orm/active_record"
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
@@ -99,7 +103,9 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = 'cd666dfd37982f9981838aa0bc32a04099d309a831dffcf64c3ec1814e9ae9ad4fde148638675ee2443b5c532222ff007c032e76fc0eec24c5fb4fccfd3546a3'
+  # config.pepper =
+  #   'cd666dfd37982f9981838aa0bc32a04099d309a831dffcf64c3ec1814e9ae9ad' \
+  #   '4fde148638675ee2443b5c532222ff007c032e76fc0eec24c5fb4fccfd3546a3'
   # Send a notification email when the user's password is changed
   # config.send_password_change_notification = false