ohm 0.0.4 → 0.0.5

data/README.markdown

@@ -1,5 +1,5 @@
 Ohm
-============
+===
 
 Object-hash mapping library for Redis.
 
@@ -16,11 +16,12 @@ Usage
 
     require 'ohm'
 
-    $redis = Redis.new
+    Ohm.connect
 
     class Event < Ohm::Model
       attribute :name
       set :participants
+      list :comments
 
       def validate
         assert_present :name
@@ -30,6 +31,11 @@ Usage
     event = Event.create(:name => "Ruby Tuesday")
     event.participants << "Michel Martens"
     event.participants << "Damian Janowski"
+    event.participants      #=> ["Damian Janowski", "Michel Martens"]
+
+    event.comments << "Very interesting event!"
+    event.comments << "Agree"
+    event.comments          #=> ["Very interesting event!", "Agree"]
 
     another_event = Event.new
     another_event.valid?    #=> false
@@ -40,7 +46,7 @@ Usage
     another_event.errors    #=> [[:name, :empty]]
 
     another_event.name = "Ruby Lunch"
-    another_event.save      #=> true
+    another_event.create    #=> true
 
 Installation
 ------------

data/lib/ohm.rb

@@ -65,8 +65,8 @@ module Ohm
       include Ohm::Validations
 
       def assert_unique(attrs)
-        index_key = index_key_for(attrs, read_locals(attrs))
-        assert(db.scard(index_key).zero? || db.sismember(index_key, id), [attrs, :not_unique])
+        index_key = index_key_for(Array(attrs), read_locals(Array(attrs)))
+        assert(db.scard(index_key).zero? || db.sismember(index_key, id), [Array(attrs), :not_unique])
       end
     end
 
@@ -103,7 +103,7 @@ module Ohm
     end
 
     def self.index(attrs)
-      indices << attrs
+      indices << Array(attrs)
     end
 
     def self.attr_list_reader(name)

data/lib/ohm/redis.rb

@@ -151,15 +151,14 @@ module Ohm
       call_command(argv)
     end
 
-
     # Wrap raw_call_command to handle reconnection on socket error. We
     # try to reconnect just one time, otherwise let the error araise.
     def call_command(argv)
       connect unless connected?
-      raw_call_command(argv)
+      raw_call_command(argv.dup)
     rescue Errno::ECONNRESET
       reconnect
-      raw_call_command(argv)
+      raw_call_command(argv.dup)
     end
 
     def raw_call_command(argv)

data/test/benchmarks.rb

@@ -1,13 +1,10 @@
 require "rubygems"
 require "bench"
 require File.dirname(__FILE__) + "/../lib/ohm"
-require "redis"
 
 Ohm.connect(:port => 6381)
 Ohm.flush
 
-$r = Redis.new(:port => 6381)
-
 class Event < Ohm::Model
   attribute :name
   set :attendees
@@ -24,10 +21,6 @@ benchmark "add to set with ohm redis" do
   Ohm.redis.sadd("foo", 1)
 end
 
-benchmark "add to set with redis" do
-  $r.set_add("foo", 1)
-end
-
 benchmark "add to set with ohm" do
   event.attendees << 1
 end
@@ -41,17 +34,7 @@ benchmark "retrieve a set of two members with ohm redis" do
   Ohm.redis.smembers("bar")
 end
 
-$r.set_add("bar", 1)
-$r.set_add("bar", 2)
-
-benchmark "retrieve a set of two members with redis" do
-  $r.set_add("bar", 3)
-  $r.set_delete("bar", 3)
-  $r.set_members("bar")
-end
-
 Ohm.redis.del("Event:#{event.id}:attendees")
-$r.delete("Event:#{event.id}:attendees")
 
 event.attendees << 1
 event.attendees << 2

data/test/db/redis.pid

@@ -1 +1 @@
-26947
+6304

data/test/indices_test.rb

@@ -4,7 +4,7 @@ class IndicesTest < Test::Unit::TestCase
   class User < Ohm::Model
     attribute :email
 
-    index [:email]
+    index :email
   end
 
   context "A model with an indexed attribute" do
@@ -23,7 +23,7 @@ class IndicesTest < Test::Unit::TestCase
       @user1.email = "baz"
       @user1.save
 
-      assert_equal [], User.find(:email, "foo").to_a
+      assert_equal [], User.find(:email, "foo")
       assert_equal [@user1], User.find(:email, "baz")
     end
 

data/test/validations_test.rb

@@ -5,7 +5,7 @@ class ValidationsTest < Test::Unit::TestCase
     attribute :name
     attribute :place
 
-    index [:name]
+    index :name
     index [:name, :place]
 
     def validate
@@ -48,7 +48,7 @@ class ValidationsTest < Test::Unit::TestCase
     context "That must have a unique name" do
       should "fail when the value already exists" do
         def @event.validate
-          assert_unique [:name]
+          assert_unique :name
         end
 
         Event.create(:name => "foo")

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
-- Michel Martens, Damian Janowski
+- Michel Martens
+- Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 -02:00
+date: 2009-06-19 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
-description: 
-email: michel@soveran.com
+description: 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.
+email: 
+- michel@soveran.com
+- djanowski@dimaion.com
 executables: []
 
 extensions: []
@@ -38,8 +41,10 @@ files:
 - test/test.conf
 - test/test_helper.rb
 - test/validations_test.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/soveran/ohm
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -59,10 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.1
+rubyforge_project: ohm
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Object-hash mapping library for Redis.
 test_files: []