ohm 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcac01f4679b94c4e17d2ee417f59887a8a41f62
-  data.tar.gz: 5fba56af15af361a22fd0cd6df37adf9bc9beaf3
+  metadata.gz: f4d772d265943ece2cb2474ffffe91ca507ea015
+  data.tar.gz: e12bcab718e57af58ecd4084db153d22bc17158a
 SHA512:
-  metadata.gz: c011955d15f026470d4af58e1b4d96be6b685bee79aa3b85247640bc700268d80fb7ed3f258ac2055fea7fc0ff8bd2dd4b07869b466b5cd89acbfa03143c8bee
-  data.tar.gz: 7e7ed6334f0db7446262362a49540cee4bbce18ff1163992854dd6faac6cb7f99147f1b753552fdf4aa4ff84dbd678fb8b9ba19951a0ef4b7f640b2eaa35b857
+  metadata.gz: e64574ab2442f7bce423f4545fe2e07bf029533e8e6a10eb56d2f86642d48e94d0b36e9f076f9658adc57fda1f9f9cf803b88209b8c5cdce63182238cfb85eea
+  data.tar.gz: 2e9378f29c6f884c8b28f19d94ca208188a06b1324898d2bec0d2a63da2d14c8e85224a5aec34be90e7c0007ee59080fdbf827e2434cd7325efd3ef2ef51890e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.0.2
+
+- Fix bug created the wrong keys when indexing floats.
+
+  As reported by @slowernet, if an indexed attribute was assigned a
+  real value with 0 fractional part (eg. 3.0), the `tostring` function
+  in lua truncated the value to an integer. As a result, the index
+  was created with the wrong key (Model:indices:attribute:3, instead
+  of Model:indices:attribute:3.0). The fix is to convert all values
+  to strings before sending them to the Lua script.
+
 ## 3.0.1
 
 - Adapt Lua scripts to Redis unstable.

data/lib/ohm.rb

@@ -15,7 +15,7 @@ module Ohm
   #
   # MissingID:
   #
-  #   Comment.new.id # => Error
+  #   Comment.new.id # => nil
   #   Comment.new.key # => Error
   #
   #   Solution: you need to save your model first.
@@ -1334,10 +1334,10 @@ module Ohm
     #
     def save
       indices = {}
-      model.indices.each { |field| indices[field] = Array(send(field)) }
+      model.indices.each { |field| indices[field] = Array(send(field)).map(&:to_s) }
 
       uniques = {}
-      model.uniques.each { |field| uniques[field] = send(field) }
+      model.uniques.each { |field| uniques[field] = send(field).to_s }
 
       features = {
         "name" => model.name

data/lib/ohm/lua/save.lua

@@ -57,7 +57,7 @@ end
 local function index(model, indices)
 	for field, enum in pairs(indices) do
 		for _, val in ipairs(enum) do
-			local key = model.name .. ":indices:" .. field .. ":" .. tostring(val)
+			local key = model.name .. ":indices:" .. field .. ":" .. val
 
 			redis.call("SADD", model.key .. ":_indices", key)
 			redis.call("SADD", key, model.id)
@@ -78,7 +78,7 @@ end
 local function unique(model, uniques)
 	for field, value in pairs(uniques) do
 		local key = model.name .. ":uniques:" .. field
-		local val = tostring(value)
+		local val = value
 
 		redis.call("HSET", model.key .. ":_uniques", key, val)
 		redis.call("HSET", key, val, model.id)
@@ -99,7 +99,7 @@ local function verify(model, uniques)
 
 	for field, value in pairs(uniques) do
 		local key = model.name .. ":uniques:" .. field
-		local id = redis.call("HGET", key, tostring(value))
+		local id = redis.call("HGET", key, value)
 
 		if id and id ~= tostring(model.id) then
 			duplicates[#duplicates + 1] = field

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "3.0.1"
+  s.version = "3.0.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 has very good performance.}
   s.authors = ["Michel Martens", "Damian Janowski", "Cyril David"]

data/test/indices.rb

@@ -124,4 +124,15 @@ scope do
 
     assert_equal nil, Node.with(:available, true)
   end
+  
+  test "float to string" do
+    u1 = User.create(:email => "foo", :update => 3.0)
+    u2 = User.create(:email => "bar", :update => 3)
+    
+    assert User.find(:update => 3.0).include?(u1)
+    assert User.find(:update => 3).include?(u2)
+    
+    assert !User.find(:update => 3.0).include?(u2)
+    assert !User.find(:update => 3).include?(u1)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic