cskit-biblekjv 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGM0MGNmM2NhZDk3MWE4OGQyMGQzMGJiOWRiN2I5NjFhMTc4YzQzNA==
-  data.tar.gz: !binary |-
-    Y2M3ZjFkMzM2MDgzMGI4YWQ1Y2ZhZGI1NjJlZTM2YjJlNDI5OGE0MQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODFlMDVkNTcxYzViYmRmY2Q1YTU5ZjQ2ZDAyMDBhODNjNjg0OWQwNjQ4MWQx
-    OGU3YWZmNDlkZjdkNjdkMWRhZGNjM2NhYmFlYWVlNmJhM2U3MDRjN2ZmMzVm
-    M2JmYWNlMjk0M2ZjZDEzZjJkYzljNDM4MmE2OGFlNTE0ZGMxMzM=
-  data.tar.gz: !binary |-
-    Yjg2YTJkZmE5YTczMTk5YWZlNDliNDE3NzRiMzdiYTE2MzA1ZGU5Y2ExM2Nm
-    OTdmMTg5NGE1N2NjNzAxOTBiNzM5MzliMWQxNTA4NWJhNDAyY2IzMWJlYmY1
-    MjUwNjgxZWM2NWY0Mjg1NjQzMGJjNjEwYWJjYjRmMzMxYThiZDI=
+SHA1:
+  metadata.gz: d57ec30684d441c976498a92ff53efbe7f3443eb
+  data.tar.gz: 9ef19012c522e30f867734b0730e38efe3e91c2a
+SHA512:
+  metadata.gz: a7e0930fe5ee3247d9dc54bb8a4df0e8f339e13850c4bb5071d2cd36f654d42658ed849b0ac194a129f2bdd7fe578ff5cae58f5a49926288cada7732604edff3
+  data.tar.gz: 96d2b7411a2afc580c752eb20b62e7919dd2b394e4bd92f3acd7d0de3d87b89759dc1cd503edd9cd57159527a4c358d79a642da7eb995033e786896b8354b96d

data/Gemfile

@@ -1,8 +1,11 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
+gem 'cskit', path: '~/workspace/cskit-rb'
+
 group :development do
-  gem "pry"
-  gem "pry-nav"
-end
+  gem 'pry'
+  gem 'pry-byebug'
+  gem 'rake'
+end

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.0
+
+* General cleanup.
+* Depend on cskit v1.1.0 and later.
+* Unify namespace as cskit/bible/kjv (breaking change).
+
 == 1.0.0
 
-* Birthday!
+* Birthday!

data/Rakefile

@@ -1,35 +1,27 @@
 # encoding: UTF-8
 
-# Copyright 2012 Twitter, Inc
-# http://www.apache.org/licenses/LICENSE-2.0
-
-require 'rubygems' unless ENV['NO_RUBYGEMS']
-
 require 'bundler'
 require 'digest'
 
 require 'rubygems/package_task'
 
-require './lib/cskit-biblekjv'
+require 'cskit/bible/kjv'
 
 Bundler::GemHelper.install_tasks
 
 task :update do
-  require 'cskit'
-  require 'cskit-biblekjv/bible_splitter'
-
-  input_file = File.join(File.dirname(__FILE__), "vendor/biblekjv.txt")
-  output_dir = File.join(File.dirname(__FILE__), "resources/bible/kjv")
-  splitter = CSKit::Splitters::BibleSplitter.new(input_file)
+  input_file = File.join(File.dirname(__FILE__), 'vendor', 'biblekjv.txt')
+  output_dir = CSKit::Bible::Kjv.resource_root
+  splitter = CSKit::Bible::Kjv::Splitter.new(input_file)
 
   FileUtils.mkdir_p(output_dir)
 
   splitter.each_chapter do |chapter, book|
-    book_name = book.name.downcase.gsub(" ", "_")
+    book_name = book.name.downcase.gsub(' ', '_')
     book_output_dir = File.join(output_dir, book_name)
     FileUtils.mkdir_p(book_output_dir)
 
-    File.open(File.join(book_output_dir, "#{chapter.number}.json"), "w+") do |f|
+    File.open(File.join(book_output_dir, "#{chapter.number}.json"), 'w+') do |f|
       puts "Writing #{book.name}, chapter #{chapter.number} ..."
       f.write(chapter.to_hash.to_json)
     end

data/cskit-biblekjv.gemspec

@@ -1,25 +1,23 @@
 # encoding: UTF-8
 
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'cskit-biblekjv/version'
+require 'cskit/bible/kjv/version'
 
 Gem::Specification.new do |s|
