jsonable 0.0.1 → 0.0.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 0
-:patch: 1
-:build:
+:patch: 2
+:build: !!null 

data/jsonable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "jsonable"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "lib/jsonable.rb",
     "test/Gemfile",
     "test/my_class.rb",
+    "test/my_other_class.rb",
     "test/test_base.rb",
     "test/test_json_class.rb"
   ]

data/lib/jsonable.rb

@@ -10,7 +10,7 @@ module Jsonable
     def json_create(object)
       puts 'object=' + object.inspect
       obj = new
-      object.each_pair do |key, value|
+      object.each do |key, value|
         next if key == 'json_class'
         #puts "setting #{key}: #{value}"
         obj.instance_variable_set key, value
@@ -25,21 +25,20 @@ module Jsonable
 
   end
 
+  # sets the variables on the current object after json parsing the string.
   def from_json!(string)
     JSON.parse(string).each do |var, val|
       self.instance_variable_set var, val
     end
   end
 
-  def to_json(options={})
-    puts 'SimpleRecord as_json called with options: ' + options.inspect
+  def to_json(*a)
     result = {}
-    result['json_class'] = self.class.name unless options && options[:exclude_json_class]
-
+    result['json_class'] = self.class.name
     self.instance_variables.each do |var|
       result[var] = self.instance_variable_get var
     end
-    result.to_json
+    result.to_json(*a)
   end
 
 end

data/test/my_class.rb

@@ -4,6 +4,6 @@ require_relative '../lib/jsonable'
 class MyClass
   include Jsonable
 
-  attr_accessor :x, :y
+  attr_accessor :x, :y, :h, :other_class
 
-end
+end

data/test/my_other_class.rb

@@ -0,0 +1,9 @@
+
+require_relative '../lib/jsonable'
+
+class MyOtherClass
+  include Jsonable
+
+  attr_accessor :a, :b
+
+end

data/test/test_json_class.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'yaml'
 require_relative 'test_base'
 require_relative 'my_class'
+require_relative 'my_other_class'
 
 class IronCacheTests < TestBase
   def setup
@@ -14,6 +15,7 @@ class IronCacheTests < TestBase
     c = MyClass.new
     c.x = "abc"
     c.y = 123
+    c.h = {'hx'=>"def", 'hy'=>456}
 
     json = c.to_json
     p json
@@ -24,6 +26,27 @@ class IronCacheTests < TestBase
     assert_equal c2.class.name, c.class.name
     assert_equal c2.x, c.x
     assert_equal c2.y, c.y
+    assert_equal c2.h, c.h
+    assert_nil c2.other_class
+
+
+    # Now for subclasses
+    c.other_class = MyOtherClass.new
+    c.other_class.a = "hi"
+    c.other_class.b = [1,2]
+    json = c.to_json
+    p json
+
+    c2 = JSON.parse(json)
+    p c2
+
+    assert_equal c2.class.name, c.class.name
+    assert_equal c2.x, c.x
+    assert_equal c2.y, c.y
+    assert_equal c2.h, c.h
+    assert_equal c2.other_class.a, c.other_class.a
+    assert_equal c2.other_class.b, c.other_class.b
+
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -25,6 +25,7 @@ files:
 - lib/jsonable.rb
 - test/Gemfile
 - test/my_class.rb
+- test/my_other_class.rb
 - test/test_base.rb
 - test/test_json_class.rb
 homepage: http://www.iron.io