ninja-model 1.0.4 → 1.0.5

data/lib/ninja_model/marshalling.rb

@@ -12,7 +12,7 @@ module NinjaModel
           r
         }
         h['@attributes'] = @attributes.inject({}) { |a, (k, v)|
-          a[k] = ActiveSupport::JSON.encode(v)
+          a[k] = read_attribute(k)
           a
         }
         ActiveSupport::JSON.encode(h)
@@ -21,8 +21,16 @@ module NinjaModel
       def marshal_load(data)
         h = ActiveSupport::JSON.decode(data)
         h.each do |k, v|
-          instance_variable_set(k, v)
+          if k.eql?('@attributes')
+            @attributes = {}
+            v.each do |n, x|
+              write_attribute(n, x)
+            end
+          else
+            instance_variable_set(k, v)
+          end
         end
+
         @association_cache = {}
         @aggregation_cache = {}
       end

data/lib/ninja_model/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -180923263
+      hash: 641017985
 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: -180923263
+      hash: 641017985
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.24