votd 2.2.0 → 3.0.0

data/spec/lib/votd/base_spec.rb

@@ -5,38 +5,51 @@ describe "Votd::Base" do
 
   describe ".text" do
     it "returns the default scripture verse" do
-      votd.text.should == "For God so loved the world, that he gave his only begotten Son, that whosoever believeth in him should not perish, but have everlasting life."
+      expect(votd.text).to eq "For God so loved the world, that he gave his only begotten Son, that whosoever believeth in him should not perish, but have everlasting life."
     end
   end
 
   describe ".reference" do
     it "returns the default scripture reference" do
-      votd.reference.should == "John 3:16"
+      expect(votd.reference).to eq "John 3:16"
     end
   end
 
   describe ".version / .translation" do
     it "returns the default bible version" do
-      votd.translation.should == "KJV"
-      votd.version.should     == "KJV"
+      expect(votd.translation).to eq "KJV"
+      expect(votd.version).to eq "KJV"
+    end
+  end
+
+  describe ".version_name / .translation_name" do
+    it "returns the default bible version" do
+      expect(votd.translation_name).to eq "King James Version"
+      expect(votd.version_name).to eq "King James Version"
+    end
+  end
+
+  describe ".link" do
+    it 'returns the default link' do
+      expect(votd.link).to eq 'https://www.biblegateway.com/passage/?search=John+3%3A16&version=KJV'
     end
   end
 
   describe ".date" do
     it "returns the default date" do
-      votd.date.should == Date.today
+      expect(votd.date).to eq Date.today
     end
   end
 
   describe ".copyright" do
     it "returns nil copyright information" do
-      votd.copyright.should be_nil
+      expect(votd.copyright).to be_nil
     end
   end
 
   describe ".to_html" do
     it "returns a HTML version" do
-      votd.to_html.should == read_fixture("base/base.html")
+      expect(votd.to_html).to eq read_fixture("base/base.html")
     end
   end
 
@@ -46,8 +59,8 @@ describe "Votd::Base" do
         "<p>#{votd.reference}|#{votd.text}|#{votd.version}</p>"
       end
       desired_output = read_fixture("base/base_custom.html")
-      html_from_block.should == desired_output
-      votd.to_html.should    == desired_output
+      expect(html_from_block).to eq desired_output
+      expect(votd.to_html).to eq desired_output
     end
 
     it "generates a VotdError when not used with a block" do
@@ -57,11 +70,11 @@ describe "Votd::Base" do
 
   describe ".to_text" do
     it "returns a text-formatted version" do
-      votd.to_text.should == read_fixture("base/base.txt")
+      expect(votd.to_text).to eq read_fixture("base/base.txt")
     end
 
     it "is aliased to .to_s" do
-      votd.to_s.should == read_fixture("base/base.txt")
+      expect(votd.to_s).to eq read_fixture("base/base.txt")
     end
   end
 
@@ -71,8 +84,8 @@ describe "Votd::Base" do
         "#{votd.reference}|#{votd.text}|#{votd.version}"
       end
       desired_output = read_fixture("base/base_custom.txt")
-      text_from_block.should == desired_output
-      votd.to_text.should    == desired_output
+      expect(text_from_block).to eq desired_output
+      expect(votd.to_text).to eq desired_output
     end
 
     it "generates a VotdError when not used with a block" do

data/spec/lib/votd/bible_gateway_spec.rb

@@ -2,114 +2,156 @@ require 'spec_helper'
 
 describe "Votd::BibleGateway" do
   let(:votd) { Votd::BibleGateway.new }
+  let(:votd_nlt) { Votd::BibleGateway.new(:nlt) }
 
-  before do
-    fake_a_uri(Votd::BibleGateway::URI, "bible_gateway/bible_gateway.rss")
-  end
+  let(:uri_regex) { /#{Votd::BibleGateway::URI}\d*/ }
 
-  it "is a type of BibleGateway" do
-    votd.should be_a(Votd::BibleGateway)
-  end
+  context 'With the default version' do
+    before do
+      fake_a_uri(uri_regex, "bible_gateway/bible_gateway.rss")
+    end
 
-  describe ".text" do
-    it "returns the correct scripture verse" do
-      votd.text.should == "If we confess our sins, he is faithful and just and will forgive us our sins and purify us from all unrighteousness."
+    it "is a type of BibleGateway" do
+      expect(votd).to be_a(Votd::BibleGateway)
     end
-  end
 
-  describe ".reference" do
-    it "returns the correct scripture reference" do
-      votd.reference.should == "1 John 1:9"
+    describe ".text" do
+      it "returns the correct scripture verse" do
+        expect(votd.text).to eq "If we confess our sins, he is faithful and just and will forgive us our sins and purify us from all unrighteousness."
+      end
     end
-  end
 
-  describe ".version / .translation" do
-    it "returns the correct bible version" do
-      votd.version.should     == "NIV"
-      votd.translation.should == "NIV"
+    describe ".reference" do
+      it "returns the correct scripture reference" do
+        expect(votd.reference).to eq "1 John 1:9"
+      end
     end
-  end
 
-  describe ".date" do
-    it "returns the correct date" do
-      votd.date.should == Date.today
+    describe ".version / .translation" do
+      it "returns the correct bible version" do
+        expect(votd.version).to     eq "NIV"
+        expect(votd.translation).to eq "NIV"
+      end
     end
-  end
 
-  describe ".copyright" do
-    it "returns copyright information" do
-      votd.copyright.should == "Brought to you by BibleGateway.com. Copyright (C) . All Rights Reserved."
+    describe ".version_name / .translation_name" do
+      it "returns the correct bible version name" do
+        expect(votd.version_name).to     eq "New International Version"
+        expect(votd.translation_name).to eq "New International Version"
+      end
     end
-  end
 
-  describe ".to_html" do
-    it "returns a HTML version" do
-      votd.to_html.should == read_fixture("bible_gateway/bible_gateway.html")
+    describe ".date" do
+      it "returns the correct date" do
+        expect(votd.date).to eq Date.today
+      end
     end
-  end
 
-  describe ".custom_html" do
-    it "overrides the default .to_html formatting" do
-      votd.custom_html do |votd|
-        "<p>#{votd.reference}|#{votd.text}|#{votd.version}</p>"
+    describe ".copyright" do
+      it "returns copyright information" do
+        expect(votd.copyright).to eq "Brought to you by BibleGateway.com. Copyright (C) . All Rights Reserved."
       end
-      votd.to_html.should == read_fixture("bible_gateway/bible_gateway_custom.html")
     end
 
-    it "generates a VotdError when not used with a block" do
-      expect{votd.custom_html}.to raise_error(Votd::VotdError)
+    describe ".link" do
+      it 'returns the link' do
+        expect(votd.link).to eq 'http://www.biblegateway.com/passage/?search=1+John+1%3A9&version=NIV'
+      end
     end
-  end
 
-  describe ".to_text" do
-    it "returns a text-formatted version" do
-      votd.to_text.should == read_fixture("bible_gateway/bible_gateway.txt")
+    describe ".to_html" do
+      it "returns a HTML version" do
+        expect(votd.to_html).to eq read_fixture("bible_gateway/bible_gateway.html")
+      end
     end
 
-    it "is aliased to .to_s" do
-      votd.to_s.should == read_fixture("bible_gateway/bible_gateway.txt")
+    describe ".custom_html" do
+      it "overrides the default .to_html formatting" do
+        votd.custom_html do |votd|
+          "<p>#{votd.reference}|#{votd.text}|#{votd.version}</p>"
+        end
+        expect(votd.to_html).to eq read_fixture("bible_gateway/bible_gateway_custom.html")
+      end
+
+      it "generates a VotdError when not used with a block" do
+        expect{votd.custom_html}.to raise_error(Votd::VotdError)
+      end
     end
-  end
 
-  describe ".custom_text" do
-    it "overrides the default.to_text formatting" do
-      text_from_block = votd.custom_text do |votd|
-        "#{votd.reference}|#{votd.text}|#{votd.version}"
+    describe ".to_text" do
+      it "returns a text-formatted version" do
+        expect(votd.to_text).to eq read_fixture("bible_gateway/bible_gateway.txt")
+      end
+
+      it "is aliased to .to_s" do
+        expect(votd.to_s).to eq read_fixture("bible_gateway/bible_gateway.txt")
       end
-      desired_output = read_fixture("bible_gateway/bible_gateway_custom.txt")
-      text_from_block.should == desired_output
-      votd.to_text.should    == desired_output
     end
 
-    it "generates a VotdError when not used with a block" do
-      expect{votd.custom_text}.to raise_error(Votd::VotdError)
+    describe ".custom_text" do
+      it "overrides the default.to_text formatting" do
+        text_from_block = votd.custom_text do |votd|
+          "#{votd.reference}|#{votd.text}|#{votd.version}"
+        end
+        desired_output = read_fixture("bible_gateway/bible_gateway_custom.txt")
+        expect(text_from_block).to eq desired_output
+        expect(votd.to_text).to eq desired_output
+      end
+
+      it "generates a VotdError when not used with a block" do
+        expect{votd.custom_text}.to raise_error(Votd::VotdError)
+      end
     end
   end
 
   context "When an error occurrs" do
     before do
-      fake_a_broken_uri(Votd::BibleGateway::URI)
+      fake_a_broken_uri(uri_regex)
     end
 
     it "falls back to default VotD values" do
-      votd.version.should   == Votd::Base::DEFAULT_BIBLE_VERSION
-      votd.reference.should == Votd::Base::DEFAULT_BIBLE_REFERENCE
-      votd.text.should      == Votd::Base::DEFAULT_BIBLE_TEXT
+      expect(votd.version).to eq Votd::Base::DEFAULT_BIBLE_VERSION
+      expect(votd.reference).to eq Votd::Base::DEFAULT_BIBLE_REFERENCE
+      expect(votd.text).to eq Votd::Base::DEFAULT_BIBLE_TEXT
     end
   end
 
   context "When the text is not a proper sentence" do
     before do
-      fake_a_uri(Votd::BibleGateway::URI, "bible_gateway/bible_gateway_with_partial.rss")
+      fake_a_uri(uri_regex, "bible_gateway/bible_gateway_with_partial.rss")
     end
 
     it "prepends an ellipsis if first letter is not a capital letter" do
-      votd.text.should =~ /^\.{3}\w/
+      expect(votd.text).to match /^\.{3}\w/
     end
 
     it "appends an ellipsis if last character is not a period" do
-      votd.text.should =~ /ness\.{3}$/
+      expect(votd.text).to match /ness\.{3}$/
     end
   end
 
+  context 'When specifying a version' do
+    before do
+      fake_a_uri("#{Votd::BibleGateway::URI}#{51}", 'bible_gateway/bible_gateway_nlt.rss')
+    end
+
+    describe ".text" do
+      it "returns the correct scripture verse" do
+        expect(votd_nlt.text).to eq "Let the message about Christ, in all its richness, fill your lives. Teach and counsel each other with all the wisdom he gives. Sing psalms and hymns and spiritual songs to God with thankful hearts."
+      end
+
+      it 'returns the correct version info' do
+        expect(votd_nlt.version).to eq 'NLT'
+        expect(votd_nlt.version_name).to eq 'New Living Translation'
+      end
+
+      it "returns copyright information" do
+        expect(votd_nlt.copyright).to eq "Brought to you by BibleGateway.com. Copyright (C) NLT. All Rights Reserved."
+      end
+
+      it 'returns the link' do
+        expect(votd_nlt.link).to eq 'https://www.biblegateway.com/passage/?search=Colossians+3%3A16&version=51'
+      end
+    end
+  end
 end

data/spec/lib/votd/esvbible_spec.rb

@@ -2,114 +2,126 @@ require 'spec_helper'
 
 describe "Votd::ESVBible" do
   let(:votd) { Votd::ESVBible.new }
-  
+
   before do
     fake_a_uri(Votd::ESVBible::URI, "esvbible/esvbible.rss")
   end
-  
+
   it "is a type of ESVBible" do
-    votd.should be_a(Votd::ESVBible)
+    expect(votd).to be_a(Votd::ESVBible)
   end
-  
+
   describe ".text" do
     it "returns the correct scripture verse" do
-      votd.text.should == "For you did not receive the spirit of slavery to fall back into fear, but you have received the Spirit of adoption as sons, by whom we cry, \"Abba! Father!\""
+      expect(votd.text).to eq "For you did not receive the spirit of slavery to fall back into fear, but you have received the Spirit of adoption as sons, by whom we cry, \"Abba! Father!\""
     end
   end
-  
+
   describe ".reference" do
     it "returns the correct scripture reference" do
-      votd.reference.should == "Romans 8:15"
+      expect(votd.reference).to eq "Romans 8:15"
     end
   end
-  
+
   describe ".version / .translation" do
     it "returns the correct bible version" do
-      votd.version.should == "ESV"
-      votd.translation.should == "ESV"
+      expect(votd.version).to eq "ESV"
+      expect(votd.translation).to eq "ESV"
+    end
+  end
+
+  describe ".version_name / .translation_name" do
+    it "returns the correct bible version" do
+      expect(votd.version_name).to eq "English Standard Version"
+      expect(votd.translation_name).to eq "English Standard Version"
     end
   end
-  
+
   describe ".date" do
     it "returns the correct date" do
-      votd.date.should == Date.today
+      expect(votd.date).to eq Date.today
     end
   end
-  
+
   describe ".copyright" do
     it "returns copyright information" do
-      votd.copyright.should == "The Holy Bible, English Standard Version copyright 2001 by Crossway Bibles, a publishing ministry of Good News Publishers. Used by permission. All rights reserved."
+      expect(votd.copyright).to eq "The Holy Bible, English Standard Version copyright 2001 by Crossway Bibles, a publishing ministry of Good News Publishers. Used by permission. All rights reserved."
+    end
+  end
+
+  describe ".link" do
+    it 'returns the link' do
+      expect(votd.link).to eq 'http://www.gnpcb.org/esv/search/?passage=Romans+8%3A15&date=20131029'
     end
   end
-  
+
   describe ".to_html" do
     it "returns a HTML version" do
-      votd.to_html.should == read_fixture("esvbible/esvbible.html")
+      expect(votd.to_html).to eq read_fixture("esvbible/esvbible.html")
     end
   end
-  
+
   describe ".custom_html" do
     it "overrides the default .to_html formatting" do
       votd.custom_html do |votd|
         "<p>#{votd.reference}|#{votd.text}|#{votd.version}</p>"
       end
-      votd.to_html.should == read_fixture("esvbible/esvbible_custom.html")
+      expect(votd.to_html).to eq read_fixture("esvbible/esvbible_custom.html")
     end
-    
+
     it "generates a VotdError when not used with a block" do
-      expect{votd.custom_html}.to raise_error(Votd::VotdError)
+      expect{ votd.custom_html }.to raise_error(Votd::VotdError)
     end
   end
-  
+
   describe ".to_text" do
     it "returns a text-formatted version" do
-      votd.to_text.should == read_fixture("esvbible/esvbible.txt")
+      expect(votd.to_text).to eq read_fixture("esvbible/esvbible.txt")
     end
-    
+
     it "is aliased to .to_s" do
-      votd.to_s.should == read_fixture("esvbible/esvbible.txt")
+      expect(votd.to_s).to eq read_fixture("esvbible/esvbible.txt")
     end
   end
-  
+
   describe ".custom_text" do
     it "overrides the default .to_text formatting" do
       text_from_block = votd.custom_text do |votd|
         "#{votd.reference}|#{votd.text}|#{votd.version}"
       end
       desired_output = read_fixture("esvbible/esvbible_custom.txt")
-      text_from_block.should == desired_output
-      votd.to_text.should    == desired_output
+      expect(text_from_block).to eq desired_output
+      expect(votd.to_text).to    eq desired_output
     end
-    
+
     it "generates a VotdError when not used with a block" do
-      expect{votd.custom_text}.to raise_error(Votd::VotdError)
+      expect{ votd.custom_text }.to raise_error(Votd::VotdError)
     end
   end
-  
+
   context "When an error occurs" do
     before do
       fake_a_broken_uri(Votd::ESVBible::URI)
     end
-    
+
     it "falls back to default VotD values" do
-      votd.version.should   == Votd::Base::DEFAULT_BIBLE_VERSION
-      votd.reference.should == Votd::Base::DEFAULT_BIBLE_REFERENCE
-      votd.text.should      == Votd::Base::DEFAULT_BIBLE_TEXT
+      expect(votd.version).to   eq Votd::Base::DEFAULT_BIBLE_VERSION
+      expect(votd.reference).to eq Votd::Base::DEFAULT_BIBLE_REFERENCE
+      expect(votd.text).to      eq Votd::Base::DEFAULT_BIBLE_TEXT
     end
   end
-  
+
   context "When the text is not a proper sentence" do
     before do
       fake_a_uri(Votd::ESVBible::URI, "esvbible/esvbible_with_partial.rss")
     end
-    
+
     it "prepends an ellipsis if first letter is not a capital letter" do
-      votd.text.should =~ /^\.{3}\w/
+      expect(votd.text).to match /^\.{3}\w/
     end
-    
+
     it "appends an ellipsis if last character is a letter, a comma or a semicolon" do
-      votd.text.should =~ /\w\.{3}$/
+      expect(votd.text).to match /\w\.{3}$/
     end
   end
-
 end

data/spec/lib/votd/helper/command_line_spec.rb

@@ -6,7 +6,8 @@ include Votd::Helper::CommandLine
 describe Votd::Helper::CommandLine do
   describe "#banner" do
     it "prints a banner wrapped at the correct location" do
-      $stdout.should_receive(:puts).with("======\n foo  \n======")
+      #$stdout.should_receive(:puts).with("======\n foo  \n======")
+      expect($stdout).to receive(:puts).with("======\n foo  \n======")
       banner("foo", 6)
     end
   end
@@ -14,7 +15,7 @@ describe Votd::Helper::CommandLine do
   describe "#word_wrap" do
     it "wraps text at the specified column" do
       text = "The quick brown fox jumps over the lazy dog."
-      word_wrap(text, 20).should == "The quick brown fox\njumps over the lazy\ndog."
+      expect(word_wrap(text, 20)).to eq "The quick brown fox\njumps over the lazy\ndog."
     end
   end
 end

data/spec/lib/votd/helper/text_spec.rb

@@ -6,26 +6,26 @@ describe Votd::Helper::Text do
   describe ".strip_html_tags" do
     it "removes HTML tags from a given string" do
       text = %q[<p>The <span name="foo">quick</span> brown fox.</p><br />]
-      strip_html_tags(text).should == "The quick brown fox."
+      expect(strip_html_tags(text)).to eq "The quick brown fox."
     end
   end
 
   describe ".clean_verse_start" do
     it "prepends '...' if the first letter is not a capital letter" do
       text = "for God so loved"
-      clean_verse_start(text).should == "...for God so loved"
+      expect(clean_verse_start(text)).to eq "...for God so loved"
     end
   end
 
   describe ".clean_verse_end" do
     it "appends '...' if the verse ends without a period" do
       text = "For God so loved"
-      clean_verse_end(text).should == "For God so loved..."
+      expect(clean_verse_end(text)).to eq "For God so loved..."
     end
 
     it "appends '...' if the verse ends in a ',' or ';'" do
-      ["loved,", "loved;"].each do |text| 
-        clean_verse_end(text).should == "loved..."
+      ["loved,", "loved;"].each do |text|
+        expect(clean_verse_end(text)).to eq "loved..."
       end
     end
   end