cacheable_delegator 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGMxYmRiOTU2OTM4YmU0YTJkMzJmYTMxODNlMWUyYmM4YmQ5YTJhMw==
+    Y2E2MWQyMTY5NWZiZmU0YjJiYTMxYTY5ZWNlZTZjMmMxYzk1OGU1MA==
   data.tar.gz: !binary |-
-    NDFjZjQxZjM5ZTA4YTZjOWFlY2ZiMDViMGYwYWEzZWJmNWExNmNhOQ==
+    NTgyMTVkZGY4NTI2ZGIxMzUwY2QyYzYzMGIwODJkMzYyYTAyNjJhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGY0YzI5MDU3OGI5Yjk5ZjExNDZhNThiMmE1NmE2Yjk4MzMwMmMzODgxODk5
-    OTRhYTEwMmRiOGJiMmNiODQ4MzFjNjI2MDc5NjBkMThkNmYyOWFkY2YwNWJj
-    MGQxYjYxMDYzODYwMWQwNTQ3NGUwNDJmNjA2OTU0MzQyZTUzMTM=
+    Njk5MDI5MGU4ZmRkNzc3ZTJiZjYzZDhmNzJmZDg4MGQzNjE2Yzk4MzkxMjM5
+    OWI3MzY2NmViZGFkMmFhMGE3NDZhMjVlYzJiYTUyZmNmNjAzM2I5OWM0ODAw
+    Mjg2ZDgyNGI2NDMwY2E3MTA2NDY2OTg3N2QzYmE0ZmUxN2EwZTY=
   data.tar.gz: !binary |-
-    OTU2M2Q4M2FiOTRlN2MyYTNhZGJmMzBlYzdkNzVjNDdlYjRhNDI1NmI2NTBk
-    OWY0MDdiYjFkMDQ3NGYwNzIyNzUzOWU4MDZkY2VjMzRjYTUwNzZiMmIwYWRh
-    NmJiMWJhNzY1Yzc5MjY3ZGUzNjZjNjA4NjBlMThkOGY1M2MxODE=
+    MDg1M2E0ZTQxM2YxNTY4MmJlZWIyYzhkNTE5OTQ1OTExMGUyMTIxOTVkNmJk
+    ZmI4OWNkOTIwM2U0M2ViMzQwMTFlNWQ2Yzc1YjY1MzZlMTQ3MDc1OWQ1NTQ3
+    NjNmNzYwYjgyZWVkYzgxMDVhYWViMjBkZjg0YzZhYWYzN2UyYzk=

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/cacheable_delegator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cacheable_delegator"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Nguyen"]
-  s.date = "2013-10-29"
+  s.date = "2013-10-30"
   s.description = "Create a cache model for your active records"
   s.email = "dansonguyen@gmail.com"
   s.extra_rdoc_files = [

data/lib/cacheable_delegator.rb

@@ -51,35 +51,49 @@ module CacheableDelegator
     # will call ActiveRecord::Base.serialize based on parameters passed in
     # from 
     def upgrade_schema!
-      # first we create a hash of source_columns
-      source_column_hash = source_columns.inject({}) do |shash, source_col|
-        source_col_atts = COL_ATTRIBUTES_TO_UPGRADE.inject({}){|hsh, att| hsh[att.to_sym] = source_col.send att; hsh  }
-        shash[source_col.name] = source_col_atts
-
-        shash
-      end
-
       # then we merge it with custom_columns
-      columns_to_add = source_column_hash.merge(custom_columns)
-
+      columns_to_add = generate_columns_to_upgrade(custom_columns)
 
       # then we add them all in using .col method from active_record_inline_schema
       columns_to_add.each_pair do |col_name, col_atts|
-        is_serialize = col_atts.delete(:serialize)
-        col col_name, col_atts
+        column_atts_without_serialized_att = col_atts.dup.tap{|h| h.delete :serialize }
+        col( col_name, column_atts_without_serialized_att )
+      end
+
+      self.auto_upgrade!( :gentle => true )
+      self.set_serialized_columns!
+    end
 
-        # by default, the client passes in serialize: true for plain serialization
-        #  and has the option to pass in serialize: Hash
-        if is_serialize
+
+    # a soft method that is run every time the class is loaded
+    # just to make sure things are properly serialized
+    def set_serialized_columns!
+      cols = generate_columns_to_upgrade(custom_columns)
+      cols.each_pair do |col_name, col_atts|
+        if is_serialize = col_atts.delete(:serialize)
+        ##  by default, the client passes in serialize: true for plain serialization
+        ##  and has the option to pass in serialize: Hash
+       
           serialize_klass = (is_serialize == true) ? Object : is_serialize
           serialize col_name, serialize_klass
         end
       end
-
-      self.auto_upgrade!( :gentle => true )
     end
 
 
+    def generate_columns_to_upgrade(custom_cols)
+      # first we create a hash of source_columns
+      source_column_hash = source_columns.inject({}){ |shash, source_col|
+        source_col_atts = COL_ATTRIBUTES_TO_UPGRADE.inject({}){|hsh, att| hsh[att.to_sym] = source_col.send att; hsh  }
+        shash[source_col.name] = source_col_atts
+
+        shash
+      }
+
+      # then we merge it with custom_columns
+      return source_column_hash.merge(custom_cols)
+    end
+
 ##################### source conveniences
 
 

data/spec/mixin_active_record_inline_schema_spec.rb

@@ -77,6 +77,9 @@ describe CacheableDelegator do
             MyCachedRecord.add_custom_column :foo_array, serialize: Hash
             MyCachedRecord.upgrade_schema!
             expect{ MyCachedRecord.create_cache(@source)  }.to raise_error ActiveRecord::SerializationTypeMismatch
+
+            # throwing this in there ad hoc to make sure nothing breaks...TODO fix later
+            MyCachedRecord.set_serialized_columns!
           end
 
         end

data/spec/spec_records.rb

@@ -91,6 +91,8 @@ class MyCachedRecord < ActiveRecord::Base
 
   include CacheableDelegator
   cache_and_delegate MyRecord
+
+  self.set_serialized_columns!
 end
 MyCachedRecord.reset_column_information
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cacheable_delegator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dan Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry