publify_core 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f81670a189d8b1a57d349dc688c93340d586128
-  data.tar.gz: 5fd4da9990342b133e045b7a797564407dbf915d
+  metadata.gz: 1a1cf89cac6e217d23be79402f8ea4fab3ef6d88
+  data.tar.gz: 1c7a95fab11db0e9c95a10b21094f59d959b7d8b
 SHA512:
-  metadata.gz: a69c04c575796c90ac2df1c7d7de537c328f6633e93e94833896efb27c355239c8a5d211bd9b3fb4938c45d847cf38323fca36ed4a1b17a96ec082bb2b6415a2
-  data.tar.gz: 0f4331c8fdb2fdc2c1bc2f1b61ed7cc0918bf195a1afe1f794adbb1f8d40e18b5cc077ef4e19a534702ea66448b6bda267629c4ea8f7939b72005bca7ff0b84f
+  metadata.gz: f41c5ddd206410b9c6fbe1a9849a811e0fc074c9092924c1725e0a03f498807eb84e2c43b4f52d527497901d58bbda91b3293d5c492b6cd7077c2bc3aef18f82
+  data.tar.gz: a56f839f4b1cff29318ffcd76fe6c1f4e680474534bd54d9ae184e28b4c1fe7e24400f2ce2ec46010cd382dfeae22080a5ddb0324dca648fcca5a8b9fcba654d

data/CHANGELOG.md

@@ -1,70 +1,79 @@
 # Changelog
 
+## 9.0.1
+
+* Remove link_to_author setting: author email is no longer shown. Whoever
+  really wants to have it shown should create a new theme (mvz)
+* Update dependencies (mvz)
+* Make Devise use the correct layout (mvz)
+* Ensure email parameter is processed correctly on sign up (mvz)
+* Correctly serve js files from themes (cantin)
+
 ## 9.0.0
 
-* Replace page caching with fragment caching
-* Replace home-grown state machine with aasm
-* Remove automigration. Users should run db:migrate themselves
-* Let first-run users pick their own password instead of generating one
+* Replace page caching with fragment caching (mvz)
+* Replace home-grown state machine with aasm (mvz)
+* Remove automigration. Users should run db:migrate themselves (mvz)
+* Let first-run users pick their own password instead of generating one (mvz)
 
 * Dependencies
-  - Update dependencies
-  - Drop support for Ruby 2.1
+  - Update dependencies (mvz)
+  - Drop support for Ruby 2.1 (mvz)
 
 * Removing of old/outdated functionality
-  - Remove support for feedburner
-  - Drop old redirects
-  - Remove RSD end point
+  - Remove support for feedburner (mvz)
+  - Drop old redirects (mvz)
+  - Remove RSD end point (mvz)
 
 * Feedback
-  - Stop sending trackbacks and pingbacks
-  - Stop accepting trackbacks
+  - Stop sending trackbacks and pingbacks (mvz)
+  - Stop accepting trackbacks (mvz)
 
 * Improve Atom/RSS feeds
-  - Fix URLs used for resources
-  - Fix URL/alternate links to not just point to the site root
-  - Unify comment and trackback feeds into feedback feed
-  - Add caching for feeds
-  - Fix atom entry publication date
-  - Fix ordering of feedback feed by using created_at
+  - Fix URLs used for resources (mvz)
+  - Fix URL/alternate links to not just point to the site root (mvz)
+  - Unify comment and trackback feeds into feedback feed (mvz)
+  - Add caching for feeds (mvz)
+  - Fix atom entry publication date (mvz)
+  - Fix ordering of feedback feed by using created_at (mvz)
 
 * Bug fixes
-  - Fix user resource image display when using Fog
-  - Fix sending of welcome email
-  - Fix Tag page description
-  - Handle setting published_at to blank
-  - Handle preview of articles without publication date
-  - Include CSRF meta tag so remote forms work
-  - Fix sidebar field rendering in admin
-  - Fix formatting of settings forms in admin
+  - Fix user resource image display when using Fog (mvz)
+  - Fix sending of welcome email (mvz)
+  - Fix Tag page description (mvz)
+  - Handle setting published_at to blank (mvz)
+  - Handle preview of articles without publication date (mvz)
+  - Include CSRF meta tag so remote forms work (mvz)
+  - Fix sidebar field rendering in admin (mvz)
+  - Fix formatting of settings forms in admin (mvz)
 
 * Code improvements
-  - Performance improvements
-  - Improve tags controller
-  - Clean up archives and authors page code
-  - Unify content models more to improve performance when mixing models
+  - Performance improvements (mvz)
+  - Improve tags controller (mvz)
+  - Clean up archives and authors page code (mvz)
+  - Unify content models more to improve performance when mixing models (mvz)
 
 ## 9.0.0.pre6 / 2016-12-23
 
-* Remove now-broken caching of theme assets
-* Remove cache invalidation support code from content
+* Remove now-broken caching of theme assets (mvz)
+* Remove cache invalidation support code from content (mvz)
 
 ## 9.0.0.pre5 / 2016-12-17
 
-* Update dependencies
+* Update dependencies (mvz)
 * Remove activerecord-session_store. The main application should decide on the
-  store to use.
-* Remove unused translations
+  store to use (mvz)
+* Remove unused translations (mvz)
 
 ## 9.0.0.pre4
 
-* Ensure theme files are part of the gem.
+* Ensure theme files are part of the gem (mvz)
 
 ## 9.0.0.pre3
 
-* Update to Rails 5.0
+* Update to Rails 5.0 (mvz)
 * Remove page caching since the released version of actionpack-page_caching is
-  incompatible with Rails 5.
+  incompatible with Rails 5 (mvz)
 
 ## 9.0.0.pre2
 

data/app/controllers/base_controller.rb

@@ -2,15 +2,9 @@ require 'cancancan'
 
 class BaseController < ApplicationController
   before_action :fire_triggers, :load_lang, :set_paths
-  before_action :configure_permitted_parameters, if: :devise_controller?
 
   private
 
-  def configure_permitted_parameters
-    # TODO: Check if this is still needed
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:email])
-  end
-
   def login_required
     authenticate_user! && authorize!(params[:action], params[:controller])
   end

data/app/controllers/theme_controller.rb

@@ -1,10 +1,13 @@
 class ThemeController < ContentController
+  # Allow javascripts via Get request
+  skip_before_action :verify_authenticity_token, only: :javascripts
+
   def stylesheets
     render_theme_item(:stylesheets, params[:filename], 'text/css; charset=utf-8')
   end
 
-  def javascript
-    render_theme_item(:javascript, params[:filename], 'text/javascript; charset=utf-8')
+  def javascripts
+    render_theme_item(:javascripts, params[:filename], 'text/javascript; charset=utf-8')
   end
 
   def images

data/app/helpers/authors_helper.rb

@@ -22,18 +22,6 @@ module AuthorsHelper
   end
 
   def author_link(article)
-    return h(article.author) if just_author?(article.user)
-    return h(article.user.name) if just_name?(article.user)
-    content_tag(:a, href: "mailto:#{h article.user.email}") { h(article.user.name) }
-  end
-
-  private
-
-  def just_author?(author)
-    author.nil? || author.name.blank?
-  end
-
-  def just_name?(author)
-    author.present? && !this_blog.link_to_author
+    h(article.author_name)
   end
 end

data/app/helpers/base_helper.rb

@@ -31,6 +31,11 @@ module BaseHelper
     stylesheet_link_tag "/stylesheets/theme/#{name}.css" if File.exist? src
   end
 
+  def themeable_javascript_include_tag(name)
+    src = this_blog.current_theme.path + "/javascripts/#{name}.js"
+    javascript_include_tag "/javascripts/theme/#{name}.js" if File.exist? src
+  end
+
   def render_to_string(*args, &block)
     controller.send(:render_to_string, *args, &block)
   end

data/app/models/blog.rb

@@ -54,7 +54,6 @@ class Blog < ActiveRecord::Base
   setting :default_allow_pings, :boolean, false
   setting :default_allow_comments, :boolean, true
   setting :default_moderate_comments, :boolean, false
-  setting :link_to_author, :boolean, false
   setting :show_extended_on_rss, :boolean, true # deprecated but still needed for backward compatibility
   setting :hide_extended_on_rss, :boolean, false
   setting :theme, :string, 'plain'

data/app/models/content.rb

@@ -45,6 +45,14 @@ class Content < ActiveRecord::Base
     end
   end
 
