toystore 0.13.0 → 0.13.1

data/spec/toy/cloneable_spec.rb

@@ -30,13 +30,6 @@ describe Toy::Cloneable do
       user.clone.skills.should_not equal(user.skills)
     end
 
-    it "regenerates id" do
-      user.clone.tap do |clone|
-        clone.id.should_not be_nil
-        clone.id.should_not == user.id
-      end
-    end
-
     it "nullifies defined instance variables" do
       user.instance_variable_set("@foo", true)
       user.clone.tap do |clone|
@@ -44,4 +37,4 @@ describe Toy::Cloneable do
       end
     end
   end
-end
+end

data/spec/toy/equality_spec.rb

@@ -1,39 +1,38 @@
 require 'helper'
 
 describe Toy::Equality do
-  uses_objects('User', 'Person')
+  uses_objects('User')
 
-  describe "#eql?" do
-    it "returns true if same class and id" do
-      User.new(:id => 1).should eql(User.new(:id => 1))
+  before do
+    User.attribute :name, String
+  end
+
+  shared_examples_for 'object equality' do |method_name|
+    it "returns true if same class and attributes" do
+      User.new(:name => 'John').send(method_name, User.new(:name => 'John')).should be_true
     end
 
     it "return false if different class" do
-      User.new(:id => 1).should_not eql(Person.new(:id => 1))
+      User.new(:name => 'John').send(method_name, Object.new).should be_false
     end
 
-    it "returns false if different id" do
-      User.new(:id => 1).should_not eql(User.new(:id => 2))
+    it "returns false if different attributes" do
+      User.new(:name => 'John').send(method_name, User.new(:name => 'Steve')).should be_false
     end
   end
 
-  describe "#equal?" do
-    it "returns true if same object" do
-      user = User.new(:id => 1)
-      user.should equal(user)
-    end
+  describe "#eql?" do
+    include_examples 'object equality', :eql?
+  end
 
-    it "returns false if not same object" do
-      user = User.new
-      other_user = User.new
-      user.should_not equal(other_user)
-    end
+  describe "#==" do
+    include_examples 'object equality', :==
   end
 
   describe "#hash" do
-    it "returns the hash of the id" do
+    it "returns the hash of the attributes" do
       user = User.new
-      user.hash.should eq(user.id.hash)
+      user.hash.should eq(user.attributes.hash)
     end
   end
 end

data/spec/toy/extensions/symbol_spec.rb

@@ -0,0 +1,26 @@
+require 'helper'
+
+describe Symbol, ".to_store" do
+  it "should convert value to string" do
+    ['foo', :foo].each do |value|
+      described_class.to_store(value).should eq('foo')
+    end
+  end
+
+  it "should be nil if nil" do
+    described_class.to_store(nil).should be_nil
+  end
+end
+
+describe Symbol, ".from_store" do
+  it "should convert value to symbol" do
+    ['foo', :foo].each do |value|
+      described_class.from_store(value).should == :foo
+    end
+  end
+
+  it "should return nil if nil" do
+    described_class.from_store(nil).should be_nil
+  end
+end
+

data/spec/toy/extensions/uuid_spec.rb

@@ -1,19 +1,39 @@
 require 'helper'
 
-describe "SimpleUUID::UUID.to_store" do
-  it "should convert value to uuid" do
-    uuid = SimpleUUID::UUID.new
-    [uuid, uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
-      SimpleUUID::UUID.from_store(value).should eq(uuid)
+describe SimpleUUID::UUID do
+  describe ".to_store" do
+    it "returns nil if value is already nil" do
+      described_class.to_store(nil).should be(nil)
+    end
+
+    it "returns value if value is already uuid" do
+      uuid = described_class.new
+      described_class.to_store(uuid).should be(uuid)
+    end
+
+    it "converts value to uuid if not already uuid" do
+      uuid = described_class.new
+      [uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
+        described_class.from_store(value).should eq(uuid)
+      end
     end
   end
-end
 
-describe "SimpleUUID::UUID.from_store" do
-  it "should convert value to uuid" do
-    uuid = SimpleUUID::UUID.new
-    [uuid, uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
-      SimpleUUID::UUID.from_store(value).should eq(uuid)
+  describe ".from_store" do
+    it "returns nil if value is already nil" do
+      described_class.from_store(nil).should be(nil)
+    end
+
+    it "returns value if value is already uuid" do
+      uuid = described_class.new
+      described_class.from_store(uuid).should be(uuid)
+    end
+
+    it "converts value to uuid if not already uuid" do
+      uuid = described_class.new
+      [uuid.to_guid, uuid.to_s, uuid.to_i].each do |value|
+        described_class.from_store(value).should eq(uuid)
+      end
     end
   end
 end

data/spec/toy/identity/uuid_key_factory_spec.rb

@@ -13,11 +13,11 @@ describe Toy::Identity::UUIDKeyFactory do
 
   describe "#eql?" do
     it "returns true for same class and key type" do
-      subject.eql?(Toy::Identity::UUIDKeyFactory.new).should be_true
+      subject.eql?(described_class.new).should be_true
     end
 
     it "returns false for same class and different key type" do
-      other = Toy::Identity::UUIDKeyFactory.new
+      other = described_class.new
       other.stub(:key_type).and_return(Integer)
       subject.eql?(other).should be_false
     end
@@ -29,11 +29,11 @@ describe Toy::Identity::UUIDKeyFactory do
 
   describe "#==" do
     it "returns true for same class and key type" do
-      subject.==(Toy::Identity::UUIDKeyFactory.new).should be_true
+      subject.==(described_class.new).should be_true
     end
 
     it "returns false for same class and different key type" do
-      other = Toy::Identity::UUIDKeyFactory.new
+      other = described_class.new
       other.stub(:key_type).and_return(Integer)
       subject.==(other).should be_false
     end

data/spec/toy/identity_spec.rb

@@ -1,7 +1,13 @@
 require 'helper'
 
 describe Toy::Identity do
-  uses_objects('User', 'Piece')
+  uses_constants('User')
+
+  describe "including" do
+    it "adds id attribute" do
+      User.attributes.keys.should == ['id']
+    end
+  end
 
   describe "setting the key" do
     it "should set key factory to UUIDKeyFactory" do
@@ -51,12 +57,112 @@ describe Toy::Identity do
     end
   end
 
+  describe "#initialize" do
+    before do
+      User.attribute :name, String
+      User.attribute :age,  Integer
+    end
+
+    it "writes id" do
+      id = User.new.id
+      id.should_not be_nil
+      id.size.should == 36
+    end
+
+    it "does not attempt to set id if already set" do
+      user = User.new(:id => 'frank')
+      user.id.should == 'frank'
+    end
+
+    it "defaults attributes to hash with only id" do
+      attrs = User.new.attributes
+      attrs.keys.should eq(['id'])
+    end
+  end
+
+  describe "#clone" do
+    it "regenerates id" do
+      user = User.new
+      user.clone.tap do |clone|
+        clone.id.should_not be_nil
+        clone.id.should_not == user.id
+      end
+    end
+  end
+
+  shared_examples_for 'identity equality' do |method_name|
+    it "returns true if same class and id" do
+      User.new(:id => 1).send(method_name, User.new(:id => 1)).should be_true
+    end
+
+    it "returns true if same class and id even if other attributes have changed" do
+      User.new(:id => 1, :name => 'John').send(method_name, User.new(:id => 1, :name => 'Steve')).should be_true
+    end
+
+    it "return false if different class" do
+      User.new(:id => 1).send(method_name, Object.new).should be_false
+    end
+
+    it "returns false if different id" do
+      User.new(:id => 1).send(method_name, User.new(:id => 2)).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples 'identity equality', :eql?
+  end
+
+  describe "#==" do
+    include_examples 'identity equality', :==
+  end
+
+  describe "#equal?" do
+    it "returns true if same object" do
+      user = User.new(:name => 'John')
+      user.should equal(user)
+    end
+
+    it "returns false if not same object" do
+      user = User.new
+      other_user = User.new
+      user.should_not equal(other_user)
+    end
+  end
+
   describe "initializing the id" do
     it "should pass use pass the new object" do
-      Piece.attribute(:name, String)
-      Piece.attribute(:number, Integer)
-      Piece.key(NameAndNumberKeyFactory.new)
-      Piece.new(:name => 'Rook', :number => 1).id.should == 'Rook-1'
+      User.key NameAndNumberKeyFactory.new
+      User.attribute :name, String
+      User.attribute :number, Integer
+      User.new(:name => 'John', :number => 1).id.should == 'John-1'
+    end
+  end
+
+  describe "#to_key" do
+    it "returns [id] if persisted" do
+      user = User.new
+      user.stub(:persisted?).and_return(true)
+      user.to_key.should == [user.id]
+    end
+
+    it "returns nil if not persisted" do
+      User.new.to_key.should be_nil
+    end
+
+    context "with native uuid" do
+      before do
+        User.key :native_uuid
+      end
+
+      it "returns array with guid if persisted" do
+        user = User.new
+        user.stub(:persisted?).and_return(true)
+        user.to_key.should == [user.id.to_guid]
+      end
+
+      it "returns nil if not persisted" do
+        User.new.to_key.should be_nil
+      end
     end
   end
 end

data/spec/toy/inheritance_spec.rb

@@ -36,10 +36,6 @@ describe 'Toy Inheritance' do
     it "sets type to class name" do
       Child.new.type.should eq('Child')
     end
-
-    it "sets the key factory to same as parent" do
-      Child.key_factory.should eq(Parent.key_factory)
-    end
   end
 
   describe 'using Toy::Store' do
@@ -89,5 +85,9 @@ describe 'Toy Inheritance' do
     it "sets the adapter to the same as the parent" do
       Child.adapter.should eq(Parent.adapter)
     end
+
+    it "sets the key factory to same as parent" do
+      Child.key_factory.should eq(Parent.key_factory)
+    end
   end
 end

data/spec/toy/inspect_spec.rb

@@ -10,14 +10,14 @@ describe Toy::Attributes do
 
   describe ".inspect" do
     it "prints out attribute names and types" do
-      User.inspect.should == %Q(User(id:String age:Integer name:String))
+      User.inspect.should == %Q(User(age:Integer name:String))
     end
   end
 
   describe "#inspect" do
-    it "prints out object id and attributes sorted with values" do
+    it "prints out attributes sorted with values" do
       user = User.new(:age => 28, :name => 'John')
-      user.inspect.should == %Q(#<User:#{user.object_id} id: "#{user.id}", age: 28, name: "John">)
+      user.inspect.should == %Q(#<User:#{user.object_id} age: 28, name: "John">)
     end
   end
 end

data/spec/toy/object_spec.rb

@@ -24,44 +24,4 @@ describe Toy::Object do
       User.new.persisted?.should be_false
     end
   end
-
-  describe "#to_key" do
-    it "returns [id] if persisted" do
-      user = User.new
-      user.stub(:persisted?).and_return(true)
-      user.to_key.should == [user.id]
-    end
-
-    it "returns nil if not persisted" do
-      User.new.to_key.should be_nil
-    end
-
-    context "with native uuid" do
-      before do
-        User.key :native_uuid
-      end
-
-      it "returns array with guid if persisted" do
-        user = User.new
-        user.stub(:persisted?).and_return(true)
-        user.to_key.should == [user.id.to_guid]
-      end
-
-      it "returns nil if not persisted" do
-        User.new.to_key.should be_nil
-      end
-    end
-  end
-
-  describe "#to_param" do
-    it "returns key joined by - if to_key present" do
-      user = User.new
-      user.stub(:persisted?).and_return(true)
-      user.to_param.should == user.to_key.join('-')
-    end
-
-    it "returns nil if to_key nil" do
-      User.new.to_param.should be_nil
-    end
-  end
 end

data/spec/toy/persistence_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe Toy::Persistence do
-  uses_constants('User')
+  uses_constants('User', 'Game')
 
   let(:klass) do
     Class.new { include Toy::Store }
@@ -42,6 +42,37 @@ describe Toy::Persistence do
     end
   end
 
+  describe ".persisted_attributes" do
+    before do
+      @name = User.attribute(:name, String)
+      @password = User.attribute(:password, String, :virtual => true)
+    end
+
+    it "includes attributes that are not virtual" do
+      User.persisted_attributes.should include(@name)
+    end
+
+    it "excludes attributes that are virtual" do
+      User.persisted_attributes.should_not include(@password)
+    end
+
+    it "memoizes after first call" do
+      User.should_receive(:attributes).once.and_return({
+        'name' => @name,
+        'password' => @password,
+      })
+      User.persisted_attributes
+      User.persisted_attributes
+      User.persisted_attributes
+    end
+
+    it "is unmemoized when declaring a new attribute" do
+      User.persisted_attributes
+      age = User.attribute :age, Integer
+      User.persisted_attributes.map(&:name).sort.should eq(%w[age name])
+    end
+  end
+
   describe ".create" do
     before do
       User.attribute :name, String
@@ -318,6 +349,13 @@ describe Toy::Persistence do
       doc.delete
       User.key?(doc.id).should be_false
     end
+
+    it "uses persisted id for adapter delete" do
+      user = User.new
+      user.stub(:persisted_id => 1)
+      user.adapter.should_receive(:delete).with(1)
+      user.delete
+    end
   end
 
   describe "#destroy" do
@@ -354,4 +392,64 @@ describe Toy::Persistence do
       user.clone.should_not be_destroyed
     end
   end
+
+  describe "#persisted_id" do
+    it "returns id attribute value converted for storage" do
+      raw_value = 1
+      typecast_for_store_value = '1'
+      user = User.new(:id => raw_value)
+      user.persisted_id.should eq(typecast_for_store_value)
+    end
+  end
+
+  describe "#persisted_attributes" do
+    before do
+      @over    = Game.attribute(:over, Boolean)
+      @score   = Game.attribute(:creator_score, Integer, :virtual => true)
+      @abbr    = Game.attribute(:super_secret_hash, String, :abbr => :ssh)
+      @rewards = Game.attribute(:rewards, Set)
+      @time    = Game.attribute(:time, Time)
+      @game    = Game.new({
+        :over          => true,
+        :creator_score => 20,
+        :rewards       => %w(twigs berries).to_set,
+        :ssh           => 'h4x',
+        :time          => nil,
+      })
+    end
+
+    it "includes persisted attributes" do
+      @game.persisted_attributes.should have_key('over')
+    end
+
+    it "includes abbreviated names for abbreviated attributes" do
+      @game.persisted_attributes.should have_key('ssh')
+    end
+
+    it "does not include full names for abbreviated attributes" do
+      @game.persisted_attributes.should_not have_key('super_secret_hash')
+    end
+
+    it "does not include virtual attributes" do
+      @game.persisted_attributes.should_not have_key(:creator_score)
+    end
+
+    it "includes to_store values for attributes" do
+      @game.persisted_attributes['rewards'].should be_instance_of(Array)
+      @game.persisted_attributes['rewards'].should == @rewards.to_store(@game.rewards)
+    end
+
+    it "does not include nil attributes" do
+      @game.persisted_attributes.should_not have_key('time')
+    end
+  end
+
+  describe "#persist" do
+    it "calls write on adapter with persisted id and attributes" do
+      user = User.new
+      user.stub(persisted_id: 1, persisted_attributes: {one: 'two'})
+      user.adapter.should_receive(:write).with(1, {one: 'two'})
+      user.persist
+    end
+  end
 end