toystore 0.8.3 → 0.9.0

data/spec/toy/identity_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe Toy::Identity do
-  uses_constants('User', 'Piece')
+  uses_objects('User', 'Piece')
 
   describe "setting the key" do
     it "should set key factory to UUIDKeyFactory" do

data/spec/toy/inspect_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe Toy::Attributes do
-  uses_constants('User')
+  uses_objects('User')
 
   before do
     User.attribute(:name, String)

data/spec/toy/lists_spec.rb

@@ -7,11 +7,6 @@ describe Toy::Lists do
     User.lists.should == {}
   end
 
-  it "does not share with embedded lists" do
-    Game.embedded_list(:moves)
-    Game.lists.should == {}
-  end
-
   describe ".list?" do
     before do
       User.list(:games)
@@ -92,4 +87,24 @@ describe Toy::Lists do
       end
     end
   end
+
+  describe "#clone" do
+    before do
+      User.list(:games)
+
+      @game = Game.create
+      @user = User.create(:games  => [@game])
+    end
+
+    let(:game)  { @game }
+    let(:user)  { @user }
+
+    it "clones list id attributes" do
+      user.clone.game_ids.should_not equal(user.game_ids)
+    end
+
+    it "clones the list" do
+      user.clone.games.should_not equal(user.games)
+    end
+  end
 end

data/spec/toy/logger_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe Toy::Logger do
-  uses_constants('User')
+  uses_objects('User')
 
   before do
     @logger = Toy.logger
@@ -18,32 +18,4 @@ describe Toy::Logger do
   it "should use Toy.logger for instance" do
     User.new.logger.should == Toy.logger
   end
-
-  describe ".log_operation" do
-    let(:adapter) { Adapter[:memory].new({}) }
-
-    it "logs operation" do
-      Toy.logger = stub(:debug? => true)
-      User.logger.should_receive(:debug).with('TOYSTORE GET User :memory "foo"')
-      User.logger.should_receive(:debug).with('  "bar"')
-      User.log_operation(:get, User, adapter, 'foo', 'bar')
-    end
-
-    it "ignores operations that should not be logged" do
-      Toy.logger = stub(:debug? => true)
-      User.logger.should_receive(:debug).with('TOYSTORE IMG User :memory "foo"')
-      User.log_operation(:img, User, adapter, 'foo', 'bar')
-    end
-  end
-
-  describe "#log_operation" do
-    let(:adapter) { Adapter[:memory].new({}) }
-
-    it "logs operation" do
-      Toy.logger = stub(:debug? => true)
-      User.logger.should_receive(:debug).with('TOYSTORE GET User :memory "foo"')
-      User.logger.should_receive(:debug).with('  "bar"')
-      User.log_operation(:get, User, adapter, 'foo', 'bar')
-    end
-  end
 end

data/spec/toy/mass_assignment_security_spec.rb

@@ -31,6 +31,12 @@ describe Toy::MassAssignmentSecurity do
       user.name.should == 'John'
     end
 
+    it "should not ignore inaccessible attribute on #initialize_from_database" do
+      user = User.allocate.initialize_from_database(:name => 'John', :admin => true)
+      user.admin.should be_true
+      user.name.should == 'John'
+    end
+
     it "should ignore inaccessible attribute on #attributes=" do
       user = User.new
       user.attributes = {:name => 'John', :admin => true}
@@ -50,11 +56,10 @@ describe Toy::MassAssignmentSecurity do
       user.admin = true
       user.save!
 
-      User.without_identity_map do
-        user = User.get(user.id)
-        user.admin.should be_true
-        user.name.should == 'John'
-      end
+      from_db = User.get(user.id)
+      from_db.should_not equal(user)
+      from_db.admin.should be_true
+      from_db.name.should == 'John'
     end
 
     it "should ignore inaccessible attribute on #update_attributes" do
@@ -103,6 +108,12 @@ describe Toy::MassAssignmentSecurity do
       user.name.should == 'John'
     end
 
+    it "should not ignore protected attribute on #initialize_from_database" do
+      user = User.allocate.initialize_from_database(:name => 'John', :admin => true)
+      user.admin.should be_true
+      user.name.should == 'John'
+    end
+
     it "should not ignore protected attributes on #initialize from the database" do
       user = User.new(:name => 'John')
       user.admin = true

data/spec/toy/middleware/identity_map_spec.rb

@@ -7,25 +7,91 @@ describe Toy::Middleware::IdentityMap do
   def app
     @app ||= Rack::Builder.new do
       use Toy::Middleware::IdentityMap
+
       map "/" do
         run lambda {|env| [200, {}, []] }
       end
+
       map "/fail" do
         run lambda {|env| raise "FAIL!" }
       end
     end.to_app
   end
 
+  before do
+    @enabled = Toy::IdentityMap.enabled
+    Toy::IdentityMap.enabled = false
+  end
+
+  after do
+    Toy::IdentityMap.enabled = @enabled
+  end
+
+  it "should delegate" do
+    called = false
+    mw = Toy::Middleware::IdentityMap.new lambda { |env|
+      called = true
+      [200, {}, nil]
+    }
+    mw.call({})
+    called.should be_true
+  end
+
+  it "should enable identity map during delegation" do
+    mw = Toy::Middleware::IdentityMap.new lambda { |env|
+      Toy::IdentityMap.should be_enabled
+      [200, {}, nil]
+    }
+    mw.call({})
+  end
+
+  class Enum < Struct.new(:iter)
+    def each(&b)
+      iter.call(&b)
+    end
+  end
+
+  it "should enable IM for body each" do
+    mw = Toy::Middleware::IdentityMap.new lambda { |env|
+      [200, {}, Enum.new(lambda { |&b|
+        Toy::IdentityMap.should be_enabled
+        b.call "hello"
+      })]
+    }
+    body = mw.call({}).last
+    body.each { |x| x.should eql('hello') }
+  end
+
+  it "should disable IM after body close" do
+    mw = Toy::Middleware::IdentityMap.new lambda { |env| [200, {}, []] }
+    body = mw.call({}).last
+    Toy::IdentityMap.should be_enabled
+    body.close
+    Toy::IdentityMap.should_not be_enabled
+  end
+
+  it "should clear IM after body close" do
+    mw = Toy::Middleware::IdentityMap.new lambda { |env| [200, {}, []] }
+    body = mw.call({}).last
+
+    Toy::IdentityMap.repository['hello'] = 'world'
+    Toy::IdentityMap.repository.should_not be_empty
+
+    body.close
+
+    Toy::IdentityMap.repository.should be_empty
+  end
+
   context "with a successful request" do
     it "clear the identity map" do
-      Toy.identity_map.should_receive(:clear).twice
+      Toy::IdentityMap.should_receive(:clear).twice
       get '/'
     end
   end
 
   context "when the request raises an error" do
     it "clear the identity map" do
-      Toy.identity_map.should_receive(:clear).twice
+      Toy::IdentityMap.should_receive(:clear).once
       get '/fail' rescue nil
     end
   end

data/spec/toy/persistence_spec.rb

@@ -7,43 +7,38 @@ describe Toy::Persistence do
     Class.new { include Toy::Store }
   end
 
-  describe ".store" do
+  describe ".adapter" do
     it "sets if arguments and reads if not" do
-      User.store(:memory, {})
-      User.store.should == Adapter[:memory].new({})
+      User.adapter(:memory, {})
+      User.adapter.should == Adapter[:memory].new({})
     end
 
     it "defaults options to empty hash" do
       Adapter[:memory].should_receive(:new).with({}, {})
-      User.store(:memory, {})
+      User.adapter(:memory, {})
     end
 
     it "works with options" do
       Adapter[:memory].should_receive(:new).with({}, :something => true)
-      User.store(:memory, {}, :something => true)
+      User.adapter(:memory, {}, :something => true)
     end
 
     it "raises argument error if name provided but not client" do
       lambda do
-        klass.store(:memory)
+        klass.adapter(:memory)
       end.should raise_error(ArgumentError, 'Client is required')
     end
 
-    it "raises argument error if no name or client provided and has not been set" do
-      lambda do
-        klass.store
-      end.should raise_error(StandardError, 'No store has been set')
-    end
-  end
-
-  describe ".has_store?" do
-    it "returns true if store set" do
-      klass.store(:memory, {})
-      klass.has_store?.should be_true
+    it "defaults to memory adapter if no name or client provided and has not been set" do
+      klass.adapter.should_not be_nil
+      klass.adapter.client.should eql({})
     end
 
-    it "returns false if store not set" do
-      klass.has_store?.should be_false
+    it "allows changing adapter even after use of default" do
+      hash = {}
+      klass.adapter
+      klass.adapter :memory, hash
+      klass.adapter.client.should equal(hash)
     end
   end
 
@@ -56,7 +51,7 @@ describe Toy::Persistence do
     let(:doc) { @doc }
 
     it "creates key in database with attributes" do
