storext 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d2b7891fc2026bb0689cd6986f65c4a10f4eba
-  data.tar.gz: e498daeb28e562bbcbecb3c24e7589268f66aca2
+  metadata.gz: a63def211664fda8bf9e6551e1cdcf632ae0c557
+  data.tar.gz: d270b2a34ffe9cf9969480bb23398b6fb5e35da6
 SHA512:
-  metadata.gz: 68807df855f69de632f74b962b2a246a7cc0c65fcd73456819a446acca19e583c50d6abacc988d35643681f839373ecfea7650978e95c52c48d84cd9ef1c921b
-  data.tar.gz: 7d86b66e517338408c6317aa9ae384521d88d079df715b246dcc8c2fcee5bbdd7318c0a82633168677b9a5867050706b2fcb736c385a6ea7dfce2ebcd37467d0
+  metadata.gz: 8b6af2eb762d8319ae340f7839ffb2a118f11dab52bf18438450358fe6f6b51c8c566b350673b8267f7333f76537de2e4f0c417965533bd45b9bca96103306bd
+  data.tar.gz: 4df6dec32afed9fc67480894f23c3a4d8b8f8c269f7bce7eb0fac30203c7aa06134d59b29668520807e5d309d3f3cc30fc22243615c5e7b620fb3073cd73f8dd

data/lib/storext.rb

@@ -2,20 +2,18 @@ require "active_support/concern"
 require "virtus"
 require "storext/attribute_proxy"
 require "storext/class_methods"
+require "storext/instance_methods"
 
 module Storext
 
   extend ActiveSupport::Concern
 
   included do
+    include InstanceMethods
+
     class_attribute :store_attribute_defs
     self.store_attribute_defs = {}
 
-    class_attribute :storext_cast_proxy_class
-    self.storext_cast_proxy_class = Class.new do
-      include Virtus.model
-    end
-
     unless defined?(self::Boolean)
       self::Boolean = ::Axiom::Types::Boolean
     end
@@ -23,32 +21,4 @@ module Storext
     after_initialize :set_storext_defaults
   end
 
-
-  private
-
-  def set_storext_defaults
-    store_attribute_defs.each do |store_column, store_keys|
-      store_keys.each do |store_key|
-        set_storext_default_for(store_column, store_key)
-      end
-    end
-  end
-
-  def set_storext_default_for(column, key)
-    if self.send(column).nil? || !self.send(column).has_key?(key.to_s)
-      write_store_attribute(column, key, default_store_value(key))
-    end
-  end
-
-  def default_store_value(key)
-    storext_cast_proxy.send("_casted_#{key}")
-  end
-
-  def storext_cast_proxy
-    if @storext_cast_proxy
-      return @storext_cast_proxy
-    end
-    @storext_cast_proxy ||= self.class.storext_cast_proxy_class.new
-  end
-
 end

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.send("_casted_#{attr}=", value)
+        storext_cast_proxy(attr).send("casted_attr=", value)
         send("#{column}=", send(column) || {})
 
-        attr_value = storext_cast_proxy.send("_casted_#{attr}")
+        attr_value = storext_cast_proxy(attr).send("casted_attr")
         write_store_attribute column, attr, value
         send(column)[attr.to_s] = value
       end
@@ -16,33 +16,54 @@ 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.send("_casted_#{attr}=", store_val)
+          storext_cast_proxy(attr).send("casted_attr=", store_val)
         end
-        storext_cast_proxy.send("_casted_#{attr}")
+        storext_cast_proxy(attr).send("casted_attr")
       end
     end
 
     def store_attribute(column, attr, type=nil, opts={})
-      track_store_attribute(column, attr)
-
-      storext_cast_proxy_class.attribute "_casted_#{attr}", type, opts
-      unless storext_cast_proxy_class.instance_methods.include? :"_casted_#{attr}"
-        raise ArgumentError, "problem defining `#{attr}`. `#{type}` may not be a valid type."
-      end
+      track_store_attribute(column, attr, type, opts)
+      storext_check_attr_validity(attr, type, opts)
+      storext_define_accessor(column, attr)
+      store_accessor column, *storext_attrs_for(column)
+    end
 
+    def storext_define_accessor(column, attr)
       storext_define_writer(column, attr)
       storext_define_reader(column, attr)
-
-      store_accessor column, *store_attribute_defs[column]
     end
 
     def store_attributes(column, &block)
       AttributeProxy.new(self, column, &block).define_store_attribute
     end
 
-    def track_store_attribute(column, attr)
-      store_attribute_defs[column] ||= []
-      store_attribute_defs[column] << attr
+    private
+
+    def storext_attrs_for(column)
+      attrs = []
+      store_attribute_defs.each do |attr, definition|
+        attrs << attr if definition[:column] == column
+      end
+      attrs
+    end
+
+    def track_store_attribute(column, attr, type, opts)
+      self.store_attribute_defs = self.store_attribute_defs.dup
+
+      store_attribute_defs[attr] = {
+        column: column,
+        type: type,
+        opts: opts,
+      }
+    end
+
+    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"
+        raise ArgumentError, "problem defining `#{attr}`. `#{type}` may not be a valid type."
+      end
     end
 
   end

data/lib/storext/instance_methods.rb

@@ -0,0 +1,43 @@
+module Storext
+  module InstanceMethods
+
+    private
+
+    def set_storext_defaults
+      store_attribute_defs.each do |attr, definition|
+        set_storext_default_for(definition[:column], attr)
+      end
+    end
+
+    def set_storext_default_for(column, attr)
+      if self.send(column).nil? || !self.send(column).has_key?(attr.to_s)
+        write_store_attribute(column, attr, default_store_value(attr))
+      end
+    end
+
+    def default_store_value(attr)
+      storext_cast_proxy(attr).send("casted_attr")
+    end
+
+    def storext_cast_proxy(attr)
+      if @storext_cast_proxies && @storext_cast_proxies[attr]
+        return @storext_cast_proxies[attr]
+      else
+        @storext_cast_proxies ||= {}
+
+        klass = Class.new do
+          include Virtus.model
+        end
+
+        klass.attribute(
+          "casted_attr",
+          self.class.store_attribute_defs[attr][:type],
+          self.class.store_attribute_defs[attr][:opts],
+        )
+
+        @storext_cast_proxies[attr] = klass.new
+      end
+    end
+
+  end
+end

data/lib/storext/version.rb

@@ -1,3 +1,3 @@
 module Storext
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storext
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - lib/storext.rb
 - lib/storext/attribute_proxy.rb
 - lib/storext/class_methods.rb
+- lib/storext/instance_methods.rb
 - lib/storext/version.rb
 - lib/tasks/storext_tasks.rake
 homepage: http://github.com/g5/storext
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Extends ActiveRecord::Store.store_accessor