-  s.name     = "cskit-biblekjv"
-  s.version  = ::CSKitBibleKJV::VERSION
-  s.authors  = ["Cameron Dutro"]
-  s.email    = ["camertron@gmail.com"]
-  s.homepage = "http://github.com/camertron"
+  s.name     = 'cskit-biblekjv'
+  s.version  = ::CSKit::Bible::Kjv::VERSION
+  s.authors  = ['Cameron Dutro']
+  s.email    = ['camertron@gmail.com']
+  s.homepage = 'http://github.com/camertron'
 
-  s.description = s.summary = "Bible resources for CSKit, King James Version."
+  s.description = s.summary = 'Bible resources for CSKit, King James Version.'
 
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
   s.add_dependency 'json'
-  s.add_dependency 'cskit', '~> 1.0.0'
-
-  s.add_development_dependency 'rake'
+  s.add_dependency 'cskit', '~> 1.1.0'
 
   s.require_path = 'lib'
-  s.files = Dir["{lib,spec,resources}/**/*", "Gemfile", "History.txt", "LICENSE", "README.md", "Rakefile", "cskit-biblekjv.gemspec"]
+  s.files = Dir['{lib,spec,resources}/**/*', 'Gemfile', 'History.txt', 'LICENSE', 'README.md', 'Rakefile', 'cskit-biblekjv.gemspec']
 end

data/lib/cskit/bible/kjv.rb

@@ -1,17 +1,43 @@
 # encoding: UTF-8
 
 require 'cskit'
-require 'cskit-biblekjv'
-require 'cskit-biblekjv/volume'
+require 'pathname'
+
+module CSKit
+  module Bible
+    module Kjv
+      autoload :Splitter, 'cskit/bible/kjv/splitter'
+      autoload :Volume,   'cskit/bible/kjv/volume'
+
+      class << self
+        def resource_dir
+          @resource_dir ||= resource_pathname.to_s
+        end
+
+        def resource_root
+          @resource_root ||= resource_pathname.join('bible', 'kjv').to_s
+        end
+
+        private
+
+        def resource_pathname
+          @resource_dir ||= Pathname(__FILE__)
+            .dirname.dirname.dirname.dirname
+            .join('resources')
+        end
+      end
+    end
+  end
+end
 
 CSKit.register_volume({
-  :type => :bible,
-  :id => :bible_kjv,
-  :name => "The Holy Bible, King James Version",
-  :author => "",
-  :language => "English",
-  :resource_path => File.join(CSKitBibleKJV.resource_dir, "bible", "kjv"),
-  :volume => CSKitBibleKJV::Volume,
-  :parser => CSKit::Parsers::BibleParser,
-  :reader => CSKit::Readers::BibleReader
-})
+  type: :bible,
+  id: :bible_kjv,
+  name: 'The Holy Bible, King James Version',
+  author: '',
+  language: 'English',
+  resource_path: CSKit::Bible::Kjv.resource_root,
+  volume: CSKit::Bible::Kjv::Volume,
+  parser: CSKit::Parsers::Bible::BibleParser,
+  reader: CSKit::Readers::BibleReader
+})

data/lib/cskit/bible/kjv/splitter.rb

