publify_core 9.0.0.pre6 → 9.0.0

data/db/migrate/20150207131657_add_missing_indexes.rb

@@ -1,4 +1,4 @@
-class AddMissingIndexes < ActiveRecord::Migration
+class AddMissingIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :feedback, [:id, :type]
     add_index :feedback, :user_id

data/db/migrate/20150807134129_simplify_redirect_relations.rb

@@ -1,4 +1,4 @@
-class SimplifyRedirectRelations < ActiveRecord::Migration
+class SimplifyRedirectRelations < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
   class Redirection < ActiveRecord::Base; end
 

data/db/migrate/20150808052637_add_blog_ids.rb

@@ -1,4 +1,4 @@
-class AddBlogIds < ActiveRecord::Migration
+class AddBlogIds < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
   class Content < ActiveRecord::Base; end
   class Sidebar < ActiveRecord::Base; end
@@ -14,15 +14,13 @@ class AddBlogIds < ActiveRecord::Migration
       Sidebar.update_all("blog_id = #{default_blog_id}")
     end
 
-    change_column :sidebars, :blog_id, :integer, :null => false
+    change_column :sidebars, :blog_id, :integer, null: false
   end
 
   def down
     if adapter_name == 'PostgreSQL'
       indexes(:contents).each do |index|
-        if index.name =~ /blog_id/
-          remove_index(:contents, :name => index.name)
-        end
+        remove_index(:contents, name: index.name) if index.name =~ /blog_id/
       end
     else
       remove_index :contents, :blog_id rescue nil

data/db/migrate/20150808191127_add_blog_id_to_redirects.rb

@@ -1,4 +1,4 @@
-class AddBlogIdToRedirects < ActiveRecord::Migration
+class AddBlogIdToRedirects < ActiveRecord::Migration[4.2]
   class Redirect < ActiveRecord::Base; end
 
   def up

data/db/migrate/20150810094754_add_blog_id_to_tags.rb

@@ -1,4 +1,4 @@
-class AddBlogIdToTags < ActiveRecord::Migration
+class AddBlogIdToTags < ActiveRecord::Migration[4.2]
   class Tag < ActiveRecord::Base; end
 
   def up

data/db/migrate/20160108111120_add_devise_to_users.rb

@@ -1,9 +1,9 @@
-class AddDeviseToUsers < ActiveRecord::Migration
+class AddDeviseToUsers < ActiveRecord::Migration[4.2]
   def self.up
     ## Database authenticatable
-    change_column :users, :email, :string, null: false, default: ""
+    change_column :users, :email, :string, null: false, default: ''
     rename_column :users, :password, :encrypted_password
-    change_column :users, :encrypted_password, :string, null: false, default: ""
+    change_column :users, :encrypted_password, :string, null: false, default: ''
 
     change_table(:users) do |t|
       ## Recoverable

data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb

@@ -1,4 +1,4 @@
-class MoveLastConnectionToLastSignInAt < ActiveRecord::Migration
+class MoveLastConnectionToLastSignInAt < ActiveRecord::Migration[4.2]
   class User < ActiveRecord::Base
   end
 

data/db/migrate/20160110094906_remove_profiles_rights.rb

@@ -1,4 +1,4 @@
-class RemoveProfilesRights < ActiveRecord::Migration
+class RemoveProfilesRights < ActiveRecord::Migration[4.2]
   def up
     drop_table :profiles_rights
   end

data/db/migrate/20160605103918_replace_profile_id_with_string.rb

@@ -1,9 +1,7 @@
-class ReplaceProfileIdWithString < ActiveRecord::Migration
+class ReplaceProfileIdWithString < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
-
   end
   class User < ActiveRecord::Base
-
   end
 
   def up

data/db/migrate/20160605154632_remove_profiles.rb

@@ -1,4 +1,4 @@
-class RemoveProfiles < ActiveRecord::Migration
+class RemoveProfiles < ActiveRecord::Migration[4.2]
   class Profile < ActiveRecord::Base
     serialize :modules
   end
@@ -19,6 +19,6 @@ class RemoveProfiles < ActiveRecord::Migration
     Profile.create!(label: 'publisher', nicename: 'Blog publisher',
                     modules: [:dashboard, :articles, :notes, :pages, :feedback, :media, :profile])
     Profile.create!(label: 'contributor', nicename: 'Contributor',
-                    modules: [:dashboard, :profile ])
+                    modules: [:dashboard, :profile])
   end
 end

data/db/migrate/20160701061851_demand_blog_id_on_contents.rb

@@ -1,4 +1,4 @@
-class DemandBlogIdOnContents < ActiveRecord::Migration
+class DemandBlogIdOnContents < ActiveRecord::Migration[4.2]
   def up
     change_column :contents, :blog_id, :integer, null: false
   end

data/db/migrate/20160701062604_add_blog_id_to_resources.rb

@@ -1,4 +1,4 @@
-class AddBlogIdToResources < ActiveRecord::Migration
+class AddBlogIdToResources < ActiveRecord::Migration[4.2]
   class Blog < ActiveRecord::Base; end
   class Content < ActiveRecord::Base; end
   class Resource < ActiveRecord::Base; end

data/db/migrate/20170528093024_move_resources_to_content.rb

@@ -0,0 +1,5 @@
+class MoveResourcesToContent < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :resources, :article_id, :content_id
+  end
+end

data/db/migrate/20170528094923_move_tags_to_content.rb

@@ -0,0 +1,6 @@
+class MoveTagsToContent < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :articles_tags, :article_id, :content_id
+    rename_table :articles_tags, :contents_tags
+  end
+end

data/db/migrate/20170528201606_remove_separate_published_flag.rb

@@ -0,0 +1,5 @@
+class RemoveSeparatePublishedFlag < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :contents, :published, :boolean, default: false
+  end
+end

data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb

@@ -0,0 +1,6 @@
+class RemoveExtraStateColumnsFromFeedback < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :feedback, :published, :boolean, default: false
+    remove_column :feedback, :status_confirmed, :boolean
+  end
+end

data/db/migrate/20170702105201_remove_published_at_from_feedback.rb

@@ -0,0 +1,5 @@
+class RemovePublishedAtFromFeedback < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :feedback, :published_at, :datetime
+  end
+end

data/db/seeds.rb

@@ -20,7 +20,7 @@ TextFilter.
   create_with(description: 'None', markup: 'none', filters: [], params: {}).
   find_or_create_by!(name: 'none')
 TextFilter.
-  create_with(description: 'Markdown', markup: "markdown", filters: [], params: {}).
+  create_with(description: 'Markdown', markup: 'markdown', filters: [], params: {}).
   find_or_create_by!(name: 'markdown')
 TextFilter.
   create_with(description: 'SmartyPants', markup: 'none', filters: [:smartypants], params: {}).

data/lib/publify_core.rb

@@ -26,7 +26,6 @@ require 'publify_textfilter_twitterfilter'
 require 'publify_time'
 require 'sidebar_registry'
 require 'spam_protection'
-require 'stateful'
 require 'text_filter_plugin'
 require 'theme'
 require 'transforms'

data/lib/publify_core/version.rb

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

data/lib/publify_guid.rb

@@ -2,7 +2,7 @@ require 'uuidtools'
 
 module PublifyGuid
   def create_guid
-    return true unless guid.blank?
+    return true if guid.present?
 
     self.guid = UUIDTools::UUID.random_create.to_s
   end

data/lib/publify_time.rb

@@ -7,8 +7,8 @@ class PublifyTime
     return nil if year.zero?
     from = Time.zone.local(year, month, day)
     to = from.end_of_year
-    to = from.end_of_month unless month.blank?
-    to = from.end_of_day unless day.blank?
+    to = from.end_of_month if month.present?
+    to = from.end_of_day if day.present?
     from..to
   end
 

data/lib/sidebar_field.rb

@@ -21,12 +21,11 @@ class SidebarField
   end
 
   def input_html(sidebar)
-    text_field_tag(input_name(sidebar), sidebar.config[key], class: 'form-control')
+    text_field_tag(input_name(sidebar), current_value(sidebar), class: 'form-control')
   end
 
   def line_html(sidebar)
-    html = label_html(sidebar)
-    html << content_tag(:div, input_html(sidebar), class: 'form-group')
+    content_tag(:div, label_html(sidebar) + input_html(sidebar), class: 'form-group')
   end
 
   def input_name(sidebar)
@@ -37,10 +36,14 @@ class SidebarField
     value
   end
 
+  def current_value(sidebar)
+    canonicalize(sidebar.config[key])
+  end
+
   class SelectField < self
     def input_html(sidebar)
       select_tag(input_name(sidebar),
-                 options_for_select(options[:choices], sidebar.config[key]),
+                 options_for_select(options[:choices], current_value(sidebar)),
                  options)
     end
   end
@@ -48,18 +51,21 @@ class SidebarField
   class TextAreaField < self
     def input_html(sidebar)
       html_options = { 'rows' => '10', 'class' => 'form-control' }.update(options.stringify_keys)
-      text_area_tag(input_name(sidebar), sidebar.config[key], html_options)
+      text_area_tag(input_name(sidebar), current_value(sidebar), html_options)
     end
   end
 
   class RadioField < self
     def input_html(sidebar)
-      options[:choices].map do |choice|
+      choices = options[:choices].map do |choice|
         value = value_for(choice)
-        radio_button_tag(input_name(sidebar), value,
-                         value == sidebar.config[key], options) +
-          content_tag('label', label_for(choice))
-      end.join('<br />')
+        radio_button = radio_button_tag(input_name(sidebar),
+                                        value,
+                                        value == current_value(sidebar),
+                                        options)
+        content_tag('div', content_tag('label', radio_button + label_for(choice)), class: 'radio')
+      end
+      safe_join(choices)
     end
 
     def label_for(choice)
@@ -73,9 +79,10 @@ class SidebarField
 
   class CheckBoxField < self
     def line_html(sidebar)
-      hidden_field_tag(input_name(sidebar), 0) +
+      content = hidden_field_tag(input_name(sidebar), 0) +
         content_tag('label',
-                    safe_join([check_box_tag(input_name(sidebar), 1, sidebar.config[key], options), label], ' '))
+                    check_box_tag(input_name(sidebar), 1, current_value(sidebar), options) + label)
+      content_tag('div', content, class: 'checkbox')
     end
 
     def canonicalize(value)

data/lib/transforms.rb

@@ -1,4 +1,5 @@
 # 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.0.pre6
+  version: 9.0.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 4.3.2
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: akismet
   requirement: !ruby/object:Gem::Requirement
@@ -89,42 +103,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: devise-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -173,28 +187,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -215,14 +229,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -271,14 +285,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +307,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.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: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -313,14 +341,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -355,14 +383,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -392,47 +420,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.8.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: i18n-tasks
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 description: Core engine for the Publify blogging system, formerly known as Typo.
 email:
 - matijs@matijs.net
@@ -440,16 +496,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - MIT-LICENSE
-- README.rdoc
-- Rakefile
+- README.md
 - app/assets/fonts/open-sans-bold.woff
 - app/assets/fonts/open-sans.woff
 - app/assets/images/admin/loading.gif
@@ -493,19 +542,16 @@ files:
 - app/assets/stylesheets/lightbox.css
 - app/assets/stylesheets/publify.css.scss
 - app/assets/stylesheets/publify_admin.css.scss
-- app/assets/stylesheets/publify_core/.keep
 - app/assets/stylesheets/rss.css
 - app/assets/stylesheets/sidebar_admin.css.scss
 - app/assets/stylesheets/tagmanager.css
 - app/assets/stylesheets/user-styles.css
 - app/assets/stylesheets/widearea.css
-- app/controllers/.keep
 - app/controllers/accounts_controller.rb
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/content_controller.rb
 - app/controllers/admin/dashboard_controller.rb
 - app/controllers/admin/feedback_controller.rb
-- app/controllers/admin/migrations_controller.rb
 - app/controllers/admin/notes_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/admin/post_types_controller.rb
@@ -523,7 +569,6 @@ files:
 - app/controllers/authors_controller.rb
 - app/controllers/base_controller.rb
 - app/controllers/comments_controller.rb
-- app/controllers/concerns/.keep
 - app/controllers/content_controller.rb
 - app/controllers/feedback_controller.rb
 - app/controllers/notes_controller.rb
@@ -532,9 +577,7 @@ files:
 - app/controllers/text_controller.rb
 - app/controllers/textfilter_controller.rb
 - app/controllers/theme_controller.rb
-- app/controllers/trackbacks_controller.rb
 - app/controllers/xml_controller.rb
-- app/helpers/.keep
 - app/helpers/admin/base_helper.rb
 - app/helpers/admin/feedback_helper.rb
 - app/helpers/articles_helper.rb
@@ -542,22 +585,18 @@ files:
 - app/helpers/base_helper.rb
 - app/helpers/blog_helper.rb
 - app/helpers/xml_helper.rb
