<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/db/subdomain_format_test.sqlite3</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -0,0 +1,19 @@
+Validates subdomain format
+==========================
+
+Validate various formats of subdomains against RFC standards.
+
+Requirements
+------------
+
+Addressable.
+
+Authors
+-------
+
+Written by Dan Croak, July 2008. Thanks to Ches Martin (http://is.gd/Zph).
+
+License
+-------
+
+MIT License, same terms as Ruby.</diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-require 'addressable'
+require 'addressable/uri'
 
 module ActiveRecord
   module Validations</diff>
      <filename>lib/validates_subdomain_format_of.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,15 +1,20 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-RAILS_ROOT = File.dirname(__FILE__)
 
 require 'rubygems'
+require 'active_record'
+
+# Set up database with accounts table, subdomain column
+
+ActiveRecord::Base.establish_connection(
+  :adapter  =&gt; 'sqlite3',
+  :database =&gt; &quot;#{File.dirname(__FILE__)}/db/subdomain_format_test.sqlite3&quot;)
+
+# Set up Feedback testing framework, a la carte
+
 require 'test/unit'
 require 'shoulda'
-require 'active_record'
 require &quot;#{File.dirname(__FILE__)}/../init&quot;
 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'subdomain_format_test'])
-
 class Test::Unit::TestCase #:nodoc:
   
   def self.should_allow_values(*good_values)
@@ -35,23 +40,6 @@ class Test::Unit::TestCase #:nodoc:
     end
   end
   
-  def self.should_pass_validation(account)
-    should 'pass validation' do
-      assert account.valid?
-      assert account.save
-      assert_nil account.errors.on(:subdomain)
-    end
-  end
-  
-  def self.should_fail_validation(account)
-    should 'fail validation' do
-      assert !account.valid?
-      assert !account.save
-      assert account.errors.on(:subdomain)
-      assert_equal 'fails with custom message', account.errors.on(:subdomain)
-    end
-  end
-  
   def self.get_options!(args, *wanted)
     ret  = []
     opts = (args.last.is_a?(Hash) ? args.pop : {})</diff>
      <filename>test/test_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class Account &lt; ActiveRecord::Base
-  validates_subdomain_format_of :subdomain, 
+  validates_subdomain_format_of :subdomain,
+    :on      =&gt; :create, 
     :message =&gt; 'fails with custom message'
 end
 
@@ -38,7 +39,11 @@ class ValidatesSubdomainFormatOfTest &lt; Test::Unit::TestCase
       @account.update_attribute :subdomain, 'dan croak'
     end
       
-    should_pass_validation @account
+    should 'pass validation' do
+      assert @account.valid?
+      assert @account.save
+      assert_nil @account.errors.on(:subdomain)
+    end
   end
 
 end</diff>
      <filename>test/validates_subdomain_format_of_test.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>test/database.yml</filename>
    </removed>
    <removed>
      <filename>test/db/schema.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>2b8e9e8dd692a6fe9763d9d31e58f87af5e2c7cc</id>
    </parent>
  </parents>
  <author>
    <name>Dan Croak</name>
    <email>dcroak@thoughtbot.com</email>
  </author>
  <url>http://github.com/dancroak/validates_subdomain_format_of/commit/876862f8a02d703e317801efdaaa407c8ad010c0</url>
  <id>876862f8a02d703e317801efdaaa407c8ad010c0</id>
  <committed-date>2008-07-21T17:31:57-07:00</committed-date>
  <authored-date>2008-07-21T17:31:57-07:00</authored-date>
  <message>updating sqlite3-style test suite</message>
  <tree>9886071c8ce86ae9324d51da857648c9a9e0af02</tree>
  <committer>
    <name>Dan Croak</name>
    <email>dcroak@thoughtbot.com</email>
  </committer>
</commit>
