cskit 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac84566cea888ff9477e3bb701a61baf499aeee
-  data.tar.gz: a9475fd9c7387d8d822f6b48f7e4a18356ff0a12
+  metadata.gz: 54b61172da1e6b1de7a0ce4965d4719291eb8d08
+  data.tar.gz: 9d32a03328acfa3c7b6210e1f3f25ce7401f3760
 SHA512:
-  metadata.gz: 623a052e6de8426972d65aab3034a40682710fb1e7ab592b56dafb8f10322bc99252e0158975c8f8364a40ccee273564fd7af852641326e932e55a3a82a63446
-  data.tar.gz: ce82b6aa1e550181d6c95ec10f72b62c3aba2a9f9ee0ffef27b34e77cfcdb808d6d71318169f4ef1814cfa69fbfa382413adb2716ca6d540d450decfba85e1cb
+  metadata.gz: 85b1a4e42f3d0582e022195c9c9e02efea87eb2115a327387c03ee3f8fff85dadd077980a5c4156665844494c7566fb832df48b57c41088224669f2f7087a7eb
+  data.tar.gz: 4463be21b3ccd6d5793843a3e0874aae3169747d6a3b8d3e17d0975f3d8016a2e0ade6d036461223f57de41aa80038392d8551ade516efca56b81c8399d61ab2

data/Gemfile

@@ -7,5 +7,6 @@ group :test do
 end
 
 group :development, :test do
+  gem 'rake'
   gem 'pry-byebug'
 end

data/History.txt

@@ -1,10 +1,20 @@
-== 1.0.0
+== 1.2.0
 
-* Birthday!
+* Fix several citation parsing issues.
+  -> Issue causing fragment like "I will" to be interpreted as a book name.
+  -> Issue causing NoMethodError in Science and Health plain text formatter.
+     Method name changed from `start_fragment` to `starter` in v1.1.0.
+  -> Issue causing NoMethodError when parsing Science and Health citations
+     because the `only?` method was not defined on any terminator, broken
+     since v1.1.0.
+* Fix issue causing the Science and Health reader to only return the first
+  line for paragraph-based citations, eg 583:10.
+* Fix incorrect parser invocation in Volume base class, broken since v1.1.0.
+* Reminder: write some blasted tests :/
 
-== 1.0.1
+== 1.1.1
 
-* Fix preface regex to detect pages starting at vii instead of vi for Science and Health.
+* Fix bible parser to handle books like "II Chronicles" and "Song of Solomon".
 
 == 1.1.0
 
@@ -12,6 +22,10 @@
 * Add parser tests.
 * General cleanup.
 
-== 1.1.1
+== 1.0.1
 
-* Fix bible parser to handle books like "II Chronicles" and "Song of Solomon".
+* Fix preface regex to detect pages starting at vii instead of vi for Science and Health.
+
+== 1.0.0
+
+* Birthday!

data/cskit.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version  = ::CSKit::VERSION
   s.authors  = ['Cameron Dutro']
   s.email    = ['camertron@gmail.com']
-  s.homepage = 'http://github.com/camertron'
+  s.homepage = 'http://github.com/CSOBerkeley/cskit-rb'
 
   s.description = s.summary = 'Christian Science citation library for Ruby.'
 

data/lib/cskit/formatters/science_health/science_health_plain_text_formatter.rb

@@ -31,8 +31,8 @@ module CSKit
             line_text = line.text
 
             line_text = if line_index == 0
-              if citation_line.start_fragment
-                index = line_text.index(citation_line.start_fragment)
+              if citation_line.starter
+                index = line_text.index(citation_line.starter)
                 index ? line_text[index..-1] : line_text
               else
                 matches = line_text.match(SENTENCE_START_REGEX)

data/lib/cskit/parsers/bible/bible_parser.rb

@@ -91,7 +91,18 @@ module CSKit
         end
 
         def book
-          current.value.tap { next_token(:book, :sos, :text) }
+          text
+        end
+
+        def text
+          ''.tap do |result|
+            while current && current.type == :text
+              result << "#{current.value} "
+              next_token(:text)
+            end
+
+            result.strip!
+          end
         end
 
         def chapter_list
@@ -173,8 +184,13 @@ module CSKit
 
         def positional
           card = cardinality
-          fragment = current.value
-          next_token(:text, :semicolon, :colon, :comma)
+          fragment = text
+
+          if fragment.empty?
+            fragment = current.value
+            next_token(:semicolon, :colon, :comma)
+          end
+
           Positional.new(card, fragment)
         end
 

data/lib/cskit/parsers/bible/bible_tokenizer.rb

@@ -6,8 +6,6 @@ module CSKit
 
       class BibleTokenizer < CSKit::Parsers::Tokenizer
         PATTERNS = {
-          book:        /\Ai{1,3}\s+[^\s\(\);:,]+/i,
-          sos:         /\Asong\s+of\s+solomon/i,
           left_paren:  /\A\(/,
           right_paren: /\A\)/,
           dash:        /\A-/,

data/lib/cskit/parsers/science_health/science_health_parser.rb

@@ -28,7 +28,7 @@ module CSKit
           end
 
           str << ' (only)' if only?
-          str << " #{start_fragment}" if start_fragment
+          str << " #{starter}" if starter
           str
         end
 
@@ -40,6 +40,10 @@ module CSKit
             terminator: terminator ? terminator.to_hash : nil
           }
         end
+
+        def only?
+          terminator && terminator.only?
+        end
       end
 
       class Positional
@@ -76,6 +80,9 @@ module CSKit
       end
 
       class FragmentTerminator < Positional
+        def only?
+          false
+        end
       end
 
       class OnlyTerminator
@@ -87,6 +94,10 @@ module CSKit
           { only: true }
         end
 
+        def only?
+          true
+        end
+
         private def initialize
         end
       end

data/lib/cskit/readers/science_health_reader.rb

@@ -82,14 +82,14 @@ module CSKit
 
       def readings_for(citation)
         citation.lines.map do |citation_line|
-          lines = if citation_line.finish
-            get_line_range(citation_line.start..citation_line.finish, citation.page)
-          else
+          lines = if citation_line.start == citation_line.finish
             if citation_line.only?
               [get_line(citation_line.start, citation.page)]
             else
               get_paragraph(citation.page, citation_line.start).lines
             end
+          else
+            get_line_range(citation_line.start..citation_line.finish, citation.page)
           end
 
           Reading.new(lines, citation_line)

data/lib/cskit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module CSKit
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/cskit/volume.rb

@@ -10,17 +10,13 @@ module CSKit
     end
 
     def parse_citation(citation_text)
-      parser.parse(citation_text).to_object
+      config[:parser].new(citation_text).parse
     end
 
     def readings_for(citation)
       reader.readings_for(citation)
     end
 
-    def parser
-      @parser ||= config[:parser].new
-    end
-
     def reader
       @reader ||= config[:reader].new(self)
     end

data/spec/parsers/bible/bible_parser_spec.rb

@@ -230,4 +230,26 @@ describe BibleParser do
       })
     end
   end
+
+  context 'multiple verses with multi-word starters' do
+    let(:citation_text) { 'John 14:12-14, 16-21 I will, 25-27 (to 1st .)' }
+
+    it 'parses correctly' do
+      expect(parser.parse.to_hash).to eq({
+        book: 'John', chapters: [{
+          chapter_number: 14, verses: [{
+            start: 12, finish: 14, terminator: nil, starter: nil
+          }, {
+            start: 16, finish: 21, terminator: nil, starter: {
+              fragment: 'I will', cardinality: 1
+            }
+          }, {
+            start: 25, finish: 27, starter: nil, terminator: {
+              fragment: '.', cardinality: 1
+            }
+          }]
+        }]
+      })
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cskit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -74,7 +74,7 @@ files:
 - spec/parsers/bible/bible_parser_spec.rb
 - spec/parsers/science_health/science_health_parser_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/camertron
+homepage: http://github.com/CSOBerkeley/cskit-rb
 licenses: []
 metadata: {}
 post_install_message: 
@@ -93,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Christian Science citation library for Ruby.
 test_files: []
-has_rdoc: true