memstore 1.0.1 → 1.1.0

data/README.md

@@ -125,10 +125,10 @@ store << a << b << c
 
 ### Retrieving Items
 
-`size` returns the current number of items:
+`length` (or `size`) returns the current number of items:
 
 ```ruby
-store.size
+store.length
 # => 3
 ```
 
@@ -187,21 +187,27 @@ store.delete_keys(5..7, 9)
 
 The following methods are available to query the data store:
 
-- `find_all` (`find`)
+- `find_all` (also available as `find`)
 - `find_any`
 - `find_one`
 - `find_not_all`
 - `find_none`
-- `first_all` (`first`)
+- `first_all` (also available as `first`)
 - `first_any`
 - `first_one`
 - `first_not_all`
 - `first_none`
+- `count_all` (also available as `count`)
+- `count_any`
+- `count_one`
+- `count_not_all`
+- `count_none`
 
 The first part indicates what is returned:
 
 - `find_*` returns all matches.
 - `first_*` returns the first match.
+- `count_*` returns the number of matches.
 
 The second part indicates how conditions are evaluated:
 
@@ -213,13 +219,11 @@ The second part indicates how conditions are evaluated:
 
 In other words:
 
-- `all` means `condition && condition && ...`
-- `any` means `condition || condition || ...`
-- `one` means `condition ^ condition ^ ...` (XOR)
-- `not all` means `!(condition && condition && ...)` or `!condition || !condition || ...`
-- `none` means `!(condition || condition || ...)` or `!condition && !condition && ...`
-
-For convenience, `find` is aliased to `find_all` and `first` to `first_all`.
+- `all` means `condition && condition && ...`.
+- `any` means `condition || condition || ...`.
+- `one` means `condition ^ condition ^ ...` (XOR).
+- `not all` means `!(condition && condition && ...)` or `!condition || !condition || ...`.
+- `none` means `!(condition || condition || ...)` or `!condition && !condition && ...`.
 
 All variants take a `conditions` hash and an optional block.
 
@@ -242,17 +246,17 @@ class Array
 	end
 end
 
-store.find age: [23, 25, 27]
+store.find(age: [23, 25, 27])
 ```
 
-The block is invoked with every item and can do more complex tests.  
-Its return value is interpreted as a boolean value:
+The block is invoked with the item *after* the conditions are evaluated. It should return a boolean value:
 
 ```ruby
-store.find { |item| item.age - item.child.age > 20 }
+store.find(age: 25) { |item| item.age - item.child.age > 20 }
+# is evaluated as (item.age == 25) && (item.age - item.child.age > 20)
 ```
 
-In addition to the evaluation logic, the arrays returned by all variants of `find` can be merged:
+In addition to the evaluation logic, the arrays returned by all variants of `find_*` can be merged:
 
 ```ruby
 store.find(...) | store.find(...) | store.find(...)
@@ -263,8 +267,6 @@ Note that the pipe operator `|` already eliminates duplicates:
 ```ruby
 [a, b, c] | [c, d, e]
 # => [a, b, c, d, e]
-# which is equal to
-([a, b, c] + [c, d, e]).uniq
 ```
 
 ### Serialization

data/lib/memstore.rb

@@ -7,11 +7,11 @@ module MemStore
   end
 
   def self.from_binary(binary)
-    begin Marshal.load(binary) rescue nil end
+    ObjectStore.from_binary(binary)
   end
 
   def self.from_file(file)
-    begin self.from_binary(IO.read(file)) rescue nil end
+    ObjectStore.from_file(file)
   end
 
   class ObjectStore
@@ -29,9 +29,11 @@ module MemStore
     end
     alias_method :<<, :insert
     
-    def size
+    def length
       @items.length
     end
+    alias_method :size, :length
+    alias_method :count, :length
 
     def [](*keys)
       return @items[keys.first] if keys.length == 1 && !keys.first.is_a?(Range)
@@ -103,6 +105,35 @@ module MemStore
       all.detect { |item| instance_exec(item, conditions, block, &FIND_NONE) }
     end
 
+    def count_all(conditions={}, &block)
+      all.count { |item| instance_exec(item, conditions, block, &FIND_ALL) }
+    end
+    alias_method :count, :count_all
+
+    def count_any(conditions={}, &block)
+      all.count { |item| instance_exec(item, conditions, block, &FIND_ANY) }
+    end
+
+    def count_one(conditions={}, &block)
+      all.count { |item| instance_exec(item, conditions, block, &FIND_ONE) }
+    end
+
+    def count_not_all(conditions={}, &block)
+      all.count { |item| !instance_exec(item, conditions, block, &FIND_ALL) }
+    end
+
+    def count_none(conditions={}, &block)
+      all.count { |item| instance_exec(item, conditions, block, &FIND_NONE) }
+    end
+
+    def self.from_binary(binary)
+      begin Marshal.load(binary) rescue nil end
+    end
+
+    def self.from_file(file)
+      begin self.from_binary(IO.read(file)) rescue nil end
+    end
+
     def to_binary
       Marshal.dump(self)
     end

data/lib/memstore/version.rb

@@ -1,3 +1,3 @@
 module MemStore
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/memstore_spec.rb

@@ -48,19 +48,32 @@ describe MemStore::ObjectStore do
   it "can be converted to and from binary" do
     o = Dummy.new("custom key")
     store = MemStore::ObjectStore.new(:id).insert(o)
-    restored = MemStore.from_binary(store.to_binary)
+    restored = MemStore::ObjectStore.from_binary(store.to_binary)
     restored.must_be_instance_of MemStore::ObjectStore
     restored.items.must_equal store.items
     restored.instance_variable_get(:@key).must_equal :id
   end
 
+  it "returns nil when conversion from binary fails" do
+    MemStore::ObjectStore.from_binary(nil).must_equal nil
+  end
+
   it "can be serialized to and deserialized from a binary file" do
     tmp = Tempfile.new("memstore")
-    MemStore::ObjectStore.new.to_file tmp
-    MemStore.from_file(tmp).must_be_instance_of MemStore::ObjectStore
+    o = Dummy.new("custom key")
+    store = MemStore::ObjectStore.new(:id).insert(o)
+    store.to_file(tmp)
+    restored = MemStore::ObjectStore.from_file(tmp)
+    restored.must_be_instance_of MemStore::ObjectStore
+    restored.items.must_equal store.items
+    restored.instance_variable_get(:@key).must_equal :id
     tmp.unlink
   end
 
+  it "returns nil when deserialization from binary file fails" do
+    MemStore::ObjectStore.from_file("does_not_exist").must_equal nil
+  end
+
 end
 
 describe MemStore::HashStore do
@@ -84,9 +97,8 @@ describe MemStore::HashStore do
   end
 
   it "can be converted to and from binary" do
-    store = MemStore::HashStore.new(:id)
-    10.times { |i| store << { id: i } }
-    restored = MemStore.from_binary(store.to_binary)
+    store = MemStore::HashStore.new(:id).insert({ id: "custom key" })
+    restored = MemStore::HashStore.from_binary(store.to_binary)
     restored.must_be_instance_of MemStore::HashStore
     restored.items.must_equal store.items
     restored.instance_variable_get(:@key).must_equal :id
@@ -94,8 +106,12 @@ describe MemStore::HashStore do
 
   it "can be serialized to and deserialized from a binary file" do
     tmp = Tempfile.new("memstore")
-    MemStore::HashStore.new.to_file tmp
-    MemStore.from_file(tmp).must_be_instance_of MemStore::HashStore
+    store = MemStore::HashStore.new(:id).insert({ id: "custom key" })
+    store.to_file(tmp)
+    restored = MemStore::HashStore.from_file(tmp)
+    restored.must_be_instance_of MemStore::HashStore
+    restored.items.must_equal store.items
+    restored.instance_variable_get(:@key).must_equal :id
     tmp.unlink
   end
 
@@ -122,6 +138,10 @@ describe MemStore do
     10.times { |i| @store << i.to_f }
   end
 
+  it "returns the overall number of items" do
+    @store.length.must_equal 10
+  end
+
   it "returns a single item by itself" do
     @store[3].must_equal 3.0
   end
@@ -157,21 +177,6 @@ describe MemStore do
     @store.all.must_equal [0.0, 1.0, 2.0, 7.0, 8.0, 9.0]
   end
 
-  it "can be serialized to and deserialized from a binary file" do
-    tmp = Tempfile.new("memstore")
-    @store.to_file tmp
-    MemStore.from_file(tmp).items.must_equal @store.items
-    tmp.unlink
-  end
-
-  it "returns nil when conversion from binary fails" do
-    MemStore.from_binary(nil).must_equal nil
-  end
-
-  it "returns nil when deserialization from binary file fails" do
-    MemStore.from_file("does_not_exist").must_equal nil
-  end
-
 end
 
 describe MemStore do
@@ -235,4 +240,29 @@ describe MemStore do
     match.id.must_equal 3
   end
 
+  it "counts all items fulfilling all conditions" do
+    count = @store.count_all(id: 3..7, child: String)
+    count.must_equal [4, 6].length
+  end
+
+  it "counts all items fulfilling at least one condition" do
+    count = @store.count_any(id: 3..7, child: String)
+    count.must_equal [0, 2, 3, 4, 5, 6, 7, 8].length
+  end
+
+  it "counts all items fulfilling exactly one condition" do
+    count = @store.count_one(name: /o/, child: String)
+    count.must_equal [1, 4, 7, 9].length
+  end
+
+  it "counts all items violating at least one condition" do
+    count = @store.count_not_all(name: /o/, child: String)
+    count.must_equal [1, 3, 4, 5, 7, 9].length
+  end
+
+  it "counts all items violating all conditions" do
+    count = @store.count_none(name: /o/, child: String)
+    count.must_equal [3, 5].length
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memstore
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: