publify_core 9.2.10 → 10.0.0

data/config/locales/zh-TW.yml

@@ -19,14 +19,8 @@ zh-TW:
           attributes:
             title:
               blank: can't be blank
-      template:
-        body: ''
-        header: ''
   admin:
-    base:
-      not_allowed: Error, you are not allowed to perform this action
-      successfully_deleted: This %{name} was deleted successfully
-    content:
+    articles:
       access_granted:
         error: Error, you are not allowed to perform this action
       article_list:
@@ -85,6 +79,11 @@ zh-TW:
         withdrawn: Withdrawn
       update:
         success: Article was successfully updated
+    base:
+      not_allowed: Error, you are not allowed to perform this action
+      successfully_created: "%{name} was successfully created."
+      successfully_deleted: This %{name} was deleted successfully
+      successfully_updated: "%{name} was successfully updated."
     dashboard:
       comment:
         by: By
@@ -95,9 +94,6 @@ zh-TW:
         no_drafts_yet: No drafts yet, why don't you write one
         your_drafts: Your drafts
       index:
-        textile_deprecated_html: The Textile text filter has been deprecated and will
-          be removed soon. Some of your content still uses this filter. Run the <code>publify:textile_to_markdown</code>
-          rake task to convert it to Markdown, or convert your content manually.
         welcome_back: 歡迎回來， %{user_name}！
       overview:
         change_your_blog_presentation: 修改你的部落格外觀
@@ -155,14 +151,17 @@ zh-TW:
     feedback:
       article:
         action_or_other_html: "%{first_action} 或 %{second_action}"
+        actions: Actions
         add_a_comment: Add a comment
         author: 作者
         cancel: 取消
         comments_for_html: 做出評論 %{title}
+        content: Content
+        created_at: Created at
         email: Email
         no_feedback: There is no feedback yet. Why don't you create some?
         save: 存檔
-        select_all: Select all
+        status: 身分
         url: Url
         your_comment: Your comment
       bulkops:
@@ -209,7 +208,6 @@ zh-TW:
         no_feedback: There is no feedback yet. Why don't you create some?
         presumed_ham: Presumed ham
         presumed_spam: Presumed spam
-        select_all: Select all
         spam: Spam
         status: 身分
         unapproved_comments: Unapproved comments
@@ -563,6 +561,7 @@ zh-TW:
         sidebar_plugins: Sidebar plugins
         tags: 標示標籤
         titles: Titles
+        view_blog: View blog
         write: Write
       twitter_alert:
         fill_the_twitter_credentials: fill in the OAuth credentials
@@ -775,6 +774,7 @@ zh-TW:
   helper:
     at: at
   langs:
+    ar_AR: Arabic
     da_DK: Danish
     de_DE: German
     en_US: English (US)

data/config/routes.rb

@@ -81,8 +81,8 @@ Rails.application.routes.draw do
   namespace :admin do
     root "dashboard#index", as: "dashboard"
 
-    resources :content, only: [:index, :new, :edit, :create, :update, :destroy],
-                        format: false do
+    resources :articles, only: [:index, :new, :edit, :create, :update, :destroy],
+                         format: false do
       collection do
         get "auto_complete_for_article_keywords"
         post "autosave"

data/db/migrate/20150807134129_simplify_redirect_relations.rb

@@ -2,6 +2,7 @@
 
 class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
+
   class Redirection < ActiveRecord::Base; end
 
   def up

data/db/migrate/20150808052637_add_blog_ids.rb

@@ -2,7 +2,9 @@
 
 class AddBlogIds < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
+
   class Content < ActiveRecord::Base; end
+
   class Sidebar < ActiveRecord::Base; end
 
   def up
@@ -22,7 +24,7 @@ class AddBlogIds < ActiveRecord::Migration[4.2]
   def down
     if adapter_name == "PostgreSQL"
       indexes(:contents).each do |index|
-        remove_index(:contents, name: index.name) if /blog_id/.match?(index.name)
+        remove_index(:contents, name: index.name) if index.name.include?("blog_id")
       end
     else
       begin

