memorydb 0.0.1 → 0.0.2

data/lib/memorydb/cursor.rb

@@ -61,6 +61,16 @@ module MemoryDb
       self
     end
 
+    def and(*filters)
+      @filters << filter_factory.and(*filters)
+      self
+    end
+
+    def not(filter)
+      @filters << filter_factory.not(filter)
+      self
+    end
+
     def sort(field, order)
       assert_field!(field)
       assert_order!(order)

data/lib/memorydb/db.rb

@@ -131,8 +131,8 @@ module MemoryDb
       end
     end
 
-    def filter_matches?(filter, model)
-      value = model[filter.field]
+    def filter_matches?(filter, hash)
+      value = filter.field ? hash.fetch(filter.field) : nil
       case filter.operator
       when '='; value == filter.value
       when '!='; value != filter.value
@@ -143,8 +143,12 @@ module MemoryDb
       when 'in'; filter.value.include?(value)
       when '!in'; !filter.value.include?(value)
       when 'or'; filter.value.any? do |sub_filter|
-        filter_matches?(sub_filter, model)
+        filter_matches?(sub_filter, hash)
       end
+      when 'and'; filter.value.all? do |sub_filter|
+        filter_matches?(sub_filter, hash)
+      end
+      when 'not'; !filter_matches?(filter.value, hash)
       when 'like'; value =~ /#{filter.value}/i
       end
     end
@@ -162,7 +166,7 @@ module MemoryDb
     end
 
     def compare_model(model1, model2, sort)
-      field1, field2 = model1[sort.field], model2[sort.field]
+      field1, field2 = model1.fetch(sort.field), model2.fetch(sort.field)
       field1 == field2                         ?  nil :
         field1 < field2 && sort.order == :asc  ?  -1  :
         field1 > field2 && sort.order == :desc ?  -1  : 1

data/lib/memorydb/filter_factory.rb

@@ -59,6 +59,14 @@ module MemoryDb
       Filter.new(nil, 'or', filters)
     end
 
+    def and(*filters)
+      Filter.new(nil, 'and', filters)
+    end
+
+    def not(filter)
+      Filter.new(nil, 'not', filter)
+    end
+
     private
 
     def assert_to_a!(name, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memorydb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json