bomdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50fee224307028e1d0970af931372cabad9a49a0
-  data.tar.gz: 63e2b95fee39540b9df7cf5ff836e3fe1342db34
+  metadata.gz: bd01b4bf2376536e016d15f732d330d173fb1d64
+  data.tar.gz: 3b3e5b8854ad7a4085da015c657ba864bb5bf695
 SHA512:
-  metadata.gz: 5e78c010d8a87974ad21d3e8e03717105410f7ad429995dd3488bfbfdebbcc3b5f573b04733b1897bd56c92bfcb13ad99e02e46e4228e6babd77e72e053dab16
-  data.tar.gz: 03ff18efe84454627f25f841ce86db57fb528a834568580237de350cbeec69d5b2b879cc3eeab177fb6c7219b7db5110490900e4c66b3a3a0a0b22c56f058609
+  metadata.gz: 8e46a8923ff7d502d18ac5eeb42f08ef8ba33a4d2eac3ebc4f57558b027a34848f6abf0a3c9d4330662ee5b4d661fa9e9aa282366bf0b0afc4d47d087e1c59cb
+  data.tar.gz: b186e70951e1dbf255cc9c9aa7c7c20be9ab74e9896f5766f71339534f2eb8f78fb736ab6d3cdad8cacc61a7e862ffbd00ad2de949c1f19f47410b9ab0d30a6b

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    bomdb (0.1.0)
+    bomdb (0.2.1)
       colorize (~> 0.7)
       constellation (~> 0.1)
       sequel (~> 4.21)
       sqlite3 (~> 1.3)
+      text_clean
       thor (~> 0.19)
 
 GEM
@@ -35,6 +36,7 @@ GEM
     rspec-support (3.2.2)
     sequel (4.21.0)
     sqlite3 (1.3.10)
+    text_clean (0.2.2)
     thor (0.19.1)
 
 PLATFORMS

data/README.md

@@ -1,6 +1,6 @@
 # BomDB -- Book of Mormon DB
 
-This is a command-line tool (packaged as a Ruby gem) that provides multiple editions of the Book of Mormon in machine-readable form. At its heart is a sqlite3 database--data can be imported or exported using various formats and options.
+BomDB is a command-line tool (packaged as a Ruby gem) that provides multiple editions of the Book of Mormon in machine-readable form. At its heart is a sqlite3 database--data can be imported or exported using various formats and options.
 
 ## Usage
 
@@ -27,7 +27,7 @@ Moroni 10:34 And now I bid unto all farewell. I soon go to rest in the paradise
 Suppose we want to remove the book, chapter, and verse headings from the output:
 
 ```bash
-$ bomdb show 1829 --no-verse
+$ bomdb show 1829 --no-verses
 
 I Nephi having been born of goodly parents, therefore I was taught somewhat in all the learning of my father...
 # ... etc ...

data/bomdb.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor',          '~> 0.19'
   spec.add_dependency 'constellation', '~> 0.1'
   spec.add_dependency 'colorize',      '~> 0.7'
+  spec.add_dependency 'text_clean'
 
   # spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake',    '~> 10.0'

data/lib/bomdb/cli/application.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'bomdb'
 require 'colorize'
+require 'text_clean'
 
 module BomDB
   module Cli
@@ -111,7 +112,7 @@ module BomDB
 
 
       desc "show EDITION RANGE", "show an edition of the Book of Mormon, or a RANGE of verses"
-      option :verse,   :type => :boolean, :default => true,
+      option :verses,  :type => :boolean, :default => true,
              :description => "show book, chapter, verse annotations"
       option :exclude, :type => :string, :aliases => [:x],
              :description => "exclude verses that are references, e.g. Bible-OT references"
@@ -123,18 +124,30 @@ module BomDB
              :description => "show chapter and verse in color"
       option :"for-alignment", :type => :boolean, :default => false,
              :description => "show output in 'alignment' mode. Useful for debugging 'align' subcommand issues."
-      def show(edition = '1829', range = nil)
+      option :clean,   :type => :boolean, :default => false,
+             :description => "remove punctuation and normalize text by sentence"
+      def show(edition = '1992', range = nil)
         body_format = nil
+        wordsep = options[:sep]
+        linesep = options[:linesep]
+
         if options[:"for-alignment"]
           linesep = " "
           verse_format = verse_format_for_alignment(options[:color])
+        elsif options[:clean]
+          linesep = " "
+          verse_format = lambda{ |b,c,v| '' }
+          body_format = lambda do |body|
+            TextClean.clean(body)
+          end
         else
-          linesep = options[:linesep]
-          if options[:verse]
+          if options[:verses]
             if options[:color]
-              verse_format = lambda{ |b,c,v| b.colorize(:yellow) + ' ' + 
-                                             c.to_s.colorize(:green) + ':' + 
-                                             v.to_s.colorize(:light_green) }
+              verse_format = lambda do |b,c,v|
+                b.colorize(:yellow) + wordsep + 
+                c.to_s.colorize(:green) + ':' + 
+                v.to_s.colorize(:light_green)
+              end
             else
               verse_format = nil
             end
@@ -149,7 +162,7 @@ module BomDB
         ).print(
           verse_format: verse_format,
           body_format: body_format,
-          sep:     options[:sep],
+          sep:     wordsep,
           linesep: linesep
         )
       end

data/lib/bomdb/query.rb

@@ -23,7 +23,11 @@ module BomDB
         select(:book_name, :verse_chapter, :verse_number, :content_body)
       q.where!(:editions__edition_id => edition[:edition_id]) if @edition
       q.where!(:verse_heading => nil) unless @headings
-      q.exclude!(:verses__verse_id => db[:refs].select(:verse_id).where(:ref_name => @exclude)) if @exclude
+      if @exclude
+        excluded_verse_ids = db[:refs].select(:verse_id).
+          where(:ref_name => @exclude.split(/\s*,\s*/))
+        q.exclude!(:verses__verse_id => excluded_verse_ids)
+      end
       q
     end
 
@@ -37,15 +41,22 @@ module BomDB
       body_format ||= lambda{ |body| body + linesep }
       query.each do |row|
         shown = true
-        io.print verse_format[
+        verse = verse_format[
           row[:book_name],
           row[:verse_chapter],
           row[:verse_number]
         ]
-        io.print sep
-        io.print body_format[ row[:content_body] ]
+        unless verse.empty?
+          io.print verse
+          io.print sep
+        end
+        begin
+          io.print body_format[ row[:content_body] ]
+        rescue TypeError
+          next
+        end
       end
-      io.puts "Nothing found" unless shown
+      io.puts "Nothing shown" unless shown
     end
   end
 end

data/lib/bomdb/version.rb

@@ -1,3 +1,3 @@
 module BomDB
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bomdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Duane Johnson
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: text_clean
+  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