<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -118,7 +118,8 @@ module ThoughtBot # :nodoc:
               protected = klass.protected_attributes || []
               accessible = klass.accessible_attributes || []
 
-              assert protected.include?(attribute.to_s) || !accessible.include?(attribute.to_s),
+              assert protected.include?(attribute.to_s) ||
+                (!accessible.empty? &amp;&amp; !accessible.include?(attribute.to_s)),
                      (accessible.empty? ?
                        &quot;#{klass} is protecting #{protected.to_a.to_sentence}, but not #{attribute}.&quot; :
                        &quot;#{klass} has made #{attribute} accessible&quot;)</diff>
      <filename>lib/shoulda/active_record/macros.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ebd37ea2d0aca9e41319e8217dc159dab9a82b34</id>
    </parent>
  </parents>
  <author>
    <name>Mike Boone</name>
    <email>mike@boonedocks.net</email>
  </author>
  <url>http://github.com/thoughtbot/shoulda/commit/2d2c1a477e69e5c601f9d7f77c52a5a8cef6b8f1</url>
  <id>2d2c1a477e69e5c601f9d7f77c52a5a8cef6b8f1</id>
  <committed-date>2008-09-14T18:19:44-07:00</committed-date>
  <authored-date>2008-09-03T14:39:58-07:00</authored-date>
  <message>Updated should_protect_attributes to fix issue when attr_protected is used and attribute is missing.</message>
  <tree>9cac5d3c58dc910a1fb1a0b619a59a3c94b18bf4</tree>
  <committer>
    <name>Ryan McGeary</name>
    <email>ryanongit@mcgeary.org</email>
  </committer>
</commit>
