From 2d7a86e17947e359cb65653b987c666b2d7e8efb Mon Sep 17 00:00:00 2001
From: Mike Dillon <mike@embody.org>
Date: Thu, 16 May 2013 11:11:27 -0700
Subject: Raise when multiple included blocks are defined

---
 activesupport/lib/active_support/concern.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index eeeba60839..b6ae86b583 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -98,6 +98,12 @@ module ActiveSupport
   #     include Bar # works, Bar takes care now of its dependencies
   #   end
   module Concern
+    class MultipleIncludedBlocks < StandardError #:nodoc:
+      def initialize
+        super "Cannot define multiple 'included' blocks for a Concern"
+      end
+    end
+
     def self.extended(base) #:nodoc:
       base.instance_variable_set("@_dependencies", [])
     end
@@ -117,6 +123,8 @@ module ActiveSupport
 
     def included(base = nil, &block)
       if base.nil?
+        raise MultipleIncludedBlocks if instance_variable_defined?("@_included_block")
+
         @_included_block = block
       else
         super
-- 
cgit v1.2.3