Merge pull request #9247 from lest/store-module

define Active Record Store accessors in a module

2 files changed, 21 insertions, 0 deletions

diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 43bf285ba9..3e32d866ee 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -35,6 +35,12 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal '(123) 456-7890', @john.phone_number
   end
 
+  test "overriding a read accessor using super" do
+    @john.settings[:color] = nil
+
+    assert_equal 'red', @john.color
+  end
+
   test "updating the store will mark it as changed" do
     @john.color = 'red'
     assert @john.settings_changed?
@@ -66,6 +72,12 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal '1234567890', @john.settings[:phone_number]
   end
 
+  test "overriding a write accessor using super" do
+    @john.color = 'yellow'
+
+    assert_equal 'blue', @john.color
+  end
+
   test "preserve store attributes data in HashWithIndifferentAccess format without any conversion" do
     @john.json_data = ActiveSupport::HashWithIndifferentAccess.new(:height => 'tall', 'weight' => 'heavy')
     @john.height = 'low'
diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb
index 024fede266..4c3b71e8f9 100644
--- a/activerecord/test/models/admin/user.rb
+++ b/activerecord/test/models/admin/user.rb
@@ -27,4 +27,13 @@ class Admin::User < ActiveRecord::Base
   def phone_number=(value)
     write_store_attribute(:settings, :phone_number, value && value.gsub(/[^\d]/,''))
   end
+
+  def color
+    super || 'red'
+  end
+
+  def color=(value)
+    value = 'blue' unless %w(black red green blue).include?(value)
+    super
+  end
 end