publify_core 9.0.1 → 9.1.0

data/config/locales/pt-BR.yml

@@ -264,12 +264,10 @@ pt-BR:
       form:
         article_filter: Filtro de artigo
         cancel: Cancelar
-        offline: offline
         online: Online
         permanent_link: Link Permanente
         publish: Publicar
         publish_settings: Configurações de publicação
-        published: publicado
         save: Salvar
         status: Estado
         title: Título
@@ -763,7 +761,7 @@ pt-BR:
     publisher: Publicador do Blog
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!
       title: Hello World!
     index:
       blog_name: Nome do Blog

data/config/locales/ro.yml

@@ -264,12 +264,10 @@ ro:
       form:
         article_filter: Filtru pentru articole
         cancel: Anulare
-        offline: offline
         online: Online
         permanent_link: Permanent link
         publish: Publică
         publish_settings: Publish settings
-        published: publicat
         save: Salvează
         status: Status
         title: Titlu
@@ -763,7 +761,7 @@ ro:
     publisher: Blog publisher
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!
       title: Hello World!
     index:
       blog_name: Blog name

data/config/locales/ru.yml

@@ -264,12 +264,10 @@ ru:
       form:
         article_filter: Фильтр постов
         cancel: Отменить
-        offline: offline
         online: Онлайн
         permanent_link: Постоянная ссылка
         publish: Опубликовать
         publish_settings: Настройки публикации
-        published: published
         save: Сохранить
         status: Статус
         title: Заголовок
@@ -763,7 +761,7 @@ ru:
     publisher: Blog publisher
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!
       title: Hello World!
     index:
       blog_name: Название блога

data/config/locales/zh-CN.yml

@@ -264,12 +264,10 @@ zh-CN:
       form:
         article_filter: Article filter
         cancel: 取消
-        offline: offline
         online: 上線
         permanent_link: Permanent link
         publish: 发布
         publish_settings: 发布设定
-        published: published
         save: 保存
         status: 状态
         title: 标题
@@ -763,7 +761,7 @@ zh-CN:
     publisher: Blog publisher
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!
       title: Hello World!
     index:
       blog_name: Blog name

data/config/locales/zh-TW.yml

@@ -264,12 +264,10 @@ zh-TW:
       form:
         article_filter: 篩選文章
         cancel: 取消
-        offline: offline
         online: 上線
         permanent_link: Permanent link
         publish: 公開
         publish_settings: Publish settings
-        published: published
         save: 存檔
         status: 身分
         title: 標題
@@ -763,7 +761,7 @@ zh-TW:
     publisher: Blog publisher
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!
       title: Hello World!
     index:
       blog_name: Blog name

data/config/routes.rb

@@ -21,7 +21,7 @@ Rails.application.routes.draw do
 
   # ArticlesController
   get '/live_search/', to: 'articles#live_search', as: :live_search_articles, format: false
-  get '/search/:q(.:format)/page/:page', to: 'articles#search', as: 'search', defaults: {page: 1}
+  get '/search/:q(.:format)/page/:page', to: 'articles#search', as: 'search', defaults: { page: 1 }
   get '/search(/:q(.:format))', to: 'articles#search'
   get '/search/', to: 'articles#search', as: 'search_base', format: false
   get '/archives/', to: 'articles#archives', format: false

data/db/migrate/113_initial_schema.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 class InitialSchema < ActiveRecord::Migration[4.2]
   def change
     create_table 'articles_tags', id: false, force: true do |t|

data/db/migrate/114_fixes_buggy_articles_and_notes.rb

@@ -16,7 +16,7 @@ class FixesBuggyArticlesAndNotes < ActiveRecord::Migration[4.2]
     end
 
     def create_guid
-      return true unless guid.blank?
+      return true if guid.present?
 
       self.guid = UUIDTools::UUID.random_create.to_s
     end

data/db/migrate/115_drops_categories_for_tags.rb

@@ -17,8 +17,8 @@ class DropsCategoriesForTags < ActiveRecord::Migration[4.2]
         tg.display_name = cat.name
       end
 
-      redirect = Redirect.create(from_path: "category/#{cat.permalink}",
-                                 to_path: File.join(Blog.first.base_url, 'tag', tag.name))
+      Redirect.create(from_path: "category/#{cat.permalink}",
+                      to_path: File.join(Blog.first.base_url, 'tag', tag.name))
       cat.articles.each do |article|
         article.tags << tag
         article.save
@@ -29,6 +29,5 @@ class DropsCategoriesForTags < ActiveRecord::Migration[4.2]
     drop_table :categories
   end
 
-  def down
-  end
+  def down; end
 end

data/db/migrate/20150807134129_simplify_redirect_relations.rb

@@ -6,9 +6,7 @@ class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
     add_column :redirects, :content_id, :integer
     Redirect.find_each do |redirect|
       redirections = Redirection.where(redirect_id: redirect.id)
-      if redirections.count > 1
-        raise "Expected zero or one redirections, found #{redirections.count}"
-      end
+      raise "Expected zero or one redirections, found #{redirections.count}" if redirections.count > 1
       redirection = redirections.first
       next unless redirection
       redirect.content_id = redirection.content_id

data/db/migrate/20150808052637_add_blog_ids.rb

@@ -23,7 +23,11 @@ class AddBlogIds < ActiveRecord::Migration[4.2]
         remove_index(:contents, name: index.name) if index.name =~ /blog_id/
       end
     else
-      remove_index :contents, :blog_id rescue nil
+      begin
+        remove_index :contents, :blog_id
+      rescue
+        nil
+      end
     end
     remove_column :contents, :blog_id
     remove_column :sidebars, :blog_id

data/db/seeds.rb

@@ -32,6 +32,4 @@ TextFilter.
   create_with(description: 'Textile', markup: 'textile', filters: [], params: {}).
   find_or_create_by!(name: 'textile')
 
-unless File.directory?("#{::Rails.root.to_s}/public/files")
-  Dir.mkdir("#{::Rails.root.to_s}/public/files")
-end
+Dir.mkdir("#{::Rails.root}/public/files") unless File.directory?("#{::Rails.root}/public/files")

data/lib/format.rb

@@ -1,17 +1,7 @@
 module Format
-  EMAIL = /^[_a-z0-9\+\.\-]+\@[_a-z0-9\-]+\.[_a-z0-9\.\-]+$/i
-  PASSWORD = /^[\_a-zA-Z0-9\.\-]+$/
-
-  # matches everything to the last \ or / in a string.
-  # can chop of path of a filename like this : '/tobi/home/tobi.jpg'.sub(/^.*[\\\/]/,'') => tobi.jpg
-  FILENAME = /^.*[\\\/]/
-
-  # good for replacing all special chars with something else, like an underscore
-  FILENORMAL = /[^a-zA-Z0-9.]/
-
   # Laxly matches an IP Address , would also pass numbers > 255 though
   IP_ADDRESS = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
 
   # Laxly matches an HTTP(S) URI
-  HTTP_URI = /^https?:\/\/\S+$/
+  HTTP_URI = %r{^https?:\/\/\S+$}
 end

data/lib/publify_core/version.rb

@@ -1,3 +1,3 @@
 module PublifyCore
-  VERSION = '9.0.1'
+  VERSION = '9.1.0'.freeze
 end

data/lib/spam_protection.rb

@@ -37,7 +37,8 @@ class SpamProtection
   end
 
   def scan_text(string)
-    uri_list = string.scan(/(http:\/\/[^\s"]+)/m).flatten
+    # FIXME: Unify HTTP URI matchers
+    uri_list = string.scan(%r{(http://[^\s"]+)}m).flatten
 
     check_uri_count(uri_list)
     scan_uris(uri_list)
@@ -48,9 +49,7 @@ class SpamProtection
   def check_uri_count(uris)
     limit = this_blog.sp_url_limit
     return if limit.to_i.zero?
-    if uris.size > limit
-      throw :hit, "Hard URL Limit hit: #{uris.size} > #{limit}"
-    end
+    throw :hit, "Hard URL Limit hit: #{uris.size} > #{limit}" if uris.size > limit
   end
 
   def scan_uris(uris = [])

data/lib/text_filter_plugin.rb

@@ -81,8 +81,7 @@ class TextFilterPlugin
     (@sanitizer ||= Rails::Html::WhiteListSanitizer.new).sanitize(*args)
   end
 
-  def self.default_helper_module!
-  end
+  def self.default_helper_module!; end
 
   # Look up a config paramater, falling back to the default as needed.
   def self.config_value(params, name)
@@ -120,8 +119,8 @@ class TextFilterPlugin::Macro < TextFilterPlugin
   end
 
   def self.filtertext(text)
-    regex1 = /<publify:#{short_name}(?:[ \t][^>]*)?\/>/
-    regex2 = /<publify:#{short_name}([ \t][^>]*)?>(.*?)<\/publify:#{short_name}>/m
+    regex1 = %r{<publify:#{short_name}(?:[ \t][^>]*)?/>}
+    regex2 = %r{<publify:#{short_name}([ \t][^>]*)?>(.*?)</publify:#{short_name}>}m
 
     new_text = text.gsub(regex1) do |match|
       macrofilter(attributes_parse(match))

data/lib/theme.rb

@@ -8,9 +8,7 @@ class Theme
 
   def layout(action = :default)
     if action.to_s == 'view_page'
-      if File.exist? "#{view_path}/layouts/pages.html.erb"
-        return 'layouts/pages'
-      end
+      return 'layouts/pages' if File.exist? "#{view_path}/layouts/pages.html.erb"
     end
     'layouts/default'
   end

data/lib/transforms.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # FIXME: Replace with helpers and/or methods provided by Rails
 class String
   ACCENTS = { %w(á à â ä ã Ã Ä Â À) => 'a',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publify_core
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,36 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
@@ -117,42 +89,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.3
 - !ruby/object:Gem::Dependency
   name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
@@ -187,14 +159,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -229,14 +201,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +237,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.1
   type: :runtime
@@ -291,36 +294,39 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.1
 - !ruby/object:Gem::Dependency
-  name: rubypants
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 4.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 4.3.2
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: rubypants
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -341,14 +347,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -364,131 +370,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: i18n-tasks
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 3.0.1
 description: Core engine for the Publify blogging system, formerly known as Typo.
 email:
 - matijs@matijs.net
@@ -760,6 +766,7 @@ files:
 - app/views/shared/_atom_item_comment.atom.builder
 - app/views/shared/_atom_item_trackback.atom.builder
 - app/views/shared/_flash.erb
+- app/views/shared/_google_analytics.html.erb
 - app/views/shared/_page_header.html.erb
 - app/views/shared/_rss_item_article.rss.builder
 - app/views/shared/_rss_item_comment.rss.builder
@@ -882,7 +889,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Core engine for the Publify blogging system.