storext 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e8a8c0e422de600c714360df2977eea1c317b21
-  data.tar.gz: 017ed53d2d1fb0cd445db1543c052b29e9e70eaa
+  metadata.gz: 575cadf889b06670fee076e367dbdd98f65dacdd
+  data.tar.gz: 9f16efe7dbfae9cd8c5982d84c2e8fc78f53c9bb
 SHA512:
-  metadata.gz: eeb083dba050d12e715ddf45a1ab5b184dcefed11c9e183bd252c735e98e5e3366b507d1234132b9cfefd7ea0c24d7e2aaf2695ca5372fe8d438f66a3e87e6b4
-  data.tar.gz: 49cf8072a4fe6b312b8917daf9a882bf0513863840a680799ad2a4c3f81671f084bba48bff406be97b6e4808e4ab45039050cbd5d62610f12cbaea896bd13efb
+  metadata.gz: 095db2aa2daefcd5b1f9202e43a9eccae3a7cd7341aa0ac335457c3560fb84456ffc88b21144fa7cac518cf4c6f044321568af3649783bbfb3f7f8ef9113d148
+  data.tar.gz: be9f734f099a4597ef6a8bf4b1862f1484598edb5d563fb6bf9e083cc24eb239098a207c9dfd72a3d0833ee072cfb5aedc9ecd5f4e649c3b8006c6c0637aaf75

data/lib/storext/class_methods.rb

@@ -3,10 +3,10 @@ module Storext
 
     def storext_define_writer(column, attr)
       define_method "#{attr}=" do |value|
-        storext_cast_proxy(attr).send("casted_attr=", value)
+        storext_cast_proxy(attr).send("#{attr}=", value)
         send("#{column}=", send(column) || {})
 
-        attr_value = storext_cast_proxy(attr).send("casted_attr")
+        attr_value = storext_cast_proxy(attr).send(attr)
         write_store_attribute column, attr, value
         send(column)[attr.to_s] = value
       end
@@ -16,9 +16,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("casted_attr=", store_val)
+          storext_cast_proxy(attr).send("#{attr}=", store_val)
         end
-        storext_cast_proxy(attr).send("casted_attr")
+        storext_cast_proxy(attr).send("#{attr}")
       end
     end
 
@@ -60,8 +60,8 @@ module Storext
 
     def storext_check_attr_validity(attr, type, opts)
       storext_cast_proxy_class = Class.new { include Virtus.model }
-      storext_cast_proxy_class.attribute "casted_attr", type, opts
-      unless storext_cast_proxy_class.instance_methods.include? :"casted_attr"
+      storext_cast_proxy_class.attribute attr, type, opts
+      unless storext_cast_proxy_class.instance_methods.include? attr
         raise ArgumentError, "problem defining `#{attr}`. `#{type}` may not be a valid type."
       end
     end

data/lib/storext/instance_methods.rb

@@ -38,7 +38,7 @@ module Storext
     end
 
     def default_store_value(attr)
-      storext_cast_proxy(attr).send("casted_attr")
+      storext_cast_proxy(attr).send(attr)
     end
 
     def storext_cast_proxy(attr)
@@ -47,18 +47,39 @@ module Storext
       else
         @storext_cast_proxies ||= {}
 
-        klass = Class.new do
-          include Virtus.model
-        end
+        definition = self.class.storext_definitions[attr]
+        klass = storext_create_proxy_class(attr, definition)
 
-        klass.attribute(
-          "casted_attr",
-          self.class.storext_definitions[attr][:type],
-          self.class.storext_definitions[attr][:opts],
-        )
+        @storext_cast_proxies[attr] = klass.new(source: self)
+      end
+    end
 
-        @storext_cast_proxies[attr] = klass.new
+    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
     end
 
   end

data/lib/storext/version.rb

@@ -1,3 +1,3 @@
 module Storext
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storext
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails