activerecord-typedstore 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e093bbab4aa7f56fe8b248cbc6b3ffee4c896523
-  data.tar.gz: 101fbbb8b13b3687010ce3543e371be6b4561ff1
+  metadata.gz: 8790af5ac7b68a121e6d5cd21305421b49b5799c
+  data.tar.gz: 0afe8bfce070b6f1d87f5c3f39334870ce9decc2
 SHA512:
-  metadata.gz: 81ccdf476b884892c67460b9945784d593e50380a7e452452d0a3b54a60f82c3e39cf8a70f64bd154f01337ecac60675866f525aaf6d39a1536ed551c971d10b
-  data.tar.gz: da7fc4fc81c1cd22156b78dad835ee14ec788b9cdc69f7d2ccc839dc0e9f77fb5a024cf13dc159db43e297d6251f6e579759a061f2287fd85443bf23fc9b6a6b
+  metadata.gz: 10d34e86b936c3c9d1f85dd35c6d2414f18c0c4346784f39ce9e4e741c02b23a8657fed819b8ed39a63c9ffb5d36b8b78b559dd2a877e1be64352a5e3b9b9cc8
+  data.tar.gz: d9954012cc7fbec9501a19b7b10e8091c9d3447fc7413cbd09023d822e75f7a00ee505c3712720bac1b8de8d47d6a9ad8b4f5c7f1ca6265a09b454f0328c1621

data/lib/active_record/typed_store/extension.rb

@@ -12,8 +12,6 @@ module ActiveRecord::TypedStore
     included do
       class_attribute :typed_stores, instance_accessor: false
       class_attribute :typed_store_attributes, instance_accessor: false
-      self.typed_stores = {}
-      self.typed_store_attributes = {}
     end
 
     module ClassMethods
@@ -27,20 +25,36 @@ module ActiveRecord::TypedStore
           store(store_attribute, options.merge(accessors: dsl.column_names))
         end
 
-        typed_stores[store_attribute] ||= {}
-        typed_stores[store_attribute].merge!(dsl.columns.index_by(&:name))
-        typed_store_attributes.merge!(dsl.columns.index_by { |c| c.name.to_s })
+        register_typed_store_columns(store_attribute, dsl.columns)
+        super(store_attribute, dsl) if defined?(super)
 
-        dsl.column_names.each { |c| define_virtual_attribute_method(c.to_s) }
         dsl.column_names.each { |c| define_store_attribute_queries(store_attribute, c) }
 
-        super(store_attribute, dsl) if defined?(super)
-
         dsl
       end
 
+      def define_attribute_methods
+        super
+        define_typed_store_attribute_methods
+      end
+
       private
 
+      def register_typed_store_columns(store_attribute, columns)
+        self.typed_stores ||= {}
+        self.typed_store_attributes ||= {}
+        typed_stores[store_attribute] ||= {}
+        typed_stores[store_attribute].merge!(columns.index_by(&:name))
+        typed_store_attributes.merge!(columns.index_by { |c| c.name.to_s })
+      end
+
+      def define_typed_store_attribute_methods
+        return unless typed_store_attributes
+        typed_store_attributes.keys.each do |attribute|
+          define_virtual_attribute_method(attribute)
+        end
+      end
+
       def hstore?(store_attribute)
         columns_hash[store_attribute.to_s].try(:type) == :hstore
       end
@@ -66,7 +80,7 @@ module ActiveRecord::TypedStore
     protected
 
     def write_store_attribute(store_attribute, key, value)
-      column = store_column_definition(store_attribute, key)
+      column = store_column(store_attribute, key)
       if column.try(:type) == :datetime && self.class.time_zone_aware_attributes && value.respond_to?(:in_time_zone)
         value = value.in_time_zone
       end
@@ -80,13 +94,17 @@ module ActiveRecord::TypedStore
     private
 
     def cast_store_attribute(store_attribute, key, value)
-      column = store_column_definition(store_attribute, key)
+      column = store_column(store_attribute, key)
       column ? column.cast(value) : value
     end
 
-    def store_column_definition(store_attribute, key)
-      store_definition = self.class.typed_stores[store_attribute]
-      store_definition && store_definition[key]
+    def store_column(store_attribute, key)
+      store = store_columns(store_attribute)
+      store && store[key]
+    end
+
+    def store_columns(store_attribute)
+      self.class.typed_stores.try(:[], store_attribute)
     end
 
     def if_store_uninitialized(store_attribute)
@@ -98,6 +116,7 @@ module ActiveRecord::TypedStore
     end
 
     def reload_stores!
+      return unless self.class.typed_stores
       self.class.typed_stores.keys.each do |store_attribute|
         instance_variable_set("@_#{store_attribute}_initialized", false)
       end
@@ -107,7 +126,7 @@ module ActiveRecord::TypedStore
       store = defined?(super) ? super : send(store_attribute)
       store.tap do |store|
         if_store_uninitialized(store_attribute) do
-          if columns = self.class.typed_stores[store_attribute]
+          if columns = store_columns(store_attribute)
             initialize_store(store, columns.values)
           end
         end
@@ -133,7 +152,7 @@ module ActiveRecord::TypedStore
       when true        then true
       when false, nil  then false
       else
-        column = store_column_definition(store_attribute, key)
+        column = store_column(store_attribute, key)
 
         if column.number?
           !value.zero?

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -4,6 +4,16 @@ shared_examples 'any model' do
 
   let(:model) { described_class.new }
 
+  describe 'reset_column_information' do
+
+    it 'do not definitely undefine attributes' do
+      expect {
+        described_class.reset_column_information
+      }.to_not change { model.age_changed? }
+    end
+
+  end
+
   describe 'regular AR::Store' do
 
     it 'save attributes as usual' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord