refinerycms-blog 2.0.5 → 2.1.0

data/spec/helpers/refinery/blog/controller_helper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    describe ControllerHelper do
+      describe "#find_tags" do
+        let(:tags) { helper.find_tags }
+
+        context "with draft posts" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post, :draft => true, :tag_list => "first, second" ) }
+
+          it "does not return tags" do
+            expect(tags).to be_empty
+          end
+        end
+
+        context "with live posts" do
+          let!(:blog_post) { FactoryGirl.create(:blog_post, :tag_list => "first, second" ) }
+
+          it "does return tags" do
+            expect(tags).to_not be_empty
+          end
+        end
+      end
+    end
+  end
+end

data/spec/helpers/refinery/blog/posts_helper_spec.rb

@@ -66,6 +66,18 @@ module Refinery
           end
         end
       end
+
+      describe "#avatar_url" do
+        let(:email) { "test@test.com" }
+
+        it "returns gravatar url" do
+          helper.avatar_url(email).should eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=60.jpg")
+        end
+
+        it "accepts options hash to change default size" do
+          helper.avatar_url(email, :size => 55).should eq("http://gravatar.com/avatar/b642b4217b34b1e8d3bd915fc65c4452?s=55.jpg")
+        end
+      end
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Refinery
   module Blog
     describe Category do
       let(:category) { FactoryGirl.create(:blog_category) }
+      let(:refinery_user) { FactoryGirl.create(:refinery_user) }
 
       describe "validations" do
         it "requires title" do
@@ -21,8 +22,15 @@ module Refinery
         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 })
-          latest_post = category.posts.create!({ :title => "parndt is p. okay", :body => "For a Kiwi.", :published_at => Time.now })
+          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 })
+
+          latest_post = category.posts.create!({ :title => "parndt is p. okay",
+                                                 :body => "For a Kiwi.",
+                                                 :published_at => Time.now,
+                                                 :author => refinery_user })
 
           category.posts.first.should == latest_post
         end

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

@@ -42,8 +42,10 @@ module Refinery
         it "acts as taggable" do
           post.should respond_to(:tag_list)
 
-          #the factory has default tags, including 'chicago'
-          post.tag_list.should include("chicago")
+          post.tag_list = "refinery, cms"
+          post.save!
+
+          post.tag_list.should include("refinery")
         end
       end
 
@@ -53,7 +55,7 @@ module Refinery
         end
       end
 
-      describe "by_archive" do
+      describe "by_month" do
         before do
           @post1 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 11))
           @post2 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 12))
@@ -65,22 +67,22 @@ module Refinery
         it "returns all posts from specified month" do
           #check for this month
           date = "03/2011"
-          described_class.by_archive(Time.parse(date)).count.should be == 2
-          described_class.by_archive(Time.parse(date)).should == [@post2, @post1]
+          described_class.by_month(Time.parse(date)).count.should be == 2
+          described_class.by_month(Time.parse(date)).should == [@post2, @post1]
         end
       end
 
       describe ".published_dates_older_than" do
         before do
-          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.now - 2.months)
-          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.now - 1.month)
+          @post1 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 20))
+          @post2 = FactoryGirl.create(:blog_post, :published_at => Time.utc(2012, 05, 01, 15, 30))
           FactoryGirl.create(:blog_post, :published_at => Time.now)
         end
 
         it "returns all published dates older than the argument" do
           expected = [@post2.published_at, @post1.published_at]
 
-          described_class.published_dates_older_than(1.day.ago).should eq(expected)
+          described_class.published_dates_older_than(5.minutes.ago).should eq(expected)
         end
       end
 
@@ -114,21 +116,21 @@ module Refinery
 
       describe "#live?" do
         it "returns true if post is not in draft and it's published" do
-          Factory.build(:blog_post).should be_live
+          FactoryGirl.build(:blog_post).should be_live
         end
 
         it "returns false if post is in draft" do
-          Factory.build(:blog_post, :draft => true).should_not be_live
+          FactoryGirl.build(:blog_post, :draft => true).should_not be_live
         end
 
         it "returns false if post pub date is in future" do
-          Factory.build(:blog_post, :published_at => Time.now.advance(:minutes => 1)).should_not be_live
+          FactoryGirl.build(:blog_post, :published_at => Time.now.advance(:minutes => 1)).should_not be_live
         end
       end
 
       describe "#next" do
         before do
-          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
           @post = FactoryGirl.create(:blog_post)
         end
 
@@ -140,7 +142,7 @@ module Refinery
       describe "#prev" do
         before do
           FactoryGirl.create(:blog_post)
-          @post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+          @post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:days => -1))
         end
 
         it "returns previous article when called on current article" do
@@ -197,7 +199,7 @@ module Refinery
           end
         end
       end
-      
+
       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')
@@ -206,13 +208,15 @@ module Refinery
           p.source_url_title.should include('author')
         end
       end
-      
+
       describe ".validate_source_url?" do
         context "with Refinery::Blog.validate_source_url set to true" do
           before do
             Refinery::Blog.validate_source_url = true
-          end  
+          end
           it "should have canonical url" do
+            UrlValidator.any_instance.should_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')
           end
@@ -227,7 +231,7 @@ module Refinery
           end
         end
       end
-      
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,56 +1,30 @@
 require 'rubygems'
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
-  require 'factory_girl_rails'
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'factory_girl_rails'
 
-  Rails.backtrace_cleaner.remove_silencers!
+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
-end
-
-def each_run
-  ActiveSupport::Dependencies.clear
-
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
+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
 
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
+# set javascript driver for capybara
+Capybara.javascript_driver = :selenium
 
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-blog
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
-- Resolve Digital
-- Neoteric Design
+- Philip Arndt
+- Uģis Ozols
+- Joe Sak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -17,28 +18,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
@@ -73,42 +74,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
-  name: refinerycms-testing
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
+        version: 4.0.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.4
 description: A really straightforward open source Ruby on Rails blog engine designed
   for integration with Refinery CMS.
 email: info@refinerycms.com
@@ -120,8 +121,8 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Guardfile
 - 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
@@ -136,10 +137,8 @@ files:
 - 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/images/refinerycms-blog/.gitkeep
 - app/assets/javascripts/refinery/blog/backend.js
 - app/assets/javascripts/refinery/blog/frontend.js
-- app/assets/javascripts/refinerycms-blog/.gitkeep
 - app/assets/stylesheets/refinery/blog/backend.css.scss
 - app/assets/stylesheets/refinery/blog/frontend.css.scss
 - app/assets/stylesheets/refinery/blog/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
@@ -157,7 +156,6 @@ files:
 - app/assets/stylesheets/refinery/blog/ui-lightness/images/ui-icons_ffd27a_256x240.png
 - app/assets/stylesheets/refinery/blog/ui-lightness/images/ui-icons_ffffff_256x240.png
 - app/assets/stylesheets/refinery/blog/ui-lightness/jquery-ui-1.8.13.custom.css.scss
-- app/assets/stylesheets/refinerycms-blog/.gitkeep
 - app/controllers/.gitkeep
 - app/controllers/refinery/blog/admin/categories_controller.rb
 - app/controllers/refinery/blog/admin/comments_controller.rb
@@ -171,10 +169,10 @@ files:
 - app/helpers/refinery/blog/posts_helper.rb
 - app/mailers/refinery/blog/comment_mailer.rb
 - app/models/.gitkeep
+- app/models/refinery/blog/categorization.rb
 - app/models/refinery/blog/category.rb
 - app/models/refinery/blog/comment.rb
 - app/models/refinery/blog/post.rb
-- app/models/refinery/categorization.rb
 - app/views/.gitkeep
 - app/views/refinery/blog/admin/_submenu.html.erb
 - app/views/refinery/blog/admin/categories/_category.html.erb
@@ -185,7 +183,6 @@ files:
 - app/views/refinery/blog/admin/categories/new.html.erb
 - app/views/refinery/blog/admin/comments/_comment.html.erb
 - app/views/refinery/blog/admin/comments/_sortable_list.html.erb
-- app/views/refinery/blog/admin/comments/approve.html.erb
 - app/views/refinery/blog/admin/comments/index.html.erb
 - app/views/refinery/blog/admin/comments/show.html.erb
 - app/views/refinery/blog/admin/posts/_form.html.erb
@@ -246,6 +243,9 @@ files:
 - db/migrate/20120103055909_add_source_url_to_blog_posts.rb
 - db/migrate/20120223022021_add_access_count_to_posts.rb
 - db/migrate/20120227022021_add_slug_to_posts_and_categories.rb
+- db/migrate/20120530102901_create_blog_translations.rb
+- db/migrate/20120531113632_delete_cached_slugs.rb
+- db/migrate/20120601151114_create_category_translations.rb
 - db/seeds.rb
 - lib/generators/refinery/blog/blog_generator.rb
 - lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb
@@ -253,26 +253,27 @@ files:
 - lib/refinery/blog/configuration.rb
 - lib/refinery/blog/engine.rb
 - lib/refinery/blog/tabs.rb
-- lib/refinery/blog/version.rb
 - lib/refinerycms-blog.rb
 - readme.md
 - refinerycms-blog.gemspec
 - script/rails
+- spec/controllers/refinery/blog/admin/comments_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/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/requests/refinery/blog/admin/categories_spec.rb
-- spec/requests/refinery/blog/admin/comments_spec.rb
-- spec/requests/refinery/blog/admin/menu_spec.rb
-- spec/requests/refinery/blog/admin/posts_spec.rb
-- spec/requests/refinery/blog/categories_spec.rb
-- spec/requests/refinery/blog/posts_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 - todo.md
@@ -296,25 +297,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 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/posts_controller_spec.rb
 - spec/factories/blog_categories.rb
 - spec/factories/blog_comments.rb
 - spec/factories/blog_posts.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/requests/refinery/blog/admin/categories_spec.rb
-- spec/requests/refinery/blog/admin/comments_spec.rb
-- spec/requests/refinery/blog/admin/menu_spec.rb
-- spec/requests/refinery/blog/admin/posts_spec.rb
-- spec/requests/refinery/blog/categories_spec.rb
-- spec/requests/refinery/blog/posts_spec.rb
 - spec/spec_helper.rb
 has_rdoc: