rffdb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e3dfa89e73ac4a581282ea7b7cbcc67f463786
-  data.tar.gz: 718a382be6454b1abcf2a000c506fefb88d7f834
+  metadata.gz: bc4467ccd374f36f1a5793286254b9e0f5e0d7ca
+  data.tar.gz: ecd7ed58e3635b2f9ca2494b6dfb69f32f772db8
 SHA512:
-  metadata.gz: b62bc3138cfb47330c901c8dc380e7f776c7ff7fb93bff8898832953b0a3951af12802b24f7b3b6dafec1f10d009ea14d0c0f323cc2c0d618a44e754ca4e17ba
-  data.tar.gz: e2e86990656d89f1eaf3db4596a79f5b732dac3d53be1b54ca5dbc2a03a662a55bc5ba22315d24ffd7b0fffd2d40c82f1a9a38253022f502146b7a13331cdca8
+  metadata.gz: d35ee19ff25eefb271ff21df71882056e8a989be0024ab261f63b094cc0943c9e68f0671e09bb6410fb668e0ceecb38f1b2a73492a097ad770b1821a3a72dc83
+  data.tar.gz: f8dc378ee8c4e67a9ae4bfb80c4a30db378d65af261e00a96cfdb20006cdfebc1c865dd291a3a15bef2bf87d5a4d253011321d972fd3759c6534de193f1fee42

data/lib/rffdb/document.rb

@@ -202,14 +202,16 @@ module RubyFFDB
 
     # Query for Documents based on an attribute
     # @see DocumentCollection#where
-    def self.where(attribute, value, comparison_method = '==')
-      if comparison_method.to_s == '==' && indexed_column?(attribute)
+    def self.where(attribute, value, comp_op = '==')
+      if indexed_column?(attribute)
         DocumentCollection.new(
-          storage.index_lookup(self, attribute, value).collect { |did| load(did) },
+          storage.index_lookup(self, attribute, value, comp_op).collect do |did|
+            load(did)
+          end,
           self
         )
       else
-        all.where(attribute, value, comparison_method)
+        all.where(attribute, value, comp_op)
       end
     end
 

data/lib/rffdb/document_collection.rb

@@ -133,7 +133,11 @@ module RubyFFDB
       end
       self.class.new(
         @list.collect do |item|
-          item if item.send(attribute).send(comparison_method.to_sym, value)
+          if item.send(attribute).nil?
+            nil
+          else
+            item if item.send(attribute).send(comparison_method.to_sym, value)
+          end
         end.compact,
         @type
       )

data/lib/rffdb/index.rb

@@ -54,10 +54,23 @@ module RubyFFDB
       end
     end
 
+    # Complex queries of the index can be done with this method
+    # @return [Array] An array of object ids matching the query
+    def query(q, operator = '==')
+      datum = []
+      GDBM.open(file_path, 0664, GDBM::READER) do |index|
+        index.each_pair do |key, value|
+          datum += Marshal.load(value) if key.send(operator.to_sym, q)
+        end
+      end
+      datum.uniq.compact
+    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? }
+        index.reorganize # clear up wasted disk space
       end
     end
   end

data/lib/rffdb/storage_engine.rb

@@ -161,9 +161,9 @@ module RubyFFDB
     # @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)
+    def self.index_lookup(type, column, data, operator = '==')
       i = index(type, column)
-      i.get(data)
+      i.query(data, operator)
     end
   end
 end

data/lib/rffdb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rffdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonathan Gnagy