ohm 1.0.0.alpha1 → 1.0.0.alpha2

data/README.markdown

@@ -456,6 +456,9 @@ You can find a collection of records with the `find` method:
     # Find all users from Argentina, except those with a suspended account.
     User.find(:country => "Argentina").except(:status => "suspended")
 
+    # Find all users both from Argentina and Uruguay
+    User.find(:country => "Argentina").union(:country => "Uruguay")
+
 Note that calling these methods results in new sets being created
 on the fly. This is important so that you can perform further operations
 before reading the items to the client.

data/lib/ohm.rb

@@ -294,6 +294,19 @@ module Ohm
       key.sadd(model.id)
     end
 
+    # Remove a model directly from the set.
+    #
+    # Example:
+    #
+    #   user = User.create
+    #   post = Post.create
+    #
+    #   user.posts.delete(post)
+    #
+    def delete(model)
+      key.srem(model.id)
+    end
+
     # Chain new fiters on an existing set.
     #
     # Example:
@@ -308,6 +321,34 @@ module Ohm
       MultiSet.new(keys, namespace, model)
     end
 
+    # Reduce the set using any number of filters.
+    #
+    # Example:
+    #
+    #   set = User.find(name: "John")
+    #   set.except(country: "US")
+    #
+    #   # You can also do it in one line.
+    #   User.find(name: "John").except(country: "US")
+    #
+    def except(dict)
+      MultiSet.new([key], namespace, model).except(dict)
+    end
+
+    # Do a union to the existing set using any number of filters.
+    #
+    # Example:
+    #
+    #   set = User.find(name: "John")
+    #   set.union(name: "Jane")
+    #
+    #   # You can also do it in one line.
+    #   User.find(name: "John").union(name: "Jane")
+    #
+    def union(dict)
+      MultiSet.new([key], namespace, model).union(dict)
+    end
+
     # Replace all the existing elements of a set with a different
     # collection of models. This happens atomically in a MULTI-EXEC
     # block.
@@ -372,10 +413,52 @@ module Ohm
       MultiSet.new(keys, namespace, model)
     end
 
+    # Reduce the set using any number of filters.
+    #
+    # Example:
+    #
+    #   set = User.find(name: "John")
+    #   set.except(country: "US")
+    #
+    #   # You can also do it in one line.
+    #   User.find(name: "John").except(country: "US")
+    #
+    def except(dict)
+      sdiff.push(*model.filters(dict)).uniq!
+
+      return self
+    end
+
+    # Do a union to the existing set using any number of filters.
+    #
+    # Example:
+    #
+    #   set = User.find(name: "John")
+    #   set.union(name: "Jane")
+    #
+    #   # You can also do it in one line.
+    #   User.find(name: "John").union(name: "Jane")
+    #
+    def union(dict)
+      sunion.push(*model.filters(dict)).uniq!
+
+      return self
+    end
+
   private
+    def sunion
+      @sunion ||= []
+    end
+
+    def sdiff
+      @sdiff ||= []
+    end
+
     def execute
       key = namespace[:temp][SecureRandom.uuid]
       key.sinterstore(*keys)
+      key.sdiffstore(key, *sdiff)   if sdiff.any?
+      key.sunionstore(key, *sunion) if sunion.any?
 
       begin
         yield key

data/test/filtering.rb

@@ -40,3 +40,25 @@ test "#[]" do |john, jane|
   assert_equal john, set[john.id]
   assert_equal jane, set[jane.id]
 end
+
+test "#except" do |john, jane|
+  out = User.create(status: "inactive", lname: "Doe")
+
+  res = User.find(lname: "Doe").except(status: "inactive")
+
+  assert_equal 2, res.size
+  assert res.include?(john)
+  assert res.include?(jane)
+end
+
+test "#union" do |john, jane|
+  included = User.create(status: "inactive", lname: "Doe")
+  excluded = User.create(status: "super", lname: "Doe")
+
+  res = User.find(status: "active").union(status: "inactive")
+
+  assert_equal 3, res.size
+  assert res.include?(john)
+  assert res.include?(jane)
+  assert res.include?(included)
+end

data/test/model.rb

@@ -452,6 +452,18 @@ test "filter elements" do
   assert [] == @event.attendees.find(:initial => "Z").to_a
 end
 
+test "delete elements" do
+  @event.save
+  @event.attendees.add(@person1)
+  @event.attendees.add(@person2)
+
+  assert_equal 2, @event.attendees.size
+
+  @event.attendees.delete(@person2)
+  assert_equal 1, @event.attendees.size
+end
+
+
 test "not be available if the model is new" do
   assert_raise Ohm::MissingID do
     @event.attendees

data/test/pipeline-performance.rb

@@ -60,6 +60,6 @@ t2 = Benchmark.realtime do
   end
 end
 
-test "the pipelined approach should be 2 times faster for 100 records" do
-  assert(t2 / t1 >= 2)
+test "the pipelined approach should be faster for 100 records" do
+  assert(t2 > t1)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &2156510860 !ruby/object:Gem::Requirement
+  requirement: &2156281500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156510860
+  version_requirements: *2156281500
 - !ruby/object:Gem::Dependency
   name: scrivener
-  requirement: &2156526680 !ruby/object:Gem::Requirement
+  requirement: &2156297300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156526680
+  version_requirements: *2156297300
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2156526220 !ruby/object:Gem::Requirement
+  requirement: &2156296800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *2156526220
+  version_requirements: *2156296800
 - !ruby/object:Gem::Dependency
   name: batch
-  requirement: &2156525700 !ruby/object:Gem::Requirement
+  requirement: &2156296280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2156525700
+  version_requirements: *2156296280
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.