refinerycms-blog 2.1.0 → 3.0.1

data/spec/models/refinery/blog/category_spec.rb

@@ -2,37 +2,37 @@ require 'spec_helper'
 
 module Refinery
   module Blog
-    describe Category do
+    describe Category, type: :model do
       let(:category) { FactoryGirl.create(:blog_category) }
-      let(:refinery_user) { FactoryGirl.create(:refinery_user) }
+      let(:author) { FactoryGirl.create(:authentication_devise_refinery_user) }
 
       describe "validations" do
         it "requires title" do
-          FactoryGirl.build(:blog_category, :title => "").should_not be_valid
+          expect(FactoryGirl.build(:blog_category, :title => "")).not_to be_valid
         end
 
         it "won't allow duplicate titles" do
-          FactoryGirl.build(:blog_category, :title => category.title).should_not be_valid
+          expect(FactoryGirl.build(:blog_category, :title => category.title)).not_to be_valid
         end
       end
 
       describe "blog posts association" do
         it "has a posts attribute" do
-          category.should respond_to(:posts)
+          expect(category).to respond_to(:posts)
         end
 
         it "returns posts by published_at date in descending order" do
           first_post = category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!",
                                                 :body => "True story.",
                                                 :published_at => Time.now.yesterday,
-                                                :author => refinery_user })
+                                                :author => author })
 
           latest_post = category.posts.create!({ :title => "parndt is p. okay",
                                                  :body => "For a Kiwi.",
                                                  :published_at => Time.now,
-                                                 :author => refinery_user })
+                                                 :author => author })
 
-          category.posts.first.should == latest_post
+          expect(category.posts.newest_first.first).to eq(latest_post)
         end
 
       end
@@ -42,9 +42,9 @@ module Refinery
           2.times do
             category.posts << FactoryGirl.create(:blog_post)
           end
-          category.post_count.should == 2
+          expect(category.post_count).to eq(2)
         end
       end
     end
   end
-end
+end

data/spec/models/refinery/blog/comment_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 module Refinery
   module Blog
-    describe Comment do
+    describe Comment, type: :model do
       context "wiring up" do
         let(:comment) { FactoryGirl.create(:blog_comment) }
 
         it "saves" do
-          comment.should_not be_nil
+          expect(comment).not_to be_nil
         end
 
         it "has a blog post" do
-          comment.post.should_not be_nil
+          expect(comment.post).not_to be_nil
         end
       end
     end

data/spec/models/refinery/blog/post_spec.rb

@@ -2,56 +2,56 @@ require 'spec_helper'
 
 module Refinery
   module Blog
-    describe Post do
+    describe Post, type: :model do
       let(:post) { FactoryGirl.create(:blog_post) }
 
       describe "validations" do
         it "requires title" do
-          FactoryGirl.build(:blog_post, :title => "").should_not be_valid
+          expect(FactoryGirl.build(:blog_post, :title => "")).not_to be_valid
         end
 
         it "won't allow duplicate titles" do
-          FactoryGirl.build(:blog_post, :title => post.title).should_not be_valid
+          expect(FactoryGirl.build(:blog_post, :title => post.title)).not_to be_valid
         end
 
         it "requires body" do
-          FactoryGirl.build(:blog_post, :body => nil).should_not be_valid
+          expect(FactoryGirl.build(:blog_post, :body => nil)).not_to be_valid
         end
       end
 
       describe "comments association" do
 
         it "have a comments attribute" do
-          post.should respond_to(:comments)
+          expect(post).to respond_to(:comments)
         end
 
         it "destroys associated comments" do
           FactoryGirl.create(:blog_comment, :blog_post_id => post.id)
           post.destroy
-          Blog::Comment.where(:blog_post_id => post.id).should be_empty
+          expect(Blog::Comment.where(:blog_post_id => post.id)).to be_empty
         end
       end
 
       describe "categories association" do
         it "have categories attribute" do
-          post.should respond_to(:categories)
+          expect(post).to respond_to(:categories)
         end
       end
 
       describe "tags" do
         it "acts as taggable" do
-          post.should respond_to(:tag_list)
+          expect(post).to respond_to(:tag_list)
 
           post.tag_list = "refinery, cms"
           post.save!
 
-          post.tag_list.should include("refinery")
+          expect(post.tag_list).to include("refinery")
         end
       end
 
       describe "authors" do
         it "are authored" do
-          described_class.instance_methods.map(&:to_sym).should include(:author)
+          expect(described_class.instance_methods.map(&:to_sym)).to include(:author)
         end
       end
 
@@ -67,8 +67,8 @@ module Refinery
         it "returns all posts from specified month" do
           #check for this month
           date = "03/2011"
-          described_class.by_month(Time.parse(date)).count.should be == 2
-          described_class.by_month(Time.parse(date)).should == [@post2, @post1]
+          expect(described_class.by_month(Time.parse(date)).count).to eq(2)
+          expect(described_class.by_month(Time.parse(date))).to eq([@post2, @post1])
         end
       end
 
@@ -82,7 +82,7 @@ module Refinery
         it "returns all published dates older than the argument" do
           expected = [@post2.published_at, @post1.published_at]
 
-          described_class.published_dates_older_than(5.minutes.ago).should eq(expected)
+          expect(described_class.published_dates_older_than(5.minutes.ago)).to eq(expected)
         end
       end
 
@@ -95,8 +95,10 @@ module Refinery
         end
 
         it "returns all posts which aren't in draft and pub date isn't in future" do
-          described_class.live.count.should be == 2
-          described_class.live.should == [@post2, @post1]
+          live_posts = described_class.live
+          expect(live_posts.count).to eq(2)
+          expect(live_posts).to include(@post2)
+          expect(live_posts).to include(@post1)
         end
       end
 
@@ -109,22 +111,22 @@ module Refinery
         end
 
         it "returns uncategorized posts if they exist" do
-          described_class.uncategorized.should include @uncategorized_post
-          described_class.uncategorized.should_not include @categorized_post
+          expect(described_class.uncategorized).to include @uncategorized_post
+          expect(described_class.uncategorized).not_to include @categorized_post
         end
       end
 
       describe "#live?" do
         it "returns true if post is not in draft and it's published" do
-          FactoryGirl.build(:blog_post).should be_live
+          expect(FactoryGirl.build(:blog_post)).to be_live
         end
 
         it "returns false if post is in draft" do
-          FactoryGirl.build(:blog_post, :draft => true).should_not be_live
+          expect(FactoryGirl.build(:blog_post, :draft => true)).not_to be_live
         end
 
         it "returns false if post pub date is in future" do
-          FactoryGirl.build(:blog_post, :published_at => Time.now.advance(:minutes => 1)).should_not be_live
+          expect(FactoryGirl.build(:blog_post, :published_at => Time.now.advance(:minutes => 1))).not_to be_live
         end
       end
 
@@ -135,7 +137,7 @@ module Refinery
         end
 
         it "returns next article when called on current article" do
-          described_class.last.next.should == @post
+          expect(described_class.newest_first.last.next).to eq(@post)
         end
       end
 
@@ -146,7 +148,7 @@ module Refinery
         end
 
         it "returns previous article when called on current article" do
-          described_class.first.prev.should == @post
+          expect(described_class.first.prev).to eq(@post)
         end
       end
 
@@ -157,7 +159,7 @@ module Refinery
           end
 
           it "should be true" do
-            described_class.comments_allowed?.should be_true
+            expect(described_class.comments_allowed?).to be_truthy
           end
         end
 
@@ -167,14 +169,14 @@ module Refinery
           end
 
           it "should be false" do
-            described_class.comments_allowed?.should be_false
+            expect(described_class.comments_allowed?).to be_falsey
           end
         end
       end
 
       describe "custom teasers" do
         it "should allow a custom teaser" do
-          FactoryGirl.create(:blog_post, :custom_teaser => 'This is some custom content').should be_valid
+          expect(FactoryGirl.create(:blog_post, :custom_teaser => 'This is some custom content')).to be_valid
         end
       end
 
@@ -185,7 +187,7 @@ module Refinery
           end
 
           it "should be true" do
-            described_class.teasers_enabled?.should be_true
+            expect(described_class.teasers_enabled?).to be_truthy
           end
         end
 
@@ -195,7 +197,7 @@ module Refinery
           end
 
           it "should be false" do
-            described_class.teasers_enabled?.should be_false
+            expect(described_class.teasers_enabled?).to be_falsey
           end
         end
       end
@@ -203,9 +205,9 @@ module Refinery
       describe "source url" do
         it "should allow a source url and title" do
           p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'author')
-          p.should be_valid
-          p.source_url.should include('google')
-          p.source_url_title.should include('author')
+          expect(p).to be_valid
+          expect(p.source_url).to include('google')
+          expect(p.source_url_title).to include('author')
         end
       end
 
@@ -215,10 +217,10 @@ module Refinery
             Refinery::Blog.validate_source_url = true
           end
           it "should have canonical url" do
-            UrlValidator.any_instance.should_receive(:resolve_redirects_verify_url).
+            expect_any_instance_of(UrlValidator).to receive(:resolve_redirects_verify_url).
                                       and_return('http://www.google.com')
             p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
-            p.source_url.should include('www')
+            expect(p.source_url).to include('www')
           end
         end
         context "with Refinery::Blog.validate_source_url set to false" do
@@ -227,7 +229,31 @@ module Refinery
           end
           it "should have original url" do
             p = FactoryGirl.create(:blog_post, :source_url => 'google.com', :source_url_title => 'google')
-            p.source_url.should_not include('www')
+            expect(p.source_url).not_to include('www')
+          end
+        end
+      end
+
+      describe "#should_generate_new_friendly_id?" do
+        context "when custom_url changes" do
+          it "regenerates slug upon save" do
+            post = FactoryGirl.create(:blog_post, :custom_url => "Test Url")
+
+            post.custom_url = "Test Url 2"
+            post.save!
+
+            expect(post.slug).to eq("test-url-2")
+          end
+        end
+
+        context "when title changes" do
+          it "regenerates slug upon save" do
+            post = FactoryGirl.create(:blog_post, :title => "Test Title")
+
+            post.title = "Test Title 2"
+            post.save!
+
+            expect(post.slug).to eq("test-title-2")
           end
         end
       end

data/spec/spec_helper.rb

@@ -7,19 +7,18 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
 require 'capybara/rspec'
-require 'factory_girl_rails'
 
 Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
 
 # set javascript driver for capybara
-Capybara.javascript_driver = :selenium
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories including factories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-blog
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,106 +10,140 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: A really straightforward open source Ruby on Rails blog engine designed
   for integration with Refinery CMS.
 email: info@refinerycms.com
@@ -117,25 +151,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Rakefile
-- app/assets/images/refinery/blog/icons/add.png
-- app/assets/images/refinery/blog/icons/cog.png
-- app/assets/images/refinery/blog/icons/comment.png
-- app/assets/images/refinery/blog/icons/comment_cross.png
-- app/assets/images/refinery/blog/icons/comment_tick.png
-- app/assets/images/refinery/blog/icons/comments.png
-- app/assets/images/refinery/blog/icons/down.gif
-- app/assets/images/refinery/blog/icons/folder.png
-- app/assets/images/refinery/blog/icons/folder_add.png
-- app/assets/images/refinery/blog/icons/folder_edit.png
-- app/assets/images/refinery/blog/icons/page.png
-- app/assets/images/refinery/blog/icons/page_add.png
-- app/assets/images/refinery/blog/icons/page_copy.png
-- app/assets/images/refinery/blog/icons/up.gif
 - app/assets/images/refinery/blog/rss-feed.png
 - app/assets/javascripts/refinery/blog/backend.js
 - app/assets/javascripts/refinery/blog/frontend.js
@@ -214,6 +234,8 @@ files:
 - app/views/refinery/blog/shared/_tags.html.erb
 - app/views/refinery/blog/widgets/_blog_archive.html.erb
 - app/views/refinery/shared/admin/_autocomplete.html.erb
+- bin/rails
+- bin/refinerycms
 - changelog.md
 - config/initializers/url_validator.rb
 - config/locales/bg.yml
@@ -232,6 +254,7 @@ files:
 - config/locales/sk.yml
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20110803223522_create_blog_structure.rb
 - db/migrate/20110803223523_add_user_id_to_blog_posts.rb
@@ -246,6 +269,8 @@ files:
 - db/migrate/20120530102901_create_blog_translations.rb
 - db/migrate/20120531113632_delete_cached_slugs.rb
 - db/migrate/20120601151114_create_category_translations.rb
+- db/migrate/20140622132537_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- db/migrate/20140622132538_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - db/seeds.rb
 - lib/generators/refinery/blog/blog_generator.rb
 - lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb
@@ -258,17 +283,18 @@ files:
 - refinerycms-blog.gemspec
 - script/rails
 - spec/controllers/refinery/blog/admin/comments_controller_spec.rb
+- spec/controllers/refinery/blog/admin/posts_controller_spec.rb
 - spec/controllers/refinery/blog/posts_controller_spec.rb
 - spec/factories/blog_categories.rb
 - spec/factories/blog_comments.rb
 - spec/factories/blog_posts.rb
+- spec/factories/user.rb
 - spec/features/refinery/blog/admin/categories_spec.rb
 - spec/features/refinery/blog/admin/comments_spec.rb
 - spec/features/refinery/blog/admin/menu_spec.rb
 - spec/features/refinery/blog/admin/posts_spec.rb
 - spec/features/refinery/blog/categories_spec.rb
 - spec/features/refinery/blog/posts_spec.rb
-- spec/helpers/refinery/blog/controller_helper_spec.rb
 - spec/helpers/refinery/blog/posts_helper_spec.rb
 - spec/lib/refinery/blog/engine_spec.rb
 - spec/models/refinery/blog/category_spec.rb
@@ -276,7 +302,6 @@ files:
 - spec/models/refinery/blog/post_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
-- todo.md
 homepage: http://refinerycms.com/blog
 licenses:
 - MIT
@@ -287,37 +312,37 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails blogging engine for Refinery CMS.
 test_files:
 - spec/controllers/refinery/blog/admin/comments_controller_spec.rb
+- spec/controllers/refinery/blog/admin/posts_controller_spec.rb
 - spec/controllers/refinery/blog/posts_controller_spec.rb
 - spec/factories/blog_categories.rb
 - spec/factories/blog_comments.rb
 - spec/factories/blog_posts.rb
+- spec/factories/user.rb
 - spec/features/refinery/blog/admin/categories_spec.rb
 - spec/features/refinery/blog/admin/comments_spec.rb
 - spec/features/refinery/blog/admin/menu_spec.rb
 - spec/features/refinery/blog/admin/posts_spec.rb
 - spec/features/refinery/blog/categories_spec.rb
 - spec/features/refinery/blog/posts_spec.rb
-- spec/helpers/refinery/blog/controller_helper_spec.rb
 - spec/helpers/refinery/blog/posts_helper_spec.rb
 - spec/lib/refinery/blog/engine_spec.rb
 - spec/models/refinery/blog/category_spec.rb
 - spec/models/refinery/blog/comment_spec.rb
 - spec/models/refinery/blog/post_spec.rb
 - spec/spec_helper.rb
-has_rdoc: