bible_ref_parser 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785c346d7af39dc9c8f2eee1088d443fb78ff980c33572bd27c28610ba364b04
-  data.tar.gz: 87fcbaa84fb663b042352e4f78339a940922b673a62a76dd0bca0af68ca07d36
+  metadata.gz: 8881964f74bd9d7be1e27232326be473469e457a5fbe8c9a5d234e668198e717
+  data.tar.gz: 9681a524b8b4f0936b4956aed6ba2918b00c66528cf5f7cb4393ddd13d7d5bfc
 SHA512:
-  metadata.gz: a7d0e3c59c1af88185012447a6f7db2e2feb13a351fa3b524bf3cdac98c4c5dbdb387bd1a467d6b08140c4bc8ea7a241331e2c0955c8ed0e18bc19a12d8526fc
-  data.tar.gz: 79230b5b2b8a4b3bf1f2626089a3bc776552f92ca1f6ea5ec05d2364e2de1b976f5177f8ab37fef85c85212895f4e1d1a3321ad71c9820f157489f2b7f518c9c
+  metadata.gz: 4a560d88938857aa86f7c2b6a981e42b7c09e23ac101d2a1e058f91fb7713c817a1e0f4a8dcf28f8e271a4115cbad83a60be820ed6d71f8e36da9a4c26af28f7
+  data.tar.gz: c96e8ecbd32d8c51529512641283ca8485871e8810cae044589f8bdbe40f6b0bea3016b4247c1a33c9d59530be0c1b1158fe243b36bf6bb30b0f0f7d8ec104e1

data/.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.7
+ruby_version: 3.1
 ignore:
   - "bin/**/*"
   - "db/**/*"

data/lib/bible_ref_parser/bible_reference.rb

@@ -1,10 +1,7 @@
 module BibleRefParser
-  BibleReference = Data.define(:text, :start_offset, :end_offset, :book_name, :_parts) do
-    def initialize(text:, start_offset:, end_offset:, book_name: nil, parts: [])
-      super(
-        text: text, start_offset: start_offset, end_offset: end_offset,
-        book_name: book_name, _parts: parts.freeze
-      )
+  BibleReference = Data.define(:text, :start_offset, :end_offset, :book_name, :chapter, :_parts) do
+    def initialize(text:, start_offset:, end_offset:, book_name: nil, chapter: nil, parts: [])
+      super(text:, start_offset:, end_offset:, book_name:, chapter:, _parts: parts.freeze)
     end
 
     def parts
@@ -15,11 +12,20 @@ module BibleRefParser
       parts.size > 1
     end
 
+    def same_chapter?
+      return false unless compound?
+
+      chapters = parts.map(&:chapter)
+      !chapters.first.nil? && chapters.uniq.size == 1
+    end
+
     def qualified_text
-      if book_name && !text.start_with?(book_name)
-        "#{book_name} #{text}"
+      return text unless book_name && !text.start_with?(book_name)
+
+      if chapter && !text.match?(/\A\d+:/)
+        "#{book_name} #{chapter}:#{text}"
       else
-        text
+        "#{book_name} #{text}"
       end
     end
 

data/lib/bible_ref_parser/parser.rb

@@ -79,12 +79,14 @@ module BibleRefParser
       (reference_int >> colon.absent?).as(:verse)
     end
 
-    rule(:verse_list) do
-      (verse >> (list_sep >> standalone_verse).repeat(1)).as(:verse_list)
+    rule(:verse_specifier) { verse_range | standalone_verse }
+
+    rule(:verse_specifier_list) do
+      (verse_specifier >> (list_sep >> verse_specifier).repeat(1)).as(:verse_specifier_list)
     end
 
-    rule(:chapter_with_verse_list) do
-      (chapter >> colon >> verse_list).as(:chapter_with_verse_list)
+    rule(:chapter_with_mixed_verses) do
+      (chapter >> colon >> verse_specifier_list).as(:chapter_with_mixed_verses)
     end
 
     rule(:chapter_with_verse_range) do
@@ -92,7 +94,7 @@ module BibleRefParser
     end
 
     rule(:chapter_with_verses) do
-      chapter_with_verse_list | chapter_with_verse_range
+      chapter_with_mixed_verses | chapter_with_verse_range
     end
 
     rule(:indicator) do

data/lib/bible_ref_parser/reference_node.rb

@@ -8,28 +8,16 @@ module BibleRefParser
     end
 
     def book_name
-      @ref_hash[:book]&.to_s
-    end
-
-    # The first Parslet::Slice in the entire reference structure
-    def first_slice
-      leaf_first(@ref_hash)
-    end
-
-    # The last Parslet::Slice in the entire reference structure
-    def last_slice
-      leaf_last(@ref_hash)
+      book&.to_s
     end
 
     # Character range covered by this reference in the original text
     def position
