<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,5 @@
 .DS_Store
+.swp
 *.log
 *.sqlite3
 pkg/*</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,8 @@
 == 2.0.6
 
 * Don't use second, use [1] instead so older rails systems don't complain.
+* Update email regular expression to be less TLD specific: (?:[A-Z]{2,4}|museum|travel)
+* Update shoulda macro for 2.0
 
 == 2.0.5 released 2009-3-30
 </diff>
      <filename>CHANGELOG.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -266,4 +266,4 @@ A lot of them forced me to name my password column as &quot;this&quot;, or the key of my c
 I am not trying to  &quot;bash&quot; any other authentication solutions. These are just my opinions, formulate your own opinion. I released Authlogic because I was &quot;scratching my own itch&quot;. It has made my life easier and I enjoy using it, hopefully it does the same for you.
 
 
-Copyright (c) 2008 Ben Johnson of [Binary Logic](http://www.binarylogic.com), released under the MIT license
\ No newline at end of file
+Copyright (c) 2009 {Ben Johnson of Binary Logic}(http://www.binarylogic.com), released under the MIT license
\ No newline at end of file</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -29,7 +29,7 @@ module Authlogic
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?(&quot;single_access_token&quot;)
-            
+          
           klass.class_eval do
             include InstanceMethods
             validates_uniqueness_of :single_access_token, :if =&gt; :single_access_token_changed?</diff>
      <filename>lib/authlogic/acts_as_authentic/single_access_token.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ module Authlogic
     # This encryption method is reversible if you have the supplied key. So in order to use this encryption method you must supply it with a key first.
     # In an initializer, or before your application initializes, you should do the following:
     #
-    #   Authlogic::CryptoProviders::AES256.key = &quot;my really long and unique key, preferrable a bunch of random characters&quot;
+    #   Authlogic::CryptoProviders::AES256.key = &quot;my really long and unique key, preferrably a bunch of random characters&quot;
     #
     # My final comment is that this is a strong encryption method, but its main weakness is that its reversible. If you do not need to reverse the hash
     # then you should consider Sha512 or BCrypt instead.
@@ -34,7 +34,7 @@ module Authlogic
     
         private
           def aes
-            raise ArgumentError.new(&quot;You provide a key like #{name}.key = my_key before using the #{name}&quot;) if @key.blank?
+            raise ArgumentError.new(&quot;You must provide a key like #{name}.key = my_key before using the #{name}&quot;) if @key.blank?
             @aes ||= OpenSSL::Cipher::Cipher.new(&quot;AES-256-ECB&quot;)
           end
       end</diff>
      <filename>lib/authlogic/crypto_providers/aes256.rb</filename>
    </modified>
    <modified>
      <diff>@@ -35,7 +35,9 @@ module Authlogic
     #
     # Tell acts_as_authentic to use it:
     #
-    #   acts_as_authentic :crypto_provider =&gt; Authlogic::CryptoProviders::BCrypt
+    #   acts_as_authentic do |c|
+    #     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
+    #   end
     #
     # You are good to go!
     class BCrypt</diff>
      <filename>lib/authlogic/crypto_providers/bcrypt.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,8 +2,8 @@ require &quot;digest/sha1&quot;
 
 module Authlogic
   module CryptoProviders
-    # This class was made for the users transitioning from restful_authentication. I highly discourage using this crypto provider as it inferior to your other options.
-    # Please use any other provider offered by Authlogic.
+    # This class was made for the users transitioning from restful_authentication. I highly discourage using this
+    # crypto provider as it inferior to your other options. Please use any other provider offered by Authlogic.
     class Sha1
       class &lt;&lt; self
         def join_token</diff>
      <filename>lib/authlogic/crypto_providers/sha1.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,7 +4,8 @@ module Authlogic
       def self.should_be_authentic
         klass = model_class
         should &quot;acts as authentic&quot; do
-          assert klass.respond_to?(:acts_as_authentic_config)
+          assert klass.respond_to?(:password=)
+          assert klass.respond_to?(:valid_password?)
         end
       end
     end</diff>
      <filename>shoulda_macros/authlogic.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>.gitignore.swp</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>369a6ece980f3902d35595e5d5b5448b3f61c08c</id>
    </parent>
  </parents>
  <author>
    <name>binarylogic</name>
    <email>bjohnson@binarylogic.com</email>
  </author>
  <url>http://github.com/binarylogic/authlogic/commit/283e38b6caba532998f02e9178a7b49c6c455651</url>
  <id>283e38b6caba532998f02e9178a7b49c6c455651</id>
  <committed-date>2009-04-03T08:33:25-07:00</committed-date>
  <authored-date>2009-04-03T08:33:25-07:00</authored-date>
  <message>* Update shoulda macro for 2.0</message>
  <tree>c8da59d2fa587fd28f7f88cca224f37b8200d30f</tree>
  <committer>
    <name>binarylogic</name>
    <email>bjohnson@binarylogic.com</email>
  </committer>
</commit>
