0
@@ -1679,6 +1679,7 @@ module ActiveRecord #:nodoc:
0
             super unless all_attributes_exists?(attribute_names)
0
             if match.finder?
0
               finder = match.finder
0
+              bang = match.bang?
0
               self.class_eval %{
0
                 def self.#{method_id}(*args)
0
                   options = args.extract_options!
0
@@ -1687,13 +1688,14 @@ module ActiveRecord #:nodoc:
0
                   validate_find_options(options)
0
                   set_readonly_option!(options)
0
 
0
-                  if options[:conditions]
0
+                  #{'result = ' if bang}if options[:conditions]
0
                     with_scope(:find => finder_options) do
0
                       ActiveSupport::Deprecation.silence { send(:#{finder}, options) }
0
                     end
0
                   else
0
                     ActiveSupport::Deprecation.silence { send(:#{finder}, options.merge(finder_options)) }
0
                   end
0
+                  #{'result || raise(RecordNotFound)' if bang}
0
                 end
0
               }, __FILE__, __LINE__
0
               send(method_id, *arguments)

0
@@ -11,6 +11,9 @@ module ActiveRecord
0
       when /^find_(all_by|by)_([_a-zA-Z]\w*)$/
0
         @finder = :find_every if $1 == 'all_by'
0
         names = $2
0
+      when /^find_by_([_a-zA-Z]\w*)\!$/
0
+        @bang = true
0
+        names = $1
0
       when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
0
         @instantiator = $1 == 'initialize' ? :new : :create
0
         names = $2
0
@@ -29,5 +32,9 @@ module ActiveRecord
0
     def instantiator?
0
       @finder == :find_initial && !@instantiator.nil?
0
     end
0
+
0
+    def bang?
0
+      @bang
0
+    end
0
   end
0
 end

0
@@ -25,6 +25,15 @@ class DynamicFinderMatchTest < ActiveRecord::TestCase
0
     assert_equal %w(age sex location), match.attribute_names
0
   end
0
 
0
+  def find_by_bang
0
+    match = ActiveRecord::DynamicFinderMatch.match("find_by_age_and_sex_and_location!")
0
+    assert_not_nil match
0
+    assert match.finder?
0
+    assert match.bang?
0
+    assert_equal :find_initial, match.finder
0
+    assert_equal %w(age sex location), match.attribute_names
0
+  end
0
+
0
   def test_find_all_by
0
     match = ActiveRecord::DynamicFinderMatch.match("find_all_by_age_and_sex_and_location")
0
     assert_not_nil match
0
@@ -482,6 +491,11 @@ class FinderTest < ActiveRecord::TestCase
0
     assert_nil Topic.find_by_title("The First Topic!")
0
   end
0
 
0
+  def test_find_by_one_attribute_bang
0
+    assert_equal topics(:first), Topic.find_by_title!("The First Topic")
0
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
0
+  end
0
+
0
   def test_find_by_one_attribute_caches_dynamic_finder
0
     # ensure this test can run independently of order
0
     class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.public_methods.any? { |m| m.to_s == 'find_by_title' }