storext 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b724caadf1e54b22c8cab75f126182a1968a7314
-  data.tar.gz: 221fc6202180a8c0c3ac3519b5811d4dc930fc29
+  metadata.gz: 654370a34da37189fcb61310813057df6646a51a
+  data.tar.gz: bbad9a052325b64305c563b2ac9001bea85137e0
 SHA512:
-  metadata.gz: 7b1dfb86dee5422517a5704ae0c5a0c58a29f5944994bec4855f64647761a945887a3897549fbe77433c8c2f1a0be8aa97aebc4f38ef96678da107b9dd5d6932
-  data.tar.gz: 5e40101f5840f73c08b09831ff9e7386eb08a1a2bbd2402d2fff8a6edd51303d29fcaeda5295d4b3537b4c48c975f81312c4759c8720930a9a91f684c28f39a1
+  metadata.gz: b8b83a87d44483d37e0824c5044a2ce04ac925269b3dcf111d5f2ed864691cd88ce2903d1f431ba3ae22d8ab8bf05d5c52127b28d2ab43ea7e88514fba93261b
+  data.tar.gz: 77ddc077b8d53e6594ad5586534f7b2054a799e3b69eb0de3cabf67e21ba25b42d03998e15ba29cca3fd6cebe7d4487a5d9f8dee65c764428fa8a659804052a8

data/lib/storext.rb

@@ -1,4 +1,5 @@
 require "active_support/concern"
+require "active_support/core_ext/module/attribute_accessors"
 require "virtus"
 require "storext/attribute_proxy"
 require "storext/class_methods"
@@ -6,6 +7,9 @@ require "storext/instance_methods"
 
 module Storext
 
+  mattr_accessor :proxy_classes
+  self.proxy_classes ||= {}
+
   def self.model(options={})
     mod = Module.new do
       mattr_accessor :storext_options

data/lib/storext/class_methods.rb

@@ -3,10 +3,7 @@ module Storext
 
     def storext_define_writer(column, attr)
       define_method "#{attr}=" do |value|
-        storext_cast_proxy(attr).send("#{attr}=", value)
         send("#{column}=", send(column) || {})
-
-        attr_value = storext_cast_proxy(attr).send(attr)
         write_store_attribute column, attr, value
         send(column)[attr.to_s] = value
       end
@@ -16,9 +13,9 @@ module Storext
       define_method attr do
         if send(column) && send(column).has_key?(attr.to_s)
           store_val = read_store_attribute(column, attr)
-          storext_cast_proxy(attr).send("#{attr}=", store_val)
+          storext_cast_proxy.send("#{attr}=", store_val)
         end
-        storext_cast_proxy(attr).send("#{attr}")
+        storext_cast_proxy.send("#{attr}")
       end
     end
 
@@ -32,12 +29,43 @@ module Storext
     def storext_define_accessor(column, attr)
       storext_define_writer(column, attr)
       storext_define_reader(column, attr)
+      storext_define_proxy_attribute(attr)
     end
 
     def store_attributes(column, &block)
       AttributeProxy.new(self, column, &block).define_store_attribute
     end
 
+    def storext_define_proxy_attribute(attr)
+      compute_default_method_name = :"compute_default_#{attr}"
+      definition = self.storext_definitions[attr]
+      proxy_class = self.storext_proxy_class
+      proxy_class.attribute(
+        attr,
+        definition[:type],
+        definition[:opts].merge(default: compute_default_method_name),
+      )
+
+      proxy_class.send :define_method, compute_default_method_name do
+        default_value = definition[:opts][:default]
+        if default_value.is_a?(Symbol)
+          source.send(default_value)
+        elsif default_value.respond_to?(:call)
+          attribute = self.class.attribute_set[attr]
+          default_value.call(source, attribute)
+        else
+          default_value
+        end
+      end
+    end
+
+    def storext_proxy_class
+      Storext.proxy_classes[self] ||= Class.new(*Storext.proxy_classes[self.superclass]) do
+        include Virtus.model
+        attribute :source
+      end
+    end
+
     private
 
     def storext_attrs_for(column)

data/lib/storext/instance_methods.rb

@@ -42,48 +42,11 @@ module Storext
     end
 
     def default_store_value(attr)
-      storext_cast_proxy(attr).send(attr)
+      storext_cast_proxy.send(attr)
     end
 
-    def storext_cast_proxy(attr)
-      if @storext_cast_proxies && @storext_cast_proxies[attr]
-        return @storext_cast_proxies[attr]
-      else
-        @storext_cast_proxies ||= {}
-
-        definition = self.class.storext_definitions[attr]
-        klass = storext_create_proxy_class(attr, definition)
-
-        @storext_cast_proxies[attr] = klass.new(source: self)
-      end
-    end
-
-    def storext_create_proxy_class(attr, definition)
-      klass = Class.new do
-        include Virtus.model
-
-        attribute :source
-      end
-
-      klass.attribute(
-        attr,
-        definition[:type],
-        definition[:opts].merge(default: :compute_default),
-      )
-
-      klass.send :define_method, :compute_default do
-        default_value = definition[:opts][:default]
-        if default_value.is_a?(Symbol)
-          source.send(default_value)
-        elsif default_value.respond_to?(:call)
-          attribute = self.class.attribute_set[attr]
-          default_value.call(source, attribute)
-        else
-          default_value
-        end
-      end
-
-      klass
+    def storext_cast_proxy
+      @storext_cast_proxy ||= self.class.storext_proxy_class.new(source: self)
     end
 
   end

data/lib/storext/version.rb

@@ -1,3 +1,3 @@
 module Storext
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storext
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Extends ActiveRecord::Store.store_accessor