ohm 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDVlZWJhMjlkNWUzM2Y2NzY3ODVmN2E3YmIxYjQ3ZmU3OGQ3N2JiOA==
-  data.tar.gz: !binary |-
-    ZGMyODFlYTAwYzU0MzE4MTQ0Y2FhZTNlZTdhODU0YzgwYTgyZjA4Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGY2YmU4YTE0NWQ3N2E4Y2QyYWViZDBiOWUwM2NmMTFhNjY5YjNmMTIxNmE3
-    OTRhNmJiMjQ2ZjcwNDQwMjU4YTQ3ZWRjZmJjMmZlOTIxMTY3OTA5ZGJkNDYy
-    Yjg0ZDllODdkNjM4NGFmNWM4YzY5MTQ0ODBlYTNkYjhkODhmOGE=
-  data.tar.gz: !binary |-
-    ZTJiYWNjNGUxZTk1ZTUxNTQ5Nzk2NTZmOGQ1YTAzY2QzY2Y2NDk4MGE5MDU3
-    Zjk1ODY3MThlYTdmOGZhZWFiY2QyNzg1MTg2YjA5NjFlODE4NDNjNmE4N2Mx
-    MmJlNjg3ZjViYzc4NmU5ZGNlNmU1MmEwMmNkMDBhOTg1ZDUyZjk=
+SHA1:
+  metadata.gz: a0015a7962f27903ee712ca027655b3f01722f64
+  data.tar.gz: 06c1b5a4101dae29fbabd19d6804a0eafbb3ccd3
+SHA512:
+  metadata.gz: 6ea9f1a1f47e0863607e97f6c6d3e5c2673a355fadca8baa88f30636028b404a08dce69a26d9489272896abd734ccdcd3535eebe4807ae740a8a4b37a6b8a8b0
+  data.tar.gz: 88ee32f78b6ce100d028ecfc1dfe5d61e4e9ec6933c0261df4828d4c63835108aba23b30ea69259717e0cae5f06df8aa31ac1aadc0f1200d8d2bac255a9c249e

data/CHANGELOG

@@ -1,3 +1,11 @@
+(unreleased)
+
+- Fetching a batch of objects is now done in batches of 1000 objects at
+  a time. If you are iterating over large collections, this change should
+  provide a significant performance boost both in used memory and total
+  execution time.
+- MutableSet#<< is now an alias for #add.
+
 1.3.1
 
 - Improve memory consumption when indexing persisted attributes.

data/README.md

@@ -31,7 +31,7 @@ These are libraries in other languages that were inspired by Ohm.
 Articles and Presentations
 --------------------------
 
-* [Simplicty](http://files.soveran.com/simplicity)
+* [Simplicity](http://files.soveran.com/simplicity)
 * [How to Redis](http://www.paperplanes.de/2009/10/30/how_to_redis.html)
 * [Redis and Ohm](http://carlopecchia.eu/blog/2010/04/30/redis-and-ohm-part1/)
 * [Ohm (Redis ORM)](http://blog.s21g.com/articles/1717) (Japanese)

data/lib/ohm.rb

@@ -145,7 +145,9 @@ module Ohm
 
     def each
       if block_given?
-        to_a.each { |element| yield element }
+        ids.each_slice(1000) do |slice|
+          fetch(slice).each { |e| yield(e) }
+        end
       else
         Enumerator.new(self, :each)
       end
@@ -503,6 +505,8 @@ module Ohm
       db.sadd(key, model.id)
     end
 
+    alias_method :<<, :add
+
     # Remove a model directly from the set.
     #
     # Example:
@@ -783,7 +787,7 @@ module Ohm
       raise IndexNotFound unless uniques.include?(att)
 
       id = db.hget(key[:uniques][att], val)
-      id && self[id]
+      new(:id => id).load! if id
     end
 
     # Find values in indexed fields.
@@ -1343,7 +1347,8 @@ module Ohm
       transaction do |t|
         _uniques = nil
         _indices = nil
-        existing = nil
+        existing_indices = nil
+        existing_uniques = nil
 
         t.watch(*_unique_keys)
 
@@ -1352,7 +1357,8 @@ module Ohm
         t.watch(key[:_uniques]) if model.uniques.any?
 
         t.read do
-          existing = _read_attributes(model.indices) if model.indices.any?
+          existing_indices = _read_attributes(model.indices) if model.indices.any?
+          existing_uniques = _read_attributes(model.uniques) if model.uniques.any?
           _uniques = db.hgetall(key[:_uniques])
           _indices = db.smembers(key[:_indices])
         end
@@ -1360,7 +1366,8 @@ module Ohm
         t.write do
           _delete_uniques(_uniques)
           _delete_indices(_indices)
-          _delete_existing_indices(existing)
+          _delete_existing_uniques(existing_uniques)
+          _delete_existing_indices(existing_indices)
           model.collections.each { |e| db.del(key[e]) }
           db.srem(model.key[:all], id)
           db.del(key[:counters])

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
   s.summary = %{Object-hash mapping library for Redis.}
   s.description = %Q{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.}
   s.authors = ["Michel Martens", "Damian Janowski", "Cyril David"]

data/test/uniques.rb

@@ -64,7 +64,7 @@ test "removes the previous index when changing" do
   u.update(:email => "d@d.com")
 
   assert_equal nil, User.with(:email, "c@c.com")
-  assert_equal nil, User.key[:unique][:email].hget("c@c.com")
+  assert_equal nil, User.key[:uniques][:email].hget("c@c.com")
   assert_equal u, User.with(:email, "d@d.com")
 end
 
@@ -72,7 +72,7 @@ test "removes the previous index when deleting" do |u|
   u.delete
 
   assert_equal nil, User.with(:email, "a@a.com")
-  assert_equal nil, User.key[:unique][:email].hget("a@a.com")
+  assert_equal nil, User.key[:uniques][:email].hget("a@a.com")
 end
 
 test "unique virtual attribute" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Michel Martens
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Object-hash mapping library for Redis.