votd 2.1.0 → 2.1.1

data/.yardopts

@@ -1,5 +1,4 @@
 --title "VotD - (Bible) Verse of the Day"
---protected
 lib/**/*
 -
 CONTRIBUTING.md

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+* Current Iteration
+  * VotD will now return a default scripture of John 3:16 in KJV if there's
+    any error enountered when accessing the VotD from the source server.
 * March 31, 2012 (2.1.0)
   * [Add] `.custom_html` method that takes a block of custom formatted
     HTML to override the `.to_html` method.

data/README.md

@@ -48,6 +48,9 @@ To use VotD in your code:
     votd.date        # 2012-03-24
     votd.version     # NIV
     votd.copyright   # Copyright © ...
+    
+*NOTE: If there's an error encountered while accessing the VotD service a default verse of John 3:16 in the KVJ
+is returned. This ensures that something is returned no matter what.*
 
 ### Outputting HTML
 

data/TODO.md

@@ -1,7 +1,5 @@
 ## Todo
 
-* Generate an appropriate VotD from a static file if there's any error communicating with the VotD API. (e.g. John 3:16)
-
 * Update `votd` command-line version. Currently only a bare stub of an app.
 
 * Integrate [ESV API](http://www.esvapi.org/api)

data/lib/votd/base.rb

@@ -32,6 +32,14 @@ module Votd
     # @return [String] any copyright information supplied by VotD provider
     attr_reader :copyright
 
+    # The default Bible text to use. This is used in case of an error
+    # retrieving the VotD from a remote server
+    DEFAULT_BIBLE_TEXT = "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."
+
+    # The default Bible reference to use. This is used in case of an error
+    # retrieving the VotD from a remote server
+    DEFAULT_BIBLE_REFERENCE = "John 3:16"
+
     # The default Bible version to use if none is given and no other default
     # is provided
     DEFAULT_BIBLE_VERSION = "KJV"
@@ -120,9 +128,14 @@ module Votd
     # used in the event of an exception thrown when getting data from live web
     # services in subclasses of {Votd::Base}
     def get_votd
-      @text      = "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."
-      @reference = "John 3:16"
+      set_defaults
+    end
+
+    def set_defaults
+      @text      = DEFAULT_BIBLE_TEXT
+      @reference = DEFAULT_BIBLE_REFERENCE
       @version   = DEFAULT_BIBLE_VERSION
+      @copyright = nil
     end
 
   end

data/lib/votd/bible_gateway.rb

@@ -27,7 +27,6 @@ module Votd
 
     private
 
-    # @todo Generate default VotD from Votd::Base if there's a problem getting feed
     # Gets the votd from the Bible Gateway RSS feed
     # @return [String]
     def get_votd
@@ -39,6 +38,10 @@ module Votd
       @text        = cleaned_text
       @copyright   = get_copyright(entry.content)
       @version     = BIBLE_VERSION
+    rescue
+      # use default info for VotD
+      set_defaults
+      # @todo Add logging
     end
 
     # Cleans up the text. Removes:

data/lib/votd/netbible.rb

@@ -43,6 +43,11 @@ module Votd
       @text = verses.join(" ")
 
       @version = BIBLE_VERSION
+
+    rescue
+      # use default info for VotD
+      set_defaults
+      # @todo Add logging
     end
   end
 end

data/lib/votd/version.rb

@@ -1,4 +1,4 @@
 module Votd
   # Gem version number
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/lib/votd/bible_gateway_spec.rb

@@ -74,4 +74,16 @@ describe "Votd::BibleGateway" do
     end
   end
 
+  context "When an error occurrs" do
+    before do
+      register_broken_uri(Votd::BibleGateway::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
+    end
+  end
+
 end

data/spec/lib/votd/netbible_spec.rb

@@ -75,4 +75,17 @@ describe "Votd::NETBible" do
     end
   end
 
+  context "When an error occurrs" do
+    before do
+      register_broken_uri(Votd::NetBible::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
+    end
+  end
+
+
 end

data/spec/spec_helper.rb

@@ -17,10 +17,16 @@ RSpec.configure do |config|
 
   # Register Bible Gateway URI
   FakeWeb.register_uri(:get, Votd::BibleGateway::URI,
-                       :body => open(fixture("bible_gateway/bible_gateway.rss")))
+                       body: open(fixture("bible_gateway/bible_gateway.rss")))
 
   # Register NETBible URI
   FakeWeb.register_uri(:get, Votd::NetBible::URI,
-                       :body => open(fixture("netbible/netbible.json")))
+                       body: open(fixture("netbible/netbible.json")))
 
+  # Register broken uri
+  def register_broken_uri(uri)
+    FakeWeb.register_uri(:get, uri,
+                         body: "Oopsies",
+                         status: ["404", "Not Found"])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: votd
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors: