ohm 0.0.38 → 0.1.0.rc1

data/test/model_test.rb

@@ -40,7 +40,7 @@ class Event < Ohm::Model
   end
 end
 
-class TestRedis < Test::Unit::TestCase
+class ModelTest < Test::Unit::TestCase
   setup do
     Ohm.flush
   end
@@ -167,7 +167,7 @@ class TestRedis < Test::Unit::TestCase
   context "Finding an event" do
     setup do
       Ohm.redis.sadd("Event:all", 1)
-      Ohm.redis.set("Event:1:name", "Concert")
+      Ohm.redis.hset("Event:1", "name", "Concert")
     end
 
     should "return an instance of Event" do
@@ -180,7 +180,7 @@ class TestRedis < Test::Unit::TestCase
   context "Finding a user" do
     setup do
       Ohm.redis.sadd("User:all", 1)
-      Ohm.redis.set("User:1:email", "albert@example.com")
+      Ohm.redis.hset("User:1", "email", "albert@example.com")
     end
 
     should "return an instance of User" do
@@ -277,8 +277,8 @@ class TestRedis < Test::Unit::TestCase
 
       assert_nil Ohm.redis.get(ModelToBeDeleted.key(id))
       assert_nil Ohm.redis.get(ModelToBeDeleted.key(id, :name))
-      assert !Ohm.redis.exists(ModelToBeDeleted.key(id, :foos))
-      assert !Ohm.redis.exists(ModelToBeDeleted.key(id, :bars))
+      assert_equal Array.new, Ohm.redis.smembers(ModelToBeDeleted.key(id, :foos))
+      assert_equal Array.new, Ohm.redis.lrange(ModelToBeDeleted.key(id, :bars), 0, -1)
 
       assert ModelToBeDeleted.all.empty?
     end
@@ -293,16 +293,11 @@ class TestRedis < Test::Unit::TestCase
 
       Foo.create(:name => "Bar")
 
-      assert_equal ["Foo:1:_indices", "Foo:1:name", "Foo:all", "Foo:id", "Foo:name:QmFy"], Ohm.redis.keys("*").sort
+      assert_equal ["Foo:1:_indices", "Foo:1", "Foo:all", "Foo:id", "Foo:name:QmFy"].sort, Ohm.redis.keys("*").sort
 
       Foo[1].delete
 
-      keys = Ohm.redis.keys("*")
-
-      assert !keys.include?("Foo:1:_indices")
-      assert !keys.include?("Foo:1:name")
-
-      assert_equal "1", Ohm.redis.get("Foo:id")
+      assert_equal ["Foo:id"], Ohm.redis.keys("*")
     end
   end
 
@@ -602,6 +597,7 @@ class TestRedis < Test::Unit::TestCase
 
     class ::Appointment < Ohm::Model
       attribute :text
+      reference :subscriber, lambda { |id| MyActiveRecordModel.find(id) }
     end
 
     setup do
@@ -620,6 +616,11 @@ class TestRedis < Test::Unit::TestCase
       assert_equal [MyActiveRecordModel.find(1)], @calendar.subscribers.all
     end
 
+    should "allow lambdas in references" do
+      appointment = Appointment.create(:subscriber => MyActiveRecordModel.find(1))
+      assert_equal MyActiveRecordModel.find(1), appointment.subscriber
+    end
+
     should "work with models too" do
       @calendar.appointments.add(Appointment.create(:text => "Meet with Bertrand"))
 
@@ -697,11 +698,17 @@ class TestRedis < Test::Unit::TestCase
     should "be able to increment a counter" do
       @event.incr(:votes)
       assert_equal 1, @event.votes
+
+      @event.incr(:votes, 2)
+      assert_equal 3, @event.votes
     end
 
     should "be able to decrement a counter" do
       @event.decr(:votes)
       assert_equal -1, @event.votes
+
+      @event.decr(:votes, 2)
+      assert_equal -3, @event.votes
     end
   end
 
@@ -910,7 +917,7 @@ class TestRedis < Test::Unit::TestCase
     end
 
     setup do
-      Car.connect(:port => 6381, :db => 2)
+      Car.connect(:port => 6379, :db => 14)
     end
 
     teardown do
@@ -921,8 +928,11 @@ class TestRedis < Test::Unit::TestCase
       car = Car.create(:name => "Twingo")
       make = Make.create(:name => "Renault")
 
-      assert_equal 1, Make.db.client.instance_variable_get("@db")
-      assert_equal 2, Car.db.client.instance_variable_get("@db")
+      assert_equal ["1"], Redis.new(:db => 15).smembers("Make:all")
+      assert_equal [], Redis.new(:db => 15).smembers("Car:all")
+
+      assert_equal ["1"], Redis.new(:db => 14).smembers("Car:all")
+      assert_equal [], Redis.new(:db => 14).smembers("Make:all")
 
       assert_equal car, Car[1]
       assert_equal make, Make[1]
@@ -933,4 +943,20 @@ class TestRedis < Test::Unit::TestCase
       assert_nil Make[1]
     end
   end
+
+  context "Persistence" do
+    should "persist attributes to a hash" do
+      event = Event.create(:name => "Redis Meetup")
+      event.incr(:votes)
+
+      assert_equal "hash", Ohm.redis.type("Event:1")
+
+      assert_equal [
+        "Event:1", "Event:all", "Event:id"
+      ].sort, Ohm.redis.keys("Event:*").sort
+
+      assert_equal "Redis Meetup", Event[1].name
+      assert_equal 1, Event[1].votes
+    end
+  end
 end

data/test/test.conf

@@ -1,6 +1,6 @@
 dir ./test/db
 pidfile ./redis.pid
-port 6381
+port 6379
 timeout 300
 loglevel debug
 logfile stdout

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require "rubygems"
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 begin
   require "ruby-debug"
@@ -6,7 +6,7 @@ rescue LoadError
 end
 
 require "contest"
-require File.dirname(__FILE__) + "/../lib/ohm"
+require "ohm"
 
-Ohm.connect(:port => 6381, :db => 1, :timeout => 3)
+Ohm.connect(:port => 6379, :db => 15, :timeout => 3)
 Ohm.flush

data/test/upgrade_script_test.rb

@@ -0,0 +1,68 @@
+# encoding: UTF-8
+
+require File.join(File.dirname(__FILE__), "test_helper")
+
+require "ohm/utils/upgrade"
+
+# class User < Ohm::Model
+#   attribute :name
+#   attribute :email
+#
+#   counter :views
+#
+#   index :email
+#
+#   set :posts
+#   list :comments
+# end
+
+class UpgradeScriptTest < Test::Unit::TestCase
+  def redis
+    Ohm.redis
+  end
+
+  setup do
+    redis.flushdb
+
+    @users = Ohm::Key[:User]
+
+    10.times do
+      @id = redis.incr(@users[:id])
+      @user = @users[@id]
+
+      redis.sadd @users[:all], @id
+
+      redis.set  @user[:name], "Albert"
+      redis.set  @user[:email], "albert-#{@id}@example.com"
+      redis.incr @user[:views]
+
+      redis.sadd @user[:posts], 1
+      redis.sadd @user[:posts], 2
+
+      redis.lpush @user[:comments], 3
+      redis.lpush @user[:comments], 4
+
+      redis.sadd @user[:_indices], @users[:email][Ohm::Model.encode "albert-#{@id}@example.com"]
+      redis.sadd @users[:email][Ohm::Model.encode "albert-#{@id}@example.com"], @id
+    end
+  end
+
+  should "upgrade to hashes" do
+    Ohm::Utils::Upgrade.new([:User]).run
+
+    @user = @users[1]
+
+    assert_nil redis.get(@user[:name])
+    assert_nil redis.get(@user[:email])
+    assert_nil redis.get(@user[:views])
+
+    assert_equal ["1", "2"], redis.smembers(@user[:posts])
+
+    assert_equal [@users[:email][Ohm::Model.encode "albert-1@example.com"]], redis.smembers(@user[:_indices])
+    assert_equal ["1"], redis.smembers(@users[:email][Ohm::Model.encode "albert-1@example.com"])
+
+    assert_equal "Albert", redis.hget(@user, :name)
+    assert_equal "albert-1@example.com", redis.hget(@user, :email)
+    assert_equal "1", redis.hget(@user, :views)
+  end
+end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 176182720
+  prerelease: true
   segments: 
   - 0
+  - 1
   - 0
-  - 38
-  version: 0.0.38
+  - rc1
+  version: 0.1.0.rc1
 platform: ruby
 authors: 
 - Michel Martens
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -03:00
+date: 2010-05-10 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -41,6 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 1
@@ -61,6 +65,7 @@ files:
 - lib/ohm/collection.rb
 - lib/ohm/compat-1.8.6.rb
 - lib/ohm/key.rb
+- lib/ohm/utils/upgrade.rb
 - lib/ohm/validations.rb
 - lib/ohm.rb
 - README.markdown
@@ -68,16 +73,15 @@ files:
 - Rakefile
 - test/1.8.6_test.rb
 - test/all_tests.rb
-- test/benchmarks.rb
-- test/circular_reference_test.rb
 - test/connection_test.rb
 - test/errors_test.rb
 - test/indices_test.rb
+- test/model_module_test.rb
 - test/model_test.rb
 - test/mutex_test.rb
 - test/test_helper.rb
+- test/upgrade_script_test.rb
 - test/validations_test.rb
-- test/wrapper_test.rb
 - test/test.conf
 has_rdoc: true
 homepage: http://github.com/soveran/ohm
@@ -93,21 +97,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ohm
-rubygems_version: 1.3.7
+rubygems_version: 1.3.7.pre.1
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.

data/test/benchmarks.rb

@@ -1,39 +0,0 @@
-require "rubygems"
-require "bench"
-require File.dirname(__FILE__) + "/../lib/ohm"
-
-Ohm.connect(:port => 6381)
-Ohm.flush
-
-class Event < Ohm::Model
-  attribute :name
-  attribute :location
-
-  index :name
-  index :location
-
-  def validate
-    assert_present :name
-    assert_present :location
-  end
-end
-
-i = 0
-
-benchmark "Create Events" do
-  Event.create(:name => "Redis Meetup #{i}", :location => "London #{i}")
-end
-
-benchmark "Find by indexed attribute" do
-  Event.find(:name => "Redis Meetup #{i}").first
-end
-
-benchmark "Mass update" do
-  Event[1].update(:name => "Redis Meetup II")
-end
-
-benchmark "Load events" do
-  Event[1].name
-end
-
-run 5000

data/test/circular_reference_test.rb

@@ -1,28 +0,0 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
-
-class Post < Ohm::Model
-  attribute :title
-
-  list :categories, Category
-end
-
-class Category < Ohm::Model
-  attribute :name
-
-  set :posts, Post
-end
-
-class CircularReferenceTest < Test::Unit::TestCase
-  setup do
-    @post = Post.create(:title => "New post")
-    @category = Category.create(:name => "Ruby")
-  end
-
-  test "inspect" do
-    @post.categories << @category
-    @category.posts << @post
-
-    assert_equal %Q{#<Post:1 title="New post" categories=#<List (Category): ["1"]>>}, @post.inspect
-    assert_equal %Q{#<Category:1 name="Ruby" posts=#<Set (Post): ["1"]>>}, @category.inspect
-  end
-end

data/test/wrapper_test.rb

@@ -1,20 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
-
-$missing_constants = []
-
-class Object
-  def self.const_missing(name)
-    $missing_constants << name
-    super(name)
-  end
-end
-
-class Foo < Ohm::Model
-  set :bars, Bar
-end
-
-class Tests < Test::Unit::TestCase
-  test "calls other const_missing hooks" do
-    assert_equal [:Bar], $missing_constants
-  end
-end