ohm 0.0.20 → 0.0.21

data/lib/ohm.rb

@@ -459,7 +459,7 @@ module Ohm
     end
 
     def initialize(attrs = {})
-      @_attributes = Hash.new {|hash,key| hash[key] = read_remote(key) }
+      @_attributes = Hash.new { |hash, key| hash[key] = read_remote(key) }
       update_attributes(attrs)
     end
 
@@ -474,7 +474,7 @@ module Ohm
       mutex do
         create_model_membership
         add_to_indices
-        save!
+        write
       end
     end
 
@@ -484,7 +484,7 @@ module Ohm
 
       mutex do
         update_indices
-        save!
+        write
       end
     end
 
@@ -561,6 +561,11 @@ module Ohm
       self.class.key(id, *args)
     end
 
+    def write
+      attributes.each { |att| write_remote(att, send(att)) }
+      self
+    end
+
   private
 
     def self.db
@@ -597,11 +602,6 @@ module Ohm
       db.srem(self.class.key(:all), id)
     end
 
-    def save!
-      attributes.each { |att| write_remote(att, send(att)) }
-      self
-    end
-
     def update_indices
       delete_from_indices
       add_to_indices

data/lib/ohm/redis.rb

@@ -183,7 +183,7 @@ module Ohm
     def extract_bulk_argument(argv)
       if bulk_command?(argv)
         bulk = argv[-1].to_s
-        argv[-1] = bulk.length
+        argv[-1] = bulk.respond_to?(:bytesize) ? bulk.bytesize : bulk.size
         bulk
       end
     end

data/test/connection_test.rb

@@ -7,7 +7,7 @@ class ConnectionTest < Test::Unit::TestCase
 
   test "connects lazily" do
     assert_nothing_raised do
-      Ohm.connect(:port => 1234567)
+      Ohm.connect(:port => 9876)
     end
 
     assert_raises(Errno::ECONNREFUSED) do

data/test/model_test.rb

@@ -23,6 +23,13 @@ class Event < Ohm::Model
   attribute :name
   counter :votes
   set :attendees, Person
+
+  attribute :slug
+
+  def write
+    self.slug = name.to_s.downcase
+    super
+  end
 end
 
 class TestRedis < Test::Unit::TestCase
@@ -46,7 +53,6 @@ class TestRedis < Test::Unit::TestCase
   end
 
   context "An event updated from a hash of attributes" do
-
     class Meetup < Ohm::Model
       attribute :name
 
@@ -146,6 +152,12 @@ class TestRedis < Test::Unit::TestCase
 
       assert_equal "Lorem", Event[event.id].name
     end
+
+    should "allow to hook into write" do
+      event = Event.create(:name => "Foo")
+
+      assert_equal "foo", event.slug
+    end
   end
 
   context "Delete" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -03:00
+date: 2009-09-21 00:00:00 -03:00
 default_executable: 
 dependencies: []