votd 2.1.3 → 2.1.4

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 Changelog
 =========
 
+2.1.4
+-----
+
+*April 6, 2012*
+
+* BUG FIX - NetBible was broken after the Helper::Text reorg. This
+  releases fixes the bug.
+
 2.1.3
------------------
+-----
 
 *April 5, 2012*
 

data/bin/votd

@@ -14,11 +14,11 @@ votd = Votd::BibleGateway.new
 
 LINE_WIDTH = 40
 
-puts banner(LINE_WIDTH) { "VERSE OF THE DAY for #{votd.date.to_s}" }
+banner("VERSE OF THE DAY for #{votd.date.to_s}", LINE_WIDTH) { }
 puts "\n"
 puts word_wrap(votd.to_text, LINE_WIDTH)
 
 if votd.copyright
   puts "\n"
-  puts banner(LINE_WIDTH) { word_wrap(votd.copyright, LINE_WIDTH) }
+  puts banner(word_wrap(votd.copyright, LINE_WIDTH), LINE_WIDTH)
 end

data/lib/votd/base.rb

@@ -92,7 +92,10 @@ module Votd
     # This returns the custom formatted HTML, or you can call the {#to_html} method
     # when ready and your custom HTML will be output.
     #
-    # @return [String] the VotD formatted as custom HTML
+    # @yield [votd] the VotD itself
+    # @yieldparam [Base] votd the VotD itself
+    # @yieldreturn [String] the VotD formatted as custom HTML
+    # @raise {VotdError} when called without block format
     def custom_html
       if block_given?
         @custom_html = yield(self)
@@ -124,7 +127,10 @@ module Votd
     # This returns the custom formatted text, or you can call the {#to_text} method
     # when ready, and your custom text will be output.
     #
-    # @return [String] the VotD formatted as custom text
+    # @yield [votd] the VotD itself
+    # @yieldparam [Base] votd the VotD itself
+    # @yieldreturn [String] the VotD formatted as custom text
+    # @raise {VotdError} when called without block format
     def custom_text
       if block_given?
         @custom_text = yield(self)

data/lib/votd/helper/command_line.rb

@@ -5,23 +5,25 @@ module Votd
     module CommandLine
       extend self
       # Generates a text banner suitable for displaying from a command-line
-      # utility, for example. Use with a block.
+      # utility.
       # @example
-      #   banner(20) { "My Banner" }
+      #   banner("My Banner", 20)
       #
       #   ->
       #   ====================
-      #   My Banner
+      #        My Banner
       #   ====================
       # @param [Integer] line_width number of columns for width
-      # @return [String] the banner text
-      def banner(line_width=40)
+      # @param [String] text text to print inside the banner
+      # @return [nil]
+      def banner(text, line_width=40)
         banner_text = "=" * line_width
         banner_text << "\n"
-        banner_text << yield.center(line_width)
+        banner_text << text.center(line_width)
         banner_text << "\n"
-        banner_text << "=" * line_width
-        banner_text
+        banner_text <<  "=" * line_width
+        puts banner_text
+        nil
       end
 
       # Word-wraps text to the specified column width.

data/lib/votd/netbible.rb

@@ -39,10 +39,9 @@ module Votd
       @reference = "#{bookname} #{chapter}:#{verse_numbers.join("-")}"
 
       # build the text
-      #text = strip_html_tags(verses.join(" "))
       text = Helper::Text.strip_html_tags(verses.join(" "))
-      text = clean_verse_start(text)
-      text = clean_verse_end(text)
+      text = Helper::Text.clean_verse_start(text)
+      text = Helper::Text.clean_verse_end(text)
 
       @text = text
 

data/lib/votd/version.rb

@@ -1,4 +1,4 @@
 module Votd
   # Gem version number
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 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
-      banner(6){ "foo" }.should == "======\n foo  \n======"
+      $stdout.should_receive(:puts).with("======\n foo  \n======")
+      banner("foo", 6)
     end
   end
 

metadata

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