blogit 1.0.0.rc1 → 1.0.0

data/spec/factories.rb

@@ -4,19 +4,24 @@ FactoryGirl.define do
   # = Gem Factories =
   # =================
   factory :post, class: Blogit::Post do
-    title "Tis is a blog post title"
-    body "This is the body of the blog post - you'll see it's a lot bigger than the title"
+    title "This is a blog post title"
+    description "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+    body "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\
+      
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
     state "draft"
     association :blogger, :factory => :user
-    factory :published_post do
+    trait :active do
       state "published"
     end
   end
 
   factory :comment, class: Blogit::Comment do
     name "Gavin"
-    email "gavin@gavinmorrice.com"
-    website "http://gavinmorrice.com"
+    email "bodacious@katanacode.com"
+    website "http://katanacode.com"
     body "I once saw a child the size of a tangerine!"
     post
   end

data/spec/helpers/blogit/application_helper_spec.rb

@@ -1,94 +1,31 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Blogit::ApplicationHelper do
 
-  describe :blog_tag do
-    it "should create a tag element and give it a 'blog_post... prefixed class" do
-      helper.blog_tag(:div, "hello", id: "blog_div", class: "other_class").should == %{<div class="other_class blog_post_div" id="blog_div">hello</div>}
-      helper.blog_tag(:li, "hello", id: "blog_li").should == %{<li class="blog_post_li" id="blog_li">hello</li>}
-    end
-
-    it "should create a comment tag element when the comment type options is set" do
-      helper.blog_tag(:div, "hello", id: "blog_div", type: "comment", class: "other_class").should == %{<div class="other_class blog_comment_div" id="blog_div">hello</div>}
-      helper.blog_tag(:li, "hello", id: "blog_li", type: "status").should == %{<li class="blog_status_li" id="blog_li">hello</li>}
-    end
-  end
-
   describe "format_content" do
     it "should convert markdown text to html if conf is :markdown" do
       Blogit.configure { |c| c.default_parser = :markdown }
-      helper.format_content("## Hello\n\nWorld").should match(/<h2>Hello<\/h2>\n\n<p>World<\/p>/)
+      expect(helper.format_content("## Hello\n\nWorld")).to match(/<h2>Hello<\/h2>\n\n<p>World<\/p>/)
     end
 
     it "should convert textile text to html if conf is :textile" do
       Blogit.configure { |c| c.default_parser = :textile }
-      helper.format_content("h1. Hello\n\nWorld").should == "<h1>Hello</h1>\n<p>World</p>"
+      expect(helper.format_content("h1. Hello\n\nWorld")).to eq("<h1>Hello</h1>\n<p>World</p>")
     end
 
-    it "should convert html text to html if conf is :html" do
+    it "should leave html text as html if conf is :html" do
       Blogit.configure { |c| c.default_parser = :html }
-      helper.format_content("<h1>Hello</h1>\n\n<p>World</p>").should == "<h1>Hello</h1>\n\n<p>World</p>"
+      string = "<h1>Hello</h1>\n\n<p>World</p>"
+      expect(helper.format_content(string)).to eq(string)
     end
   end
 
-  describe :actions do
+  describe "actions" do
     it "should create a div with class 'actions'" do
-      helper.actions do
+      expect(helper.actions do
         "hello"
-      end.should == %{<div class="actions">hello</div>}
+      end).to eq(%{<div class="actions">hello</div>})
     end
   end
 
-  describe "main app's named routes" do
-    # rspec generates a helper by mixin in the tested helper and the application
-    # helper. But this is not what is being done by rails inside an engine.
-    # This mockery is more like the real thing
-    class MainAppApplicationHelperBench
-      def dummy_thing_path
-        "/dummy_thing"
-      end
-      def dummy_thing_url
-        "http://host/dummy_thing"
-      end
-      def secret
-      end
-    end
-    class BlogitApplicationHelperBench
-      include Blogit::ApplicationHelper
-
-      def main_app
-        MainAppApplicationHelperBench.new
-      end
-    end
-
-    let(:raw_helper) { BlogitApplicationHelperBench.new }
-
-    it "should not know named routes of the main app if not configured" do
-      Blogit.configure {|c| c.inline_main_app_named_routes = false }
-
-      lambda { raw_helper.dummy_thing_path }.should raise_error(NoMethodError)
-      lambda { raw_helper.dummy_thing_url }.should raise_error(NoMethodError)
-    end
-
-    it "should know named routes of the main app" do
-      Blogit.configure {|c| c.inline_main_app_named_routes = true }
-
-      raw_helper.dummy_thing_path.should == "/dummy_thing"
-      raw_helper.dummy_thing_url.should == "http://host/dummy_thing"
-    end
-
-    it "should not know anything but named routes of the main app" do
-      Blogit.configure {|c| c.inline_main_app_named_routes = true }
-
-      lambda { raw_helper.secret }.should raise_error(NoMethodError)
-    end
-
-    it "should not know other routes" do
-      Blogit.configure {|c| c.inline_main_app_named_routes = true }
-
-      lambda { raw_helper.junk_path }.should raise_error(NoMethodError)
-      lambda { raw_helper.junk_url }.should raise_error(NoMethodError)
-    end
-
-  end
-end
+end

data/spec/helpers/blogit/posts_helper_spec.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-require "spec_helper"
+require "rails_helper"
 
 describe Blogit::PostsHelper do
 
-  describe :comments_for do
+  describe "comments_for_post" do
     let(:post) { FactoryGirl.create :post }
 
     it "should be empty if comments are not configured" do
@@ -11,7 +11,7 @@ describe Blogit::PostsHelper do
         config.include_comments = :no
       end
 
-      helper.comments_for(post).should == ""
+      expect(helper.comments_for_post(post)).to eq("")
     end
 
     it "should be full html when comments use active record" do
@@ -21,12 +21,12 @@ describe Blogit::PostsHelper do
 
       comment = Blogit::Comment.new
       Blogit::Comment.expects(:new).returns(comment)
-      helper.expects(:render).with(partial: "blogit/posts/active_record_comments", locals: {post: post, comment: comment})
-      helper.comments_for(post)
+      helper.expects(:render).with(partial: "blogit/comments/active_record_comments", locals: {post: post, comment: comment})
+      helper.comments_for_post(post)
     end
   end
 
-  describe :share_bar_for do
+  describe "share_bar_for" do
     let(:post) { FactoryGirl.create :post }
 
     it "should be empty if not configured" do
@@ -34,7 +34,7 @@ describe Blogit::PostsHelper do
         config.include_share_bar = false
       end
 
-      helper.share_bar_for(post).should == ""
+      expect(helper.share_bar_for_post(post)).to eq("")
     end
 
     it "should render a share bar if configured" do
@@ -43,62 +43,7 @@ describe Blogit::PostsHelper do
       end
 
       helper.expects(:render).with(partial: "blogit/posts/share_bar", locals: {post: post}).returns(share_bar_html='<div id="share-bar">...</div>')
