rffdb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46b42ee1876f919030207416134f7cf94b4250a
-  data.tar.gz: 9c232c54e21b2939b651bfb8c758dff486fbe107
+  metadata.gz: 15e3dfa89e73ac4a581282ea7b7cbcc67f463786
+  data.tar.gz: 718a382be6454b1abcf2a000c506fefb88d7f834
 SHA512:
-  metadata.gz: bbef6842d8e3b86a1317dca7e5a0a5f2ff4453a45abd382210511780ae2d349c1870045f1fae38c31779303572ab4cd7bb8f9e41488bbc567807e4a5fc02389c
-  data.tar.gz: 6d326d41d2daade93ffe1da82d043fb18385bda30ac80e4605edf0c1377f970ef685fc0522d3ac690eead523e17f92bb8464fb34204242c2fff7c4fcfd548b8f
+  metadata.gz: b62bc3138cfb47330c901c8dc380e7f776c7ff7fb93bff8898832953b0a3951af12802b24f7b3b6dafec1f10d009ea14d0c0f323cc2c0d618a44e754ca4e17ba
+  data.tar.gz: e2e86990656d89f1eaf3db4596a79f5b732dac3d53be1b54ca5dbc2a03a662a55bc5ba22315d24ffd7b0fffd2d40c82f1a9a38253022f502146b7a13331cdca8

data/lib/rffdb/document.rb

@@ -205,7 +205,7 @@ module RubyFFDB
     def self.where(attribute, value, comparison_method = '==')
       if comparison_method.to_s == '==' && indexed_column?(attribute)
         DocumentCollection.new(
-          storage.index(self, attribute).get(value).collect { |did| load(did) },
+          storage.index_lookup(self, attribute, value).collect { |did| load(did) },
           self
         )
       else
@@ -260,9 +260,7 @@ module RubyFFDB
           @read_lock.synchronize do
             @write_lock.synchronize do
               if valid
-                storage.index(self.class, key).delete(@data[key.to_s], id) if indexed_column?(key)
                 @data[key.to_s] = args.last
-                storage.index(self.class, key).put(args.last, id) if indexed_column?(key)
               end
             end
           end

data/lib/rffdb/index.rb

@@ -31,6 +31,7 @@ module RubyFFDB
       end
     end
 
+    # Remove a specific Document association with a key
     def delete(key, value)
       previous = get(key)
       GDBM.open(file_path, 0664, GDBM::WRCREAT) do |index|
@@ -38,16 +39,26 @@ module RubyFFDB
       end
     end
 
+    # Remove all associations with a specific key (column data)
     def truncate(key)
       GDBM.open(file_path, 0664, GDBM::WRCREAT) do |index|
         index.delete(key.to_s)
       end
     end
 
+    # All keys (column data) in the index
+    # @return [Array] An array of object ids
     def keys
       GDBM.open(file_path, 0664, GDBM::READER) do |index|
         index.keys
       end
     end
+
+    # Evict keys (column data) with no associated Documents
+    def prune
+      GDBM.open(file_path, 0664, GDBM::WRCREAT) do |index|
+        index.delete_if { |key, value| Marshal.load(value).empty? }
+      end
+    end
   end
 end

data/lib/rffdb/storage_engine.rb

@@ -139,5 +139,31 @@ module RubyFFDB
       @indexes[type] ||= {}
       @indexes[type][column.to_sym] ||= Index.new(type, column.to_sym)
     end
+
+    # Update the index for a column
+    # @param type [Document] the document type
+    # @param column [String,Symbol] the column / attribute for the index
+    # @param object_id [Object] unique identifier for the document
+    # @param data [String] column data to be stored
+    def self.index_update(type, column, object_id, data)
+      i = index(type, column)
+      # Delete all previous entries in this index
+      oldkeys = i.keys.collect { |k| k if i.get(k).include?(object_id) }.compact
+      oldkeys.each do |k|
+        i.delete(k, object_id)
+      end
+
+      # Add the new indexed version
+      i.put(data, object_id)
+    end
+
+    # Query an index for column data
+    # @param type [Document] the document type
+    # @param column [String,Symbol] the column / attribute for the index
+    # @param data [String] column data to use for the lookup
+    def self.index_lookup(type, column, data)
+      i = index(type, column)
+      i.get(data)
+    end
   end
 end

data/lib/rffdb/storage_engines/json_engine.rb

@@ -11,6 +11,10 @@ module RubyFFDB
           File.open(path, 'w') do |file|
             file.puts JSON.dump(data)
           end
+          # Update all indexed columns
+          type.structure.collect {|k,v| k if v[:index] }.compact.each do |col|
+            index_update(type, col, object_id, data[col.to_s])
+          end
           cache_store(type, object_id, data)
         end
         true

data/lib/rffdb/storage_engines/yaml_engine.rb

@@ -11,6 +11,9 @@ module RubyFFDB
           File.open(path, 'w') do |file|
             file.puts YAML.dump(data)
           end
+          type.structure.collect {|k,v| k if v[:index] }.compact.each do |col|
+            index_update(type, col, object_id, data[col.to_s])
+          end
           cache_store(type, object_id, data)
         end
         true

data/lib/rffdb/version.rb

@@ -1,3 +1,3 @@
 module RubyFFDB
-  VERSION = [0, 1, 0].join('.')
+  VERSION = [0, 1, 1].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rffdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec