lib/signore/database.rb in signore-0.2.4 vs lib/signore/database.rb in signore-0.3.0

@@ -1,9 +1,11 @@
 require 'fileutils'
 require 'yaml/store'
+require_relative 'mapper'
 require_relative 'settings'
 require_relative 'sig_finder'
+require_relative 'signature'
 require_relative 'tags'
 
 module Signore
   class Database
     def initialize(path: Settings.new.db_path, sig_finder: SigFinder)
@@ -12,25 +14,36 @@
       initialise_store if path.zero? or not path.exist?
       @store      = YAML::Store.new(path)
     end
 
     def <<(sig)
-      store.transaction { store['signatures'] << sig }
+      sigs << sig
+      persist
     end
 
     def find(tags: Tags.new)
-      sigs = store.transaction(true) { store['signatures'] }
       sig_finder.find(sigs, tags: tags)
     end
 
+    def sigs
+      @sigs ||= store.transaction(true) { store['signatures'] }.map do |elem|
+        elem.is_a?(Signature) ? elem : Mapper.from_h(elem)
+      end
+    end
+
     attr_reader :path, :sig_finder, :store
     private     :path, :sig_finder, :store
 
     private
 
     def initialise_store
       FileUtils.mkdir_p path.dirname
       FileUtils.touch path
       YAML::Store.new(path).transaction { |store| store['signatures'] = [] }
+    end
+
+    def persist
+      hashes = sigs.map { |sig| Mapper.to_h(sig) }
+      store.transaction { store['signatures'] = hashes }
     end
   end
 end