ninja-model 1.0.3 → 1.0.4

data/lib/ninja_model/marshalling.rb

@@ -4,33 +4,27 @@ module NinjaModel
 
     module InstanceMethods
       def marshal_dump
+        exceptions = %w(@association_cache @aggregation_cache @attributes)
         h = self.instance_variables.inject({}) { |r, k|
-          if k.to_s.eql?('@attributes')
-            r[:attributes] = @attributes.inject({}) { |a, (k, v)|
-              a[k] = ActiveSupport::JSON.encode(v)
-              a
-            }
-          else
+          unless exceptions.include?(k.to_s)
             r[k.to_s] = instance_variable_get(k)
           end
           r
         }
-        h[:attributes] = {}
-        @attributes.each do |k, v|
-          h[:attributes][k] = ActiveSupport::JSON.encode(v)
-        end
+        h['@attributes'] = @attributes.inject({}) { |a, (k, v)|
+          a[k] = ActiveSupport::JSON.encode(v)
+          a
+        }
         ActiveSupport::JSON.encode(h)
       end
 
       def marshal_load(data)
         h = ActiveSupport::JSON.decode(data)
         h.each do |k, v|
-          if k.to_s.eql?('attributes')
-            @attributes = v
-          else
-            instance_variable_set(k, v)
-          end
+          instance_variable_set(k, v)
         end
+        @association_cache = {}
+        @aggregation_cache = {}
       end
     end
   end

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "1.0.3"
+ VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 834533805
+      hash: -180923263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 834533805
+      hash: -180923263
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.24