cskit 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjI2YTAyZWQ5ZDVlMTQ0OGVmMDFmODEzMjAxNjExMjJlODMyNjk3MA==
-  data.tar.gz: !binary |-
-    OTExOGU2MjJjNTUyZWVkMDVlMzEzNGIyMjMwZGJkODYxOTRmYjIxNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Nzc4MDcyZWE1ZWU5ODg4MTJlNzJhYjU5NmQ2MTYwMWI4YTVlM2RiMjZmYTY5
-    MmU5YTFhNjM5NzM4YTYxNWRiNDk5NmIxNWNhMzU4N2JmYzUxMGQxYTZlYjE2
-    Mjc4MDhkZWUzODI5ZmI4N2Q1ZTk2NzdiNWUyNTlhNDJlOGJkN2E=
-  data.tar.gz: !binary |-
-    YzdmOGI5YmFkZjc0OTYzYmVmODJlNzEwYzI5MTkwYTdmYjQ4N2I0OGQ2NTI5
-    YTNkY2JjZDEzYjNjZjEwZGNiMzMyZDllMmI5NzQ4MTI2YTBjNjAzYWFmODg5
-    NzYyZWYwNWY5MjNhNDZjYmE1MjRlZDFjMjU4ZDQ5MThkOWNhNjU=
+SHA1:
+  metadata.gz: b63a117f2cc1e418414654ab99412b9a70355c05
+  data.tar.gz: 59293273440f24aea1a23c80c6b96d845d601a12
+SHA512:
+  metadata.gz: cd54044d09b723ccfd504dd87d9a44283df32ddd56905a40df1b0e36314368b04388c343e2d9190b175f2f786ecf0e89e2e824488fb72ff11bf808f2238d9b3f
+  data.tar.gz: 204c2eec966c773dfabb68a3e70a2778ef7811691238dbc26a01ce66f0bbf55651b943e6eebf4c1fd39ddda6f883027ad1889d980526a2fed6570e2ce3616ee0

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 group :development do
   gem "pry"
   gem "pry-nav"
-end
+end

data/History.txt

@@ -1,3 +1,8 @@
 == 1.0.0
 
-* Birthday!
+* Birthday!
+
+== 1.0.1
+
+* Fix preface regex to detect pages starting at vii instead of vi for Science and Health.
+

data/README.md

@@ -8,6 +8,9 @@ CSKit is a citation parsing and retrieval toolkit for various Christian Science
 2. Science and Health with Key to the Scriptures ([cskit-shkts-rb](https://github.com/camertron/cskit-shkts-rb))
 3. Christian Science Hymnal ([cskit-hymnal-rb](https://github.com/camertron/cskit-hymnal-rb))
 
+Clone all repositories with this handy one-liner:
+`\curl -sSL http://bit.ly/1dyPu88 | bash -s`
+
 ## Installation
 
 `gem install cskit`, `gem install cskit-shkts`, etc

data/lib/cskit/formatters/bible/bible_plain_text_formatter.rb

@@ -39,7 +39,7 @@ module CSKit
             annotated_str = CSKit::AnnotatedString.new(text, reading.annotations_at(index))
             annotated_str.delete(terminator_pos + 1, text.length - (terminator_pos + 1)) if terminator_pos
             annotated_str.delete(0, starter_pos) if starter_pos
-            
+
             text = annotated_str.render do |snippet, annotation|
               annotation_formatter.format_annotation(annotation, snippet)
             end

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

@@ -9,7 +9,7 @@ module CSKit
         SENTENCE_TERMINATOR_REGEX = /[;\?\.]/
 
         # either a period + space, quotes, or start of line followed by the first capital letter or number.
-        SENTENCE_START_REGEX = /(\.\s+|\.\"\s+|\.\'\s+|^)[A-Z0-9\"\']/
+        SENTENCE_START_REGEX = /(\.\s+|\.\"\s+|\.\'\s+|\?\s+|\!\s+|^)[A-Z0-9\"\']/
 
         def format_readings(readings)
           join(

data/lib/cskit/readers/science_health_reader.rb

@@ -6,6 +6,10 @@ module CSKit
 
       attr_reader :volume
 
+      Paragraph = Struct.new(
+        :lines, :line_start, :line_end, :page_start, :page_end
+      )
+
       def initialize(volume)
         @volume = volume
       end
@@ -22,34 +26,48 @@ module CSKit
       def each_line(line_number, page_number)
         while page = get_page(page_number)
           yield get_line(line_number, page_number), line_number, page_number
+          line_number, page_number = increment(line_number, page_number)
+        end
+      rescue Errno::ENOENT => e
+      end
 
-          line_number, page_number = if (line_number + 1) > page.lines.size
-            [1, next_page_number(page_number)]
-          else
-            [line_number + 1, page_number]
-          end
+      # be careful - this will go all the way to the end of the book unless you break
+      def each_paragraph(line_number, page_number)
+        while paragraph = get_paragraph(page_number, line_number)
+          yield paragraph
+          line_number, page_number = increment(
+            paragraph.line_end, paragraph.page_end
+          )
         end
+      rescue Errno::ENOENT => e
       end
 
       def get_paragraph(page_number, line_number)
+        original_page_number = page_number
+        original_line_number = line_number
         first_line = true
         lines = []
 
-        each_line(line_number, page_number) do |line, line_number, page_number|
+        each_line(line_number, page_number) do |cur_line, cur_line_number, cur_page_number|
           if first_line
-            lines << line
+            lines << cur_line
           else
-            if line.paragraph_start? && !first_line
+            if cur_line.paragraph_start? && !first_line
               break
             else
-              lines << line
+              lines << cur_line
             end
           end
 
           first_line = false
+          line_number = cur_line_number
+          page_number = cur_page_number
         end
 
-        lines
+        Paragraph.new(
+          lines, original_line_number, line_number,
+          original_page_number, page_number
+        )
       end
 
       def get_line_range(range, page_number)
@@ -69,7 +87,7 @@ module CSKit
             if citation_line.only?
               [get_line(citation_line.start, citation.page)]
             else
-              get_paragraph(citation.page, citation_line.start)
+              get_paragraph(citation.page, citation_line.start).lines
             end
           end
 
@@ -79,6 +97,15 @@ module CSKit
 
       protected
 
+      def increment(line_number, page_number)
+        page = get_page(page_number)
+        if (line_number + 1) > page.lines.size
+          [1, next_page_number(page_number)]
+        else
+          [line_number + 1, page_number]
+        end
+      end
+
       def next_page_number(page_number)
         numerals = ["vi", "vii", "ix", "x", "xi", "xii"]
         if index = numerals.index(page_number)
@@ -88,7 +115,11 @@ module CSKit
             numerals[index + 1]
           end
         else
-          (page_number.to_i + 1).to_s
+          if page_number == "497"
+            "501"
+          else
+            (page_number.to_i + 1).to_s
+          end
         end
       end
 

data/lib/cskit/resources/volumes/science_health.rb

@@ -6,7 +6,7 @@ module CSKit
 
       Page = Struct.new(:number, :lines) do
         def preface?
-          !!(number =~ /vi{1,3}|xi{1,2}|i{0,1}x/)
+          !!(number =~ /vi{2,3}|xi{1,2}|i{0,1}x/)
         end
 
         def to_hash
@@ -46,4 +46,4 @@ module CSKit
 
     end
   end
-end
+end

data/lib/cskit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module CSKit
-  VERSION = "1.0.0"
-end
+  VERSION = "1.0.1"
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cskit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Christian Science citation library for Ruby.
@@ -59,18 +59,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- History.txt
+- LICENSE
+- README.md
+- Rakefile
+- cskit.gemspec
+- lib/cskit.rb
 - lib/cskit/annotated_string.rb
 - lib/cskit/annotator.rb
+- lib/cskit/formatters.rb
+- lib/cskit/formatters/bible.rb
 - lib/cskit/formatters/bible/bible_html_formatter.rb
 - lib/cskit/formatters/bible/bible_plain_text_formatter.rb
-- lib/cskit/formatters/bible.rb
+- lib/cskit/formatters/science_health.rb
 - lib/cskit/formatters/science_health/science_health_html_formatter.rb
 - lib/cskit/formatters/science_health/science_health_plain_text_formatter.rb
-- lib/cskit/formatters/science_health.rb
-- lib/cskit/formatters.rb
+- lib/cskit/lesson.rb
 - lib/cskit/lesson/lesson.rb
 - lib/cskit/lesson/section.rb
-- lib/cskit/lesson.rb
+- lib/cskit/parsers.rb
 - lib/cskit/parsers/bible/bible.rb
 - lib/cskit/parsers/bible/bible.treetop
 - lib/cskit/parsers/bible/nodes.rb
@@ -79,23 +87,15 @@ files:
 - lib/cskit/parsers/science_health/objects.rb
 - lib/cskit/parsers/science_health/science_health.rb
 - lib/cskit/parsers/science_health/science_health.treetop
-- lib/cskit/parsers.rb
+- lib/cskit/readers.rb
 - lib/cskit/readers/bible_reader.rb
 - lib/cskit/readers/reading.rb
 - lib/cskit/readers/science_health_reader.rb
-- lib/cskit/readers.rb
+- lib/cskit/resources/volumes.rb
 - lib/cskit/resources/volumes/bible.rb
 - lib/cskit/resources/volumes/science_health.rb
-- lib/cskit/resources/volumes.rb
 - lib/cskit/version.rb
 - lib/cskit/volume.rb
-- lib/cskit.rb
-- Gemfile
-- History.txt
-- LICENSE
-- README.md
-- Rakefile
-- cskit.gemspec
 homepage: http://github.com/camertron
 licenses: []
 metadata: {}
@@ -105,18 +105,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Christian Science citation library for Ruby.
 test_files: []
+has_rdoc: true