-      User.store.read(doc.id).should == {
+      User.adapter.read(doc.id).should == {
         'name' => 'John',
         'age'  => 50,
       }
@@ -113,9 +108,58 @@ describe Toy::Persistence do
     end
   end
 
-  describe "#store" do
+  describe "#adapter" do
     it "delegates to class" do
-      User.new.store.should equal(User.store)
+      User.new.adapter.should equal(User.adapter)
+    end
+  end
+
+  describe "declaring an attribute with an abbreviation" do
+    before do
+      User.attribute(:twitter_access_token, String, :abbr => 'tat')
+    end
+
+    it "persists to adapter using abbreviation" do
+      user = User.create(:twitter_access_token => '1234')
+      raw = user.adapter.read(user.id)
+      raw['tat'].should == '1234'
+      raw.should_not have_key('twitter_access_token')
+    end
+
+    it "loads from store correctly" do
+      user = User.create(:twitter_access_token => '1234')
+      user = User.get(user.id)
+      user.twitter_access_token.should == '1234'
+      user.tat.should == '1234'
+    end
+  end
+
+  describe "#initialize_from_database" do
+    before do
+      User.attribute(:age, Integer, :default => 20)
+      @user = User.allocate
+    end
+
+    it "sets new record to false" do
+      @user.initialize_from_database
+      @user.should_not be_new_record
+    end
+
+    it "sets attributes" do
+      @user.initialize_from_database('age' => 21)
+    end
+
+    it "sets defaults" do
+      @user.initialize_from_database
+      @user.age.should == 20
+    end
+
+    it "does not fail with nil" do
+      @user.initialize_from_database(nil).should == @user
+    end
+
+    it "returns self" do
+      @user.initialize_from_database.should == @user
     end
   end
 
@@ -163,7 +207,7 @@ describe Toy::Persistence do
       end
 
       it "does not persist virtual attributes" do
-        @doc.store.read(@doc.id).should_not include('accepted_terms')
+        @doc.adapter.read(@doc.id).should_not include('accepted_terms')
       end
     end
 
@@ -171,23 +215,23 @@ describe Toy::Persistence do
       before do
         @doc      = User.create(:name => 'John', :age => 28)
         @key      = @doc.id
-        @value    = User.store.read(@doc.id)
+        @value    = User.adapter.read(@doc.id)
         @doc.name = 'Bill'
         @doc.accepted_terms = false
         @doc.save
       end
       let(:doc) { @doc }
 
-      it "stores in same key" do
+      it "does not change primary key" do
         doc.id.should == @key
       end
 
-      it "updates value in store" do
-        User.store.read(doc.id).should_not == @value
+      it "updates value in adapter" do
+        User.adapter.read(doc.id).should_not == @value
       end
 
       it "does not persist virtual attributes" do
-        @doc.store.read(@doc.id).should_not include('accepted_terms')
+        @doc.adapter.read(@doc.id).should_not include('accepted_terms')
       end
 
       it "updates the attributes in the instance" do
@@ -211,7 +255,7 @@ describe Toy::Persistence do
   end
 
   describe "#delete" do
-    it "should remove the instance from the store" do
+    it "should remove the instance" do
       doc = User.create
       doc.delete
       User.key?(doc.id).should be_false
@@ -219,7 +263,7 @@ describe Toy::Persistence do
   end
 
   describe "#destroy" do
-    it "should remove the instance from the store" do
+    it "should remove the instance" do
       doc = User.create
       doc.destroy
       User.key?(doc.id).should be_false
@@ -238,4 +282,18 @@ describe Toy::Persistence do
       doc.should be_destroyed
     end
   end
+
+  describe "#clone" do
+    it "returns instance that is a new_record" do
+      User.new.clone.should be_new_record
+      User.create.clone.should be_new_record
+    end
+
+    it "is never destroyed" do
+      user = User.create
+      user.clone.should_not be_destroyed
+      user.destroy
+      user.clone.should_not be_destroyed
+    end
+  end
 end

data/spec/toy/reference_spec.rb

@@ -316,7 +316,6 @@ describe Toy::Reference do
       it "delegates #equal?" do
         @game.user.should equal(@user)
         @user.should equal(@game.user)
-        @game.user.should equal(User.get(@user.id)) # identity map
         @game.user.should_not equal(User.create)
         @game.user.should_not equal(@game)
       end

data/spec/toy/references_spec.rb

@@ -83,4 +83,24 @@ describe Toy::References do
       reference.options.should == {:some_option => true}
     end
   end
+
+  describe "#eql?" do
+    it "returns true if reference and target is same class and id" do
+      Game.reference(:user)
+      user = User.create
+      game = Game.create(:user => user)
+      user.should eql(game.user)
+    end
+  end
+
+  describe "#equal?" do
+    it "returns true if same object through proxy" do
+      Game.reference(:user)
+      user = User.create
+      game = Game.create(:user => user)
+
+      user.should equal(game.user)
+      game.user.should equal(user)
+    end
+  end
 end