addressbook_txt 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26a9f61a1a9f134d0bce159197382d41a3faab9
-  data.tar.gz: c0f83c8ca76827f2ec822d1dcdb15fbd410d0f29
+  metadata.gz: 7eb28b52f74e5eddd7ba29cf99fe876493135fb9
+  data.tar.gz: 0e4010cc8713b00ccf99eafae500498fc65e3884
 SHA512:
-  metadata.gz: 4d2275704f49a165e149d09e3d11b9ded04f4aea5b86da68fd93631c4f5ee112335fb8c60bee333515cbf7016295ebc2d4c53e3536a2e68765722d9a62c6f509
-  data.tar.gz: 4884dd5e2e0e5299d8105c085cb25f5309c7f23abc4aa6317784ef427fa29fdc38ea8e16874cbf2e15121cd1435b15a0f5b18627ef033d34ed86a55af60c5d7a
+  metadata.gz: 1838fbdd33342235cf1b240ed314fbacb459712ef59db0f2d02e99903f85df9ec1cda3195b2c2b9dc078f918120cd40064ef3d55a603a13b54a79656101046ed
+  data.tar.gz: e6d3488ee1bdecd38db53ae0e5faededa9c7f1ea0731a0c8f004a391bf7219e41b0d715d7ea3acc768a56f4d709951700de1faccdbd4ef1aed7ef94fb0d75532

data/lib/addressbook_txt.rb

@@ -15,31 +15,30 @@ require 'rexle-diff'
 #  [x] read an existing addressbook.txt file
 #  [x] search each entry using a keyword
 #  [x] archive address entries on an annual basis
-#  [ ] search the archive using a keyword
+#  [x] search the archive using a keyword
 
 
 
 class AddressbookTxt
   
-  attr_reader :to_s
+  attr_reader :to_s, :dx
 
-  def initialize(filename='addressbook.txt', path: '.')
+  def initialize(filename='addressbook.txt', path: File.dirname(filename))        
     
-    @filename, @path = filename, path
+    @filename, @path = File.basename(filename), File.expand_path(path)
     
-    fpath = File.join(path, filename)
+    fpath = File.join(@path, @filename)
     
-    if File.exists?(fpath) then
+    @dx = if File.exists?(fpath) then
+
+      s = File.read(fpath)
+
+      File.extname(@filename) == '.txt' ? import_to_dx(s) :  Dynarex.new(s)
 
-      @dx = import_to_dx(File.read(fpath))    
-          
     else
-      @dx = new_dx    
+      new_dx()
     end
-  end
-
-  def dx()
-    @dx
+    
   end
   
   def save(filename=@filename)
@@ -67,7 +66,22 @@ class AddressbookTxt
   end
   
   def search(keyword)
-    dx.all.select {|r| r.x =~ /#{keyword}/i}
+
+    found = dx.all.select {|r| r.x =~ /#{keyword}/i}
+
+    if found.empty? then
+      
+      # search the archive
+      
+      archive_files = File.join(@path,'archive','addressbook-*.xml')
+
+      found = Dir.glob(archive_files).sort.reverse[1..-1].flat_map do |file|
+        AddressbookTxt.new(file).search keyword
+      end
+    end
+    
+    return found
+    
   end
   
   def to_s()
@@ -107,5 +121,4 @@ class AddressbookTxt
 
   end
   
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addressbook_txt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson