ohm 2.0.0.alpha3 → 2.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3734bd99776bff0786c42047b43dbeed799d907
-  data.tar.gz: f3883cf4aa7fea58b716b5e5dd0796458bfda388
+  metadata.gz: 0098b213347fa1dade66ecb25578c98661dede1f
+  data.tar.gz: bf14fe6201dcc44633250fe1c76efd1ee9319d41
 SHA512:
-  metadata.gz: fa9b8566cf79aa0470f1236c056bcd60f6968f2e3d50f39512431860758a3335363e32a1876610fde9d5a5ca4a72c7602a96779b83e8357c10088cdcb11fab93
-  data.tar.gz: cbe87bc0b7eb78ec264ab0e28dd48a36387b2f8325a8ec4d5d26666bda6f9755aeaefc1208687fabf56523865be9b9d96c70308137feda6260d21ab13223dab9
+  metadata.gz: 6452603dcdc4f3d0d822243c6d85d30d73d012f3521d04f673c5c53a8d71e6a153b7fada6420f889ef389f50e2d0ad2994b2985c239820471270a3d4c0410114
+  data.tar.gz: f1877e6cc349845df64382b0aa65f9f61955db0dd28f5e41ca47b6047d5625eb44b8bafbb0a1bb46dc0136641d98ebf786077f322672e8552d4edf323113bcca

data/README.md

@@ -443,8 +443,7 @@ lookups.
 In the `Event` example, the index on the name attribute will
 allow for searches like `Event.find(:name => "some value")`.
 
-Note that the {Ohm::Model::Validations#assert_unique assert_unique}
-validation and the methods {Ohm::Model::Set#find find} and
+Note that the methods {Ohm::Model::Set#find find} and
 {Ohm::Model::Set#except except} need a corresponding index in order to work.
 
 ### Finding records

data/lib/ohm.rb

@@ -65,7 +65,8 @@ module Ohm
     #
     def self.const(context, name)
       case name
-      when Symbol then context.const_get(name)
+      when Symbol, String
+        context.const_get(name)
       else name
       end
     end

data/lib/ohm/lua/delete.lua

@@ -1,6 +1,27 @@
-local model       = cmsgpack.unpack(ARGV[1])
-local uniques     = cmsgpack.unpack(ARGV[2])
-local tracked     = cmsgpack.unpack(ARGV[3])
+-- This script receives three parameters, all encoded with
+-- MessagePack. The decoded values are used for deleting a model
+-- instance in Redis and removing any reference to it in sets
+-- (indices) and hashes (unique indices).
+--
+-- # model
+--
+-- Table with three attributes:
+--    id (model instance id)
+--    key (hash where the attributes will be saved)
+--    name (model name)
+--
+-- # uniques
+--
+-- Fields and values to be removed from the unique indices.
+--
+-- # tracked
+--
+-- Keys that share the lifecycle of this model instance, that
+-- should be removed as this object is deleted.
+--
+local model   = cmsgpack.unpack(ARGV[1])
+local uniques = cmsgpack.unpack(ARGV[2])
+local tracked = cmsgpack.unpack(ARGV[3])
 
 local function remove_indices(model)
   local memo = model.key .. ":_indices"

data/lib/ohm/lua/save.lua

@@ -1,7 +1,38 @@
-local model      = cmsgpack.unpack(ARGV[1])
-local attrs      = cmsgpack.unpack(ARGV[2])
-local indices    = cmsgpack.unpack(ARGV[3])
-local uniques    = cmsgpack.unpack(ARGV[4])
+-- This script receives four parameters, all encoded with
+-- MessagePack. The decoded values are used for saving a model
+-- instance in Redis, creating or updating a hash as needed and
+-- updating zero or more sets (indices) and zero or more hashes
+-- (unique indices).
+--
+-- # model
+--
+-- Table with three attributes:
+--    id (model instance id)
+--    key (hash where the attributes will be saved)
+--    name (model name)
+--
+-- # attrs
+--
+-- Array with attribute/value pairs.
+--
+-- # indices
+--
+-- Fields and values to be indexed. Each key in the indices
+-- table is mapped to an array of values. One index is created
+-- for each field/value pair.
+--
+-- # uniques
+--
+-- Fields and values to be indexed as unique. Unlike indices,
+-- values are not enumerable. If a field/value pair is not unique
+-- (i.e., if there was already a hash entry for that field and
+-- value), an error is returned with the UniqueIndexViolation
+-- message and the field that triggered the error.
+--
+local model   = cmsgpack.unpack(ARGV[1])
+local attrs   = cmsgpack.unpack(ARGV[2])
+local indices = cmsgpack.unpack(ARGV[3])
+local uniques = cmsgpack.unpack(ARGV[4])
 
 local function save(model, attrs)
   redis.call("SADD", model.name .. ":all", model.id)
@@ -46,12 +77,10 @@ local function unique(model, uniques)
   end
 end
 
-local function remove_uniques(model, uniques)
+local function remove_uniques(model)
   local memo = model.key .. ":_uniques"
 
-  for field, _ in pairs(uniques) do
-    local key = model.name .. ":uniques:" .. field
-
+  for _, key in pairs(redis.call("HKEYS", memo)) do
     redis.call("HDEL", key, redis.call("HGET", memo, key))
     redis.call("HDEL", memo, key)
   end

data/makefile

@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	cutest -r ./test/helper.rb ./test/*.rb

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "2.0.0.alpha3"
+  s.version = "2.0.0.alpha4"
   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/model.rb

@@ -42,6 +42,10 @@ module SomeNamespace
   class Foo < Ohm::Model
     attribute :name
   end
+
+  class Bar < Ohm::Model
+    reference :foo, 'SomeNamespace::Foo'
+  end
 end
 
 class Meetup < Ohm::Model
@@ -779,9 +783,12 @@ end
 test "be persisted" do
   SomeNamespace::Foo.create(:name => "foo")
 
+  SomeNamespace::Bar.create(:foo  => SomeNamespace::Foo[1])
+
   assert "hash" == Ohm.redis.call("TYPE", "SomeNamespace::Foo:1")
 
   assert "foo" == SomeNamespace::Foo[1].name
+  assert "foo" == SomeNamespace::Bar[1].foo.name
 end
 
 test "typecast attributes" do

data/test/uniques.rb

@@ -12,7 +12,7 @@ class User < Ohm::Model
   end
 
   def provider
-    email[/@(.*?).com/, 1]
+    email.to_s[/@(.*?).com/, 1]
   end
 end
 
@@ -66,6 +66,11 @@ test "removes the previous index when changing" do
   assert_equal nil, User.with(:email, "c@c.com")
   assert_equal nil, User.redis.call("HGET", User.key[:uniques][:email], "c@c.com")
   assert_equal u, User.with(:email, "d@d.com")
+
+  u.update(:email => nil)
+
+  assert_equal nil, User.with(:email, "d@d.com")
+  assert_equal nil, User.redis.call("HGET", User.key[:uniques][:email], "d@d.com")
 end
 
 test "removes the previous index when deleting" do |u|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha3
+  version: 2.0.0.alpha4
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -101,6 +101,7 @@ files:
 - lib/ohm/json.rb
 - lib/ohm/lua/delete.lua
 - lib/ohm/lua/save.lua
+- makefile
 - ohm.gemspec
 - test/association.rb
 - test/command.rb
@@ -145,3 +146,4 @@ signing_key:
 specification_version: 4
 summary: Object-hash mapping library for Redis.
 test_files: []
+has_rdoc: