bible_reference_parser 0.1.3 → 0.1.4

data/Gemfile

@@ -1,13 +1,11 @@
-source 'http://rubygems.org'
-
-gem "rake"
+source :rubygems
 
 group :development do
-  gem "rspec", ">= 2.0.0.rc"
-  gem "jeweler"  
+  gem "rspec", ">= 2.2.0"
+  gem "jeweler"
 end
 
 group :test do
-  gem "rspec", ">= 2.0.0.rc"
-  gem 'simplecov', '>= 0.3.5', :group => :test
+  gem "rspec", ">= 2.2.0"
+  gem 'simplecov', '>= 0.3.7'
 end

data/Gemfile.lock

@@ -2,35 +2,28 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    gemcutter (0.6.1)
     git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
+      rake
     rake (0.8.7)
-    rspec (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-      rspec-mocks (= 2.0.0.rc)
-    rspec-core (2.0.0.rc)
-    rspec-expectations (2.0.0.rc)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    simplecov (0.3.6)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+    simplecov (0.3.7)
       simplecov-html (>= 0.3.7)
-    simplecov-html (0.3.8)
+    simplecov-html (0.3.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jeweler
-  rake
-  rspec (>= 2.0.0.rc)
-  simplecov (>= 0.3.5)
+  rspec (>= 2.2.0)
+  simplecov (>= 0.3.7)

data/Rakefile

@@ -15,9 +15,6 @@ begin
     gem.email       = "nathan.mcwilliams@gmail.com"
     gem.homepage    = "http://github.com/endium/bible_reference_parser"
     gem.authors     = ["Nathan McWilliams"]
-    
-    gem.add_development_dependency "rspec", ">= 2.0.0.rc"
-    gem.add_development_dependency "simplecov", ">= 0.3.5"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError => ex

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bible_reference_parser.gemspec

@@ -1,64 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bible_reference_parser}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan McWilliams"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-12-04}
   s.description = %q{BibleReferenceParser can parse scriptures passages, such as 'Gen. 1:15-18, 21' to the individual books, chapters and verses in the passage. It also provides validation for invalid book names, chapters, and verses.}
   s.email = %q{nathan.mcwilliams@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bible_reference_parser.gemspec",
-     "lib/bible_reference_parser.rb",
-     "lib/bible_reference_parser/metadata/bible_metadata.rb",
-     "lib/bible_reference_parser/metadata/metadata.yml",
-     "lib/bible_reference_parser/parser.rb",
-     "lib/bible_reference_parser/reference/behavior/tracks_errors.rb",
-     "lib/bible_reference_parser/reference/book_reference.rb",
-     "lib/bible_reference_parser/reference/chapter_reference.rb",
-     "lib/bible_reference_parser/reference/reference_collection.rb",
-     "lib/bible_reference_parser/reference/verse_reference.rb",
-     "spec/bible_metadata_spec.rb",
-     "spec/book_reference_spec.rb",
-     "spec/chapter_reference_spec.rb",
-     "spec/parser_spec.rb",
-     "spec/reference_collection_spec.rb",
-     "spec/shared/it_tracks_errors_shared.rb",
-     "spec/spec_helper.rb",
-     "spec/verse_reference_spec.rb"
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bible_reference_parser.gemspec",
+    "lib/bible_reference_parser.rb",
+    "lib/bible_reference_parser/metadata/bible_metadata.rb",
+    "lib/bible_reference_parser/metadata/metadata.yml",
+    "lib/bible_reference_parser/parser.rb",
+    "lib/bible_reference_parser/reference/behavior/tracks_errors.rb",
+    "lib/bible_reference_parser/reference/book_reference.rb",
+    "lib/bible_reference_parser/reference/chapter_reference.rb",
+    "lib/bible_reference_parser/reference/reference_collection.rb",
+    "lib/bible_reference_parser/reference/verse_reference.rb",
+    "spec/bible_metadata_spec.rb",
+    "spec/book_reference_spec.rb",
+    "spec/chapter_reference_spec.rb",
+    "spec/parser_spec.rb",
+    "spec/reference_collection_spec.rb",
+    "spec/shared/it_tracks_errors_shared.rb",
+    "spec/spec_helper.rb",
+    "spec/verse_reference_spec.rb"
   ]
   s.homepage = %q{http://github.com/endium/bible_reference_parser}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Parsing and validation for scripture passages.}
   s.test_files = [
     "spec/bible_metadata_spec.rb",
-     "spec/book_reference_spec.rb",
-     "spec/chapter_reference_spec.rb",
-     "spec/parser_spec.rb",
-     "spec/reference_collection_spec.rb",
-     "spec/shared/it_tracks_errors_shared.rb",
-     "spec/spec_helper.rb",
-     "spec/verse_reference_spec.rb"
+    "spec/book_reference_spec.rb",
+    "spec/chapter_reference_spec.rb",
+    "spec/parser_spec.rb",
+    "spec/reference_collection_spec.rb",
+    "spec/shared/it_tracks_errors_shared.rb",
+    "spec/spec_helper.rb",
+    "spec/verse_reference_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -66,15 +64,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.rc"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.3.5"])
+      s.add_development_dependency(%q<rspec>, [">= 2.2.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
-      s.add_dependency(%q<simplecov>, [">= 0.3.5"])
+      s.add_dependency(%q<rspec>, [">= 2.2.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
-    s.add_dependency(%q<simplecov>, [">= 0.3.5"])
+    s.add_dependency(%q<rspec>, [">= 2.2.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/lib/bible_reference_parser/metadata/metadata.yml

@@ -6,7 +6,7 @@ genesis: &gen
   chapter_info:  [31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26]
 gen:  *gen
 gn:   *gen
-ge:   *gen  
+ge:   *gen
 exodus: &ex
   name:          Exodus
   short_name:    Ex.
@@ -140,9 +140,9 @@ ecclesiastes: &eccles
   name:          Ecclesiastes
   short_name:    Eccles.
   chapter_info:  [18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14]
-ecc:    *ecc
-ec:     *ec
-eccl:   *eccl
+ecc:    *eccles
+ec:     *eccles
+eccl:   *eccles
 songofsolomon: &song
   name:          Song of Solomon
   short_name:    Song.
@@ -454,4 +454,4 @@ revelation: &rev
   name:          Revelation
   short_name:    Rev.
   chapter_info:  [20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21]
-rev:    *rev
+rev:    *rev

data/spec/bible_metadata_spec.rb

@@ -7,6 +7,10 @@ describe BibleMetadata do
     @matthew = "Matthew"
   end
   
+  it "should have valid abbreviations" do
+    BibleMetadata.metadata.any? {|book| book[1].is_a?(Syck::BadAlias) }.should_not be_true
+  end
+  
   it "should find the correct book for an all lower-cased name" do
     info = BibleMetadata["matthew"]
     info.should_not be_nil
@@ -63,4 +67,4 @@ describe BibleMetadata do
     info["chapter_info"].length.should eql 50
   end
 
-end
+end

data/spec/book_reference_spec.rb

@@ -98,6 +98,9 @@ describe BookReference do
 
       it "should correctly identify when there are 2 books" do
         books = BookReference.parse_books("Genesis 1:1, Exodus 1:1")
+        books.length.should eql 2
+        
+        books = BookReference.parse_books("Genesis 1:1; Exodus 1:1")
         books.length.should eql 2    
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nathan McWilliams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -07:00
+date: 2010-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,15 +26,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 2
         - 0
-        - 0
-        - rc
-        version: 2.0.0.rc
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: jeweler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,9 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 5
-        version: 0.3.5
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -59,7 +56,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -90,8 +86,8 @@ homepage: http://github.com/endium/bible_reference_parser
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -99,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4000593101668032954
+      hash: -3109086924271571769
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.bundle
-
-## PROJECT::SPECIFIC