bible_reference_parser 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +3 -3
- data/Gemfile.lock +11 -11
- data/Rakefile +2 -2
- data/VERSION +1 -1
- data/bible_reference_parser.gemspec +7 -7
- data/lib/bible_reference_parser/reference/verse_reference.rb +8 -4
- data/spec/verse_reference_spec.rb +7 -0
- metadata +7 -8
data/Gemfile
CHANGED
@@ -3,11 +3,11 @@ source 'http://rubygems.org'
|
|
3
3
|
gem "rake"
|
4
4
|
|
5
5
|
group :development do
|
6
|
-
gem "rspec", ">= 2.0.0.
|
6
|
+
gem "rspec", ">= 2.0.0.rc"
|
7
7
|
gem "jeweler"
|
8
8
|
end
|
9
9
|
|
10
10
|
group :test do
|
11
|
-
gem "rspec", ">= 2.0.0.
|
12
|
-
gem 'simplecov', '>= 0.3.
|
11
|
+
gem "rspec", ">= 2.0.0.rc"
|
12
|
+
gem 'simplecov', '>= 0.3.5', :group => :test
|
13
13
|
end
|
data/Gemfile.lock
CHANGED
@@ -10,16 +10,16 @@ GEM
|
|
10
10
|
rubyforge (>= 2.0.0)
|
11
11
|
json_pure (1.4.6)
|
12
12
|
rake (0.8.7)
|
13
|
-
rspec (2.0.0.
|
14
|
-
rspec-core (= 2.0.0.
|
15
|
-
rspec-expectations (= 2.0.0.
|
16
|
-
rspec-mocks (= 2.0.0.
|
17
|
-
rspec-core (2.0.0.
|
18
|
-
rspec-expectations (2.0.0.
|
13
|
+
rspec (2.0.0.rc)
|
14
|
+
rspec-core (= 2.0.0.rc)
|
15
|
+
rspec-expectations (= 2.0.0.rc)
|
16
|
+
rspec-mocks (= 2.0.0.rc)
|
17
|
+
rspec-core (2.0.0.rc)
|
18
|
+
rspec-expectations (2.0.0.rc)
|
19
19
|
diff-lcs (>= 1.1.2)
|
20
|
-
rspec-mocks (2.0.0.
|
21
|
-
rspec-core (= 2.0.0.
|
22
|
-
rspec-expectations (= 2.0.0.
|
20
|
+
rspec-mocks (2.0.0.rc)
|
21
|
+
rspec-core (= 2.0.0.rc)
|
22
|
+
rspec-expectations (= 2.0.0.rc)
|
23
23
|
rubyforge (2.0.4)
|
24
24
|
json_pure (>= 1.1.7)
|
25
25
|
simplecov (0.3.6)
|
@@ -32,5 +32,5 @@ PLATFORMS
|
|
32
32
|
DEPENDENCIES
|
33
33
|
jeweler
|
34
34
|
rake
|
35
|
-
rspec (>= 2.0.0.
|
36
|
-
simplecov (>= 0.3.
|
35
|
+
rspec (>= 2.0.0.rc)
|
36
|
+
simplecov (>= 0.3.5)
|
data/Rakefile
CHANGED
@@ -16,8 +16,8 @@ begin
|
|
16
16
|
gem.homepage = "http://github.com/endium/bible_reference_parser"
|
17
17
|
gem.authors = ["Nathan McWilliams"]
|
18
18
|
|
19
|
-
gem.add_development_dependency "rspec", ">= 2.0.0.
|
20
|
-
gem.add_development_dependency "simplecov", ">= 0.3.
|
19
|
+
gem.add_development_dependency "rspec", ">= 2.0.0.rc"
|
20
|
+
gem.add_development_dependency "simplecov", ">= 0.3.5"
|
21
21
|
end
|
22
22
|
Jeweler::GemcutterTasks.new
|
23
23
|
rescue LoadError => ex
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.3
|
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{bible_reference_parser}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.3"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Nathan McWilliams"]
|
@@ -66,15 +66,15 @@ Gem::Specification.new do |s|
|
|
66
66
|
s.specification_version = 3
|
67
67
|
|
68
68
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
69
|
-
s.add_development_dependency(%q<rspec>, [">= 2.0.0.
|
70
|
-
s.add_development_dependency(%q<simplecov>, [">= 0.3.
|
69
|
+
s.add_development_dependency(%q<rspec>, [">= 2.0.0.rc"])
|
70
|
+
s.add_development_dependency(%q<simplecov>, [">= 0.3.5"])
|
71
71
|
else
|
72
|
-
s.add_dependency(%q<rspec>, [">= 2.0.0.
|
73
|
-
s.add_dependency(%q<simplecov>, [">= 0.3.
|
72
|
+
s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
|
73
|
+
s.add_dependency(%q<simplecov>, [">= 0.3.5"])
|
74
74
|
end
|
75
75
|
else
|
76
|
-
s.add_dependency(%q<rspec>, [">= 2.0.0.
|
77
|
-
s.add_dependency(%q<simplecov>, [">= 0.3.
|
76
|
+
s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
|
77
|
+
s.add_dependency(%q<simplecov>, [">= 0.3.5"])
|
78
78
|
end
|
79
79
|
end
|
80
80
|
|
@@ -152,10 +152,14 @@ module BibleReferenceParser
|
|
152
152
|
range = verse_range.split "-"
|
153
153
|
first = range.first.to_i
|
154
154
|
last = range.last.to_i
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
155
|
+
|
156
|
+
unless last < first
|
157
|
+
# add each verse in the range
|
158
|
+
(first..last).each do |number|
|
159
|
+
verses << VerseReference.new(number, metadata, chapter_number)
|
160
|
+
end
|
161
|
+
else
|
162
|
+
verses.add_error "'#{verse_range}' is an invalid range of verses"
|
159
163
|
end
|
160
164
|
else
|
161
165
|
verses << VerseReference.new(single_verse, metadata, chapter_number)
|
@@ -57,6 +57,13 @@ describe VerseReference do
|
|
57
57
|
describe "when parsing the verses in a string" do
|
58
58
|
|
59
59
|
describe "the parse_verses method" do
|
60
|
+
it "should add an error if the last verse in a range is lower than the first" do
|
61
|
+
verses = VerseReference.parse_verses "2-1"
|
62
|
+
verses.errors(false).length.should eql 1
|
63
|
+
verses.errors(false).first.should eql "'2-1' is an invalid range of verses"
|
64
|
+
verses.should be_empty
|
65
|
+
end
|
66
|
+
|
60
67
|
it "should parse single verses" do
|
61
68
|
verses = VerseReference.parse_verses "1, 2,3"
|
62
69
|
verses.length.should eql 3
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 1
|
8
|
-
-
|
9
|
-
version: 0.1.
|
8
|
+
- 3
|
9
|
+
version: 0.1.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Nathan McWilliams
|
@@ -28,9 +28,8 @@ dependencies:
|
|
28
28
|
- 2
|
29
29
|
- 0
|
30
30
|
- 0
|
31
|
-
-
|
32
|
-
|
33
|
-
version: 2.0.0.beta.19
|
31
|
+
- rc
|
32
|
+
version: 2.0.0.rc
|
34
33
|
type: :development
|
35
34
|
prerelease: false
|
36
35
|
version_requirements: *id001
|
@@ -44,8 +43,8 @@ dependencies:
|
|
44
43
|
segments:
|
45
44
|
- 0
|
46
45
|
- 3
|
47
|
-
-
|
48
|
-
version: 0.3.
|
46
|
+
- 5
|
47
|
+
version: 0.3.5
|
49
48
|
type: :development
|
50
49
|
prerelease: false
|
51
50
|
version_requirements: *id002
|
@@ -100,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
100
99
|
requirements:
|
101
100
|
- - ">="
|
102
101
|
- !ruby/object:Gem::Version
|
103
|
-
hash: -
|
102
|
+
hash: -4000593101668032954
|
104
103
|
segments:
|
105
104
|
- 0
|
106
105
|
version: "0"
|