-- app/mailers/.keep
+- app/jobs/application_job.rb
 - app/mailers/notification_mailer.rb
-- app/models/.keep
 - app/models/ability.rb
 - app/models/archives_sidebar.rb
 - app/models/article.rb
 - app/models/article/factory.rb
-- app/models/article/states.rb
 - app/models/blog.rb
 - app/models/comment.rb
-- app/models/concerns/.keep
 - app/models/config_manager.rb
 - app/models/content.rb
 - app/models/content_base.rb
 - app/models/feedback.rb
-- app/models/feedback/states.rb
 - app/models/meta_sidebar.rb
 - app/models/note.rb
 - app/models/page.rb
@@ -576,10 +615,8 @@ files:
 - app/models/trackback.rb
 - app/models/trigger.rb
 - app/models/user.rb
-- app/services/migrator.rb
 - app/services/title_builder.rb
 - app/uploaders/resource_uploader.rb
-- app/views/.keep
 - app/views/accounts/confirm.html.erb
 - app/views/admin/content/_article_list.html.erb
 - app/views/admin/content/_form.html.erb
@@ -654,6 +691,7 @@ files:
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/new.html.erb
 - app/views/archives_sidebar/_content.html.erb
+- app/views/articles/_archives_article.html.erb
 - app/views/articles/_article.html.erb
 - app/views/articles/_article_collection.html.erb
 - app/views/articles/_article_content.html.erb
@@ -686,9 +724,6 @@ files:
 - app/views/authors/show_atom_feed.atom.builder
 - app/views/authors/show_rss_feed.rss.builder
 - app/views/comments/_comment.html.erb
-- app/views/comments/index.html.erb
-- app/views/comments/index_atom_feed.atom.builder
-- app/views/comments/index_rss_feed.rss.builder
 - app/views/comments/preview.html.erb
 - app/views/comments/preview.js.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
@@ -698,6 +733,8 @@ files:
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.html.erb
 - app/views/errors/404.html.erb
+- app/views/feedback/index.atom.builder
+- app/views/feedback/index.rss.builder
 - app/views/layouts/accounts.html.erb
 - app/views/layouts/administration.html.erb
 - app/views/layouts/default.html.erb
@@ -736,15 +773,11 @@ files:
 - app/views/tags/index.html.erb
 - app/views/tags/show.html.erb
 - app/views/theme/static_view_test.html.erb
-- app/views/trackbacks/index_atom_feed.atom.builder
-- app/views/trackbacks/index_rss_feed.rss.builder
-- app/views/trackbacks/trackback.xml.builder
 - app/views/xml/_googlesitemap_item_article.googlesitemap.builder
 - app/views/xml/_googlesitemap_item_category.googlesitemap.builder
 - app/views/xml/_googlesitemap_item_page.googlesitemap.builder
 - app/views/xml/_googlesitemap_item_tag.googlesitemap.builder
-- app/views/xml/feed.googlesitemap.builder
-- app/views/xml/rsd.rsd.builder
+- app/views/xml/sitemap.googlesitemap.builder
 - config/i18n-tasks.yml
 - config/initializers/devise.rb
 - config/initializers/mime_types.rb
@@ -798,6 +831,11 @@ files:
 - db/migrate/20160605154632_remove_profiles.rb
 - db/migrate/20160701061851_demand_blog_id_on_contents.rb
 - db/migrate/20160701062604_add_blog_id_to_resources.rb
+- db/migrate/20170528093024_move_resources_to_content.rb
+- db/migrate/20170528094923_move_tags_to_content.rb
+- db/migrate/20170528201606_remove_separate_published_flag.rb
+- db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb
+- db/migrate/20170702105201_remove_published_at_from_feedback.rb
 - db/seeds.rb
 - lib/email_notify.rb
 - lib/format.rb
@@ -816,12 +854,10 @@ files:
 - lib/sidebar_field.rb
 - lib/sidebar_registry.rb
 - lib/spam_protection.rb
-- lib/stateful.rb
 - lib/tasks/publify_core_tasks.rake
 - lib/text_filter_plugin.rb
 - lib/theme.rb
 - lib/transforms.rb
-- publify_core.gemspec
 - themes/plain/about.markdown
 - themes/plain/preview.png
 - themes/plain/stylesheets/theme.css
@@ -837,15 +873,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Core engine for the Publify blogging system.