From 9dfef5a46bb6a0c74a48aa70fa350c0f09f92c0d Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Mon, 11 Feb 2013 17:00:55 +0300
Subject: define Active Record Store accessors in a module

Allow store accessors to be overrided like other attribute methods,
e.g.:

    class User < ActiveRecord::Base
      store :settings, accessors: [ :color, :homepage ], coder: JSON

      def color
        super || 'red'
      end
    end
---
 activerecord/lib/active_record/store.rb | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index cf4cf9e602..a610f479f2 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -42,21 +42,19 @@ module ActiveRecord
   #
   # All stored values are automatically available through accessors on the Active Record
   # object, but sometimes you want to specialize this behavior. This can be done by overwriting
-  # the default accessors (using the same name as the attribute) and calling
-  # <tt>read_store_attribute(store_attribute_name, attr_name)</tt> and
-  # <tt>write_store_attribute(store_attribute_name, attr_name, value)</tt> to actually
-  # change things.
+  # the default accessors (using the same name as the attribute) and calling <tt>super</tt>
+  # to actually change things.
   #
   #   class Song < ActiveRecord::Base
   #     # Uses a stored integer to hold the volume adjustment of the song
   #     store :settings, accessors: [:volume_adjustment]
   #
   #     def volume_adjustment=(decibels)
-  #       write_store_attribute(:settings, :volume_adjustment, decibels.to_i)
+  #       super(decibels.to_i)
   #     end
   #
   #     def volume_adjustment
-  #       read_store_attribute(:settings, :volume_adjustment).to_i
+  #       super.to_i
   #     end
   #   end
   module Store
@@ -75,19 +73,30 @@ module ActiveRecord
 
       def store_accessor(store_attribute, *keys)
         keys = keys.flatten
-        keys.each do |key|
-          define_method("#{key}=") do |value|
-            write_store_attribute(store_attribute, key, value)
-          end
 
-          define_method(key) do
-            read_store_attribute(store_attribute, key)
+        _store_accessors_module.module_eval do
+          keys.each do |key|
+            define_method("#{key}=") do |value|
+              write_store_attribute(store_attribute, key, value)
+            end
+
+            define_method(key) do
+              read_store_attribute(store_attribute, key)
+            end
           end
         end
 
         self.stored_attributes[store_attribute] ||= []
         self.stored_attributes[store_attribute] |= keys
       end
+
+      def _store_accessors_module
+        @_store_accessors_module ||= begin
+          mod = Module.new
+          include mod
+          mod
+        end
+      end
     end
 
     protected
-- 
cgit v1.2.3