Merge pull request hashie#1 from kgrz/fix-stack-error

Fix SystemStackError in IndifferentAccess
kgrz · Jun 12, 2014 · 4137935 · 4137935
2 parents 160643b + f916824
commit 4137935
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/hashie/extensions/indifferent_access.rb b/lib/hashie/extensions/indifferent_access.rb
@@ -25,11 +25,11 @@ module Extensions
     module IndifferentAccess
       def self.included(base)
         base.class_eval do
-          alias_method :regular_writer, :[]=
+          alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
           alias_method :[]=, :indifferent_writer
           alias_method :store, :indifferent_writer
           %w(default update replace fetch delete key? values_at).each do |m|
-            alias_method "regular_#{m}", m
+            alias_method "regular_#{m}", m unless method_defined?("regular_#{m}")
             alias_method m, "indifferent_#{m}"
           end