ohm 0.0.17 → 0.0.18

data/lib/ohm.rb

@@ -385,10 +385,7 @@ module Ohm
 
     def initialize(attrs = {})
       @_attributes = Hash.new {|hash,key| hash[key] = read_remote(key) }
-
-      attrs.each do |key, value|
-        send(:"#{key}=", value)
-      end
+      update_attributes(attrs)
     end
 
     def new?
@@ -398,16 +395,33 @@ module Ohm
     def create
       return unless valid?
       initialize_id
-      create_model_membership
-      add_to_indices
-      save!
+
+      mutex do
+        create_model_membership
+        add_to_indices
+        save!
+      end
     end
 
     def save
       return create if new?
       return unless valid?
-      update_indices
-      save!
+
+      mutex do
+        update_indices
+        save!
+      end
+    end
+
+    def update(attrs)
+      update_attributes(attrs)
+      save
+    end
+
+    def update_attributes(attrs)
+      attrs.each do |key, value|
+        send(:"#{key}=", value)
+      end
     end
 
     def delete
@@ -457,6 +471,14 @@ module Ohm
       false
     end
 
+    # Lock the object before ejecuting the block, and release it once the block is done.
+    def mutex
+      lock!
+      yield
+      unlock!
+      self
+    end
+
   protected
 
     def key(*args)
@@ -553,5 +575,17 @@ module Ohm
     def index_key_for(attrs, values)
       self.class.key *(attrs + self.class.encode_each(values))
     end
+
+    # Lock the object so no other instances can modify it.
+    # @see Model#mutex
+    def lock!
+      lock = db.setnx(key(:_lock), 1) until lock == 1
+    end
+
+    # Release the lock.
+    # @see Model#mutex
+    def unlock!
+      db.del(key(:_lock))
+    end
   end
 end

data/test/model_test.rb

@@ -24,7 +24,6 @@ class Event < Ohm::Model
   set :attendees, Person
 end
 
-
 class TestRedis < Test::Unit::TestCase
   context "An event initialized with a hash of attributes" do
     should "assign the passed attributes" do
@@ -45,6 +44,28 @@ class TestRedis < Test::Unit::TestCase
     end
   end
 
+  context "An event updated from a hash of attributes" do
+
+    class Meetup < Ohm::Model
+      attribute :name
+
+      def validate
+        assert_present :name
+      end
+    end
+
+    should "assign an id and save the object" do
+      event = Meetup.create(:name => "Ruby Tuesday")
+      event.update(:name => "Ruby Meetup")
+      assert_equal "Ruby Meetup", event.name
+    end
+
+    should "return false if the validation fails" do
+      event = Meetup.create(:name => "Ruby Tuesday")
+      assert !event.update(:name => nil)
+    end
+  end
+
   context "Finding an event" do
     setup do
       Ohm.redis.sadd("Event", 1)
@@ -350,18 +371,20 @@ class TestRedis < Test::Unit::TestCase
   end
 
   context "Applying arbitrary transformations" do
+    require "date"
+
     class Calendar < Ohm::Model
       list :holidays, lambda { |v| Date.parse(v) }
     end
 
     setup do
       @calendar = Calendar.create
-      @calendar.holidays << "05/25/2009"
-      @calendar.holidays << "07/09/2009"
+      @calendar.holidays << "2009-05-25"
+      @calendar.holidays << "2009-07-09"
     end
 
     should "apply a transformation" do
-      assert_equal [Date.parse("2009-05-25"), Date.parse("2009-07-09")], @calendar.holidays
+      assert_equal [Date.new(2009, 5, 25), Date.new(2009, 7, 9)], @calendar.holidays
     end
   end
 

data/test/mutex_test.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestMutex < Test::Unit::TestCase
+  class Person < Ohm::Model
+    attribute :name
+  end
+
+  setup do
+    Ohm.flush
+    @p1 = Person.create :name => "Albert"
+    @p2 = Person[1]
+  end
+
+  context "Using a mutex on an object" do
+    should "prevent other instances of the same object from grabing a locked record" do
+      t1 = t2 = nil
+      p1 = Thread.new do
+        @p1.mutex do
+          sleep 0.4
+          t1 = Time.now
+        end
+      end
+
+      p2 = Thread.new do
+        sleep 0.1
+        @p2.mutex do
+          t2 = Time.now
+        end
+      end
+
+      p1.join
+      p2.join
+      assert t2 > t1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -37,14 +37,13 @@ files:
 - test/errors_test.rb
 - test/indices_test.rb
 - test/model_test.rb
+- test/mutex_test.rb
 - test/redis_test.rb
 - test/test_helper.rb
 - test/validations_test.rb
 - test/test.conf
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/soveran/ohm
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -65,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ohm
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Object-hash mapping library for Redis.
 test_files: []