-      helper.share_bar_for(post).should == share_bar_html
-    end
-  end
-
-  describe :blog_post_archive do
-
-    before :each do
-      Post.delete_all
-    end
-    after :each do
-      Post.delete_all
-    end
-
-    # TODO: Clean up this horrible spec
-    it "should create an ul tag tree with years, monthes and articles" do
-      july_2012_1 = FactoryGirl.create(:post, title: "Great Post 2", created_at: Time.new(2012,7,14))
-      july_2012_2 = FactoryGirl.create(:post, title: "Great Post 3", created_at: Time.new(2012,7,28))
-      dec_2011 = FactoryGirl.create(:post, title: "Great post 1", created_at: Time.new(2011, 12, 25))
-      sept_2012 = FactoryGirl.create(:post, title: "Great Post 4", created_at: Time.new(2012,9, 3))
-
-      year_css = "archive-years"
-      month_css = "archive-month"
-      post_css = "archive-post"
-
-      archive_html = helper.blog_posts_archive_tag(year_css, month_css, post_css) {|post| post.title }
-
-      archive_html.should == ["<ul class=\"#{year_css}\">",
-                                "<li><a data-blogit-click-to-toggle-children>2012</a>",
-                                  "<ul class=\"#{month_css}\">",
-                                    "<li><a data-blogit-click-to-toggle-children>September</a>",
-                                      "<ul class=\"#{post_css}\">",
-                                        "<li>#{link_to(sept_2012.title, blogit.post_path(sept_2012))}</li>",
-                                      "</ul>",
-                                    "</li>",
-                                    "<li><a data-blogit-click-to-toggle-children>July</a>",
-                                      "<ul class=\"#{post_css}\">",
-                                        "<li>#{link_to(july_2012_2.title, blogit.post_path(july_2012_2))}</li>",
-                                        "<li>#{link_to(july_2012_1.title, blogit.post_path(july_2012_1))}</li>",
-                                      "</ul>",
-                                    "</li>",
-                                  "</ul>",
-                                "</li>",
-                                "<li><a data-blogit-click-to-toggle-children>2011</a>",
-                                  "<ul class=\"#{month_css}\">",
-                                    "<li><a data-blogit-click-to-toggle-children>December</a>",
-                                      "<ul class=\"#{post_css}\">",
-                                        "<li>#{link_to(dec_2011.title, blogit.post_path(dec_2011))}</li>",
-                                      "</ul>",
-                                    "</li>",
-                                  "</ul>",
-                                "</li>",
-                              "</ul>"].join
-    end
-
-    it "should be a safe html string" do
-      helper.blog_posts_archive_tag('y','m','p').should be_html_safe
+      expect(helper.share_bar_for_post(post)).to eq(share_bar_html)
     end
 
   end

data/spec/injectables/dummy_archiveable.rb

@@ -0,0 +1,6 @@
+class DummyArchiveable
+  attr_reader :published_at
+  def initialize(published_at = Time.now)
+    @published_at = published_at
+  end
+end

data/spec/lib/archive/list_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'blogit/archive'
+require 'injectables/dummy_archiveable'
+
+describe Blogit::Archive::List do
+  
+  describe :to_partial_path do
+    
+    let(:list) { Blogit::Archive::List.new([]) }
+    
+    it "returns the class name as a path to partial" do
+      expect(list.to_partial_path).to eql("blogit/archive/list")
+    end
+    
+  end
+  
+  describe :years do
+      
+    context "when archiveables is empty" do
+      
+      let(:list) { Blogit::Archive::List.new([]) }
+      
+      it "returns an empty array" do
+        expect(list.years).to be_empty  
+      end
+      
+    end
+    
+    context "when archiveables contains valid archiveables" do
+      
+      let(:list) { 
+        Blogit::Archive::List.new([
+          DummyArchiveable.new(2.years.ago),
+          DummyArchiveable.new(2.years.ago),
+          DummyArchiveable.new(2.weeks.ago)
+        ])
+      }
+      
+      it "returns an empty array" do
+        expect(list.years.size).to eql(2)
+      end
+      
+    end
+
+    context "when archiveables doesn't contain valid archiveables" do
+      
+      let(:list) { 
+        Blogit::Archive::List.new([Object.new, Object.new])
+      }
+      
+      it "raises an exception" do
+        expect { list.years }.to raise_error(Blogit::Archive::ArchiveError)
+      end
+      
+    end
+    
+      
+  end
+  
+end

data/spec/lib/archive/month_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'blogit/archive'
+require 'injectables/dummy_archiveable'
+
+describe Blogit::Archive::Month do
+  
+  describe :to_partial_path do
+    
+    let(:list) { Blogit::Archive::Month.new("June", []) }
+    
+    it "returns the class name as a path to partial" do
+      expect(list.to_partial_path).to eql("blogit/archive/month")
+    end
+    
+  end
+  
+end

