omah_search 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53301f944538a93efdc09e66f8358f94392493a
-  data.tar.gz: 659624930cff0dad0ac99d44e130ec6fe202195b
+  metadata.gz: d4ed5b3c86ecb8eb64122bac7703f0c62ef6cabd
+  data.tar.gz: 12aee622b9b37585c8bcf0e9b64cbf90f31ff8c2
 SHA512:
-  metadata.gz: 28101579e202b303b295b767b081f0e67fe26d9d673fc4947accd199c925d1fec46e29bd76348901df1656f289662b52210feb3314b869923ba0ff8f24986d60
-  data.tar.gz: ab2a9ca8a9e43fa342333202fed4deb0cdb8c239e273e3afd72e8c8d08a51d268daed772658df6df67fd55a626e2cf322e4cc4565ecf627c71100166095aa75e
+  metadata.gz: dad3030c14f6e176febb9af1a5723fde8b13e8a7ac37049eebbfa7df807daaf93a3fd67d8a70ca3ae62b8c6b74cf4b6f3fc9125dfb6297ec64af285dcd267a11
+  data.tar.gz: 5a6ca46742eb9b5806a71a91121954efb7b991e415a265af9f091cb3ec82f3a258b28825bf2fa3ff4b6b4a61ca15c8ce8ad1ffabefb65f82612529cfa13c8a58

data/lib/omah_search.rb

@@ -2,33 +2,40 @@
 
 # file: omah_search.rb
 
-require "sqlite3"
 require 'dynarex'
+require 'recordx_sqlite'
 
 
 class OmahSearch
 
-  def initialize(db_file='headers.db')
-
-    @db = SQLite3::Database.new db_file
-    @db.results_as_hash = true
+  def initialize(db_file='headers.db', url_base: nil)
+    
+    @rs = RecordxSqlite.new(db_file)
+    @url_base = url_base    
 
   end
 
   def search(keyword)
 
-    r = @db.query( "select date, from_x, to_x, subject from headers " + 
+    @rs.query( "select date, from_x, to_x, subject, filepath from headers " + 
           "where from_x like '%#{keyword}%' " + 
           "or subject like '%#{keyword}%' order by id desc limit 10" )
-
+    
+    a = @rs.all.map do |x| 
+      
+      {
+        date: x.date[/^[^T]+/], from: x.from_x, to: x.to_x, subject: x.subject,
+        url: "[link](%s%s)" % [@url_base, x.filepath]
+      }
+        
+    end
+    
     dx = Dynarex.new
-    a = r.to_a.map {|row| row[0].slice!(/T[^T]+$/); row}
-
     dx.import a
     table = dx.to_table      
-    table.labels = %w(date from to subject )
+    table.labels = %w(date from to subject link)
     table.markdown = true
     table
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omah_search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,48 +31,48 @@ cert_chain:
   z09kLQzLRi8385RDh2u1niQgWzcsGz1kVmKs+NzaFjvUYUY3GA1bP7wGLoMA4MkO
   8HkKDVgvtq+gmg==
   -----END CERTIFICATE-----
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.7.9
 - !ruby/object:Gem::Dependency
-  name: dynarex
+  name: recordx-sqlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 0.2.0
 description: 
 email: james@r0bertson.co.uk
 executables: []