cskit-shkts 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58d883c6a4dc2f4596b997b195a9758a2d50ef0
-  data.tar.gz: 928effd57ef416ca29d5cf1aa70c21ccef4046c0
+  metadata.gz: a496e58690cb8ae3e9a42e3e53fb12e682e30eb2
+  data.tar.gz: 04cd45be1b1629af31f7dfd8b70bf5dc281a7384
 SHA512:
-  metadata.gz: c372495cadb6db9db8cda440b9d78db612d84d4c6a80019dc541111c7182fb870784bfbd55f4ff34acf4b558edc520697f137061627d6537243859f4a728aef4
-  data.tar.gz: 559d37d78266072154d19d7d734e72f598de956a8162d8ae26590ecb2d01904988d55a8a72b4b3a71aee2fa266a274e649d6e5cb2ac8763c1f0a442343df517f
+  metadata.gz: c29054ef04928117061b65622706e212a0956142b07c2774b36014530791050ca082d0504e8735fd1680b24ca571897dbbaaded2e1f9f1edbc86445aaf1f3269
+  data.tar.gz: f87df2871b8c1d9f0fc98f2a99458f73068decbb0356a5bec3785b1c851def5f56f5ca2fe11e37684821c1f0c55c024b9c427d016d2ef1dddc1da49056f39c57

data/Gemfile

@@ -1,8 +1,9 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
 group :development do
-  gem "pry"
-  gem "pry-nav"
-end
+  gem 'pry'
+  gem 'pry-byebug'
+  gem 'rake'
+end

data/History.txt

@@ -1,8 +1,13 @@
-== 1.0.0
+== 2.0.0
 
-* Birthday!
+* General cleanup.
+* Depend on cskit v1.1.0 and later.
+* Unify namespace as cskit/science_health (breaking change).
 
 == 1.0.1
 
 * Fix preface page numbers
 
+== 1.0.0
+
+* Birthday!

data/Rakefile

@@ -10,20 +10,19 @@ require 'digest'
 
 require 'rubygems/package_task'
 
+require 'cskit/science_health'
+
 Bundler::GemHelper.install_tasks
 
 task :update do
-  require 'cskit'
-  require 'cskit-shkts/science_health_splitter'
-
-  input_file = File.join(File.dirname(__FILE__), "vendor/shkts.txt")
-  output_dir = File.join(File.dirname(__FILE__), "resources/science_health")
-  splitter = CSKit::Splitters::ScienceHealthSplitter.new(input_file)
+  input_file = File.join(File.dirname(__FILE__), 'vendor', 'shkts.txt')
+  output_dir = CSKit::ScienceHealth.resource_root
+  splitter = CSKit::ScienceHealth::Splitter.new(input_file)
 
   FileUtils.mkdir_p(output_dir)
 
   splitter.each_page do |page|
-    File.open(File.join(output_dir, "#{page.number}.json"), "w+") do |f|
+    File.open(File.join(output_dir, "#{page.number}.json"), 'w+') do |f|
       puts "Writing #{page.number}.json ..."
       f.write(page.to_hash.to_json)
     end

data/cskit-shkts.gemspec

@@ -1,25 +1,23 @@
 # encoding: UTF-8
 
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'cskit-shkts/version'
+require 'cskit/science_health/version'
 
 Gem::Specification.new do |s|
-  s.name     = "cskit-shkts"
-  s.version  = ::CSKitShkts::VERSION
-  s.authors  = ["Cameron Dutro"]
-  s.email    = ["camertron@gmail.com"]
-  s.homepage = "http://github.com/camertron"
+  s.name     = 'cskit-shkts'
+  s.version  = ::CSKit::ScienceHealth::VERSION
+  s.authors  = ['Cameron Dutro']
+  s.email    = ['camertron@gmail.com']
+  s.homepage = 'http://github.com/camertron'
 
-  s.description = s.summary = "Science and Health resources for CSKit."
+  s.description = s.summary = 'Science and Health resources for CSKit.'
 
   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-shkts.gemspec"]
+  s.files = Dir["{lib,spec,resources}/**/*", 'Gemfile', 'History.txt', 'LICENSE', 'README.md', 'Rakefile', 'cskit-shkts.gemspec']
 end

data/lib/cskit/science_health.rb

@@ -1,16 +1,41 @@
 # encoding: UTF-8
 
 require 'cskit'
-require 'cskit-shkts/volume'
+require 'pathname'
+
+module CSKit
+  module ScienceHealth
+    autoload :Splitter, 'cskit/science_health/splitter'
+    autoload :Volume,   'cskit/science_health/volume'
+
+    class << self
+      def resource_dir
+        @resource_dir ||= resource_pathname.to_s
+      end
+
+      def resource_root
+        @resource_root ||= resource_pathname.join('science_health').to_s
+      end
+
+      private
+
+      def resource_pathname
+        @resource_dir ||= Pathname(__FILE__)
+          .dirname.dirname.dirname
+          .join('resources')
+      end
+    end
+  end
+end
 
 CSKit.register_volume({
-  :type => :science_health,
-  :id => :science_health,
-  :name => "Science and Health with Key to the Scriptures",
-  :author => "Mary Baker Eddy",
-  :language => "English",
-  :resource_path => File.expand_path(File.join(File.dirname(__FILE__), "../../resources/science_health")),
-  :volume => CSKitShkts::Volume,
-  :parser => CSKit::Parsers::ScienceHealthParser,
-  :reader => CSKit::Readers::ScienceHealthReader
-})
+  type: :science_health,
+  id: :science_health,
+  name: 'Science and Health with Key to the Scriptures',
+  author: 'Mary Baker Eddy',
+  language: 'English',
+  resource_path: CSKit::ScienceHealth.resource_root,
+  volume: CSKit::ScienceHealth::Volume,
+  parser: CSKit::Parsers::ScienceHealth::ScienceHealthParser,
+  reader: CSKit::Readers::ScienceHealthReader
+})

data/lib/{cskit-shkts/science_health_splitter.rb → cskit/science_health/splitter.rb}

@@ -3,8 +3,8 @@
 include CSKit::Volumes::ScienceHealth
 
 module CSKit
-  module Splitters
-    class ScienceHealthSplitter
+  module ScienceHealth
+    class Splitter
 
       include Enumerable
       attr_reader :input_file
@@ -14,7 +14,7 @@ module CSKit
       end
 
       def each
-        cur_page = Page.new("vii", []) # starting page is vi (in preface)
+        cur_page = Page.new('vii', []) # starting page is vi (in preface)
         cur_line = nil
         cur_lines = []
         new_paragraph = true
@@ -49,7 +49,7 @@ module CSKit
 
       def is_flyout?(line)
         # if a line has more than 14 spaces at the beginning, it's a flyout
-        @flyout_spaces ||= " " * 14
+        @flyout_spaces ||= ' ' * 14
         line[0..13] == @flyout_spaces
       end
 

data/lib/cskit/science_health/version.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+
+module CSKit
+  module ScienceHealth
+    VERSION = '2.0.0'
+  end
+end

data/lib/cskit/science_health/volume.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require 'json'
+
+module CSKit
+  module ScienceHealth
+    class Volume < CSKit::Volume
+      def get_page(page_number)
+        resource_file = File.join(resource_path, "#{page_number}.json")
+        page_cache[page_number] ||= CSKit::Volumes::ScienceHealth::Page.from_hash(
+          JSON.parse(File.read(resource_file))
+        )
+      end
+
+      private
+
+      def page_cache
+        @page_cache ||= {}
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cskit-shkts
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,28 +30,14 @@ dependencies:
     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: Science and Health resources for CSKit.
 email:
 - camertron@gmail.com
@@ -65,10 +51,10 @@ files:
 - README.md
 - Rakefile
 - cskit-shkts.gemspec
-- lib/cskit-shkts/science_health_splitter.rb
-- lib/cskit-shkts/version.rb
-- lib/cskit-shkts/volume.rb
 - lib/cskit/science_health.rb
+- lib/cskit/science_health/splitter.rb
+- lib/cskit/science_health/version.rb
+- lib/cskit/science_health/volume.rb
 - resources/science_health/1.json
 - resources/science_health/10.json
 - resources/science_health/100.json
@@ -695,4 +681,3 @@ signing_key:
 specification_version: 4
 summary: Science and Health resources for CSKit.
 test_files: []
-has_rdoc: true

data/lib/cskit-shkts/version.rb

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

data/lib/cskit-shkts/volume.rb

@@ -1,20 +0,0 @@
-# encoding: UTF-8
-
-require 'json'
-
-module CSKitShkts
-  class Volume < CSKit::Volume
-
-    def get_page(page_number)
-      resource_file = File.join(resource_path, "#{page_number}.json")
-      page_cache[page_number] ||= CSKit::Volumes::ScienceHealth::Page.from_hash(JSON.parse(File.read(resource_file)))
-    end
-
-    protected
-
-    def page_cache
-      @page_cache ||= {}
-    end
-
-  end
-end