<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/fixtures/addresses.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,4 @@
 class Address &lt; ActiveRecord::Base
   belongs_to :addressable, :polymorphic =&gt; true
+  validates_uniqueness_of :title, :scope =&gt; [:addressable_type, :addressable_id]
 end</diff>
      <filename>test/rails_root/app/models/address.rb</filename>
    </modified>
    <modified>
      <diff>@@ -10,4 +10,5 @@ class User &lt; ActiveRecord::Base
   validates_length_of :email, :in =&gt; 1..100
   validates_inclusion_of :age, :in =&gt; 1..100
   validates_acceptance_of :eula
+  validates_uniqueness_of :email, :scope =&gt; :name
 end</diff>
      <filename>test/rails_root/app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 class CreateAddresses &lt; ActiveRecord::Migration
   def self.up
     create_table :addresses do |t|
+      t.column :title, :string
       t.column :addressable_id, :integer
       t.column :addressable_type, :string
     end</diff>
      <filename>test/rails_root/db/migrate/006_create_addresses.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,4 +3,5 @@ require File.dirname(__FILE__) + '/../test_helper'
 class AddressTest &lt; Test::Unit::TestCase
   load_all_fixtures
   should_belong_to :addressable
+  should_require_unique_attributes :title, :scoped_to =&gt; [:addressable_id, :addressable_type]
 end</diff>
      <filename>test/unit/address_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -23,4 +23,5 @@ class UserTest &lt; Test::Unit::TestCase
   should_have_db_column :email, :type =&gt; &quot;string&quot;, :default =&gt; nil,   :precision =&gt; nil, :limit    =&gt; 255, 
                                 :null =&gt; true,     :primary =&gt; false, :scale     =&gt; nil, :sql_type =&gt; 'varchar(255)'
   should_require_acceptance_of :eula
+  should_require_unique_attributes :email, :scoped_to =&gt; :name
 end</diff>
      <filename>test/unit/user_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>af11bb115ee4cca8c79c0dd7d87454ccc5f7da88</id>
    </parent>
    <parent>
      <id>911b2f7cb43e8afb1395e55be9334bcd533fe330</id>
    </parent>
  </parents>
  <author>
    <name>Tammer Saleh</name>
    <email>tsaleh@thoughtbot.com</email>
  </author>
  <url>http://github.com/snowblink/shoulda/commit/09e40f4440bad1b4a8cf568f435945aaa10a9727</url>
  <id>09e40f4440bad1b4a8cf568f435945aaa10a9727</id>
  <committed-date>2008-06-07T08:05:03-07:00</committed-date>
  <authored-date>2008-06-07T08:05:03-07:00</authored-date>
  <message>Merge git://github.com/nate/shoulda into pull-requests

* git://github.com/nate/shoulda:
  Scoping of uniqueness validations on multiple attributes</message>
  <tree>7e4812494dc108c1284746940ec7eb5a41c26c2c</tree>
  <committer>
    <name>Tammer Saleh</name>
    <email>tsaleh@thoughtbot.com</email>
  </committer>
</commit>