data/db/migrate/20160605103918_replace_profile_id_with_string.rb

@@ -3,6 +3,7 @@
 class ReplaceProfileIdWithString < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
   end
+
   class User < ActiveRecord::Base
   end
 

data/db/migrate/20160701062604_add_blog_id_to_resources.rb

@@ -2,7 +2,9 @@
 
 class AddBlogIdToResources < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
+
   class Content < ActiveRecord::Base; end
+
   class Resource < ActiveRecord::Base; end
 
   def up

data/db/migrate/20190208152646_move_text_filter_to_name.rb

@@ -46,23 +46,23 @@ class MoveTextFilterToName < ActiveRecord::Migration[5.2]
   end
 
   def down
-    TextFilter.
-      create_with(description: "None", markup: "none", filters: [], params: {}).
-      find_or_create_by!(name: "none")
-    TextFilter.
-      create_with(description: "Markdown", markup: "markdown", filters: [], params: {}).
-      find_or_create_by!(name: "markdown")
-    TextFilter.
-      create_with(description: "SmartyPants", markup: "none", filters: [:smartypants],
-                  params: {}).
-      find_or_create_by!(name: "smartypants")
-    TextFilter.
-      create_with(description: "Markdown with SmartyPants", markup: "markdown",
-                  filters: [:smartypants], params: {}).
-      find_or_create_by!(name: "markdown smartypants")
-    TextFilter.
-      create_with(description: "Textile", markup: "textile", filters: [], params: {}).
-      find_or_create_by!(name: "textile")
+    TextFilter
+      .create_with(description: "None", markup: "none", filters: [], params: {})
+      .find_or_create_by!(name: "none")
+    TextFilter
+      .create_with(description: "Markdown", markup: "markdown", filters: [], params: {})
+      .find_or_create_by!(name: "markdown")
+    TextFilter
+      .create_with(description: "SmartyPants", markup: "none", filters: [:smartypants],
+                   params: {})
+      .find_or_create_by!(name: "smartypants")
+    TextFilter
+      .create_with(description: "Markdown with SmartyPants", markup: "markdown",
+                   filters: [:smartypants], params: {})
+      .find_or_create_by!(name: "markdown smartypants")
+    TextFilter
+      .create_with(description: "Textile", markup: "textile", filters: [], params: {})
+      .find_or_create_by!(name: "textile")
 
     Content.find_each do |content|
       filter_name = content.text_filter_name

data/db/migrate/20221007091049_remove_table_sitealizer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveTableSitealizer < ActiveRecord::Migration[6.1]
+  def up
+    drop_table :sitealizer
+  end
+
+  def down
+    create_table :sitealizer do |t|
+      t.string :path
+      t.string :ip
+      t.string :referer
+      t.string :language
+      t.string :user_agent
+      t.datetime :created_at
+      t.date :created_on
+    end
+  end
+end

data/db/migrate/20221010092846_remove_page_caches_table.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemovePageCachesTable < ActiveRecord::Migration[6.1]
+  def up
+    drop_table :page_caches
+  end
+
+  def down
+    create_table :page_caches do |t|
+      t.string :name
+    end
+
+    add_index :page_caches, :name
+  end
+end

data/db/migrate/20221012163214_remove_itunes_fields_from_resources.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class RemoveItunesFieldsFromResources < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :resources, :itunes_metadata, :boolean
+    remove_column :resources, :itunes_author, :string
+    remove_column :resources, :itunes_subtitle, :string
+    remove_column :resources, :itunes_duration, :integer
+    remove_column :resources, :itunes_summary, :text
+    remove_column :resources, :itunes_keywords, :string
+    remove_column :resources, :itunes_category, :string
+    remove_column :resources, :itunes_explicit, :boolean
+  end
+end

data/db/seeds.rb

@@ -19,7 +19,3 @@ unless blog.sidebars.any?
   StaticSidebar.create!(active_position: 3, blog_id: blog.id)
   MetaSidebar.create!(active_position: 4, blog_id: blog.id)
 end
