simple_record 1.4.7 → 1.4.8

data/lib/simple_record/json.rb

@@ -11,6 +11,10 @@ module SimpleRecord
                 obj = new
                 for key, value in object
                     next if key == 'json_class'
+                    if key == 'id'
+                        obj.id = value
+                        next
+                    end
                     obj.set key, value
                 end
                 obj
@@ -23,6 +27,7 @@ module SimpleRecord
         end
 
         def to_json(*a)
+#            puts 'to_json called'
             result = {
                     'json_class' => self.class.name,
                     'id' => self.id
@@ -36,8 +41,9 @@ module SimpleRecord
                 end
 #                puts 'result[name]=' + result[name].inspect
             end
-
-            result.to_json(*a)
+            ret = result.to_json(*a)
+#            puts 'ret=' + ret.inspect
+            return ret
         end
 
     end

data/test/test_json.rb

@@ -36,13 +36,16 @@ class TestJson < TestBase
 
         models << mm
 
-        jsoned = JSON.generate models
+        jsoned = models.to_json
         puts 'jsoned=' + jsoned
         unjsoned = JSON.parse jsoned
         puts 'unjsoned=' + unjsoned.inspect
         assert unjsoned.size == models.size
         assert unjsoned[0].name == mm.name
         assert unjsoned[0].age == mm.age
+        assert unjsoned[0].created.present?
+        assert unjsoned[0].id.present?
+        assert unjsoned[0].id == mm.id, "unjsoned.id=#{unjsoned[0].id}"
 
         t = Tester.new
         t2 = Tester.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 4
-  - 7
-  version: 1.4.7
+  - 8
+  version: 1.4.8
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -07:00
+date: 2010-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency