ohm 0.1.0.rc4 → 0.1.0.rc5

data/test/indices_test.rb

@@ -59,7 +59,7 @@ class IndicesTest < Test::Unit::TestCase
     end
 
     should "use a special namespace for set operations" do
-      assert_match /^~:/, User.find(:email => "foo", :activation_code => "bar").key.to_s
+      assert_match(/^~:/, User.find(:email => "foo", :activation_code => "bar").key.to_s)
 
       assert Ohm.redis.keys("~:*").size > 0
     end
@@ -159,9 +159,11 @@ class IndicesTest < Test::Unit::TestCase
       @event1 = Event.create(:timeline => 1).update(:days => [1, 2])
       @event2 = Event.create(:timeline => 1).update(:days => [2, 3])
       @event3 = Event.create(:timeline => 2).update(:days => [3, 4])
+      @event4 = Event.create(:timeline => 2).update(:days => [1, 3])
     end
 
     should "intersect multiple sets of results" do
+      assert_equal [@event1], Event.find(:days => [1, 2]).all
       assert_equal [@event1], Event.find(:timeline => 1, :days => [1, 2]).all
       assert_equal [@event1], Event.find(:timeline => 1).find(:days => [1, 2]).all
     end

data/test/model_test.rb

@@ -6,7 +6,6 @@ require "json"
 
 class Post < Ohm::Model
   attribute :body
-  list :comments
   list :related, Post
 end
 
@@ -41,9 +40,16 @@ class Event < Ohm::Model
   end
 end
 
+module SomeNamespace
+  class Foo < Ohm::Model
+    attribute :name
+  end
+end
+
 class ModelTest < Test::Unit::TestCase
   setup do
     Ohm.flush
+    Logger.current.clear
   end
 
   context "An event initialized with a hash of attributes" do
@@ -113,7 +119,10 @@ class ModelTest < Test::Unit::TestCase
       assert_nothing_raised do
         class RedefinedModel < Ohm::Model
           attribute :name
-          attribute :name
+
+          silence_warnings do
+            attribute :name
+          end
         end
       end
     end
@@ -122,7 +131,10 @@ class ModelTest < Test::Unit::TestCase
       assert_nothing_raised do
         class RedefinedModel < Ohm::Model
           counter :age
-          counter :age
+
+          silence_warnings do
+            counter :age
+          end
         end
       end
     end
@@ -130,8 +142,11 @@ class ModelTest < Test::Unit::TestCase
     should "not raise if a list is redefined" do
       assert_nothing_raised do
         class RedefinedModel < Ohm::Model
-          list :todo
-          list :todo
+          list :todo, lambda { }
+
+          silence_warnings do
+            list :todo, lambda { }
+          end
         end
       end
     end
@@ -139,8 +154,11 @@ class ModelTest < Test::Unit::TestCase
     should "not raise if a set is redefined" do
       assert_nothing_raised do
         class RedefinedModel < Ohm::Model
-          set :friends
-          set :friends
+          set :friends, lambda { }
+
+          silence_warnings do
+            set :friends, lambda { }
+          end
         end
       end
     end
@@ -148,8 +166,11 @@ class ModelTest < Test::Unit::TestCase
     should "not raise if a collection is redefined" do
       assert_nothing_raised do
         class RedefinedModel < Ohm::Model
-          list :toys
-          set :toys
+          list :toys, lambda { }
+
+          silence_warnings do
+            set :toys, lambda { }
+          end
         end
       end
     end
@@ -190,7 +211,7 @@ class ModelTest < Test::Unit::TestCase
       assert_equal "albert@example.com", User[1].email
     end
 
-    should "allow to map ids to models" do
+    should "allow to map key to models" do
       assert_equal [User[1]], [1].map(&User)
     end
   end
@@ -273,23 +294,23 @@ class ModelTest < Test::Unit::TestCase
     should "delete an existing model" do
       class ModelToBeDeleted < Ohm::Model
         attribute :name
-        set :foos
-        list :bars
+        set :foos, Post
+        list :bars, Post
       end
 
       @model = ModelToBeDeleted.create(:name => "Lorem")
 
-      @model.foos << "foo"
-      @model.bars << "bar"
+      @model.foos << Post.create
+      @model.bars << Post.create
 
       id = @model.id
 
       @model.delete
 
-      assert_nil Ohm.redis.get(ModelToBeDeleted.key(id))
-      assert_nil Ohm.redis.get(ModelToBeDeleted.key(id, :name))
-      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_nil Ohm.redis.get(ModelToBeDeleted.key[id])
+      assert_nil Ohm.redis.get(ModelToBeDeleted.key[id][:name])
+      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
@@ -373,8 +394,15 @@ class ModelTest < Test::Unit::TestCase
     should "load attributes lazily" do
       event = Event[@id]
 
-      assert_nil event.send(:instance_variable_get, "@name")
+      Logger.current.clear
+
+      assert Logger.current.commands.empty?
       assert_equal "Ruby Tuesday", event.name
+      assert !Logger.current.commands.empty?
+
+      Logger.current.clear
+      assert_equal "Ruby Tuesday", event.name
+      assert Logger.current.commands.empty?
     end
 
     should "load attributes as a strings" do
@@ -400,14 +428,14 @@ class ModelTest < Test::Unit::TestCase
       end
     end
 
-    should "remove an element if sent :delete" do
+    should "remove an element if sent delete" do
       @event.create
       @event.attendees << @person1
       @event.attendees << @person2
       @event.attendees << @person3
-      assert_equal ["1", "2", "3"], @event.attendees.raw.sort
+      assert_equal ["1", "2", "3"], @event.attendees.key.sort
       @event.attendees.delete(@person2)
-      assert_equal ["1", "3"], Event[@event.id].attendees.raw.sort
+      assert_equal ["1", "3"], Event[@event.id].attendees.key.sort
     end
 
     should "return true if the set includes some member" do
@@ -423,7 +451,7 @@ class ModelTest < Test::Unit::TestCase
       @event.attendees << @person1
 
       assert_equal [@person1], @event.attendees.all
-      assert_equal @person1, @event.attendees[0]
+      assert_equal @person1, @event.attendees[@person1.id]
     end
 
     should "return the size of the set" do
@@ -451,7 +479,7 @@ class ModelTest < Test::Unit::TestCase
 
       @event.attendees.replace([@person2, @person3])
 
-      assert_equal [@person2, @person3], @event.attendees.sort
+      assert_equal [@person2, @person3], @event.attendees.all.sort_by(&:id)
     end
 
     should "filter elements" do
@@ -473,91 +501,116 @@ class ModelTest < Test::Unit::TestCase
     end
 
     should "return an array" do
-      assert @post.comments.all.kind_of?(Array)
+      assert @post.related.all.kind_of?(Array)
     end
 
     should "append elements with push" do
-      @post.comments.push "1"
-      @post.comments << "2"
+      @post.related.push Post.create
+      @post.related << Post.create
 
-      assert_equal ["1", "2"], @post.comments.all
+      assert_equal ["2", "3"], @post.related.all.map { |model| model.id }
     end
 
     should "keep the inserting order" do
-      @post.comments << "1"
-      @post.comments << "2"
-      @post.comments << "3"
-      assert_equal ["1", "2", "3"], @post.comments.all
+      @post.related << Post.create
+      @post.related << Post.create
+      @post.related << Post.create
+      assert_equal ["2", "3", "4"], @post.related.all.map { |model| model.id }
     end
 
     should "keep the inserting order after saving" do
-      @post.comments << "1"
-      @post.comments << "2"
-      @post.comments << "3"
+      @post.related << Post.create
+      @post.related << Post.create
+      @post.related << Post.create
       @post.save
-      assert_equal ["1", "2", "3"], Post[@post.id].comments.all
+      assert_equal ["2", "3", "4"], Post[@post.id].related.map { |model| model.id }
+    end
+
+    should "allow slicing the list" do
+      post1 = Post.create
+      post2 = Post.create
+      post3 = Post.create
+
+      @post.related << post1
+      @post.related << post2
+      @post.related << post3
+
+      assert_equal post1, @post.related[0]
+      assert_equal post2, @post.related[1]
+      assert_equal post3, @post.related[-1]
+
+      assert_equal nil, @post.related[3]
+
+      assert_equal [post2, post3], @post.related[1, 2]
+      assert_equal [post2, post3], @post.related[1, -1]
+
+      assert_equal [], @post.related[4, 5]
+
+      assert_equal [post2, post3], @post.related[1..2]
+      assert_equal [post2, post3], @post.related[1..5]
+
+      assert_equal [], @post.related[4..5]
     end
 
     should "respond to each" do
-      @post.comments << "1"
-      @post.comments << "2"
-      @post.comments << "3"
+      @post.related << Post.create
+      @post.related << Post.create
+      @post.related << Post.create
 
-      i = 1
-      @post.comments.each do |c|
-        assert_equal i, c.to_i
+      i = 2
+      @post.related.each do |c|
+        assert_equal i, c.id.to_i
         i += 1
       end
     end
 
     should "return the size of the list" do
-      @post.comments << "1"
-      @post.comments << "2"
-      @post.comments << "3"
-      assert_equal 3, @post.comments.size
+      @post.related << Post.create
+      @post.related << Post.create
+      @post.related << Post.create
+      assert_equal 3, @post.related.size
     end
 
     should "return the last element with pop" do
-      @post.comments << "1"
-      @post.comments << "2"
-      assert_equal "2", @post.comments.pop
-      assert_equal "1", @post.comments.pop
-      assert @post.comments.empty?
+      @post.related << Post.create
+      @post.related << Post.create
+      assert_equal "3", @post.related.pop.id
+      assert_equal "2", @post.related.pop.id
+      assert @post.related.empty?
     end
 
     should "return the first element with shift" do
-      @post.comments << "1"
-      @post.comments << "2"
-      assert_equal "1", @post.comments.shift
-      assert_equal "2", @post.comments.shift
-      assert @post.comments.empty?
+      @post.related << Post.create
+      @post.related << Post.create
+      assert_equal "2", @post.related.shift.id
+      assert_equal "3", @post.related.shift.id
+      assert @post.related.empty?
     end
 
     should "push to the head of the list with unshift" do
-      @post.comments.unshift "1"
-      @post.comments.unshift "2"
-      assert_equal "1", @post.comments.pop
-      assert_equal "2", @post.comments.pop
-      assert @post.comments.empty?
+      @post.related.unshift Post.create
+      @post.related.unshift Post.create
+      assert_equal "2", @post.related.pop.id
+      assert_equal "3", @post.related.pop.id
+      assert @post.related.empty?
     end
 
     should "empty the list" do
-      @post.comments.unshift "1"
-      @post.comments.clear
+      @post.related.unshift Post.create
+      @post.related.clear
 
-      assert @post.comments.empty?
+      assert @post.related.empty?
     end
 
     should "replace the values in the list" do
-      @post.comments.replace(["1", "2"])
+      @post.related.replace([Post.create, Post.create])
 
-      assert_equal ["1", "2"], @post.comments
+      assert_equal ["2", "3"], @post.related.map { |model| model.id }
     end
 
     should "add models" do
       @post.related.add(Post.create(:body => "Hello"))
-
-      assert_equal ["2"], @post.related.raw
+      assert_equal ["2"], @post.related.map { |model| model.id }
     end
 
     should "find elements in the list" do
@@ -573,7 +626,7 @@ class ModelTest < Test::Unit::TestCase
       @post.related.unshift(Post.create(:body => "Hello"))
       @post.related.unshift(Post.create(:body => "Goodbye"))
 
-      assert_equal ["3", "2"], @post.related.raw
+      assert_equal ["3", "2"], @post.related.map { |model| model.id }
 
       assert_equal "3", @post.related.shift.id
 
@@ -614,8 +667,8 @@ class ModelTest < Test::Unit::TestCase
     setup do
       @calendar = Calendar.create
 
-      @calendar.holidays.raw << "2009-05-25"
-      @calendar.holidays.raw << "2009-07-09"
+      @calendar.holidays.key.rpush "2009-05-25"
+      @calendar.holidays.key.rpush "2009-07-09"
 
       @calendar.subscribers << MyActiveRecordModel.find(1)
     end
@@ -623,7 +676,7 @@ class ModelTest < Test::Unit::TestCase
     should "apply a transformation" do
       assert_equal [Date.new(2009, 5, 25), Date.new(2009, 7, 9)], @calendar.holidays.all
 
-      assert_equal ["1"], @calendar.subscribers.raw.all
+      assert_equal [1], @calendar.subscribers.all.map { |model| model.id }
       assert_equal [MyActiveRecordModel.find(1)], @calendar.subscribers.all
     end
 
@@ -642,13 +695,13 @@ class ModelTest < Test::Unit::TestCase
   context "Sorting lists and sets" do
     setup do
       @post = Post.create(:body => "Lorem")
-      @post.comments << 2
-      @post.comments << 3
-      @post.comments << 1
+      @post.related << Post.create
+      @post.related << Post.create
+      @post.related << Post.create
     end
 
     should "sort values" do
-      assert_equal %w{1 2 3}, @post.comments.sort
+      assert_equal %w{2 3 4}, @post.related.sort.map { |model| model.id }
     end
   end
 
@@ -716,10 +769,10 @@ class ModelTest < Test::Unit::TestCase
 
     should "be able to decrement a counter" do
       @event.decr(:votes)
-      assert_equal -1, @event.votes
+      assert_equal(-1, @event.votes)
 
       @event.decr(:votes, 2)
-      assert_equal -3, @event.votes
+      assert_equal(-3, @event.votes)
     end
   end
 
@@ -752,8 +805,8 @@ class ModelTest < Test::Unit::TestCase
     class ::Bar < Ohm::Model
       attribute :name
       counter :visits
-      set :friends
-      list :comments
+      set :friends, self
+      list :comments, self
 
       def foo
         bar.foo
@@ -774,12 +827,12 @@ class ModelTest < Test::Unit::TestCase
       assert_equal "#<Bar:? name=nil friends=nil comments=nil visits=0>", bar.inspect
 
       bar.update(:name => "Albert")
-      bar.friends << 1
-      bar.friends << 2
-      bar.comments << "A"
+      bar.friends << Bar.create
+      bar.friends << Bar.create
+      bar.comments << Bar.create
       bar.incr(:visits)
 
-      assert_equal %Q{#<Bar:#{bar.id} name="Albert" friends=#<Set: ["1", "2"]> comments=#<List: ["A"]> visits=1>}, Bar[bar.id].inspect
+      assert_equal %Q{#<Bar:#{bar.id} name="Albert" friends=#<Set (Bar): ["3", "2"]> comments=#<List (Bar): ["4"]> visits=1>}, Bar[bar.id].inspect
     end
 
     def assert_wrapper_exception(&block)
@@ -788,7 +841,7 @@ class ModelTest < Test::Unit::TestCase
       rescue NoMethodError => exception_raised
       end
 
-      assert_match /You tried to call SomeMissingConstant#\w+, but SomeMissingConstant is not defined on #{__FILE__}:\d+:in `bar'/, exception_raised.message
+      assert_match(/You tried to call SomeMissingConstant#\w+, but SomeMissingConstant is not defined on #{__FILE__}:\d+:in `bar'/, exception_raised.message)
     end
 
     should "inform about a miscatch by Wrapper when calling class methods" do
@@ -928,10 +981,7 @@ class ModelTest < Test::Unit::TestCase
     end
 
     setup do
-      Car.connect(:port => 6379, :db => 14)
-    end
-
-    teardown do
+      Car.connect(:db => 15)
       Car.db.flushdb
     end
 
@@ -939,11 +989,11 @@ class ModelTest < Test::Unit::TestCase
       car = Car.create(:name => "Twingo")
       make = Make.create(:name => "Renault")
 
-      assert_equal ["1"], Redis.new(:db => 15).smembers("Make:all")
-      assert_equal [], Redis.new(:db => 15).smembers("Car:all")
+      assert_equal ["1"], Redis.connect.smembers("Make:all")
+      assert_equal [], Redis.connect.smembers("Car:all")
 
-      assert_equal ["1"], Redis.new(:db => 14).smembers("Car:all")
-      assert_equal [], Redis.new(:db => 14).smembers("Make:all")
+      assert_equal ["1"], Car.db.smembers("Car:all")
+      assert_equal [], Car.db.smembers("Make:all")
 
       assert_equal car, Car[1]
       assert_equal make, Make[1]
@@ -957,13 +1007,13 @@ class ModelTest < Test::Unit::TestCase
     should "allow changing the database" do
       Car.create(:name => "Twingo")
 
-      assert_equal ["1"], Car.all.raw
+      assert_equal ["1"], Car.all.key.smembers
 
-      Car.connect :db => 15
-      assert_equal [], Car.all.raw
+      Car.connect
+      assert_equal [], Car.all.key.smembers
 
-      Car.connect :db => 14
-      assert_equal ["1"], Car.all.raw
+      Car.connect :db => 15
+      assert_equal ["1"], Car.all.key.smembers
     end
   end
 
@@ -1081,4 +1131,14 @@ class ModelTest < Test::Unit::TestCase
       assert_equal 'authorized', order.state
     end
   end
+
+  context "namespaced models" do
+    should "be persisted" do
+      SomeNamespace::Foo.create(:name => "foo")
+
+      assert_equal "hash", Ohm.redis.type("SomeNamespace::Foo:1")
+
+      assert_equal "foo", SomeNamespace::Foo[1].name
+    end
+  end
 end

data/test/mutex_test.rb

@@ -68,12 +68,12 @@ class TestMutex < Test::Unit::TestCase
 
       threads = []
 
-      n = 10
-      m = 9
+      n = 3
+      m = 2
 
-      n.times do |i|
+      n.times do
         threads << Thread.new do
-          m.times do |i|
+          m.times do
             @candidate.mutex do
               sleep 0.1
               @candidate.incr(:votes)

data/test/pattern_test.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+
+class TestArray < Test::Unit::TestCase
+  test "should provide pattern matching" do
+    assert(Ohm::Pattern[1, Fixnum] === [1, 2])
+    assert(Ohm::Pattern[String, Array] === ["foo", ["bar"]])
+  end
+end

data/test/test_helper.rb

@@ -6,7 +6,48 @@ rescue LoadError
 end
 
 require "contest"
+
+def silence_warnings
+  original_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = original_verbose
+end
+
+$VERBOSE = true
+
+class Logger
+  def self.current
+    Thread.current[:logger] ||= new
+  end
+
+  def initialize
+    clear
+  end
+
+  def clear
+    @lines = []
+  end
+
+  def debug(message)
+    @lines << message.to_s
+  end
+
+  def debug?; true; end
+  alias info  debug
+  alias warn  debug
+  alias error debug
+
+  def commands
+    @lines.map { |line| line[/Redis >> ([A-Z].+?)$/, 1] }.compact
+  end
+end
+
 require "ohm"
 
-Ohm.connect(:port => 6379, :db => 15, :timeout => 3)
-Ohm.flush
+class Test::Unit::TestCase
+  setup do
+    Ohm.redis = Redis.connect(:logger => Logger.current)
+    Ohm.flush
+  end
+end

data/test/upgrade_script_test.rb

@@ -24,7 +24,7 @@ class UpgradeScriptTest < Test::Unit::TestCase
   setup do
     redis.flushdb
 
-    @users = Ohm::Key[:User]
+    @users = Ohm::Key.new(:User, Ohm.redis)
 
     10.times do
       @id = redis.incr(@users[:id])

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 0
-  - rc4
-  version: 0.1.0.rc4
+  - rc5
+  version: 0.1.0.rc5
 platform: ruby
 authors: 
 - Michel Martens
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -03:00
+date: 2010-08-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,8 +31,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - rc3
-        version: 2.0.0.rc3
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -75,9 +74,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ohm/collection.rb
 - lib/ohm/compat-1.8.6.rb
 - lib/ohm/key.rb
+- lib/ohm/pattern.rb
 - lib/ohm/utils/upgrade.rb
 - lib/ohm/validations.rb
 - lib/ohm/version.rb
@@ -91,9 +90,9 @@ files:
 - test/errors_test.rb
 - test/hash_key_test.rb
 - test/indices_test.rb
-- test/model_module_test.rb
 - test/model_test.rb
 - test/mutex_test.rb
+- test/pattern_test.rb
 - test/test_helper.rb
 - test/upgrade_script_test.rb
 - test/validations_test.rb