refinerycms-blog 3.0.2 → 4.0.0

data/db/migrate/20110803223524_acts_as_taggable_on_migration.rb

@@ -1,4 +1,4 @@
-class ActsAsTaggableOnMigration < ActiveRecord::Migration
+class ActsAsTaggableOnMigration < ActiveRecord::Migration[4.2]
   def up
     create_table :tags do |t|
       t.string :name

data/db/migrate/20110803223526_add_cached_slugs.rb

@@ -1,4 +1,4 @@
-class AddCachedSlugs < ActiveRecord::Migration
+class AddCachedSlugs < ActiveRecord::Migration[4.2]
   def change
     add_column :refinery_blog_categories, :cached_slug, :string
     add_column :refinery_blog_posts, :cached_slug, :string

data/db/migrate/20110803223527_add_custom_url_field_to_blog_posts.rb

@@ -1,4 +1,4 @@
-class AddCustomUrlFieldToBlogPosts < ActiveRecord::Migration
+class AddCustomUrlFieldToBlogPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :refinery_blog_posts, :custom_url, :string
   end

data/db/migrate/20110803223528_add_custom_teaser_field_to_blog_posts.rb

@@ -1,4 +1,4 @@
-class AddCustomTeaserFieldToBlogPosts < ActiveRecord::Migration
+class AddCustomTeaserFieldToBlogPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :refinery_blog_posts, :custom_teaser, :text
   end

data/db/migrate/20110803223529_add_primary_key_to_categorizations.rb

@@ -1,4 +1,4 @@
-class AddPrimaryKeyToCategorizations < ActiveRecord::Migration
+class AddPrimaryKeyToCategorizations < ActiveRecord::Migration[4.2]
   def up
     unless Refinery::Blog::Categorization.column_names.include?("id")
       add_column Refinery::Blog::Categorization.table_name, :id, :primary_key

data/db/migrate/20120103055909_add_source_url_to_blog_posts.rb

@@ -1,7 +1,7 @@
-class AddSourceUrlToBlogPosts < ActiveRecord::Migration
+class AddSourceUrlToBlogPosts < ActiveRecord::Migration[4.2]
   def change
     add_column Refinery::Blog::Post.table_name, :source_url, :string
     add_column Refinery::Blog::Post.table_name, :source_url_title, :string
-    
+
   end
 end

data/db/migrate/20120223022021_add_access_count_to_posts.rb

@@ -1,8 +1,8 @@
-class AddAccessCountToPosts < ActiveRecord::Migration
+class AddAccessCountToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column Refinery::Blog::Post.table_name, :access_count, :integer, :default => 0
-    
+
     add_index Refinery::Blog::Post.table_name, :access_count
-    
+
   end
-end
+end

data/db/migrate/20120227022021_add_slug_to_posts_and_categories.rb

@@ -1,4 +1,4 @@
-class AddSlugToPostsAndCategories < ActiveRecord::Migration
+class AddSlugToPostsAndCategories < ActiveRecord::Migration[4.2]
   def change
     add_column Refinery::Blog::Post.table_name, :slug, :string
     add_index Refinery::Blog::Post.table_name, :slug
@@ -6,4 +6,4 @@ class AddSlugToPostsAndCategories < ActiveRecord::Migration
     add_column Refinery::Blog::Category.table_name, :slug, :string
     add_index Refinery::Blog::Category.table_name, :slug
   end
-end
+end

data/db/migrate/20120530102901_create_blog_translations.rb

@@ -1,4 +1,4 @@
-class CreateBlogTranslations < ActiveRecord::Migration
+class CreateBlogTranslations < ActiveRecord::Migration[4.2]
   def up
     Refinery::Blog::Post.create_translation_table!({
       :body => :text,

data/db/migrate/20120531113632_delete_cached_slugs.rb

@@ -1,4 +1,4 @@
-class DeleteCachedSlugs < ActiveRecord::Migration
+class DeleteCachedSlugs < ActiveRecord::Migration[4.2]
   def change
     remove_column Refinery::Blog::Category.table_name, :cached_slug, :string
     remove_column Refinery::Blog::Post.table_name, :cached_slug, :string

data/db/migrate/20120601151114_create_category_translations.rb

@@ -1,4 +1,4 @@
-class CreateCategoryTranslations < ActiveRecord::Migration
+class CreateCategoryTranslations < ActiveRecord::Migration[4.2]
   def up
     Refinery::Blog::Category.create_translation_table!({
       :title => :string,

data/db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 2)
-class AddMissingUniqueIndices < ActiveRecord::Migration
+class AddMissingUniqueIndices < ActiveRecord::Migration[4.2]
   def self.up
     add_index :tags, :name, unique: true
 

data/db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 

data/db/migrate/20160602042848_add_username_to_blog_posts.rb

@@ -0,0 +1,5 @@
+class AddUsernameToBlogPosts < ActiveRecord::Migration[4.2]
+  def change
+    add_column :refinery_blog_posts, :username, :string
+  end
+end

data/db/migrate/20161223024527_create_multi_user_model.rb

@@ -0,0 +1,13 @@
+class CreateMultiUserModel < ActiveRecord::Migration[4.2]
+  def up
+    return unless Rails.env.test?
+    create_table :refinery_blog_test_users do |t|
+      t.string :username
+    end
+  end
+
+  def down
+    return unless Rails.env.test?
+    drop_table :refinery_blog_test_users
+  end
+end

data/db/migrate/20180420132008_remove_translated_columns_to_refinery_blog_categories.rb

@@ -0,0 +1,5 @@
+class RemoveTranslatedColumnsToRefineryBlogCategories < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :refinery_blog_categories, :title
+  end
+end

data/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb

@@ -10,7 +10,8 @@ Refinery::Blog.configure do |config|
   # config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %>
 
   # config.page_url = <%= Refinery::Blog.page_url.inspect %>
-  
+
   # If you're grafting onto an existing app, change this to your User class
+  # (eg: Refinery::Blog.user_class = "Refinery::Authentication::Devise::User" )
   # Refinery::Blog.user_class = <%= Refinery::Blog.user_class.to_s.inspect %>
 end

data/lib/refinery/blog.rb

@@ -3,6 +3,8 @@ require 'refinerycms-settings'
 require 'rails_autolink'
 require 'friendly_id'
 require 'jquery-ui-rails'
+require 'globalize'
+require 'seo_meta'
 
 module Refinery
   autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'

data/lib/refinery/blog/configuration.rb

@@ -11,7 +11,7 @@ module Refinery
     self.post_teaser_length = 250
     self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     self.page_url = "/blog"
-  
+
     # Refinery::User isn't available when this line gets hit, so we use static methods instead
     @@user_class_name = nil
     class << self
@@ -26,9 +26,9 @@ module Refinery
       end
 
       def user_class
-        class_name = @@user_class_name || "Refinery::Authentication::Devise::User"
+        class_name = @@user_class_name
         begin
-          Object.const_get(class_name)
+          Object.const_get(class_name) if class_name.present?
         rescue NameError
           class_name.constantize
         end

data/lib/refinery/blog/engine.rb

@@ -14,6 +14,7 @@ module Refinery
         end
 
         Rails.application.config.assets.precompile += %w(
+          refinery/blog/backend.js
           refinery/blog/backend.css
           refinery/blog/frontend.css
           refinery/blog/**/*.css

data/readme.md

@@ -2,7 +2,7 @@
 
 Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
 
-This version of `refinerycms-blog` supports Refinery 3.x and Rails 4.1.x.  To use Rails 3.x / Refinery 2.1.x use the [refinerycms-blog "Refinery CMS 2-1 stable branch"](http://github.com/refinery/refinerycms-blog/tree/2-1-stable).
+This version of `refinerycms-blog` supports Refinery 4.x and Rails 5.1.x (Ruby 2.2+). To use Rails 4.x / Refinery 3.1.x / Ruby 2.1 or older use the [refinerycms-blog "Refinery CMS 3-0 stable branch"](http://github.com/refinery/refinerycms-blog/tree/3-0-stable).
 
 Options:
 
@@ -11,7 +11,7 @@ Options:
 
 ## Requirements
 
-Refinery CMS version 3.0.0 or above.
+Refinery CMS version 4.0.0 or above (Ruby 2.2 or above).
 
 ## Install
 

data/refinerycms-blog.gemspec

@@ -1,8 +1,8 @@
-# Encoding: UTF-8
+# Encoding: utf-8
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-blog}
-  s.version           = %q{3.0.2}
+  s.version           = %q{4.0.0}
   s.description       = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with Refinery CMS.}
   s.summary           = %q{Ruby on Rails blogging engine for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}
@@ -15,13 +15,20 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',      '~> 3.0.0'
-  s.add_dependency    'refinerycms-settings',  '~> 3.0.0'
+  s.add_dependency    'refinerycms-core',      '~> 4.0'
+  s.add_dependency    'refinerycms-settings',  '~> 4.0'
   s.add_dependency    'filters_spam',          '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',              '~> 2.0.0.rc.1'
+  s.add_dependency    'seo_meta',              ['>=3.0.0', '~>3.0']
   s.add_dependency    'rails_autolink',        '~> 1.1.3'
-  s.add_dependency    'friendly_id',           ['>= 5.1.0', '< 6.0']
-  s.add_dependency    'globalize',             ['>= 4.0.0', '< 5.2']
-  s.add_dependency    'jquery-ui-rails',       '~> 5.0.0'
+  s.add_dependency    'friendly_id',           ['< 5.3', '>= 5.1.0']
+  s.add_dependency    'globalize',             '~> 5.1.0'
+  s.add_dependency    'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1'
+  s.add_dependency    'responders',            '~> 2.0'
+
+
+  s.cert_chain = [File.expand_path('certs/parndt.pem', __dir__)]
+  if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  end
 end

data/spec/controllers/refinery/blog/admin/comments_controller_spec.rb

@@ -4,14 +4,10 @@ module Refinery
   module Blog
     module Admin
       describe CommentsController, type: :controller do
-        refinery_login_with_devise [:refinery, :superuser]
-        
-        before do
-          logged_in_user.plugins = logged_in_user.plugins | %w(refinerycms_blog)
-        end
+        refinery_login
 
         describe "#index" do
-          let!(:comment) { FactoryGirl.create(:blog_comment) }
+          let!(:comment) { FactoryBot.create(:blog_comment) }
 
           it "succeeds" do
             get :index
@@ -26,7 +22,7 @@ module Refinery
         end
 
         describe "#approved" do
-          let!(:comment) { FactoryGirl.create(:approved_comment) }
+          let!(:comment) { FactoryBot.create(:approved_comment) }
 
           it "succeeds" do
             get :approved
@@ -41,21 +37,21 @@ module Refinery
         end
 
         describe "#approve" do
-          let!(:comment) { FactoryGirl.create(:blog_comment) }
+          let!(:comment) { FactoryBot.create(:blog_comment) }
 
           it "redirects on success" do
-            post :approve, :id => comment.id
+            post :approve, params: { id: comment.id }
             expect(response).to be_redirect
           end
 
           it "approves the comment" do
-            post :approve, :id => comment.id
+            post :approve, params: { :id => comment.id }
             expect(Refinery::Blog::Comment.approved.count).to eq(1)
           end
         end
 
         describe "#rejected" do
-          let!(:comment) { FactoryGirl.create(:rejected_comment) }
+          let!(:comment) { FactoryBot.create(:rejected_comment) }
 
           it "succeeds" do
             get :rejected
@@ -70,15 +66,15 @@ module Refinery
         end
 
         describe "#reject" do
-          let!(:comment) { FactoryGirl.create(:blog_comment) }
+          let!(:comment) { FactoryBot.create(:blog_comment) }
 
           it "redirects on success" do
-            post :reject, :id => comment.id
+            post :reject, params: { :id => comment.id }
             expect(response).to be_redirect
           end
 
           it "rejects the comment" do
-            post :reject, :id => comment.id
+            post :reject, params:{ :id => comment.id }
             expect(Refinery::Blog::Comment.rejected.count).to eq(1)
           end
         end

data/spec/controllers/refinery/blog/admin/posts_controller_spec.rb

@@ -4,10 +4,10 @@ module Refinery
   module Blog
     module Admin
       describe PostsController, type: :controller do
-        refinery_login_with_devise [:refinery, :superuser]
+        refinery_login
 
         describe "#delete_translation" do
-          let!(:blog_post) { FactoryGirl.create(:blog_post) }
+          let!(:blog_post) { FactoryBot.create(:blog_post) }
 
           before do
             blog_post.translations.create(:locale => :fr, :title => 'Un titre francais', :body => "La baguette, c'est bon. Mangez-en.")
@@ -15,17 +15,17 @@ module Refinery
           end
 
           it "destroys the translation" do
-            post :delete_translation, :id => blog_post.id, :locale_to_delete => :fr
+            post :delete_translation, params: { :id => blog_post.id, :locale_to_delete => :fr }
             expect(blog_post.translations.exists?(:locale => :fr)).to be_falsey
           end
 
           it "does not destroy other translations" do
-            post :delete_translation, :id => blog_post.id, :locale_to_delete => :fr
+            post :delete_translation, params: { :id => blog_post.id, :locale_to_delete => :fr }
             expect(blog_post.translations.exists?(:locale => :es)).to be_truthy
           end
 
           it "redirects on success" do
-            post :delete_translation, :id => blog_post.id, :locale_to_delete => :fr
+            post :delete_translation, params: { :id => blog_post.id, :locale_to_delete => :fr }
             expect(response).to be_redirect
           end
         end

data/spec/controllers/refinery/blog/posts_controller_spec.rb

@@ -4,9 +4,9 @@ module Refinery
   module Blog
     describe PostsController, type: :controller do
       before do
-        FactoryGirl.create(:blog_post, :title => "blogpost_one")
-        FactoryGirl.create(:blog_post, :title => "blogpost_two")
-        FactoryGirl.create(:blog_post, :title => "blogpost_three")
+        FactoryBot.create(:blog_post, :title => "blogpost_one")
+        FactoryBot.create(:blog_post, :title => "blogpost_two")
+        FactoryBot.create(:blog_post, :title => "blogpost_three")
       end
 
       it "should not limit rss feed" do
@@ -15,7 +15,7 @@ module Refinery
       end
 
       it "should limit rss feed" do
-        get :index, :format => :rss, :max_results => 2
+        get :index, :format => :rss, params: { :max_results => 2 }
         expect(assigns[:posts].count).to eq(2)
       end
     end

data/spec/factories/blog_categories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :blog_category, :class => Refinery::Blog::Category do
     sequence(:title) { |n| "Shopping #{n}" }
   end

data/spec/factories/blog_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :blog_comment, :class => Refinery::Blog::Comment do
     name "Joe Commenter"
     sequence(:email) { |n| "person#{n}@example.com" }

data/spec/factories/blog_posts.rb

@@ -1,13 +1,17 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :blog_post, :class => Refinery::Blog::Post do
     sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" }
     body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
     draft false
     published_at Time.now
-    author { FactoryGirl.create(:authentication_devise_refinery_user) }
+    username "John Doe"
 
     factory :blog_post_draft do
       draft true
     end
+
+    factory :blog_post_authentication_devise_refinery_user_author do
+      author { FactoryBot.create(:blog_test_user) }
+    end
   end
 end

data/spec/factories/blog_test_users.rb

@@ -0,0 +1,6 @@
+require File.expand_path("../../support/refinery_blog_test_user", __FILE__)
+
+FactoryBot.define do
+  factory :blog_test_user, :class => Refinery::Blog::TestUser do
+  end
+end

data/spec/features/refinery/blog/admin/categories_spec.rb

@@ -5,7 +5,7 @@ module Refinery
   module Blog
     module Admin
       describe Category, type: :feature do
-        refinery_login_with_devise :authentication_devise_refinery_superuser
+        refinery_login
 
         let(:title) { "lol" }
 
@@ -25,7 +25,7 @@ module Refinery
         context "with translations" do
           before do
             allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
-            blog_page = Globalize.with_locale(:en) { FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog") }
+            blog_page = Globalize.with_locale(:en) { FactoryBot.create(:page, :link_url => "/blog", :title => "Blog") }
             Globalize.with_locale(:ru) do
               blog_page.title = 'блог'
               blog_page.save
@@ -84,7 +84,7 @@ module Refinery
             end
 
             it "suceeds" do
-              expect(page).to have_content("'#{@c.title}' was successfully added.")
+              expect(page).to have_content("'#{@c.title_translations['ru']}' was successfully added.")
               expect(Refinery::Blog::Category.count).to eq(1)
             end
 

data/spec/features/refinery/blog/admin/comments_spec.rb

@@ -4,7 +4,7 @@ module Refinery
   module Blog
     module Admin
       describe Comment, type: :feature do
-        refinery_login_with_devise :authentication_devise_refinery_superuser
+        refinery_login
 
         describe "#index" do
           context "when has no new unapproved comments" do
@@ -20,7 +20,7 @@ module Refinery
             end
           end
           context "when has new unapproved comments" do
-            let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
+            let!(:blog_comment) { FactoryBot.create(:blog_comment) }
             before { visit refinery.blog_admin_comments_path }
 
             it "should list comments" do
@@ -55,7 +55,7 @@ module Refinery
           end
           context "when has approved comments" do
             let!(:blog_comment) do
-              FactoryGirl.create(:blog_comment, :state => 'approved')
+              FactoryBot.create(:blog_comment, :state => 'approved')
             end
             before { visit refinery.approved_blog_admin_comments_path }
 
@@ -85,7 +85,7 @@ module Refinery
           end
           context "when has rejected comments" do
             let!(:blog_comment) do
-              FactoryGirl.create(:blog_comment, :state => 'rejected')
+              FactoryBot.create(:blog_comment, :state => 'rejected')
             end
             before { visit refinery.rejected_blog_admin_comments_path }
 
@@ -103,7 +103,7 @@ module Refinery
         end
 
         describe "#show" do
-          let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
+          let!(:blog_comment) { FactoryBot.create(:blog_comment) }
           before { visit refinery.blog_admin_comment_path(blog_comment) }
           it "should display the comment" do
             expect(page).to have_content(blog_comment.body)