-
-unless File.directory?("#{::Rails.root}/public/files")
-  Dir.mkdir("#{::Rails.root}/public/files")
-end

data/lib/publify_core/content_text_helpers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "rails_autolink/helpers"
+
+module PublifyCore
+  class ContentTextHelpers
+    include ActionView::Helpers::UrlHelper
+    include ActionView::Helpers::TextHelper
+    include ActionView::Helpers::SanitizeHelper
+  end
+end

data/lib/publify_core/lang.rb

@@ -4,6 +4,6 @@ module PublifyCore
   module Lang
     LIST = [:da_DK, :de_DE, :en_US, :es_MX, :fr_FR, :he_IL, :it_IT, :ja_JP,
             :lt_LT, :nb_NO, :nl_NL, :pl_PL, :ro_RO, :ru_RU, :zh_TW, :zh_CN,
-            :pt_BR].freeze
+            :pt_BR, :ar_AR].freeze
   end
 end

data/lib/publify_core/testing_support/factories/articles.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :article do
+    title { "A big article" }
+    body { "A content with several data" }
+    extended { "extended content for fun" }
+    guid
+    published_at { Time.zone.now }
+    user
+    allow_comments { true }
+    state { :published }
+    allow_pings { true }
+    text_filter_name { "markdown" }
+
+    after :build do |article|
+      article.blog ||= Blog.first || create(:blog)
+    end
+
+    after :stub do |article|
+      article.blog ||= Blog.first || create(:blog)
+    end
+
+    trait :with_tags do
+      keywords { "a tag" }
+    end
+  end
+
+  factory :unpublished_article, parent: :article do
+    published_at { nil }
+    state { :draft }
+  end
+
+  factory :full_article, parent: :article do
+    after :create do |article|
+      article.resources << create(:resource)
+      article.tags << create(:tag)
+    end
+  end
+
+  factory :utf8article, parent: :article do
+    title { "ルビー" }
+    permalink { "ルビー" }
+  end
+
+  factory :second_article, parent: :article do
+    title { "Another big article" }
+  end
+
+  factory :article_with_accent_in_html, parent: :article do
+    title { "article with accent" }
+    body { "&eacute;coute The future is cool!" }
+    permalink { "article-with-accent" }
+  end
+end

data/lib/publify_core/testing_support/factories/blogs.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :blog do
+    base_url { "http://test.host/blog" }
+    hide_extended_on_rss { true }
+    blog_name { "test blog" }
+    limit_article_display { 2 }
+    sp_url_limit { 3 }
+    plugin_avatar { "" }
+    blog_subtitle { "test subtitle" }
+    limit_rss_display { 10 }
+    geourl_location { "" }
+    default_allow_pings { false }
+    send_outbound_pings { false }
+    sp_global { true }
+    default_allow_comments { true }
+    email_from { "scott@sigkill.org" }
+    sp_article_auto_close { 0 }
+    permalink_format { "/%year%/%month%/%day%/%title%" }
+    rss_description_text { "rss description text" }
+    lang { "en_US" }
+  end
+end

data/lib/publify_core/testing_support/factories/comments.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :comment do
+    article
+    author { "Bob Foo" }
+    url { "http://fakeurl.com" }
+    body { "Comment body" }
+    guid
+    state { "ham" }
+
+    factory :unconfirmed_comment do
+      state { "presumed_ham" }
+    end
+
+    factory :published_comment do
+      state { "ham" }
+    end
+
+    factory :not_published_comment do
+      state { "spam" }
+    end
+
+    factory :ham_comment do
+      state { "ham" }
+    end
+
+    factory :presumed_ham_comment do
+      state { "presumed_ham" }
+    end
+
+    factory :presumed_spam_comment do
+      state { "presumed_spam" }
+    end
+
+    factory :spam_comment do
+      state { "spam" }
+    end
+  end
+end

data/lib/publify_core/testing_support/factories/contents.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :content do
+    blog { Blog.first || create(:blog) }
+  end
+end

data/lib/publify_core/testing_support/factories/notes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :note do
+    body { "this is a note" }
+    published_at { Time.zone.now }
+    user
+    state { "published" }
+    text_filter_name { "markdown" }
+    guid
+    blog { Blog.first || create(:blog) }
+  end
+
+  factory :unpublished_note, parent: :note do
+    state { "draft" }
+  end
+end

data/lib/publify_core/testing_support/factories/pages.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :page do
+    name { FactoryBot.generate(:name) }
+    title { "Page One Title" }
+    body { FactoryBot.generate(:body) }
+    published_at { Time.zone.now }
+    user
+    blog { Blog.first || create(:blog) }
+    state { "published" }
+  end
+end

data/lib/publify_core/testing_support/factories/post_types.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :post_type do
+    name { "foobar" }
+    description { "Some description" }
+  end
+end

data/lib/publify_core/testing_support/factories/redirects.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :redirect do
+    from_path { "foo/bar" }
+    to_path { "/someplace/else" }
+    blog { Blog.first || create(:blog) }
+  end
+end

data/lib/publify_core/testing_support/factories/resources.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :resource do
+    upload { PublifyCore::TestingSupport::UploadFixtures.file_upload }
+    mime { "image/jpeg" }
+    size { 110 }
+    blog { Blog.first || create(:blog) }
+  end
+
+  factory :avatar, parent: :resource do
+    upload { "avatar.jpg" }
+    mime { "image/jpeg" }
+    size { 600 }
+  end
+end

data/lib/publify_core/testing_support/factories/sequences.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  sequence(:name) { |n| "name_#{n}" }
+  sequence(:body) { |n| "body #{n}" * ((n % 5) + 3) }
+  sequence(:user) { |n| "user#{n}" }
+  sequence(:email) { |n| "user#{n}@example.com" }
+  sequence(:guid) { |n| "deadbeef#{n}" }
+  sequence(:label) { |n| "lab_#{n}" }
+  sequence(:file_name) { |f| "file_name_#{f}" }
+  sequence(:time) { |n| Time.new(2012, 3, 26, 19, 56).in_time_zone - n }
+end

data/lib/publify_core/testing_support/factories/sidebars.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :sidebar do
+    active_position { 1 }
+    config { { "title" => "Links", "body" => "some links" } }
+    type { "StaticSidebar" }
+    blog { Blog.first || create(:blog) }
+  end
+end

data/lib/publify_core/testing_support/factories/tags.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :tag do |tag|
+    tag.name { FactoryBot.generate(:name) }
+    tag.display_name { |a| a.name } # rubocop:disable Style/SymbolProc
+    blog { Blog.first || create(:blog) }
+  end
+end

data/lib/publify_core/testing_support/factories/trackbacks.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :trackback do
+    state { "ham" }
+    article
+    blog_name { "Trackback Blog" }
+    title { "Trackback Entry" }
+    url { "http://www.example.com" }
+    excerpt { "This is an excerpt" }
+    guid { "dsafsadffsdsf" }
+  end
+end

data/lib/publify_core/testing_support/factories/users.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :user do
+    login { FactoryBot.generate(:user) }
+    email { generate(:email) }
+    name { "Bond" }
+    nickname { "James Bond" }
+    notify_via_email { false }
+    notify_on_new_articles { false }
+    notify_on_comments { false }
+    password { "top-Secret12!$#" }
+    state { "active" }
+    profile { User::CONTRIBUTOR }
+
+    trait :without_twitter do
+      twitter { nil }
+      association :resource, nil
+    end
+
+    trait :with_a_full_profile do
+      description { "I am a poor lonesone factory generated user" }
+      url { "http://myblog.net" }
+      msn { "random@mail.com" }
+      aim { "randomaccount" }
+      yahoo { "anotherrandomaccount" }
+      twitter { "@random" }
+      jabber { "random@account.com" }
+    end
+
+    trait :as_admin do
+      profile { User::ADMIN }
+    end
+
+    trait :as_publisher do
+      profile { User::PUBLISHER }
+    end
+
+    trait :as_contributor do
+      profile { User::CONTRIBUTOR }
+    end
+  end
+end

data/lib/publify_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PublifyCore
-  VERSION = "9.2.10"
+  VERSION = "10.0.0"
 end

data/lib/publify_core.rb

@@ -7,13 +7,13 @@ require "devise_zxcvbn"
 require "publify_core/version"
 require "publify_core/engine"
 require "publify_core/lang"
+require "publify_core/content_text_helpers"
 
 require "carrierwave"
-require "dynamic_form"
 require "jquery-rails"
 require "jquery-ui-rails"
 require "kaminari"
-require "rails_autolink"
+require "rails-i18n"
 require "rails-timeago"
 require "recaptcha/rails"
 require "sassc-rails"
@@ -22,8 +22,8 @@ require "email_notify"
 require "publify_guid"
 require "publify_textfilter_none"
 require "publify_textfilter_markdown"
+require "publify_textfilter_markdown_smartquotes"
 require "publify_textfilter_smartypants"
-require "publify_textfilter_textile"
 require "publify_textfilter_twitterfilter"
 require "publify_time"
 require "sidebar_registry"

data/lib/publify_textfilter_markdown.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "text_filter_plugin"
-require "bluecloth"
+require "commonmarker"
 
 # TODO: Move to a different namespace
 class PublifyApp
@@ -9,7 +9,7 @@ class PublifyApp
     class Markdown < TextFilterPlugin::Markup
       plugin_display_name "Markdown"
       plugin_description "Markdown markup language from" \
-        ' <a href="http://daringfireball.com/">Daring Fireball</a>'
+                         ' <a href="http://daringfireball.com/">Daring Fireball</a>'
 
       def self.help_text
         <<~TXT
@@ -19,9 +19,9 @@ class PublifyApp
           available from the author's site, but here's a short summary:
 
           * **Paragraphs**: Start a new paragraph by skipping a line.
-          * **Italics**: Put text in *italics* by enclosing it in either \* or
-            \_: `*italics*` turns into *italics*.
-          * **Bold**: Put text in **bold** by enclosing it in two \*s:
+          * **Italics**: Put text in *italics* by enclosing it in either * or
+            _: `*italics*` turns into *italics*.
+          * **Bold**: Put text in **bold** by enclosing it in two *s:
             `**bold**` turns into **bold**.
           * **Pre-formatted text**: Enclosing a short block of text in
             backquotes (&#96;) displays it in a monospaced font and converts HTML
@@ -46,11 +46,10 @@ class PublifyApp
       end
 
       def self.filtertext(text)
-        # FIXME: Workaround for BlueCloth not interpreting <publify:foo> as an
-        # HTML tag. See <http://deveiate.org/projects/BlueCloth/ticket/70>.
+        # FIXME: Workaround for <publify:foo> not being interpreted as an HTML tag.
         escaped_macros = text.gsub(%r{(</?publify):}, '\1X')
-        html = BlueCloth.new(escaped_macros).to_html.gsub(%r{</?notextile>}, "")
-        html.gsub(%r{(</?publify)X}, '\1:')
+        html = CommonMarker.render_html(escaped_macros, :UNSAFE)
+        html.gsub(%r{(</?publify)X}, '\1:').strip
       end
     end
   end

data/lib/publify_textfilter_markdown_smartquotes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "publify_textfilter_markdown"
+
+module PublifyTextfilter
+  class MarkdownSmartquotes < PublifyApp::Textfilter::Markdown
+    plugin_display_name "Markdown with smart quotes"
+    plugin_description "Markdown markup language from" \
+                       ' <a href="http://daringfireball.com/">Daring Fireball</a>' \
+                       " with automatic use of typographically correct quotes and dashes"
+
+    def self.filtertext(text)
+      # FIXME: Workaround for <publify:foo> not being interpreted as an HTML tag.
+      escaped_macros = text.gsub(%r{(</?publify):}, '\1X')
+      html = CommonMarker.render_doc(escaped_macros, :SMART).to_html(:UNSAFE)
+      html.gsub(%r{(</?publify)X}, '\1:').strip
+    end
+  end
+end