data/spec/lib/archive/year_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'blogit/archive'
+require 'injectables/dummy_archiveable'
+
+describe Blogit::Archive::Year do
+  
+  describe :to_partial_path do
+    
+    let(:list) { Blogit::Archive::Year.new(2015, []) }
+    
+    it "returns the class name as a path to partial" do
+      expect(list.to_partial_path).to eql("blogit/archive/year")
+    end
+    
+  end
+  
+  describe :months do
+
+    
+    context "when archiveables contains valid archiveables" do
+      
+      let(:list) { 
+        Blogit::Archive::Year.new("2015", [
+          DummyArchiveable.new(2.months.ago),
+          DummyArchiveable.new(2.months.ago),
+          DummyArchiveable.new(2.weeks.ago)
+        ])
+      }
+      
+      it "returns an empty array" do
+        expect(list.months.size).to eql(2)
+      end
+      
+    end
+    
+  end
+  
+end

data/spec/lib/blogit/parsers/html_parser_spec.rb

@@ -6,7 +6,7 @@ describe Blogit::Parsers::HtmlParser do
   let(:desired_output) { "<h2>Some textile</h2>\n<p>A paragraph</p>" }
   
   it "should return an html string of content passed when calling parsed" do
-    parser.parsed.should == desired_output
+    expect(parser.parsed).to eq(desired_output)
   end
   
 end

data/spec/lib/blogit/parsers/markdown_parser_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Blogit::Parsers::MarkdownParser do
 
@@ -6,7 +6,7 @@ describe Blogit::Parsers::MarkdownParser do
   let(:desired_output) { Regexp.new("<h2>Some textile</h2>\n\n<p>A paragraph</p>\n") }
 
   it "should return an html string of content passed when calling parsed" do
-    parser.parsed.should =~ desired_output
+    expect(parser.parsed).to match(desired_output)
   end
 
   describe "code highlighting" do
@@ -16,7 +16,7 @@ describe Blogit::Parsers::MarkdownParser do
     }
 
     it "requires pymentize to run" do
-      system("pygmentize > /dev/null").should equal(true), "It seems that pygmentize is not installed on your system"
+      expect(system("pygmentize > /dev/null")).to equal(true), "It seems that pygmentize is not installed on your system"
     end
 
     context "when highlight_code_syntax is true" do
@@ -28,13 +28,14 @@ describe Blogit::Parsers::MarkdownParser do
       it "should raise an exception if pygments isn't installed" do
         original_path = ENV['PATH']
         ENV['PATH']   = ""
-        expect { parser.parsed }.to raise_error
+        expect { parser.parsed }.to raise_error(RuntimeError)
         ENV["PATH"] = original_path
       end
       
       it "should highlight code syntax" do
-        parser.parsed.should =~
+        expect(parser.parsed).to match(
         Regexp.new("<h2>Header</h2>\n<div class=\"highlight\"><pre><span class=\"nb\">puts</span> <span class=\"s1\">&#39;hello world&#39;</span>\n</pre>\n</div>\n")
+        )
       end
       
     end
@@ -53,7 +54,7 @@ describe Blogit::Parsers::MarkdownParser do
       end
       
       it "shoud not highlight code" do
-        parser.parsed.should == "<h2>Header</h2>\n\n<pre><code class=\"ruby\">puts &#39;hello world&#39;\n</code></pre>\n"
+        expect(parser.parsed).to eq("<h2>Header</h2>\n\n<pre><code class=\"ruby\">puts &#39;hello world&#39;\n</code></pre>\n")
       end
       
     end

data/spec/lib/blogit/parsers/textile_parser_spec.rb

@@ -6,7 +6,7 @@ describe Blogit::Parsers::TextileParser do
   let(:desired_output) { "<h2>Some textile</h2>\n<p>A paragraph</p>" }
   
   it "should return an html string of content passed when calling parsed" do
-    parser.parsed.should == desired_output
+    expect(parser.parsed).to eq(desired_output)
   end
   
 end

data/spec/lib/blogs_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe Blogit::Blogs do
   
   it "should be included in ActiveRecord::Base" do
-    ActiveRecord::Base.included_modules.should include(Blogit::Blogs)
+    expect(ActiveRecord::Base.included_modules).to include(Blogit::Blogs)
   end
   
   describe :blogs do
     it "should be a class macro to AR Base" do
-      ActiveRecord::Base.methods.should include(:blogs)
+      expect(ActiveRecord::Base.methods).to include(:blogs)
     end
         
   end