votd 2.1.6 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4eced14b46eed3c5289eeb500f6529c22422bb19
+  data.tar.gz: 5c1dcf6de1ea31371b226abf70dad4f325efb15f
+SHA512:
+  metadata.gz: 7477be79d25ae436862e6112875c7cfa41a446b928690244398c17538edf14e5d696de49d86f26d5eecf5088a44351cfcd88cb2cb5645443ebf42d22d79b872f
+  data.tar.gz: 01f29a9b550cd91bc4ead7dd6b9767aeedc6f3314ff04f8519f3ef9c061128e71e10439145c8fdca243d3b13466b94f66e4fc7b94ba3fdf325b1cbece93e6706

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   #- jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
 notifications:

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+2.2.0
+-----
+*October 31, 2013*
+
+* Added ESV Support (thanks [Sebastian Hirsch](https://github.com/SebastianHirsch))
+
+2.1.6
+-----
+*January 24, 2013*
+
+* Fixed minor documentation error
+* Changed repository owner on GitHub
+
+
 2.1.5
 -----
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Christopher Clarke, Stephen Clarke
+Copyright (c) 2012-2013 Christopher Clarke, Stephen Clarke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,16 +6,15 @@ VotD (Verse of the Day) is a Ruby Gem that wraps various web services that gener
 daily Bible Verses.
 
 
-Currently the gem supports two VotD web services:
+Currently the gem supports three VotD web services:
 
 * [Bible.org](http://labs.bible.org) - NETBible Translation
 * [Bible Gateway](http://www.biblegateway.com) - NIV Translations (Currently only supporting the default NIV, but planning on adding more.)
+* [ESV Bible Web Service](http://www.esvapi.org/) - ESV Translation
 
 Other services are are planned:
 
-* [Bible Gateway](http://www.biblegateway.com) - More Translations
- 
-* [ESV Bible Web Service](http://www.esvapi.org/) - ESV Translation
+* [Bible Gateway](http://www.biblegateway.com) - More Translations 
 
 If you are able to contribute modules for any of these, please see our [CONTRIBUTING](https://github.com/Sevenview/votd/blob/master/CONTRIBUTING.md) file. Let us know before you begin work in case someone else has a module in-progress.
 
@@ -141,12 +140,14 @@ See our [TODO](https://github.com/Sevenview/votd/blob/master/TODO.md) file.
 
 ## Authors
 
-Christopher Clarke <beakr@ninjanizr.com>
+Christopher Clarke <chris@seven7.ca>
 
 Stephen Clarke <steve@sevenview.ca>
 
+[Sebastian Hirsch](https://github.com/SebastianHirsch) (ESV)
+
 ## Copyright
 
 (The MIT License)
 
-&copy; 2012 Christopher Clarke, Stephen Clarke. See [LICENSE](https://github.com/Sevenview/votd/blob/master/LICENSE) for details.
+&copy; 2012-2013 Christopher Clarke, Stephen Clarke. See [LICENSE](https://github.com/Sevenview/votd/blob/master/LICENSE) for details.

data/TODO.md

@@ -2,8 +2,6 @@
 
 * Update `votd` command-line version. Currently only a bare stub of an app.
 
-* Integrate [ESV API](http://www.esvapi.org/api)
-
 * Enable support for more translations from [Bible Gateway](http://www.biblegateway.com/usage/votd/docs/)
 
 * Add some kind of simple caching

data/lib/votd.rb

@@ -13,3 +13,4 @@ require "votd/votd_error"
 require "votd/base"
 require "votd/bible_gateway"
 require "votd/netbible"
+require "votd/esvbible"

data/lib/votd/esvbible.rb

@@ -0,0 +1,52 @@
+require 'votd/helper/text'
+
+module Votd
+  # Retrieves a Verse of the Day from http://www.gnpcb.org,
+  # Good News Publishers, Crossway Bibles,
+  # using the English Standard Version translation (ESV).
+  class ESVBible < Votd::Base
+    # The name of the Bible Translation that this module generates
+    BIBLE_VERSION = "ESV"
+    
+    # The URI of the API gateway
+    URI = "http://www.gnpcb.org/esv/share/rss2.0/daily/"
+    
+    # Initializes the ESVBible class
+    # @return [Votd::ESVBible]
+    def initialize
+      super
+    end
+    
+    private
+    
+    # Gets the votd from the Good News Publishers, Crossway Bibles,
+    # RSS feed
+    # @return [String]
+    def get_votd
+      parsed_feed       = Nokogiri::XML(HTTParty.get(URI).body)
+      cleaned_copyright = clean_copyright(parsed_feed.xpath("//copyright").text)
+      
+      @reference = parsed_feed.xpath("//title")[1].text
+      @text      = parsed_feed.xpath("//description")[1].text
+      @copyright = cleaned_copyright
+      @version   = BIBLE_VERSION
+      
+      @text = Helper::Text.clean_verse_start(@text)
+      @text = Helper::Text.clean_verse_end(@text)
+    rescue => e
+      # use default info for VotD
+      set_defaults
+    end
+    
+    # Cleans up the copyright.
+    # Removes:
+    #   - Tabs, line breaks
+    # Inserts:
+    #   - Missing space after commas
+    # @return [String]
+    def clean_copyright(text)
+      text = text.gsub(/[\t\n]/, '')
+      text = text.gsub(/,(?!\s)/, ', ')
+    end
+  end
+end

data/lib/votd/version.rb

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

data/spec/fixtures/esvbible/esvbible.html

@@ -0,0 +1,5 @@
+<p class="votd-text">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!"</p>
+<p>
+<span class="votd-reference"><strong>Romans 8:15</strong></span>
+<span class="votd-version"><em>(ESV)</em></span>
+</p>

data/spec/fixtures/esvbible/esvbible.rss

@@ -0,0 +1,19 @@
+<rss version="2.0">
+	<channel>
+		<title>English Standard Version Bible Daily Verse</title>
+		<link>http://www.gnpcb.org/esv/share/rss2.0/</link>
+		<description>A daily verse from the ESV Bible.</description>
+		<webMaster>webmaster@crossway.org</webMaster>
+		<copyright>The Holy Bible, English Standard Version copyright 2001 by Crossway Bibles,
+				a publishing ministry of Good News Publishers. Used by permission. All rights reserved.
+		</copyright>
+		<ttl>1440</ttl>
+		<item>
+			<title>Romans 8:15</title>
+			<link>http://www.gnpcb.org/esv/search/?passage=Romans+8%3A15</link>
+			<guid isPermaLink="false">http://www.gnpcb.org/esv/search/?passage=Romans+8%3A15&amp;date=20131029</guid>
+			<pubDate>Tue, 29 Oct 2013 00:01:00 -0500</pubDate>
+			<description>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, &quot;Abba! Father!&quot;</description>
+					</item>
+	</channel>
+</rss>

data/spec/fixtures/esvbible/esvbible.txt

@@ -0,0 +1 @@
+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!" -- Romans 8:15 (ESV)

data/spec/fixtures/esvbible/esvbible_custom.html

@@ -0,0 +1 @@
+<p>Romans 8:15|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!"|ESV</p>

data/spec/fixtures/esvbible/esvbible_custom.txt

@@ -0,0 +1 @@
+Romans 8:15|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!"|ESV

data/spec/fixtures/esvbible/esvbible_with_partial.rss

@@ -0,0 +1,19 @@
+<rss version="2.0">
+	<channel>
+		<title>English Standard Version Bible Daily Verse</title>
+		<link>http://www.gnpcb.org/esv/share/rss2.0/</link>
+		<description>A daily verse from the ESV Bible.</description>
+		<webMaster>webmaster@crossway.org</webMaster>
+		<copyright>The Holy Bible, English Standard Version copyright 2001 by Crossway Bibles,
+				a publishing ministry of Good News Publishers. Used by permission. All rights reserved.
+		</copyright>
+		<ttl>1440</ttl>
+		<item>
+			<title>Romans 8:15</title>
+			<link>http://www.gnpcb.org/esv/search/?passage=Romans+8%3A15</link>
+			<guid isPermaLink="false">http://www.gnpcb.org/esv/search/?passage=Romans+8%3A15&amp;date=20131029</guid>
+			<pubDate>Tue, 29 Oct 2013 00:01:00 -0500</pubDate>
+			<description>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, &quot;Abba! Father</description>
+					</item>
+	</channel>
+</rss>

data/spec/lib/votd/esvbible_spec.rb

@@ -0,0 +1,115 @@
+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)
+  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!\""
+    end
+  end
+  
+  describe ".reference" do
+    it "returns the correct scripture reference" do
+      votd.reference.should == "Romans 8:15"
+    end
+  end
+  
+  describe ".version / .translation" do
+    it "returns the correct bible version" do
+      votd.version.should == "ESV"
+      votd.translation.should == "ESV"
+    end
+  end
+  
+  describe ".date" do
+    it "returns the correct date" do
+      votd.date.should == 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."
+    end
+  end
+  
+  describe ".to_html" do
+    it "returns a HTML version" do
+      votd.to_html.should == 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")
+    end
+    
+    it "generates a VotdError when not used with a block" do
+      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")
+    end
+    
+    it "is aliased to .to_s" do
+      votd.to_s.should == 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
+    end
+    
+    it "generates a VotdError when not used with a block" do
+      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
+    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/
+    end
+    
+    it "appends an ellipsis if last character is a letter, a comma or a semicolon" do
+      votd.text.should =~ /\w\.{3}$/
+    end
+  end
+
+end

data/votd.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/votd/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Steve Clarke", "Chris Clarke"]
-  gem.email         = ["steve@sevenview.ca", "beakr@ninjanizr.com"]
+  gem.email         = ["steve@sevenview.ca", "chris@seven7.ca"]
   gem.summary       = %q{Generate a (Bible) Verse of the Day using various web service wrappers}
   gem.homepage      = "http://sevenview.github.com/votd"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = Votd::VERSION
   gem.license       = "MIT"
 
-  gem.required_ruby_version = ">= 1.9.2"
+  gem.required_ruby_version = ">= 1.9.3"
 
   gem.add_runtime_dependency     "httparty"
   gem.add_runtime_dependency     "feedzirra", "~> 0.2.0.rc2"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: votd
 version: !ruby/object:Gem::Version
-  version: 2.1.6
-  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors:
 - Steve Clarke
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: feedzirra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,119 +42,105 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
 email:
 - steve@sevenview.ca
-- beakr@ninjanizr.com
+- chris@seven7.ca
 executables:
 - votd
 extensions: []
@@ -181,6 +162,7 @@ files:
 - lib/votd.rb
 - lib/votd/base.rb
 - lib/votd/bible_gateway.rb
+- lib/votd/esvbible.rb
 - lib/votd/helper/command_line.rb
 - lib/votd/helper/helper.rb
 - lib/votd/helper/text.rb
@@ -197,6 +179,12 @@ files:
 - spec/fixtures/bible_gateway/bible_gateway_custom.html
 - spec/fixtures/bible_gateway/bible_gateway_custom.txt
 - spec/fixtures/bible_gateway/bible_gateway_with_partial.rss
+- spec/fixtures/esvbible/esvbible.html
+- spec/fixtures/esvbible/esvbible.rss
+- spec/fixtures/esvbible/esvbible.txt
+- spec/fixtures/esvbible/esvbible_custom.html
+- spec/fixtures/esvbible/esvbible_custom.txt
+- spec/fixtures/esvbible/esvbible_with_partial.rss
 - spec/fixtures/netbible/netbible.html
 - spec/fixtures/netbible/netbible.json
 - spec/fixtures/netbible/netbible.txt
@@ -206,6 +194,7 @@ files:
 - spec/fixtures/netbible/netbible_with_partial.json
 - spec/lib/votd/base_spec.rb
 - spec/lib/votd/bible_gateway_spec.rb
+- spec/lib/votd/esvbible_spec.rb
 - spec/lib/votd/helper/command_line_spec.rb
 - spec/lib/votd/helper/helper_spec.rb
 - spec/lib/votd/helper/text_spec.rb
@@ -218,27 +207,26 @@ files:
 homepage: http://sevenview.github.com/votd
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate a (Bible) Verse of the Day using various web service wrappers
 test_files:
 - spec/fixtures/base/base.html
@@ -251,6 +239,12 @@ test_files:
 - spec/fixtures/bible_gateway/bible_gateway_custom.html
 - spec/fixtures/bible_gateway/bible_gateway_custom.txt
 - spec/fixtures/bible_gateway/bible_gateway_with_partial.rss
+- spec/fixtures/esvbible/esvbible.html
+- spec/fixtures/esvbible/esvbible.rss
+- spec/fixtures/esvbible/esvbible.txt
+- spec/fixtures/esvbible/esvbible_custom.html
+- spec/fixtures/esvbible/esvbible_custom.txt
+- spec/fixtures/esvbible/esvbible_with_partial.rss
 - spec/fixtures/netbible/netbible.html
 - spec/fixtures/netbible/netbible.json
 - spec/fixtures/netbible/netbible.txt
@@ -260,6 +254,7 @@ test_files:
 - spec/fixtures/netbible/netbible_with_partial.json
 - spec/lib/votd/base_spec.rb
 - spec/lib/votd/bible_gateway_spec.rb
+- spec/lib/votd/esvbible_spec.rb
 - spec/lib/votd/helper/command_line_spec.rb
 - spec/lib/votd/helper/helper_spec.rb
 - spec/lib/votd/helper/text_spec.rb