publify_core 9.0.0 → 9.2.2
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 +92 -37
- 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 -16
- data/app/controllers/admin/content_controller.rb +38 -36
- data/app/controllers/admin/dashboard_controller.rb +16 -65
- data/app/controllers/admin/feedback_controller.rb +45 -37
- data/app/controllers/admin/notes_controller.rb +16 -10
- data/app/controllers/admin/pages_controller.rb +19 -29
- 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 +6 -5
- data/app/controllers/admin/tags_controller.rb +6 -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 +49 -33
- data/app/controllers/authors_controller.rb +6 -3
- data/app/controllers/base_controller.rb +9 -11
- data/app/controllers/comments_controller.rb +13 -13
- data/app/controllers/content_controller.rb +4 -2
- data/app/controllers/feedback_controller.rb +4 -2
- data/app/controllers/notes_controller.rb +5 -3
- data/app/controllers/setup_controller.rb +15 -12
- data/app/controllers/tags_controller.rb +6 -4
- data/app/controllers/text_controller.rb +2 -4
- data/app/controllers/textfilter_controller.rb +2 -0
- data/app/controllers/theme_controller.rb +18 -13
- data/app/controllers/xml_controller.rb +2 -0
- 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 +7 -16
- data/app/helpers/base_helper.rb +56 -52
- data/app/helpers/blog_helper.rb +4 -2
- data/app/helpers/xml_helper.rb +3 -1
- data/app/jobs/application_job.rb +2 -0
- data/app/mailers/notification_mailer.rb +5 -3
- data/app/models/ability.rb +25 -23
- data/app/models/archives_sidebar.rb +14 -11
- data/app/models/article.rb +42 -42
- data/app/models/article/factory.rb +14 -6
- data/app/models/blog.rb +86 -75
- data/app/models/comment.rb +10 -11
- data/app/models/config_manager.rb +4 -2
- data/app/models/content.rb +37 -50
- data/app/models/content_base.rb +10 -4
- data/app/models/feedback.rb +21 -17
- data/app/models/meta_sidebar.rb +4 -3
- data/app/models/note.rb +26 -25
- data/app/models/page.rb +9 -8
- data/app/models/page_sidebar.rb +4 -2
- data/app/models/ping.rb +3 -1
- data/app/models/post_type.rb +3 -3
- data/app/models/redirect.rb +13 -7
- data/app/models/redirection.rb +3 -1
- data/app/models/resource.rb +5 -3
- data/app/models/search_sidebar.rb +4 -2
- data/app/models/sidebar.rb +11 -6
- data/app/models/static_sidebar.rb +14 -13
- data/app/models/tag.rb +15 -11
- data/app/models/tag_sidebar.rb +6 -3
- data/app/models/text_filter.rb +85 -11
- data/app/models/trackback.rb +7 -11
- data/app/models/trigger.rb +7 -4
- data/app/models/user.rb +44 -43
- data/app/services/title_builder.rb +52 -45
- data/app/uploaders/resource_uploader.rb +5 -3
- data/app/views/accounts/confirm.html.erb +3 -3
- data/app/views/admin/content/_article_list.html.erb +23 -8
- data/app/views/admin/content/_form.html.erb +71 -47
- 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 +23 -47
- data/app/views/admin/seo/_permalinks.html.erb +16 -16
- data/app/views/admin/seo/_titles.html.erb +63 -64
- data/app/views/admin/seo/show.html.erb +14 -19
- data/app/views/admin/settings/display.html.erb +22 -25
- data/app/views/admin/settings/feedback.html.erb +31 -32
- data/app/views/admin/settings/index.html.erb +23 -24
- data/app/views/admin/settings/write.html.erb +21 -22
- 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 +3 -3
- data/app/views/articles/_article.html.erb +7 -9
- data/app/views/articles/_article_author.html.erb +4 -0
- data/app/views/articles/_article_content.html.erb +2 -2
- data/app/views/articles/_article_excerpt.html.erb +2 -2
- data/app/views/articles/_article_links.html.erb +1 -1
- 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_preview.html.erb +3 -3
- 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 +1 -1
- data/app/views/articles/feedback_atom_feed.atom.builder +3 -1
- data/app/views/articles/feedback_rss_feed.rss.builder +9 -8
- data/app/views/articles/index_atom_feed.atom.builder +5 -3
- data/app/views/articles/index_rss_feed.rss.builder +10 -9
- data/app/views/articles/live_search.html.erb +3 -3
- data/app/views/articles/read.html.erb +16 -8
- data/app/views/articles/search.html.erb +2 -2
- 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 +9 -9
- data/app/views/authors/show_atom_feed.atom.builder +4 -2
- data/app/views/authors/show_rss_feed.rss.builder +10 -9
- data/app/views/comments/_comment.html.erb +3 -3
- 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 +3 -1
- data/app/views/feedback/index.rss.builder +9 -8
- 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 +1 -1
- data/app/views/notes/index.html.erb +1 -1
- data/app/views/notes/show_in_reply.html.erb +1 -1
- data/app/views/notification_mailer/_mail_footer.html.erb +3 -3
- data/app/views/notification_mailer/article.html.erb +2 -2
- data/app/views/notification_mailer/comment.html.erb +5 -5
- data/app/views/notification_mailer/notif_user.html.erb +1 -1
- 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 +7 -7
- data/app/views/shared/_atom_header.atom.builder +4 -4
- data/app/views/shared/_atom_item_article.atom.builder +19 -29
- data/app/views/shared/_atom_item_comment.atom.builder +4 -2
- data/app/views/shared/_atom_item_trackback.atom.builder +4 -2
- data/app/views/shared/_google_analytics.html.erb +8 -0
- data/app/views/shared/_page_header.html.erb +9 -12
- data/app/views/shared/_rss_item_article.rss.builder +9 -7
- data/app/views/shared/_rss_item_comment.rss.builder +3 -1
- data/app/views/shared/_rss_item_trackback.rss.builder +3 -1
- 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 +1 -1
- 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 +4 -2
- data/config/i18n-tasks.yml +0 -5
- data/config/initializers/devise.rb +10 -4
- data/config/initializers/mime_types.rb +3 -1
- data/config/locales/da.yml +134 -73
- data/config/locales/de.yml +142 -77
- data/config/locales/en.yml +128 -68
- data/config/locales/es-MX.yml +135 -71
- data/config/locales/fr.yml +167 -88
- data/config/locales/he.yml +128 -72
- data/config/locales/it.yml +136 -74
- data/config/locales/ja.yml +110 -66
- data/config/locales/lt.yml +153 -76
- data/config/locales/nb-NO.yml +123 -67
- data/config/locales/nl.yml +140 -77
- data/config/locales/pl.yml +329 -240
- data/config/locales/pt-BR.yml +137 -72
- data/config/locales/ro.yml +148 -72
- data/config/locales/ru.yml +161 -71
- data/config/locales/zh-CN.yml +106 -61
- data/config/locales/zh-TW.yml +109 -63
- data/config/routes.rb +68 -63
- data/db/migrate/113_initial_schema.rb +191 -191
- data/db/migrate/114_fixes_buggy_articles_and_notes.rb +10 -7
- data/db/migrate/115_drops_categories_for_tags.rb +5 -4
- data/db/migrate/20150207131657_add_missing_indexes.rb +2 -0
- data/db/migrate/20150807134129_simplify_redirect_relations.rb +5 -0
- data/db/migrate/20150808052637_add_blog_ids.rb +9 -3
- data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +2 -0
- data/db/migrate/20150810094754_add_blog_id_to_tags.rb +2 -0
- data/db/migrate/20160108111120_add_devise_to_users.rb +4 -2
- data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +2 -0
- data/db/migrate/20160110094906_remove_profiles_rights.rb +2 -0
- data/db/migrate/20160605103918_replace_profile_id_with_string.rb +2 -0
- data/db/migrate/20160605154632_remove_profiles.rb +10 -5
- data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +2 -0
- data/db/migrate/20160701062604_add_blog_id_to_resources.rb +2 -0
- data/db/migrate/20170528093024_move_resources_to_content.rb +2 -0
- data/db/migrate/20170528094923_move_tags_to_content.rb +2 -0
- data/db/migrate/20170528201606_remove_separate_published_flag.rb +2 -0
- data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +2 -0
- data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +2 -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 -35
- 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 +3 -1
- 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 +4 -0
- data/lib/sidebar_field.rb +15 -13
- 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 +21 -20
- data/themes/plain/javascripts/theme.js +0 -0
- metadata +247 -109
- data/app/assets/javascripts/widearea.js +0 -486
- data/app/assets/stylesheets/widearea.css +0 -133
- data/app/controllers/admin/textfilters_controller.rb +0 -6
- 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/models/sidebar.rb
CHANGED
@@ -1,7 +1,9 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "sidebar_field"
|
2
4
|
|
3
5
|
# This class cannot be autoloaded since other sidebar classes depend on it.
|
4
|
-
class Sidebar <
|
6
|
+
class Sidebar < ApplicationRecord
|
5
7
|
serialize :config, Hash
|
6
8
|
|
7
9
|
belongs_to :blog
|
@@ -24,7 +26,7 @@ class Sidebar < ActiveRecord::Base
|
|
24
26
|
end
|
25
27
|
|
26
28
|
def self.purge
|
27
|
-
delete_all(
|
29
|
+
delete_all("active_position is null and staged_position is null")
|
28
30
|
end
|
29
31
|
|
30
32
|
def self.setting(key, default = nil, options = {})
|
@@ -55,7 +57,7 @@ class Sidebar < ActiveRecord::Base
|
|
55
57
|
if desc
|
56
58
|
@description = desc
|
57
59
|
else
|
58
|
-
@description ||
|
60
|
+
@description || ""
|
59
61
|
end
|
60
62
|
end
|
61
63
|
|
@@ -90,7 +92,7 @@ class Sidebar < ActiveRecord::Base
|
|
90
92
|
end
|
91
93
|
|
92
94
|
def html_id
|
93
|
-
short_name
|
95
|
+
"#{short_name}-#{id}"
|
94
96
|
end
|
95
97
|
|
96
98
|
def parse_request(_contents, _params); end
|
@@ -130,8 +132,11 @@ class Sidebar < ActiveRecord::Base
|
|
130
132
|
end
|
131
133
|
|
132
134
|
def admin_state
|
133
|
-
|
135
|
+
if active_position && (staged_position == active_position || staged_position.nil?)
|
136
|
+
return :active
|
137
|
+
end
|
134
138
|
return :will_change_position if active_position != staged_position
|
139
|
+
|
135
140
|
raise "Unknown admin_state: active: #{active_position}, staged: #{staged_position}"
|
136
141
|
end
|
137
142
|
end
|
@@ -1,20 +1,21 @@
|
|
1
|
-
#
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class StaticSidebar < Sidebar
|
4
|
-
DEFAULT_TEXT =
|
5
|
-
<ul>
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
</ul>
|
4
|
+
DEFAULT_TEXT = <<~TEXT
|
5
|
+
<ul>
|
6
|
+
<li><a href="https://publify.github.io/" title="Publify">Publify</a></li>
|
7
|
+
<li><a href="http://t37.net/" title="Le Rayon UX">Frédéric</a></li>
|
8
|
+
<li><a href="http://www.matijs.net/" title="Matijs">Matijs</a></li>
|
9
|
+
<li><a href="http://elsif.fr/" title="Yannick">Yannick</a></li>
|
10
|
+
<li><a href="http://blog.ookook.fr/" title="Thomas">Thomas</a></li>
|
11
|
+
<li><a href="/admin">Admin</a></li>
|
12
|
+
</ul>
|
13
|
+
TEXT
|
13
14
|
|
14
|
-
|
15
|
-
|
15
|
+
description "Static content, like links to other sites, advertisements," \
|
16
|
+
" or blog meta-information"
|
16
17
|
|
17
|
-
setting :title,
|
18
|
+
setting :title, "Links"
|
18
19
|
setting :body, DEFAULT_TEXT, input_type: :text_area
|
19
20
|
end
|
20
21
|
|
data/app/models/tag.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Tag < ApplicationRecord
|
2
4
|
belongs_to :blog
|
3
|
-
has_and_belongs_to_many :contents, order:
|
5
|
+
has_and_belongs_to_many :contents, order: "created_at DESC"
|
4
6
|
|
5
7
|
validates :name, uniqueness: { scope: :blog_id }
|
6
8
|
validates :blog, presence: true
|
@@ -12,10 +14,11 @@ class Tag < ActiveRecord::Base
|
|
12
14
|
|
13
15
|
def self.create_from_article!(article)
|
14
16
|
return if article.keywords.nil?
|
17
|
+
|
15
18
|
tags = []
|
16
19
|
Tag.transaction do
|
17
|
-
tagwords = article.keywords.to_s.scan(/((['"]).*?\2|[
|
18
|
-
x.first.tr("\"'",
|
20
|
+
tagwords = article.keywords.to_s.scan(/((['"]).*?\2|[.:[[:alnum:]]]+)/).map do |x|
|
21
|
+
x.first.tr("\"'", "")
|
19
22
|
end
|
20
23
|
tagwords.uniq.each do |tagword|
|
21
24
|
tagname = tagword.to_url
|
@@ -35,18 +38,19 @@ class Tag < ActiveRecord::Base
|
|
35
38
|
|
36
39
|
def self.find_all_with_content_counters
|
37
40
|
Tag.joins(:contents).
|
38
|
-
where(contents: { state:
|
39
|
-
select(*Tag.column_names,
|
41
|
+
where(contents: { state: "published" }).
|
42
|
+
select(*Tag.column_names, "COUNT(contents_tags.content_id) as content_counter").
|
40
43
|
group(*Tag.column_names).
|
41
|
-
order(
|
44
|
+
order("content_counter DESC").limit(1000)
|
42
45
|
end
|
43
46
|
|
44
47
|
def self.find_with_char(char)
|
45
|
-
where(
|
48
|
+
where("name LIKE ? ", "%#{char}%").order("name ASC")
|
46
49
|
end
|
47
50
|
|
48
51
|
def self.collection_to_string(tags)
|
49
|
-
tags.map(&:display_name).sort.
|
52
|
+
tags.map(&:display_name).sort.
|
53
|
+
map { |name| / /.match?(name) ? "\"#{name}\"" : name }.join ", "
|
50
54
|
end
|
51
55
|
|
52
56
|
def published_contents
|
@@ -58,10 +62,10 @@ class Tag < ActiveRecord::Base
|
|
58
62
|
end
|
59
63
|
|
60
64
|
def feed_url(format)
|
61
|
-
"#{permalink_url}.#{format.gsub(/\d/,
|
65
|
+
"#{permalink_url}.#{format.gsub(/\d/, "")}"
|
62
66
|
end
|
63
67
|
|
64
68
|
def permalink_url(_anchor = nil, only_path = false)
|
65
|
-
blog.url_for(controller:
|
69
|
+
blog.url_for(controller: "tags", action: "show", id: permalink, only_path: only_path)
|
66
70
|
end
|
67
71
|
end
|
data/app/models/tag_sidebar.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class TagSidebar < Sidebar
|
2
|
-
display_name
|
3
|
-
description
|
4
|
+
display_name "Tags"
|
5
|
+
description "Show most popular tags for this blog"
|
4
6
|
|
5
7
|
setting :maximum_tags, 20
|
6
8
|
|
@@ -11,8 +13,9 @@ class TagSidebar < Sidebar
|
|
11
13
|
|
12
14
|
def sizes
|
13
15
|
return @sizes if @sizes
|
16
|
+
|
14
17
|
total = tags.reduce(0) { |sum, tag| sum + tag.content_counter }
|
15
|
-
average = total.to_f / @tags.size
|
18
|
+
average = total.to_f / @tags.size
|
16
19
|
@sizes = tags.reduce({}) do |h, tag|
|
17
20
|
size = tag.content_counter.to_f / average
|
18
21
|
h.merge tag => [[2.0 / 3.0, size].max, 2].min * 100
|
data/app/models/text_filter.rb
CHANGED
@@ -1,15 +1,28 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
3
|
+
require "net/http"
|
4
|
+
|
5
|
+
class TextFilter
|
6
|
+
attr_accessor :description, :filters, :markup, :name, :params
|
7
|
+
|
8
|
+
def initialize(name: nil,
|
9
|
+
description: nil,
|
10
|
+
markup: nil,
|
11
|
+
filters: [],
|
12
|
+
params: nil)
|
13
|
+
@name = name
|
14
|
+
@description = description
|
15
|
+
@markup = markup
|
16
|
+
@filters = filters
|
17
|
+
@params = params
|
18
|
+
end
|
6
19
|
|
7
20
|
def sanitize(*args, &blk)
|
8
21
|
self.class.sanitize(*args, &blk)
|
9
22
|
end
|
10
23
|
|
11
24
|
def self.find_or_default(name)
|
12
|
-
|
25
|
+
make_filter(name) || none
|
13
26
|
end
|
14
27
|
|
15
28
|
def self.filter_text(text, filters)
|
@@ -17,8 +30,10 @@ class TextFilter < ActiveRecord::Base
|
|
17
30
|
|
18
31
|
filters.each do |filter|
|
19
32
|
next if filter.nil?
|
33
|
+
|
20
34
|
filter_class = map[filter.to_s]
|
21
35
|
next unless filter_class
|
36
|
+
|
22
37
|
text = filter_class.filtertext(text)
|
23
38
|
end
|
24
39
|
|
@@ -35,12 +50,16 @@ class TextFilter < ActiveRecord::Base
|
|
35
50
|
|
36
51
|
help = []
|
37
52
|
help.push(filter_map[markup])
|
38
|
-
filter_types[
|
39
|
-
filter_types[
|
53
|
+
filter_types["macropre"].sort_by(&:short_name).each { |f| help.push f }
|
54
|
+
filter_types["macropost"].sort_by(&:short_name).each { |f| help.push f }
|
40
55
|
filters.each { |f| help.push(filter_map[f.to_s]) }
|
41
56
|
|
42
57
|
help_text = help.map do |f|
|
43
|
-
f.help_text.blank?
|
58
|
+
if f.help_text.blank?
|
59
|
+
""
|
60
|
+
else
|
61
|
+
"<h3>#{f.display_name}</h3>\n#{BlueCloth.new(f.help_text).to_html}\n"
|
62
|
+
end
|
44
63
|
end
|
45
64
|
|
46
65
|
help_text.join("\n")
|
@@ -52,10 +71,65 @@ class TextFilter < ActiveRecord::Base
|
|
52
71
|
help = [filter_map[markup]]
|
53
72
|
filters.each { |f| help.push(filter_map[f.to_s]) }
|
54
73
|
|
55
|
-
|
56
|
-
f.help_text.blank? ?
|
74
|
+
help.map do |f|
|
75
|
+
f.help_text.blank? ? "" : "#{BlueCloth.new(f.help_text).to_html}\n"
|
57
76
|
end.join("\n")
|
77
|
+
end
|
78
|
+
|
79
|
+
def self.all
|
80
|
+
[
|
81
|
+
markdown,
|
82
|
+
smartypants,
|
83
|
+
markdown_smartypants,
|
84
|
+
textile,
|
85
|
+
none,
|
86
|
+
]
|
87
|
+
end
|
88
|
+
|
89
|
+
def self.make_filter(name)
|
90
|
+
case name
|
91
|
+
when "markdown"
|
92
|
+
markdown
|
93
|
+
when "smartypants"
|
94
|
+
smartypants
|
95
|
+
when "markdown smartypants"
|
96
|
+
markdown_smartypants
|
97
|
+
when "textile"
|
98
|
+
textile
|
99
|
+
when "none"
|
100
|
+
none
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
def self.markdown
|
105
|
+
new(name: "markdown",
|
106
|
+
description: "Markdown",
|
107
|
+
markup: "markdown")
|
108
|
+
end
|
109
|
+
|
110
|
+
def self.smartypants
|
111
|
+
new(name: "smartypants",
|
112
|
+
description: "SmartyPants",
|
113
|
+
markup: "none",
|
114
|
+
filters: [:smartypants])
|
115
|
+
end
|
116
|
+
|
117
|
+
def self.markdown_smartypants
|
118
|
+
new(name: "markdown smartypants",
|
119
|
+
description: "Markdown with SmartyPants",
|
120
|
+
markup: "markdown",
|
121
|
+
filters: [:smartypants])
|
122
|
+
end
|
123
|
+
|
124
|
+
def self.textile
|
125
|
+
new(name: "textile",
|
126
|
+
description: "Textile",
|
127
|
+
markup: "textile")
|
128
|
+
end
|
58
129
|
|
59
|
-
|
130
|
+
def self.none
|
131
|
+
new(name: "none",
|
132
|
+
description: "None",
|
133
|
+
markup: "none")
|
60
134
|
end
|
61
135
|
end
|
data/app/models/trackback.rb
CHANGED
@@ -1,34 +1,30 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
# Legacy class to support old feedback sent as trackbacks.
|
2
4
|
class Trackback < Feedback
|
3
5
|
content_fields :excerpt
|
4
6
|
validates :title, :excerpt, :url, presence: true
|
5
7
|
|
6
|
-
# attr_accessible :url, :blog_name, :title, :excerpt, :ip, :published, :article_id
|
7
|
-
|
8
|
-
def initialize(*args, &block)
|
9
|
-
super(*args, &block)
|
10
|
-
self.title ||= url
|
11
|
-
self.blog_name ||= ''
|
12
|
-
end
|
13
|
-
|
14
8
|
before_create :process_trackback
|
15
9
|
|
16
10
|
def process_trackback
|
17
11
|
if excerpt.length >= 251
|
18
12
|
# this limits excerpt to 250 chars, including the trailing "..."
|
19
|
-
self.excerpt = excerpt[0..246] <<
|
13
|
+
self.excerpt = excerpt[0..246] << "..."
|
20
14
|
end
|
21
15
|
end
|
22
16
|
|
23
17
|
def article_allows_feedback?
|
24
18
|
return true if article.allow_pings?
|
25
|
-
|
19
|
+
|
20
|
+
errors.add(:article, "Article is not pingable")
|
26
21
|
false
|
27
22
|
end
|
28
23
|
|
29
24
|
def blog_allows_feedback?
|
30
25
|
return true unless blog.global_pings_disable
|
31
|
-
|
26
|
+
|
27
|
+
errors.add(:article, "Pings are disabled")
|
32
28
|
false
|
33
29
|
end
|
34
30
|
|
data/app/models/trigger.rb
CHANGED
@@ -1,20 +1,23 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Trigger < ApplicationRecord
|
2
4
|
belongs_to :pending_item, polymorphic: true
|
3
5
|
|
4
6
|
class << self
|
5
|
-
def post_action(due_at, item, method =
|
7
|
+
def post_action(due_at, item, method = "came_due")
|
6
8
|
create!(due_at: due_at, pending_item: item,
|
7
9
|
trigger_method: method)
|
8
10
|
fire
|
9
11
|
end
|
10
12
|
|
11
13
|
def fire
|
12
|
-
where(
|
14
|
+
where("due_at <= ?", Time.zone.now).destroy_all
|
13
15
|
true
|
14
16
|
end
|
15
17
|
|
16
18
|
def remove(pending_item, conditions = {})
|
17
19
|
return if pending_item.new_record?
|
20
|
+
|
18
21
|
conditions = conditions.merge(pending_item_id: pending_item.id,
|
19
22
|
pending_item_type: pending_item.class.to_s)
|
20
23
|
where(conditions).delete_all
|
@@ -25,7 +28,7 @@ class Trigger < ActiveRecord::Base
|
|
25
28
|
before_destroy :trigger_pending_item
|
26
29
|
|
27
30
|
def trigger_pending_item
|
28
|
-
pending_item
|
31
|
+
pending_item&.send(trigger_method)
|
29
32
|
true
|
30
33
|
end
|
31
34
|
end
|
data/app/models/user.rb
CHANGED
@@ -1,11 +1,13 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "digest/sha1"
|
2
4
|
|
3
5
|
# Publify user.
|
4
6
|
# TODO: Should belong to a blog
|
5
|
-
class User <
|
6
|
-
ADMIN =
|
7
|
-
PUBLISHER =
|
8
|
-
CONTRIBUTOR =
|
7
|
+
class User < ApplicationRecord
|
8
|
+
ADMIN = "admin"
|
9
|
+
PUBLISHER = "publisher"
|
10
|
+
CONTRIBUTOR = "contributor"
|
9
11
|
|
10
12
|
# Include default devise modules. Others available are:
|
11
13
|
# :confirmable, :lockable, :timeoutable and :omniauthable
|
@@ -13,14 +15,17 @@ class User < ActiveRecord::Base
|
|
13
15
|
:recoverable, :rememberable, :trackable, :validatable
|
14
16
|
include ConfigManager
|
15
17
|
|
16
|
-
|
17
|
-
belongs_to :resource, optional: true
|
18
|
+
before_validation :set_default_profile
|
18
19
|
|
19
|
-
|
20
|
+
validates :login, uniqueness: true, on: :create
|
21
|
+
validates :email, uniqueness: true, on: :create
|
22
|
+
validates :email, :login, presence: true
|
23
|
+
validates :login, length: { in: 3..40 }
|
20
24
|
|
21
|
-
|
25
|
+
belongs_to :resource, optional: true
|
26
|
+
has_many :notifications, foreign_key: "notify_user_id"
|
22
27
|
has_many :notify_contents, -> { uniq }, through: :notifications,
|
23
|
-
source:
|
28
|
+
source: "notify_content"
|
24
29
|
|
25
30
|
has_many :articles
|
26
31
|
|
@@ -32,36 +37,38 @@ class User < ActiveRecord::Base
|
|
32
37
|
|
33
38
|
# Settings
|
34
39
|
setting :notify_watch_my_articles, :boolean, true
|
35
|
-
setting :firstname, :string,
|
36
|
-
setting :lastname, :string,
|
37
|
-
setting :nickname, :string,
|
38
|
-
setting :description, :string,
|
39
|
-
setting :url, :string,
|
40
|
-
setting :msn, :string,
|
41
|
-
setting :aim, :string,
|
42
|
-
setting :yahoo, :string,
|
43
|
-
setting :twitter, :string,
|
44
|
-
setting :jabber, :string,
|
45
|
-
setting :admin_theme, :string,
|
46
|
-
setting :twitter_account, :string,
|
47
|
-
setting :twitter_oauth_token, :string,
|
48
|
-
setting :twitter_oauth_token_secret, :string,
|
49
|
-
setting :twitter_profile_image, :string,
|
40
|
+
setting :firstname, :string, ""
|
41
|
+
setting :lastname, :string, ""
|
42
|
+
setting :nickname, :string, ""
|
43
|
+
setting :description, :string, ""
|
44
|
+
setting :url, :string, ""
|
45
|
+
setting :msn, :string, ""
|
46
|
+
setting :aim, :string, ""
|
47
|
+
setting :yahoo, :string, ""
|
48
|
+
setting :twitter, :string, ""
|
49
|
+
setting :jabber, :string, ""
|
50
|
+
setting :admin_theme, :string, "blue"
|
51
|
+
setting :twitter_account, :string, ""
|
52
|
+
setting :twitter_oauth_token, :string, ""
|
53
|
+
setting :twitter_oauth_token_secret, :string, ""
|
54
|
+
setting :twitter_profile_image, :string, ""
|
50
55
|
|
51
56
|
# echo "publify" | sha1sum -
|
52
57
|
class_attribute :salt
|
53
58
|
|
54
59
|
def self.salt
|
55
|
-
|
60
|
+
"20ac4d290c2293702c64b3b287ae5ea79b26a5c1"
|
56
61
|
end
|
57
62
|
|
58
63
|
def first_and_last_name
|
59
|
-
return
|
64
|
+
return "" unless firstname.present? && lastname.present?
|
65
|
+
|
60
66
|
"#{firstname} #{lastname}"
|
61
67
|
end
|
62
68
|
|
63
69
|
def display_names
|
64
|
-
[:login, :nickname, :firstname, :lastname, :first_and_last_name].
|
70
|
+
[:login, :nickname, :firstname, :lastname, :first_and_last_name].
|
71
|
+
map { |f| send(f) }.delete_if(&:empty?)
|
65
72
|
end
|
66
73
|
|
67
74
|
# Authenticate users with old password hashes
|
@@ -75,23 +82,23 @@ class User < ActiveRecord::Base
|
|
75
82
|
# Update old SHA1 password with new Devise ByCrypt password
|
76
83
|
self.encrypted_password = password_digest(password)
|
77
84
|
save
|
78
|
-
|
85
|
+
true
|
79
86
|
else
|
80
87
|
# If not BCrypt password and not old SHA1 password deny access
|
81
|
-
|
88
|
+
false
|
82
89
|
end
|
83
90
|
end
|
84
91
|
|
85
92
|
def active_for_authentication?
|
86
|
-
super && state ==
|
93
|
+
super && state == "active"
|
87
94
|
end
|
88
95
|
|
89
|
-
def
|
90
|
-
|
96
|
+
def text_filter
|
97
|
+
TextFilter.make_filter(text_filter_name)
|
91
98
|
end
|
92
99
|
|
93
100
|
def self.to_prefix
|
94
|
-
|
101
|
+
"author"
|
95
102
|
end
|
96
103
|
|
97
104
|
def article_counter
|
@@ -118,6 +125,7 @@ class User < ActiveRecord::Base
|
|
118
125
|
|
119
126
|
def update_twitter_profile_image(img)
|
120
127
|
return if twitter_profile_image == img
|
128
|
+
|
121
129
|
self.twitter_profile_image = img
|
122
130
|
save
|
123
131
|
end
|
@@ -126,16 +134,9 @@ class User < ActiveRecord::Base
|
|
126
134
|
twitter_oauth_token.present? && twitter_oauth_token_secret.present?
|
127
135
|
end
|
128
136
|
|
129
|
-
|
130
|
-
|
131
|
-
before_validation :set_default_profile
|
137
|
+
private
|
132
138
|
|
133
139
|
def set_default_profile
|
134
|
-
self.profile ||= User.count.zero? ?
|
140
|
+
self.profile ||= User.count.zero? ? "admin" : "contributor"
|
135
141
|
end
|
136
|
-
|
137
|
-
validates :login, uniqueness: true, on: :create
|
138
|
-
validates :email, uniqueness: true, on: :create
|
139
|
-
validates :email, :login, presence: true
|
140
|
-
validates :login, length: { in: 3..40 }
|
141
142
|
end
|