refinerycms-blog 2.0.4 → 4.0.0

data/refinerycms-blog.gemspec

@@ -1,30 +1,34 @@
-# Encoding: UTF-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'refinery/blog/version'
-
-version = Refinery::Blog::Version.to_s
+# Encoding: utf-8
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-blog}
-  s.version           = version
+  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}
   s.homepage          = %q{http://refinerycms.com/blog}
-  s.authors           = ['Resolve Digital', 'Neoteric Design']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Joe Sak']
   s.require_paths     = %w(lib)
+  s.license           = %q{MIT}
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.0.3'
-  s.add_dependency    'refinerycms-settings', '~> 2.0.1'
-  s.add_dependency    'filters_spam',         '~> 0.2'
+  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',             '~> 1.3.0'
-  s.add_dependency    'rails_autolink'
+  s.add_dependency    'seo_meta',              ['>=3.0.0', '~>3.0']
+  s.add_dependency    'rails_autolink',        '~> 1.1.3'
+  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'
+
 
-  # Development dependencies
-  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
-end
+  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/script/rails

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)

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

@@ -0,0 +1,84 @@
+require "spec_helper"
+
+module Refinery
+  module Blog
+    module Admin
+      describe CommentsController, type: :controller do
+        refinery_login
+
+        describe "#index" do
+          let!(:comment) { FactoryBot.create(:blog_comment) }
+
+          it "succeeds" do
+            get :index
+            expect(response).to be_success
+            expect(response).to render_template(:index)
+          end
+
+          it "assigns unmoderated comments" do
+            get :index
+            expect(assigns(:comments).first).to eq(comment)
+          end
+        end
+
+        describe "#approved" do
+          let!(:comment) { FactoryBot.create(:approved_comment) }
+
+          it "succeeds" do
+            get :approved
+            expect(response).to be_success
+            expect(response).to render_template(:index)
+          end
+
+          it "assigns approved comments" do
+            get :approved
+            expect(assigns(:comments).first).to eq(comment)
+          end
+        end
+
+        describe "#approve" do
+          let!(:comment) { FactoryBot.create(:blog_comment) }
+
+          it "redirects on success" do
+            post :approve, params: { id: comment.id }
+            expect(response).to be_redirect
+          end
+
+          it "approves the comment" do
+            post :approve, params: { :id => comment.id }
+            expect(Refinery::Blog::Comment.approved.count).to eq(1)
+          end
+        end
+
+        describe "#rejected" do
+          let!(:comment) { FactoryBot.create(:rejected_comment) }
+
+          it "succeeds" do
+            get :rejected
+            expect(response).to be_success
+            expect(response).to render_template(:index)
+          end
+
+          it "assigns rejected comments" do
+            get :rejected
+            expect(assigns(:comments).first).to eq(comment)
+          end
+        end
+
+        describe "#reject" do
+          let!(:comment) { FactoryBot.create(:blog_comment) }
+
+          it "redirects on success" do
+            post :reject, params: { :id => comment.id }
+            expect(response).to be_redirect
+          end
+
+          it "rejects the comment" do
+            post :reject, params:{ :id => comment.id }
+            expect(Refinery::Blog::Comment.rejected.count).to eq(1)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+module Refinery
+  module Blog
+    module Admin
+      describe PostsController, type: :controller do
+        refinery_login
+
+        describe "#delete_translation" do
+          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.")
+            blog_post.translations.create(:locale => :es, :title => 'Un titulo espanol', :body => "Mi casa e su casa.")
+          end
+
+          it "destroys the translation" do
+            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, 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, params: { :id => blog_post.id, :locale_to_delete => :fr }
+            expect(response).to be_redirect
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+module Refinery
+  module Blog
+    describe PostsController, type: :controller do
+      before do
+        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
+        get :index, :format => :rss
+        expect(assigns[:posts].size).to eq(3)
+      end
+
+      it "should limit rss feed" do
+        get :index, :format => :rss, params: { :max_results => 2 }
+        expect(assigns[:posts].count).to eq(2)
+      end
+    end
+  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
-    tag_list "chicago, shopping, fun times"
     published_at Time.now
-    
+    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

@@ -0,0 +1,121 @@
+# encoding: utf-8
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    module Admin
+      describe Category, type: :feature do
+        refinery_login
+
+        let(:title) { "lol" }
+
+        it "can create categories" do
+          visit refinery.admin_root_path
+
+          within("nav#menu") { click_link "Blog" }
+          within("nav.multilist") { click_link "Create new category" }
+
+          fill_in "Title", :with => title
+          click_button "Save"
+
+          category = Refinery::Blog::Category.first
+          expect(category.title).to eq(title)
+        end
+
+        context "with translations" do
+          before do
+            allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
+            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
+            end
+          end
+
+          describe "add a category with title for default locale" do
+            before do
+              Globalize.locale = :en
+              visit refinery.blog_admin_posts_path
+              click_link "Create new category"
+              fill_in "Title", :with => "Testing Category"
+              expect { click_button "Save" }.to change(Refinery::Blog::Category, :count).by(1)
+              @c = Refinery::Blog::Category.by_title("Testing Category")
+            end
+
+            it "suceeds" do
+              expect(page).to have_content("'#{@c.title}' was successfully added.")
+              expect(Refinery::Blog::Category.count).to eq(1)
+            end
+
+            it "shows locale for category" do
+              click_link "Manage"
+              within "#category_#{@c.id}" do
+                expect(page).to have_css(".locale .en")
+              end
+            end
+
+            it "shows up in blog page for default locale" do
+              visit refinery.blog_root_path
+              within "#categories" do
+                expect(page).to have_selector('li')
+              end
+            end
+
+            it "does not show up in blog page for secondary locale" do
+              visit refinery.blog_root_path(:locale => :ru)
+              expect(page).not_to have_selector('#categories')
+            end
+
+          end
+
+          describe "add a category with title for secondary locale" do
+
+            let(:ru_category_title) { 'категория' }
+
+            before do
+              visit refinery.blog_admin_posts_path
+              click_link "Create new category"
+              within "#switch_locale_picker" do
+                click_link "RU"
+              end
+              fill_in "Title", :with => ru_category_title
+              expect { click_button "Save" }.to change(Refinery::Blog::Category, :count).by(1)
+              @c = Refinery::Blog::Category.by_title(ru_category_title)
+            end
+
+            it "suceeds" do
+              expect(page).to have_content("'#{@c.title_translations['ru']}' was successfully added.")
+              expect(Refinery::Blog::Category.count).to eq(1)
+            end
+
+            it "shows locale for category" do
+              click_link "Manage"
+              within "#category_#{@c.id}" do
+                expect(page).to have_css(".locale .ru")
+              end
+            end
+
+            it "does not show locale for primary locale" do
+              click_link "Manage"
+              within "#category_#{@c.id}" do
+                expect(page).not_to have_css(".locale .en")
+              end
+            end
+
+            it "does not shows up in blog page for default locale" do
+              visit refinery.blog_root_path
+              expect(page).not_to have_selector('#categories')
+            end
+
+            it "shows up in blog page for secondary locale" do
+              visit refinery.blog_root_path(:locale => :ru)
+              within "#categories" do
+                expect(page).to have_selector('li')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/{requests → features}/refinery/blog/admin/comments_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 module Refinery
   module Blog
     module Admin
-      describe Comment do
-        login_refinery_user
+      describe Comment, type: :feature do
+        refinery_login
 
         describe "#index" do
           context "when has no new unapproved comments" do
-            before(:each) do
+            before do
               subject.class.delete_all
               visit refinery.blog_admin_comments_path
             end
@@ -16,106 +16,106 @@ module Refinery
             it "should list no comments" do
               visit refinery.blog_admin_comments_path
 
-              page.should have_content('There are no new comments')
+              expect(page).to have_content('There are no new comments')
             end
           end
           context "when has new unapproved comments" do
-            let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
-            before(:each) { visit refinery.blog_admin_comments_path }
+            let!(:blog_comment) { FactoryBot.create(:blog_comment) }
+            before { visit refinery.blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to approve a comment" do
               click_link "Approve this comment"
 
-              page.should have_content("has been approved")
+              expect(page).to have_content("has been approved")
             end
 
             it "should allow me to reject a comment" do
               click_link "Reject this comment"
 
-              page.should have_content("has been rejected")
+              expect(page).to have_content("has been rejected")
             end
           end
         end
 
         describe "#approved" do
           context "when has no approved comments" do
-            before(:each) do
+            before do
               subject.class.delete_all
               visit refinery.approved_blog_admin_comments_path
             end
 
             it "should list no comments" do
-              page.should have_content('There are no approved comments')
+              expect(page).to have_content('There are no approved comments')
             end
           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(:each) { visit refinery.approved_blog_admin_comments_path }
+            before { visit refinery.approved_blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to reject a comment" do
               click_link "Reject this comment"
 
-              page.should have_content("has been rejected")
+              expect(page).to have_content("has been rejected")
             end
           end
         end
 
         describe "#rejected" do
           context "when has no rejected comments" do
-            before(:each) do
+            before do
               subject.class.delete_all
               visit refinery.rejected_blog_admin_comments_path
             end
 
             it "should list no comments" do
-              page.should have_content('There are no rejected comments')
+              expect(page).to have_content('There are no rejected comments')
             end
           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(:each) { visit refinery.rejected_blog_admin_comments_path }
+            before { visit refinery.rejected_blog_admin_comments_path }
 
             it "should list comments" do
-              page.should have_content(blog_comment.body)
-              page.should have_content(blog_comment.name)
+              expect(page).to have_content(blog_comment.body)
+              expect(page).to have_content(blog_comment.name)
             end
 
             it "should allow me to approve a comment" do
               click_link "Approve this comment"
 
-              page.should have_content("has been approved")
+              expect(page).to have_content("has been approved")
             end
           end
         end
 
         describe "#show" do
-          let!(:blog_comment) { FactoryGirl.create(:blog_comment) }
-          before(:each) { visit refinery.blog_admin_comment_path(blog_comment) }
+          let!(:blog_comment) { FactoryBot.create(:blog_comment) }
+          before { visit refinery.blog_admin_comment_path(blog_comment) }
           it "should display the comment" do
-            page.should have_content(blog_comment.body)
-            page.should have_content(blog_comment.name)
+            expect(page).to have_content(blog_comment.body)
+            expect(page).to have_content(blog_comment.name)
           end
           it "should allow me to approve the comment" do
             click_link "Approve this comment"
 
-            page.should have_content("has been approved")
+            expect(page).to have_content("has been approved")
           end
         end
       end
     end
   end
-end
+end