+  def author_name
+    if user.present? && user.name.present?
+      user.name
+    else
+      author
+    end
+  end
+
   # Set the text filter for this object.
   # NOTE: Due to how Rails injects association methods, this cannot be put in ContentBase
   # TODO: Allowing assignment of a string here is not very clean.
@@ -109,16 +117,11 @@ class Content < ActiveRecord::Base
     self[:whiteboard] ||= {}
   end
 
-  def link_to_author?
-    user.email.present? && blog.link_to_author
-  end
-
   def get_rss_description
     return '' unless blog.rss_description
-    return '' unless respond_to?(:user) && user && user.name
 
     rss_desc = blog.rss_description_text
-    rss_desc.gsub!('%author%', user.name)
+    rss_desc.gsub!('%author%', author_name)
     rss_desc.gsub!('%blog_url%', blog.base_url)
     rss_desc.gsub!('%blog_name%', blog.blog_name)
     rss_desc.gsub!('%permalink_url%', permalink_url)

data/app/views/articles/feedback_rss_feed.rss.builder

@@ -2,8 +2,7 @@ xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
 xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
-        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
   xml.channel do
     xml.title feed_title
     xml.link @article.permalink_url

data/app/views/articles/index_rss_feed.rss.builder

@@ -2,8 +2,7 @@ xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
 xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
-        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url

data/app/views/authors/show_rss_feed.rss.builder

@@ -2,8 +2,7 @@ xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
 xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
-        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url

data/app/views/feedback/index.rss.builder

@@ -2,8 +2,7 @@ xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
 xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
-        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url

data/app/views/layouts/default.html.erb

@@ -3,6 +3,7 @@
   <head>
     <%= render 'shared/page_header' %>
     <%= themeable_stylesheet_link_tag :theme %>
+    <%= themeable_javascript_include_tag :theme %>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%=h page_title %></title>
   </head>

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

@@ -1,17 +1,6 @@
 feed.entry item, id: "urn:uuid:#{item.guid}", published: item.published_at, url: item.permalink_url do |entry|
   entry.author do
-    name = begin
-             item.user.name
-           rescue
-             item.author
-           end
-    email = begin
-              item.user.email
-            rescue
-              nil
-            end
-    entry.name name
-    entry.email email unless email.blank? || !this_blog.link_to_author
+    entry.name item.author_name
   end
 
   if item.is_a?(Note)

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

@@ -8,7 +8,7 @@ xm.item do
   xm.description content_html + item.get_rss_description
   xm.pubDate item.published_at.rfc822
   xm.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
-  xm.author "#{item.user.email} (#{item.user.name})" if item.link_to_author?
+  xm.dc :creator, item.author_name
 
   if item.is_a?(Article)
     xm.comments(item.permalink_url('comments'))

data/config/routes.rb

@@ -48,7 +48,7 @@ Rails.application.routes.draw do
   # ThemeController
   scope controller: 'theme', filename: /.*/ do
     get 'stylesheets/theme/:filename', action: 'stylesheets', format: false
-    get 'javascripts/theme/:filename', action: 'javascript', format: false
+    get 'javascripts/theme/:filename', action: 'javascripts', format: false
     get 'images/theme/:filename', action: 'images', format: false
     get 'fonts/theme/:filename', action: 'fonts', format: false
   end

data/lib/publify_core/engine.rb

@@ -5,6 +5,11 @@ module PublifyCore
       generators.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
 
+    config.to_prepare do
+      DeviseController.layout 'accounts'
+      DeviseController.before_action { devise_parameter_sanitizer.permit(:sign_up, keys: [:email]) }
+    end
+
     initializer 'publify_core.assets.precompile' do |app|
       app.config.assets.precompile += %w(
         publify.js

data/lib/publify_core/version.rb

@@ -1,3 +1,3 @@
 module PublifyCore
-  VERSION = '9.0.0'
+  VERSION = '9.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publify_core
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,14 +145,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
@@ -187,14 +187,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -859,6 +859,7 @@ files:
 - lib/theme.rb
 - lib/transforms.rb
 - themes/plain/about.markdown
+- themes/plain/javascripts/theme.js
 - themes/plain/preview.png
 - themes/plain/stylesheets/theme.css
 homepage: https://publify.co
@@ -881,7 +882,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Core engine for the Publify blogging system.