diatheke 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b7ae5fc4f88ee0fa647202198780d172c53b1a
-  data.tar.gz: bf21942929da6a63e5279c0ac61abce6c30b8b4b
+  metadata.gz: 2bb793eaf473921eaa0daf081dc2361f86b9af35
+  data.tar.gz: 0220a2355cb328882df3d89ea20ac2595c701187
 SHA512:
-  metadata.gz: 8a7cefb85adff3b1970eb7dcf1099dfe03e2594db75239a4d6505459e80a928a93926cbf45e1923a0357029e70cfb207d957388bc3c1602f8abecf3324156284
-  data.tar.gz: 6c5279f2f648312fc4c39471a32a4eca487d7e58eac58a932bcecb9969075a4c0bf0edb57a63220087d94b1083680ac34220aa5571672ea3810cf63acf4a4bd6
+  metadata.gz: 39d969e16e7f8062bf51efa6dc7c0ec0f77e545b80d10b1d6b14d0249ea196c7b63c559ad5906714cbb80f3f77cd9077c276901ba477d1a10c132a79a807e573
+  data.tar.gz: ff34f6dff4074b7868c78f911e71eeac78d9fde96366f60618e251542a9ada92a1a5277b413f99e8e2f1a050084fc38acb866a90cb8e937579558efb0435efef

data/Changelog

@@ -1,3 +1,6 @@
+0.2.0
+Support output format option.
+
 0.1.2
 Split passages at reference key to ensure correct handling of line breaks.
 

data/README.md

@@ -19,13 +19,13 @@ This library is a wrapper of the
     puts Diatheke.passage('KJV', 'John 1').to_yaml
 
     # Search a phrase
-    p Diatheke.search('KJV', 'with God', :range => 'Joh 1')
+    p Diatheke.search('KJV', 'with God', range:  'Joh 1')
 
     # Search with method "multi word"
-    p Diatheke.search('KJV', %w(God Jesus), :range => 'Joh 1')
+    p Diatheke.search('KJV', %w(God Jesus), range:  'Joh 1')
 
     # Search with regular expression
-    p Diatheke.search('KJV', /Jesus.+Jesus/, :range => 'Joh 1')
+    p Diatheke.search('KJV', /Jesus.+Jesus/, range:  'Joh 1')
 
 ## Author
 

data/Rakefile

@@ -5,6 +5,6 @@ Rim.setup do
   name 'diatheke'
   authors 'Jan Friedrich'
   email 'janfri26@gmail.com'
-  version '0.1.2'
+  version '0.2.0'
   summary 'This library is a wrapper of the diatheke command-line client of the sword project.'
 end

data/lib/diatheke.rb

@@ -19,18 +19,18 @@ module Diatheke
       call('system', 'modulelistnames').split(/\n/)
     end
 
-    def passage(mod, key)
-      s = call(mod, key)
+    def passage(mod, key, **opts)
+      s = call(mod, key, opts)
       parse_passage s
     end
 
-    def search(mod, key, opts={})
+    def search(mod, key, **opts)
       search_type = :phrase
       search_key = key
       case key
       when Regexp
         search_type = :regex
-        search_key = key.inspect.sub(%r(^/), '').sub(%r(/$), '')
+        search_key = key.source
       when Array
         search_type = :multiword
         search_key = key.join(' ')
@@ -42,8 +42,11 @@ module Diatheke
 
     private
 
-    def call(mod, key, opts={})
+    def call(mod, key, **opts)
       args = []
+      if f = opts[:format]
+        args << '-f' << f
+      end
       if s = opts[:search_type]
         args << '-s' << s
       end

data/test/test_diatheke.rb

@@ -9,24 +9,27 @@ class TestDiatheke < Test::Unit::TestCase
   end
 
   def test_passage
-    res = Diatheke.passage('KJV', 'Joh 1:1-3')
+    res = Diatheke.passage('KJV', 'Joh 1:1-3', format: :plain)
     assert_equal ['John 1:1', 'John 1:2', 'John 1:3'], res.map {|e| e.key}
     assert_match /^In the beginning was the Word/, res.first.text
+    res = Diatheke.passage('KJV', 'Joh 1:1-3', format: :CGI)
+    assert_equal ['John 1:1', 'John 1:2', 'John 1:3'], res.map {|e| e.key}
+    assert_match %r(^<span >: In the beginning was the Word.+the Word was God.</span><br />$), res.first.text
   end
 
   def test_search_phrase
-    res = Diatheke.search('KJV', 'with God', :range => 'Joh 1')
+    res = Diatheke.search('KJV', 'with God', range: 'Joh 1')
     assert_equal ['John 1:1', 'John 1:2'], res
   end
 
   def test_search_multiword
-    res = Diatheke.search('KJV', %w(God Jesus), :range => 'Joh 1')
+    res = Diatheke.search('KJV', %w(God Jesus), range: 'Joh 1')
     assert_equal ['John 1:29', 'John 1:36'], res
   end
 
   def test_search_regex
-    res = Diatheke.search('KJV', /Jesus.+Jesus/, :range => 'Joh 1')
-    assert_equal ['John 1:42'], res
+    res = Diatheke.search('KJV', /witness.+witness/, range: 'Joh 1')
+    assert_equal ['John 1:7'], res
   end
 
   def test_correct_split_with_colon_in_text

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diatheke
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.10'
 description: ''
 email: janfri26@gmail.com
 executables: []
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: This library is a wrapper of the diatheke command-line client of the sword