ninja-model 1.0.0 → 1.0.1

data/lib/ninja_model/marshalling.rb

@@ -4,11 +4,34 @@ module NinjaModel
 
     module InstanceMethods
       def marshal_dump
-        ActiveSupport::JSON.encode(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
+            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
+        ActiveSupport::JSON.encode(h)
       end
 
       def marshal_load(data)
-        self.instantiate(ActiveSupport::JSON.decode(data))
+        h = ActiveSupport::JSON.decode(data)
+        @attributes = {}
+        h.each do |k, v|
+          if k.eql?(:attributes)
+            @attributes[k] = ActiveSupport::JSON.decode(v)
+          else
+            instance_variable_set(k, v)
+          end
+        end
       end
     end
   end

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "1.0.0"
+ VERSION = "1.0.1"
 end

data/ninja-model.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = %q{http://github.com/t3hpr1m3/ninja-model.git}
   s.summary     = %q{Pseudo-ORM for Ruby}
   s.description = %q{Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface}
+  s.license     = %q{MIT}
 
   s.rubyforge_project = s.name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -270,7 +270,8 @@ files:
 - spec/support/factories/user.rb
 - spec/support/matchers/convert.rb
 homepage: http://github.com/t3hpr1m3/ninja-model.git
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -283,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 651932753
+      hash: 861620109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 651932753
+      hash: 861620109
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.24