ohm 0.0.21 → 0.0.22

data/lib/ohm.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "base64"
 require File.join(File.dirname(__FILE__), "ohm", "redis")
 require File.join(File.dirname(__FILE__), "ohm", "validations")
@@ -473,8 +475,8 @@ module Ohm
 
       mutex do
         create_model_membership
-        add_to_indices
         write
+        add_to_indices
       end
     end
 
@@ -483,8 +485,8 @@ module Ohm
       return unless valid?
 
       mutex do
-        update_indices
         write
+        update_indices
       end
     end
 
@@ -563,7 +565,6 @@ module Ohm
 
     def write
       attributes.each { |att| write_remote(att, send(att)) }
-      self
     end
 
   private
@@ -648,7 +649,9 @@ module Ohm
     end
 
     def write_remote(att, value)
-      db.set(key(att), value)
+      value.nil? ?
+        db.del(key(att)) :
+        db.set(key(att), value)
     end
 
     def read_locals(attrs)

data/lib/ohm/redis.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'socket'
 
 begin
@@ -238,7 +240,7 @@ module Ohm
     def format_bulk_reply(line)
       bulklen = line.to_i
       return nil if bulklen == -1
-      reply = @sock.read(bulklen)
+      reply = @sock.read(bulklen).encode("UTF-8")
       @sock.read(2) # Discard CRLF.
       reply
     end

data/lib/ohm/validations.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Ohm
   module Validations
     class Presenter

data/test/indices_test.rb

@@ -8,11 +8,13 @@ class IndicesTest < Test::Unit::TestCase
   class User < Ohm::Model
     attribute :email
     attribute :update
+    attribute :activation_code
 
     index :email
     index :email_provider
     index :working_days
     index :update
+    index :activation_code
 
     def email_provider
       email.split("@").last
@@ -21,6 +23,11 @@ class IndicesTest < Test::Unit::TestCase
     def working_days
       @working_days ||= []
     end
+
+    def write
+      self.activation_code ||= "user:#{id}"
+      super
+    end
   end
 
   context "A model with an indexed attribute" do
@@ -69,6 +76,10 @@ class IndicesTest < Test::Unit::TestCase
       assert_equal [@user1, @user2], User.find(:email_provider, "gmail.com").to_a.sort_by { |u| u.id }
       assert_equal [@user3], User.find(:email_provider, "yahoo.com")
     end
+
+    should "allow indexing by an attribute that is lazily set" do
+      assert_equal [@user1], User.find(:activation_code, "user:1").to_a
+    end
   end
 
   context "Indexing enumerables" do

data/test/model_test.rb

@@ -55,6 +55,7 @@ class TestRedis < Test::Unit::TestCase
   context "An event updated from a hash of attributes" do
     class Meetup < Ohm::Model
       attribute :name
+      attribute :location
 
       def validate
         assert_present :name
@@ -71,6 +72,18 @@ class TestRedis < Test::Unit::TestCase
       event = Meetup.create(:name => "Ruby Tuesday")
       assert !event.update(:name => nil)
     end
+
+    should "save the attributes in UTF8" do
+     event = Meetup.create(:name => "Ruby Tuesday")
+     assert_equal "UTF-8", Meetup[event.id].name.encoding.to_s
+    end
+
+    should "delete the attribute if set to nil" do
+      event = Meetup.create(:name => "Ruby Tuesday", :location => "Los Angeles")
+      assert_equal "Los Angeles", Meetup[event.id].location
+      assert event.update(:location => nil)
+      assert_equal nil, Meetup[event.id].location
+    end
   end
 
   context "Finding an event" do

metadata

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