ohm 2.0.0.alpha4 → 2.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0098b213347fa1dade66ecb25578c98661dede1f
-  data.tar.gz: bf14fe6201dcc44633250fe1c76efd1ee9319d41
+  metadata.gz: eddfa837c7904b72acba3e95ea9af454412bef88
+  data.tar.gz: de756a4ef37ea55738cea7636a251a411da4cabd
 SHA512:
-  metadata.gz: 6452603dcdc4f3d0d822243c6d85d30d73d012f3521d04f673c5c53a8d71e6a153b7fada6420f889ef389f50e2d0ad2994b2985c239820471270a3d4c0410114
-  data.tar.gz: f1877e6cc349845df64382b0aa65f9f61955db0dd28f5e41ca47b6047d5625eb44b8bafbb0a1bb46dc0136641d98ebf786077f322672e8552d4edf323113bcca
+  metadata.gz: cc35a4e810775b5350ccd255035b2659b5559aa277d91a0f4584bf417bf663d4d27173d64ef324c7d305aba6eda8cc1f96bfde9ab71ead4f237b7382613cad45
+  data.tar.gz: 6314ece218f9ad0f82548dfb99b44db51979d14e8282277ae1abb9f4dfba5c96a68cadd8ec573efe6d475aeb0315b33aded1ce26862c28b3ff8cc6be8d761bfb

data/lib/ohm.rb

@@ -1244,13 +1244,16 @@ module Ohm
       uniques = {}
       model.uniques.each { |field| uniques[field] = send(field) }
 
-      _initialize_id if new?
+      features = {
+        "name" => model.name
+      }
+
+      if defined?(@id)
+        features["id"] = @id
+      end
 
       response = script(LUA_SAVE, 0,
-        { "name" => model.name,
-          "id" => id,
-          "key" => key
-        }.to_msgpack,
+        features.to_msgpack,
         _sanitized_attributes.to_msgpack,
         indices.to_msgpack,
         uniques.to_msgpack
@@ -1264,6 +1267,8 @@ module Ohm
         end
       end
 
+      @id = response
+
       return self
     end
 
@@ -1378,10 +1383,6 @@ module Ohm
       end
     end
 
-    def self.new_id
-      redis.call("INCR", key[:id])
-    end
-
     attr_writer :id
 
     def model
@@ -1392,10 +1393,6 @@ module Ohm
       model.redis
     end
 
-    def _initialize_id
-      @id = model.new_id.to_s
-    end
-
     def _sanitized_attributes
       result = []
 

data/lib/ohm/lua/save.lua

@@ -35,6 +35,12 @@ local indices = cmsgpack.unpack(ARGV[3])
 local uniques = cmsgpack.unpack(ARGV[4])
 
 local function save(model, attrs)
+  if model.id == nil then
+    model.id = redis.call("INCR", model.name .. ":id")
+  end
+
+  model.key = model.name .. ":" .. model.id
+
   redis.call("SADD", model.name .. ":all", model.id)
   redis.call("DEL", model.key)
 

data/ohm.gemspec

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

@@ -16,8 +16,8 @@ test "assign an ID and save the object" do
   event1 = Event.create(:name => "Ruby Tuesday")
   event2 = Event.create(:name => "Ruby Meetup")
 
-  assert_equal "1", event1.id
-  assert_equal "2", event2.id
+  assert_equal "1", event1.id.to_s
+  assert_equal "2", event2.id.to_s
 end
 
 test "save the attributes in UTF8" do

data/test/enumerable.rb

@@ -32,7 +32,7 @@ scope do
 
   test "select" do |john, jane|
     assert_equal 2, Contact.all.count
-    assert_equal [john], Contact.all.select { |c| c.id == john.id }
+    assert_equal [john], Contact.all.select { |c| c.id.to_s == john.id.to_s }
   end
 end
 

data/test/json.rb

@@ -33,12 +33,12 @@ end
 
 test "export a hash with the its id" do
   person = Venue.create(:name => "John Doe")
-  assert Hash[:id => '1'] == person.to_hash
+  assert_equal Hash[:id => 1], person.to_hash
 end
 
 test "return the merged attributes" do
   programmer = Programmer.create(:language => "Ruby")
-  expected_hash = { :id => '1', :language => 'Ruby' }
+  expected_hash = { :id => 1, :language => 'Ruby' }
 
   assert expected_hash == programmer.to_hash
 end
@@ -47,7 +47,7 @@ test "just be the to_hash of a model" do
   json = JSON.parse(Programmer.create(:language => "Ruby").to_json)
 
   assert ["id", "language"] == json.keys.sort
-  assert "1" == json["id"]
+  assert 1 == json["id"]
   assert "Ruby" == json["language"]
 end
 

data/test/model.rb

@@ -57,12 +57,6 @@ class Meetup < Ohm::Model
   end
 end
 
-class Invoice < Ohm::Model
-  def _initialize_id
-    @id = "_custom_id"
-  end
-end
-
 test "booleans" do
   post = Post.new(body: true, published: false)
 
@@ -77,15 +71,6 @@ test "booleans" do
   assert_equal nil, post.published
 end
 
-test "customized ID" do
-  inv = Invoice.create
-  assert_equal "_custom_id", inv.id
-
-  i = Invoice.create(:id => "_diff_id")
-  assert_equal "_diff_id", i.id
-  assert_equal i, Invoice["_diff_id"]
-end
-
 test "empty model is ok" do
   class Foo < Ohm::Model
   end
@@ -135,8 +120,8 @@ test "assign an ID and save the object" do
   event1 = Event.create(:name => "Ruby Tuesday")
   event2 = Event.create(:name => "Ruby Meetup")
 
-  assert "1" == event1.id
-  assert "2" == event2.id
+  assert 1 == event1.id
+  assert 2 == event2.id
 end
 
 test "updates attributes" do
@@ -286,8 +271,8 @@ test "assign a new id to the event" do
   assert !event1.new?
   assert !event2.new?
 
-  assert "1" == event1.id
-  assert "2" == event2.id
+  assert 1 == event1.id
+  assert 2 == event2.id
 end
 
 # Saving a model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha4
+  version: 2.0.0.alpha5
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic