ohm 0.0.32 → 0.0.33

data/test/indices_test.rb

@@ -33,7 +33,7 @@ class IndicesTest < Test::Unit::TestCase
 
   context "A model with an indexed attribute" do
     setup do
-      @user1 = User.create(:email => "foo")
+      @user1 = User.create(:email => "foo", :activation_code => "bar")
       @user2 = User.create(:email => "bar")
       @user3 = User.create(:email => "baz qux")
     end
@@ -42,6 +42,22 @@ class IndicesTest < Test::Unit::TestCase
       assert_equal @user1, User.find(:email => "foo").first
     end
 
+    should "avoid intersections with the all collection" do
+      assert_equal "IndicesTest::User:email:#{Ohm::Model.encode "foo"}", User.find(:email => "foo").key.to_s
+
+      assert_equal "~:IndicesTest::User:email:Zm9v+IndicesTest::User:activation_code:",
+        User.find(:email => "foo").find(:activation_code => "").key.to_s
+
+      assert_equal "~:IndicesTest::User:email:Zm9v+IndicesTest::User:activation_code:+IndicesTest::User:working_days:",
+        User.find(:email => "foo").find(:activation_code => "").find(:working_days => "").key.to_s
+    end
+
+    should "use a special namespace for set operations" do
+      assert_match /^~:/, User.find(:email => "foo", :activation_code => "bar").key.to_s
+
+      assert Ohm.redis.keys("~:*").size > 0
+    end
+
     should "raise if the field is not indexed" do
       assert_raises(Ohm::Model::IndexNotFound) do
         User.find(:sandunga => "foo")
@@ -57,28 +73,18 @@ class IndicesTest < Test::Unit::TestCase
       @user1.email = "baz"
       @user1.save
 
-      assert_equal [], User.find(:email => "foo")
-      assert_equal [@user1], User.find(:email => "baz")
+      assert_equal [], User.find(:email => "foo").all
+      assert_equal [@user1], User.find(:email => "baz").all
     end
 
     should "remove from the index after deleting" do
       @user2.delete
 
-      assert_equal [], User.find(:email => "bar")
+      assert_equal [], User.find(:email => "bar").all
     end
 
     should "work with attributes that contain spaces" do
-      assert_equal [@user3], User.find(:email => "baz qux")
-    end
-
-    should "not allow to manually clear an index" do
-      assert_raise Ohm::Model::CannotDeleteIndex do
-        User.find(:email => "bar").clear
-      end
-
-      assert_raise Ohm::Model::CannotDeleteIndex do
-        User.find(:email => "bar").find(:email => "baz").clear
-      end
+      assert_equal [@user3], User.find(:email => "baz qux").all
     end
   end
 
@@ -91,7 +97,7 @@ class IndicesTest < Test::Unit::TestCase
 
     should "allow indexing by an arbitrary attribute" do
       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")
+      assert_equal [@user3], User.find(:email_provider => "yahoo.com").all
     end
 
     should "allow indexing by an attribute that is lazily set" do
@@ -122,7 +128,7 @@ class IndicesTest < Test::Unit::TestCase
     should "remove the indices when the object changes" do
       @user2.working_days.delete "Mon"
       @user2.save
-      assert_equal [@user1], User.find(:working_days => "Mon")
+      assert_equal [@user1], User.find(:working_days => "Mon").all
     end
   end
 
@@ -146,12 +152,12 @@ class IndicesTest < Test::Unit::TestCase
     end
 
     should "intersect multiple sets of results" do
-      assert_equal [@event1], Event.find(:timeline => 1, :days => [1, 2])
-      assert_equal [@event1], Event.find(:timeline => 1).find(:days => [1, 2])
+      assert_equal [@event1], Event.find(:timeline => 1, :days => [1, 2]).all
+      assert_equal [@event1], Event.find(:timeline => 1).find(:days => [1, 2]).all
     end
 
     should "compute the difference between sets" do
-      assert_equal [@event2], Event.find(:timeline => 1).except(:days => 1)
+      assert_equal [@event2], Event.find(:timeline => 1).except(:days => 1).all
     end
 
     should "raise if the argument is not an index" do
@@ -162,7 +168,7 @@ class IndicesTest < Test::Unit::TestCase
 
     should "work with strings that generate a new line when encoded" do
       user = User.create(:email => "foo@bar", :update => "CORRECTED - UPDATE 2-Suspected US missile strike kills 5 in Pakistan")
-      assert_equal [user], User.find(:update => "CORRECTED - UPDATE 2-Suspected US missile strike kills 5 in Pakistan")
+      assert_equal [user], User.find(:update => "CORRECTED - UPDATE 2-Suspected US missile strike kills 5 in Pakistan").all
     end
   end
 

data/test/model_test.rb

@@ -96,6 +96,13 @@ class TestRedis < Test::Unit::TestCase
       assert event.update(:location => nil)
       assert_equal nil, Meetup[event.id].location
     end
+
+    should "delete the attribute if set to an empty string" do
+      event = Meetup.create(:name => "Ruby Tuesday", :location => "Los Angeles")
+      assert_equal "Los Angeles", Meetup[event.id].location
+      assert event.update(:location => "")
+      assert_equal nil, Meetup[event.id].location
+    end
   end
 
   context "Model definition" do
@@ -331,7 +338,7 @@ class TestRedis < Test::Unit::TestCase
       Person.create :name => "B"
       Person.create :name => "A"
 
-      assert_equal "A", Person.all.sort_by(:name, :get => "Person:*:name", :order => "ALPHA").first
+      assert_equal "A", Person.all.sort_by(:name, :get => :name, :order => "ALPHA").first
     end
   end
 
@@ -360,62 +367,59 @@ class TestRedis < Test::Unit::TestCase
 
   context "Attributes of type Set" do
     setup do
+      Ohm.flush
+
+      @person1 = Person.create(:name => "Albert")
+      @person2 = Person.create(:name => "Bertrand")
+      @person3 = Person.create(:name => "Charles")
+
       @event = Event.new
       @event.name = "Ruby Tuesday"
     end
 
     should "not be available if the model is new" do
       assert_raise Ohm::Model::MissingID do
-        @event.attendees << 1
+        @event.attendees << Person.new
       end
     end
 
     should "remove an element if sent :delete" do
       @event.create
-      @event.attendees << "1"
-      @event.attendees << "2"
-      @event.attendees << "3"
+      @event.attendees << @person1
+      @event.attendees << @person2
+      @event.attendees << @person3
       assert_equal ["1", "2", "3"], @event.attendees.raw.sort
-      @event.attendees.delete("2")
+      @event.attendees.delete(@person2)
       assert_equal ["1", "3"], Event[@event.id].attendees.raw.sort
     end
 
     should "return true if the set includes some member" do
       @event.create
-      @event.attendees << "1"
-      @event.attendees << "2"
-      @event.attendees << "3"
-      assert @event.attendees.include?("2")
-      assert_equal false, @event.attendees.include?("4")
+      @event.attendees << @person1
+      @event.attendees << @person2
+      assert @event.attendees.include?(@person2)
+      assert !@event.attendees.include?(@person3)
     end
 
-    should "return instances of the passed model if the call to all includes a class" do
-      @event.create
-      @person = Person.create :name => "albert"
-      @event.attendees << @person.id
-
-      assert_equal [@person], @event.attendees.all
-    end
-
-    should "insert the model instance id instead of the object if using add" do
+    should "return instances of the passed model" do
       @event.create
-      @person = Person.create :name => "albert"
-      @event.attendees.add(@person)
+      @event.attendees << @person1
 
-      assert_equal [@person.id.to_s], @event.attendees.raw
+      assert_equal [@person1], @event.attendees.all
+      assert_equal @person1, @event.attendees[0]
     end
 
     should "return the size of the set" do
       @event.create
-      @event.attendees << "1"
-      @event.attendees << "2"
-      @event.attendees << "3"
+      @event.attendees << @person1
+      @event.attendees << @person2
+      @event.attendees << @person3
       assert_equal 3, @event.attendees.size
     end
 
     should "empty the set" do
       @event.create
-      @event.attendees << "1"
+      @event.attendees << @person1
 
       @event.attendees.clear
 
@@ -424,21 +428,23 @@ class TestRedis < Test::Unit::TestCase
 
     should "replace the values in the set" do
       @event.create
-      @event.attendees << "1"
+      @event.attendees << @person1
 
-      @event.attendees.replace(["2", "3"])
+      assert_equal [@person1], @event.attendees.all
 
-      assert_equal ["2", "3"], @event.attendees.raw.sort
+      @event.attendees.replace([@person2, @person3])
+
+      assert_equal [@person2, @person3], @event.attendees.sort
     end
 
     should "filter elements" do
       @event.create
-      @event.attendees.add(Person.create(:name => "Albert"))
-      @event.attendees.add(Person.create(:name => "Marie"))
+      @event.attendees.add(@person1)
+      @event.attendees.add(@person2)
 
-      assert_equal ["1"], @event.attendees.find(:initial => "A").raw
-      assert_equal ["2"], @event.attendees.find(:initial => "M").raw
-      assert_equal [],    @event.attendees.find(:initial => "Z").raw
+      assert_equal [@person1], @event.attendees.find(:initial => "A").all
+      assert_equal [@person2], @event.attendees.find(:initial => "B").all
+      assert_equal [],    @event.attendees.find(:initial => "Z").all
     end
   end
 
@@ -528,7 +534,7 @@ class TestRedis < Test::Unit::TestCase
     should "replace the values in the list" do
       @post.comments.replace(["1", "2"])
 
-      assert_equal ["1", "2"], @post.comments.raw
+      assert_equal ["1", "2"], @post.comments
     end
 
     should "add models" do
@@ -542,26 +548,46 @@ class TestRedis < Test::Unit::TestCase
 
       @post.related.add(another_post)
 
-      assert  @post.related.include?(another_post.id)
-      assert !@post.related.include?("-1")
+      assert  @post.related.include?(another_post)
+      assert !@post.related.include?(Post.create)
     end
   end
 
   context "Applying arbitrary transformations" do
     require "date"
 
+    class MyActiveRecordModel
+      def self.find(id)
+        return new if id.to_i == 1
+      end
+
+      def id
+        1
+      end
+
+      def ==(other)
+        id == other.id
+      end
+    end
+
     class Calendar < Ohm::Model
       list :holidays, lambda { |v| Date.parse(v) }
+      list :subscribers, lambda { |id| MyActiveRecordModel.find(id) }
     end
 
     setup do
       @calendar = Calendar.create
-      @calendar.holidays << "2009-05-25"
-      @calendar.holidays << "2009-07-09"
+      @calendar.holidays.raw << "2009-05-25"
+      @calendar.holidays.raw << "2009-07-09"
+
+      @calendar.subscribers << MyActiveRecordModel.find(1)
     end
 
     should "apply a transformation" do
-      assert_equal [Date.new(2009, 5, 25), Date.new(2009, 7, 9)], @calendar.holidays
+      assert_equal [Date.new(2009, 5, 25), Date.new(2009, 7, 9)], @calendar.holidays.all
+
+      assert_equal ["1"], @calendar.subscribers.raw.all
+      assert_equal [MyActiveRecordModel.find(1)], @calendar.subscribers.all
     end
   end
 
@@ -581,10 +607,10 @@ class TestRedis < Test::Unit::TestCase
   context "Sorting lists and sets by model attributes" do
     setup do
       @event = Event.create(:name => "Ruby Tuesday")
-      @event.attendees << Person.create(:name => "D").id
-      @event.attendees << Person.create(:name => "C").id
-      @event.attendees << Person.create(:name => "B").id
-      @event.attendees << Person.create(:name => "A").id
+      @event.attendees << Person.create(:name => "D")
+      @event.attendees << Person.create(:name => "C")
+      @event.attendees << Person.create(:name => "B")
+      @event.attendees << Person.create(:name => "A")
     end
 
     should "sort the model instances by the values provided" do
@@ -710,4 +736,114 @@ class TestRedis < Test::Unit::TestCase
       assert_equal "Foobar", Baz[baz.id].name
     end
   end
+
+  context "References to other objects" do
+    class ::Note < Ohm::Model
+      attribute :content
+      reference :source, Post
+    end
+
+    class ::Editor < Ohm::Model
+      attribute :name
+      reference :post, Post
+    end
+
+    class ::Post < Ohm::Model
+      reference :author, Person
+      collection :notes, Note, :source
+      collection :editors, Editor
+    end
+
+    setup do
+      @post = Post.create
+    end
+
+    context "a reference to another object" do
+      should "return an instance of Person if author_id has a valid id" do
+        @post.author_id = Person.create(:name => "Albert").id
+        @post.save
+        assert_equal "Albert", Post[@post.id].author.name
+      end
+
+      should "assign author_id if author is sent a valid instance" do
+        @post.author = Person.create(:name => "Albert")
+        @post.save
+        assert_equal "Albert", Post[@post.id].author.name
+      end
+
+      should "assign nil if nil is passed to author" do
+        @post.author = nil
+        @post.save
+        assert_nil Post[@post.id].author
+      end
+
+      should "be cached in an instance variable" do
+        @author = Person.create(:name => "Albert")
+        @post.update(:author => @author)
+
+        assert_equal @author, @post.author
+        assert @post.author.object_id == @post.author.object_id
+
+        @post.update(:author => Person.create(:name => "Bertrand"))
+
+        assert_equal "Bertrand", @post.author.name
+        assert @post.author.object_id == @post.author.object_id
+
+        @post.update(:author_id => Person.create(:name => "Charles").id)
+
+        assert_equal "Charles", @post.author.name
+      end
+    end
+
+    context "a collection of other objects" do
+      setup do
+        @note = Note.create(:content => "Interesting stuff", :source => @post)
+      end
+
+      should "return a set of notes" do
+        assert_equal @note.source, @post
+        assert_equal @note, @post.notes.first
+      end
+
+      should "default to the current class name" do
+        @editor = Editor.create(:name => "Albert", :post => @post)
+
+        assert_equal @editor, @post.editors.first
+      end
+    end
+  end
+
+  context "Models connected to different databases" do
+    class ::Car < Ohm::Model
+      attribute :name
+    end
+
+    class ::Make < Ohm::Model
+      attribute :name
+    end
+
+    setup do
+      Car.connect(:port => 6381, :db => 2)
+    end
+
+    teardown do
+      Car.db.flushdb
+    end
+
+    should "save to the selected database" do
+      car = Car.create(:name => "Twingo")
+      make = Make.create(:name => "Renault")
+
+      assert_equal 1, Make.db.instance_variable_get("@db")
+      assert_equal 2, Car.db.instance_variable_get("@db")
+
+      assert_equal car, Car[1]
+      assert_equal make, Make[1]
+
+      Make.db.flushdb
+
+      assert_equal car, Car[1]
+      assert_nil Make[1]
+    end
+  end
 end

data/test/redis_test.rb

@@ -398,7 +398,7 @@ class RedisTest < Test::Unit::TestCase
       assert_equal "11", @r.zscore("league", "foo")
 
       @r.set "bar", "2"
-      assert_raises do
+      assert_raises(RuntimeError) do
         @r.zincrby "bar", 2, "baz"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -03:00
+date: 2010-03-03 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/ohm/collection.rb
 - lib/ohm/compat-1.8.6.rb
+- lib/ohm/key.rb
 - lib/ohm/redis.rb
 - lib/ohm/validations.rb
 - lib/ohm.rb