refinerycms-blog 2.1.0 → 3.0.1

data/refinerycms-blog.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-blog}
-  s.version           = %q{2.1.0}
+  s.version           = %q{3.0.1}
   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,11 +15,13 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.1.0'
-  s.add_dependency    'refinerycms-settings', '~> 2.1.0'
-  s.add_dependency    'filters_spam',         '~> 0.2'
+  s.add_dependency    'refinerycms-core',      '~> 3.0.0'
+  s.add_dependency    'refinerycms-settings',  '~> 3.0.0'
+  s.add_dependency    'filters_spam',          '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',             '~> 1.4.0'
-  s.add_dependency    'rails_autolink',       '~> 1.0.7'
-  s.add_dependency    'friendly_id',          '~> 4.0.4'
+  s.add_dependency    'seo_meta',              '~> 2.0.0.rc.1'
+  s.add_dependency    'rails_autolink',        '~> 1.1.3'
+  s.add_dependency    'friendly_id',           '~> 5.1.0'
+  s.add_dependency    'globalize',             ['>= 4.0.0', '< 5.2']
+  s.add_dependency    'jquery-ui-rails',       '~> 5.0.0'
 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

@@ -3,21 +3,25 @@ require "spec_helper"
 module Refinery
   module Blog
     module Admin
-      describe CommentsController do
-        refinery_login_with :refinery_user
+      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
 
         describe "#index" do
           let!(:comment) { FactoryGirl.create(:blog_comment) }
-          
+
           it "succeeds" do
             get :index
-            response.should be_success
-            response.should render_template(:index)
+            expect(response).to be_success
+            expect(response).to render_template(:index)
           end
 
           it "assigns unmoderated comments" do
             get :index
-            assigns(:comments).first.should eq(comment)
+            expect(assigns(:comments).first).to eq(comment)
           end
         end
 
@@ -26,13 +30,13 @@ module Refinery
 
           it "succeeds" do
             get :approved
-            response.should be_success
-            response.should render_template(:index)
+            expect(response).to be_success
+            expect(response).to render_template(:index)
           end
 
           it "assigns approved comments" do
             get :approved
-            assigns(:comments).first.should eq(comment)
+            expect(assigns(:comments).first).to eq(comment)
           end
         end
 
@@ -41,27 +45,27 @@ module Refinery
 
           it "redirects on success" do
             post :approve, :id => comment.id
-            response.should be_redirect
+            expect(response).to be_redirect
           end
-          
+
           it "approves the comment" do
             post :approve, :id => comment.id
-            Refinery::Blog::Comment.approved.count.should eq(1)
+            expect(Refinery::Blog::Comment.approved.count).to eq(1)
           end
         end
-        
+
         describe "#rejected" do
           let!(:comment) { FactoryGirl.create(:rejected_comment) }
 
           it "succeeds" do
             get :rejected
-            response.should be_success
-            response.should render_template(:index)
+            expect(response).to be_success
+            expect(response).to render_template(:index)
           end
 
           it "assigns rejected comments" do
             get :rejected
-            assigns(:comments).first.should eq(comment)
+            expect(assigns(:comments).first).to eq(comment)
           end
         end
 
@@ -70,12 +74,12 @@ module Refinery
 
           it "redirects on success" do
             post :reject, :id => comment.id
-            response.should be_redirect
+            expect(response).to be_redirect
           end
-          
+
           it "rejects the comment" do
             post :reject, :id => comment.id
-            Refinery::Blog::Comment.rejected.count.should eq(1)
+            expect(Refinery::Blog::Comment.rejected.count).to eq(1)
           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_with_devise [:refinery, :superuser]
+
+        describe "#delete_translation" do
+          let!(:blog_post) { FactoryGirl.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, :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
+            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
+            expect(response).to be_redirect
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   module Blog
-    describe PostsController do
+    describe PostsController, type: :controller do
       before do
         FactoryGirl.create(:blog_post, :title => "blogpost_one")
         FactoryGirl.create(:blog_post, :title => "blogpost_two")
@@ -11,12 +11,12 @@ module Refinery
 
       it "should not limit rss feed" do
         get :index, :format => :rss
-        assigns[:posts].size.should == 3
+        expect(assigns[:posts].size).to eq(3)
       end
 
       it "should limit rss feed" do
         get :index, :format => :rss, :max_results => 2
-        assigns[:posts].count.should == 2
+        expect(assigns[:posts].count).to eq(2)
       end
     end
   end

data/spec/factories/blog_posts.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
     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(:refinery_user) }
+    author { FactoryGirl.create(:authentication_devise_refinery_user) }
 
     factory :blog_post_draft do
       draft true

data/spec/factories/user.rb

@@ -0,0 +1,27 @@
+FactoryGirl.define do
+  factory :authentication_devise_user, :class => Refinery::Authentication::Devise::User do
+    sequence(:username) { |n| "refinery#{n}" }
+    sequence(:email) { |n| "refinery#{n}@example.com" }
+    password  "refinerycms"
+    password_confirmation "refinerycms"
+  end
+
+  factory :authentication_devise_refinery_user, :parent => :authentication_devise_user do
+    roles { [ ::Refinery::Authentication::Devise::Role[:refinery] ] }
+
+    after(:create) do |user|
+      ::Refinery::Plugins.registered.each_with_index do |plugin, index|
+        user.plugins.create(:name => plugin.name, :position => index)
+      end
+    end
+  end
+
+  factory :authentication_devise_refinery_superuser, :parent => :authentication_devise_refinery_user do
+    roles {
+      [
+        ::Refinery::Authentication::Devise::Role[:refinery],
+        ::Refinery::Authentication::Devise::Role[:superuser]
+      ]
+    }
+  end
+end

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

@@ -1,119 +1,121 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "Categories admin" do
-  refinery_login_with :refinery_user
+module Refinery
+  module Blog
+    module Admin
+      describe Category, type: :feature do
+        refinery_login_with_devise :authentication_devise_refinery_superuser
 
-  let(:title) { "lol" }
+        let(:title) { "lol" }
 
-  it "can create categories" do
-    visit refinery.admin_root_path
+        it "can create categories" do
+          visit refinery.admin_root_path
 
-    within("nav#menu") { click_link "Blog" }
-    within("nav.multilist") { click_link "Create new category" }
+          within("nav#menu") { click_link "Blog" }
+          within("nav.multilist") { click_link "Create new category" }
 
-    fill_in "Title", :with => title
-    click_button "Save"
+          fill_in "Title", :with => title
+          click_button "Save"
 
-    category = Refinery::Blog::Category.first
-    category.title.should eq(title)
-  end
-
-  context "with translations" do
-    before do
-      Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
-      blog_page = Globalize.with_locale(:en) { FactoryGirl.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"
-        click_button "Save"
-        @c = Refinery::Blog::Category.find_by_title("Testing Category")
-      end
-
-      it "suceeds" do
-        page.should have_content("'#{@c.title}' was successfully added.")
-        Refinery::Blog::Category.count.should eq(1)
-      end
-
-      it "shows locale flag for category" do
-        click_link "Manage"
-        within "#category_#{@c.id}" do
-          page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
-        end
-      end
-
-      it "shows up in blog page for default locale" do
-        visit refinery.blog_root_path
-        within "#categories" do
-          page.should have_selector('li')
-        end
-      end
-
-      it "does not show up in blog page for secondary locale" do
-        visit refinery.blog_root_path(:locale => :ru)
-        page.should_not 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
-        click_button "Save"
-        @c = Refinery::Blog::Category.find_by_title(ru_category_title)
-      end
-
-      it "suceeds" do
-        page.should have_content("'#{@c.title}' was successfully added.")
-        Refinery::Blog::Category.count.should eq(1)
-      end
-
-      it "shows locale flag for category" do
-        click_link "Manage"
-        within "#category_#{@c.id}" do
-          page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
-        end
-      end
-
-      it "does not show locale flag for primary locale" do
-        click_link "Manage"
-        within "#category_#{@c.id}" do
-          page.should_not have_css("img[src='/assets/refinery/icons/flags/en.png']")
+          category = Refinery::Blog::Category.first
+          expect(category.title).to eq(title)
         end
-      end
-
-      it "does not shows up in blog page for default locale" do
-        visit refinery.blog_root_path
-        page.should_not have_selector('#categories')
-      end
 
-      it "shows up in blog page for secondary locale" do
-        visit refinery.blog_root_path(:locale => :ru)
-        within "#categories" do
-          page.should have_selector('li')
+        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") }
+            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}' 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