@@ -0,0 +1,101 @@
+# encoding: UTF-8
+
+require 'json'
+
+module CSKit
+  module Bible
+    module Kjv
+
+      # Splits the kjv bible text (from Project Gutenberg) in the vendor directory.
+      # Mainly designed to be used by the 'update' rake task.
+      class Splitter
+
+        VERSE_REGEX = /\d{1,3}:\d{1,3}/
+        BOOK_TRIGGERS = [
+          'Jonah',
+          'The Epistle of Paul the Apostle to the Hebrews',
+          'The Third Epistle General of John',
+          'The General Epistle of Jude',
+          'The Revelation of Saint John the Devine'
+        ]
+
+        include Enumerable
+        attr_reader :input_file
+
+        def initialize(input_file)
+          @input_file = input_file
+        end
+
+        def each
+          verse_buffer = ''
+          chapter = CSKit::Volumes::Bible::Chapter.new(1, [])
+          book = CSKit::Volumes::Bible::Book.new(book_data.first['name'], [chapter])
+          book_count = 1
+
+          File.open(input_file).each_line do |line|
+            if line.strip.empty?
+              if verse_buffer =~ /\A#{VERSE_REGEX}/
+                split_verses(verse_buffer).each do |verse_data|
+                  chapter_num, verse_num, text = verse_data
+
+                  if chapter_num != chapter.number
+                    yield chapter, book
+                    new_chapter = CSKit::Volumes::Bible::Chapter.new(chapter_num, [])
+                  end
+
+                  if chapter_num > chapter.number
+                    book.chapters << new_chapter
+                    chapter = new_chapter
+                  elsif chapter_num != chapter.number
+                    book = CSKit::Volumes::Bible::Book.new(book_data[book_count]['name'], [new_chapter])
+                    book_count += 1
+                    chapter = new_chapter
+                  end
+
+                  chapter.verses << CSKit::Volumes::Bible::Verse.new(text.strip)
+                end
+              end
+
+              verse_buffer.clear
+            elsif
+              # Jonah (and Hebrews) is special because Obadiah (the book before Jonah)
+              # only has one chapter and therefore breaks the assumption that all
+              # books have more than one chapter, which this script uses to avoid
+              # having to identify book headers. Yes, it's ugly.
+              if BOOK_TRIGGERS.include?(line.strip)
+                yield chapter, book
+                chapter = CSKit::Volumes::Bible::Chapter.new(1, [])
+                book = CSKit::Volumes::Bible::Book.new(book_data[book_count]['name'], [chapter])
+                book_count += 1
+              end
+            else
+              verse_buffer << "#{line.strip} "
+            end
+          end
+
+          yield chapter, book
+        end
+
+        alias_method :each_chapter, :each
+
+        private
+
+        def book_data
+          @book_data ||= JSON.parse(
+            File.read(
+              File.join(CSKit::Bible::Kjv.resource_root, 'books.json')
+            )
+          )
+        end
+
+        def split_verses(text)
+          verses = text.split(/(#{VERSE_REGEX})/)
+          verses[1..-1].each_slice(2).map do |verse_parts|
+            verse_parts.first.split(":").map(&:to_i) + [verse_parts.last]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/cskit/bible/kjv/version.rb

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+
+module CSKit
+  module Bible
+    module Kjv
+      VERSION = '2.0.0'
+    end
+  end
+end

data/lib/cskit/bible/kjv/volume.rb

@@ -0,0 +1,57 @@
+# encoding: UTF-8
+
+require 'json'
+
+module CSKit
+  module Bible
+    module Kjv
+      class Volume < CSKit::Volume
+
+        def get_book(book_name)
+          if File.directory?(book_resource_path(book_name))
+            glob_path = File.join(book_resource_path, '**')
+
+            chapters = Dir.glob(glob_path).map.with_index do |resource_file, index|
+              get_chapter(index + 1, book_name)
+            end
+
+            CSKit::Volumes::Bible::Book.new(book_name, chapters)
+          end
+        end
+
+        def get_chapter(chapter_number, book_name)
+          resource_file = File.join(book_resource_path(book_name), "#{chapter_number}.json")
+          chapter_cache[resource_file] ||= CSKit::Volumes::Bible::Chapter.from_hash(
+            JSON.parse(File.read(resource_file))
+          )
+        end
+
+        def unabbreviate_book_name(orig_book_name)
+          book_name = orig_book_name.strip.chomp('.')  # remove trailing period
+          regex = /^#{book_name}\w*/i
+
+          found_book = books.find do |book|
+            book['name'] =~ regex
+          end
+
+          found_book ? found_book['name'] : orig_book_name
+        end
+
+        def books
+          @books ||= JSON.parse(File.read(File.join(resource_path, 'books.json')))
+        end
+
+        private
+
+        def book_resource_path(book_name)
+          File.join(resource_path, book_name)
+        end
+
+        def chapter_cache
+          @chapter_cache ||= {}
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cskit-biblekjv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2017-01-04 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: cskit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.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'
+        version: 1.1.0
 description: Bible resources for CSKit, King James Version.
 email:
 - camertron@gmail.com
@@ -59,11 +45,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- History.txt
+- LICENSE
+- README.md
+- Rakefile
+- cskit-biblekjv.gemspec
 - lib/cskit/bible/kjv.rb
-- lib/cskit-biblekjv/bible_splitter.rb
-- lib/cskit-biblekjv/version.rb
-- lib/cskit-biblekjv/volume.rb
-- lib/cskit-biblekjv.rb
+- lib/cskit/bible/kjv/splitter.rb
+- lib/cskit/bible/kjv/version.rb
+- lib/cskit/bible/kjv/volume.rb
 - resources/bible/kjv/acts/1.json
 - resources/bible/kjv/acts/10.json
 - resources/bible/kjv/acts/11.json
@@ -1254,12 +1245,6 @@ files:
 - resources/bible/kjv/zephaniah/1.json
 - resources/bible/kjv/zephaniah/2.json
 - resources/bible/kjv/zephaniah/3.json
-- Gemfile
-- History.txt
-- LICENSE
-- README.md
-- Rakefile
-- cskit-biblekjv.gemspec
 homepage: http://github.com/camertron
 licenses: []
 metadata: {}
@@ -1269,17 +1254,17 @@ 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: Bible resources for CSKit, King James Version.

data/lib/cskit-biblekjv.rb

@@ -1,7 +0,0 @@
-# encoding: UTF-8
-
-module CSKitBibleKJV
-  def self.resource_dir
-    @resource_dir ||= File.join(File.dirname(File.dirname(__FILE__)), "resources")
-  end
-end

data/lib/cskit-biblekjv/bible_splitter.rb

@@ -1,91 +0,0 @@
-# encoding: UTF-8
-
-include CSKit::Books
-
-module CSKit
-  module Splitters
-    class BibleSplitter
-
-      VERSE_REGEX = /\d{1,3}:\d{1,3}/
-      BOOK_TRIGGERS = [
-        "Jonah",
-        "The Epistle of Paul the Apostle to the Hebrews",
-        "The Third Epistle General of John",
-        "The General Epistle of Jude",
-        "The Revelation of Saint John the Devine"
-      ]
-
-      include Enumerable
-      attr_reader :input_file
-
-      def initialize(input_file)
-        @input_file = input_file
-      end
-
-      def each
-        verse_buffer = ""
-        chapter = Bible::Chapter.new(1, [])
-        book = Bible::Book.new(book_data.first["name"], [chapter])
-        book_count = 1
-
-        File.open(input_file).each_line do |line|
-          if line.strip.empty?
-            if verse_buffer =~ /\A#{VERSE_REGEX}/
-              split_verses(verse_buffer).each do |verse_data|
-                chapter_num, verse_num, text = verse_data
-
-                if chapter_num != chapter.number
-                  yield chapter, book
-                  new_chapter = Bible::Chapter.new(chapter_num, [])
-                end
-
-                if chapter_num > chapter.number
-                  book.chapters << new_chapter
-                  chapter = new_chapter
-                elsif chapter_num != chapter.number
-                  book = Bible::Book.new(book_data[book_count]["name"], [new_chapter])
-                  book_count += 1
-                  chapter = new_chapter
-                end
-
-                chapter.verses << Bible::Verse.new(text.strip)
-              end
-            end
-
-            verse_buffer.clear
-          elsif
-            # Jonah (and Hebrews) is special because Obadiah (the book before Jonah) only has one chapter
-            # and therefore breaks the assumption that all books have more than one chapter, which this
-            # script uses to avoid having to identify book headers. Yes, it's ugly.
-            if BOOK_TRIGGERS.include?(line.strip)
-              yield chapter, book
-              chapter = Bible::Chapter.new(1, [])
-              book = Bible::Book.new(book_data[book_count]["name"], [chapter])
-              book_count += 1
-            end
-          else
-            verse_buffer << "#{line.strip} "
-          end
-        end
-
-        yield chapter, book
-      end
-
-      alias :each_chapter :each
-
-      private
-
-      def book_data
-        @book_data ||= JSON.parse(File.read(File.join(CSKitBibleKJV.resource_dir, "bible", "kjv", "books.json")))
-      end
-
-      def split_verses(text)
-        verses = text.split(/(#{VERSE_REGEX})/)
-        verses[1..-1].each_slice(2).map do |verse_parts|
-          verse_parts.first.split(":").map(&:to_i) + [verse_parts.last]
-        end
-      end
-
-    end
-  end
-end

data/lib/cskit-biblekjv/version.rb

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

data/lib/cskit-biblekjv/volume.rb

@@ -1,49 +0,0 @@
-# encoding: UTF-8
-
-require 'json'
-
-module CSKitBibleKJV
-  class Volume < CSKit::Volume
-
-    def get_book(book_name)
-      if File.directory?(book_resource_path(book_name))
-        CSKit::Volumes::Bible::Book.new(book_name, Dir.glob(File.join(book_resource_path, "**")).map.with_index do |resource_file, index|
-          get_chapter(index + 1, book_name)
-        end)
-      else
-        nil
-      end
-    end
-
-    def get_chapter(chapter_number, book_name)
-      resource_file = File.join(book_resource_path(book_name), "#{chapter_number}.json")
-      chapter_cache[resource_file] ||= CSKit::Volumes::Bible::Chapter.from_hash(JSON.parse(File.read(resource_file)))
-    end
-
-    def unabbreviate_book_name(orig_book_name)
-      book_name = orig_book_name.strip.chomp(".")  # remove trailing period
-      regex = /^#{book_name}\w*/i
-
-      found_book = books.find do |book|
-        book["name"] =~ regex
-      end
-
-      found_book ? found_book["name"] : orig_book_name
-    end
-
-    def books
-      @books ||= JSON.parse(File.read(File.join(resource_path, "books.json")))
-    end
-
-    protected
-
-    def book_resource_path(book_name)
-      File.join(resource_path, book_name)
-    end
-
-    def chapter_cache
-      @chapter_cache ||= {}
-    end
-
-  end
-end