-      book = @ref_hash[:book]
-      last = last_slice
-      book.offset...(last.offset + last.size)
+      book.offset...end_offset(indicators.last)
     end
 
     def compound?
-      indicators.is_a?(Array) && indicators.size > 1
+      multiple_indicators? || one_chapter_verse_list?
     end
 
     def to_bible_reference(text)
@@ -44,6 +32,10 @@ module BibleRefParser
 
     private
 
+    def book
+      @ref_hash[:book]
+    end
+
     def indicators
       @ref_hash[:indicator_list]
     end
@@ -51,35 +43,91 @@ module BibleRefParser
     def extract_parts(text)
       return [] unless compound?
 
-      indicators.each_with_index.map do |indicator, idx|
-        first = leaf_first(indicator)
-        last = leaf_last(indicator)
-        end_pos = last.offset + last.size
-        start_pos = (idx == 0) ? @ref_hash[:book].offset : first.offset
+      if one_chapter_verse_list?
+        extract_verse_list_parts(text)
+      else
+        extract_parts_per_indicator(text)
+      end
+    end
+
+    def multiple_indicators?
+      indicators in [_, _, *]
+    end
+
+    def one_chapter_verse_list?
+      indicators in [{chapter_with_mixed_verses: {verse_specifier_list: [_, _, *]}}]
+    end
+
+    def extract_parts_per_indicator(text)
+      indicators.flat_map.with_index do |indicator, idx|
+        if indicator in {chapter_with_mixed_verses: {chapter: chapter_slice, verse_specifier_list: specifiers}}
+          first_start = (idx == 0) ? book.offset : chapter_slice.offset
+          extract_mixed_verse_parts(text, chapter_slice, specifiers, first_part_start: first_start)
+        else
+          end_pos = end_offset(indicator)
+          start_pos = (idx == 0) ? book.offset : start_offset(indicator)
+
+          BibleReference.new(
+            text: text[start_pos...end_pos],
+            start_offset: start_pos,
+            end_offset: end_pos,
+            book_name: book_name
+          )
+        end
+      end
+    end
+
+    def extract_verse_list_parts(text)
+      indicators => [{chapter_with_mixed_verses: {chapter: chapter_slice, verse_specifier_list: specifiers}}]
+      extract_mixed_verse_parts(text, chapter_slice, specifiers, first_part_start: book.offset)
+    end
+
+    def extract_mixed_verse_parts(text, chapter_slice, specifiers, first_part_start:)
+      specifiers.each_with_index.map do |spec, idx|
+        case spec
+        in {verse_range: {start: {verse: start_verse}, end: {verse: end_verse}}}
+          end_pos = end_verse.offset + end_verse.size
+          start_pos = (idx == 0) ? first_part_start : start_verse.offset
+        in {verse: verse_slice}
+          end_pos = verse_slice.offset + verse_slice.size
+          start_pos = (idx == 0) ? first_part_start : verse_slice.offset
+        end
 
         BibleReference.new(
           text: text[start_pos...end_pos],
           start_offset: start_pos,
           end_offset: end_pos,
-          book_name: book_name
+          book_name: book_name,
+          chapter: chapter_slice.to_s
         )
       end
     end
 
-    def leaf_first(node)
-      case node
-      when Hash then leaf_first(node.values.first)
-      when Array then leaf_first(node.first)
-      else node
+    def start_offset(indicator)
+      case indicator
+      in {chapter: first_slice}
+      in {explicit_verse: {chapter: first_slice}}
+      in {chapter_range: {start: {chapter: first_slice}}}
+      in {chapter_with_verse_range: {chapter: first_slice}}
+      in {chapter_with_mixed_verses: {chapter: first_slice}}
+      in {explicit_verse_range: {start: {explicit_verse: {chapter: first_slice}}}}
       end
+
+      first_slice.offset
     end
 
-    def leaf_last(node)
-      case node
-      when Hash then leaf_last(node.values.last)
-      when Array then leaf_last(node.last)
-      else node
+    def end_offset(indicator)
+      case indicator
+      in {chapter: last_slice}
+      in {explicit_verse: {verse: last_slice}}
+      in {chapter_range: {end: {chapter: last_slice}}}
+      in {chapter_with_verse_range: {verse_range: {end: {verse: last_slice}}}}
+      in {chapter_with_mixed_verses: {verse_specifier_list: [*, {verse: last_slice}]}}
+      in {chapter_with_mixed_verses: {verse_specifier_list: [*, {verse_range: {end: {verse: last_slice}}}]}}
+      in {explicit_verse_range: {end: {explicit_verse: {verse: last_slice}}}}
       end
+
+      last_slice.offset + last_slice.size
     end
   end
 end

data/lib/bible_ref_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BibleRefParser
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Fabio Papa