serializable_decorator 0.0.2 → 0.0.3

data/Gemfile

@@ -8,3 +8,7 @@ group :test do
   gem 'spork'
   gem 'autotest'
 end
+
+group :development do
+  gem 'pry'
+end

data/lib/serializable_decorator.rb

@@ -44,7 +44,17 @@ class SerializableDecorator < Delegator
     __getobj__.instance_variable_get(name) || super
   end
 
+  def as_json
+    if __getobj__.respond_to?(:as_json) then
+      delegator_instance_vars = Delegator.instance_method(:instance_variables).bind(self).call
+      json_hash = Hash[delegator_instance_vars.map { | name | [name.to_s[1..-1], instance_variable_get(name) ] } ]
+      json_hash.merge!(__getobj__.as_json)
+    else
+      instance_values
+    end
+  end
+
   def to_json
-    instance_values.to_json
+    as_json.to_json
   end
 end

data/lib/serializable_decorator/version.rb

@@ -1,5 +1,5 @@
 module Delegators
   module SerializableDecorator
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/serializable_decorator_spec.rb

@@ -4,6 +4,13 @@ class Test
   attr_accessor :foo
 end
 
+class TestJson < Test
+  attr_accessor :quux
+  def as_json
+    { extra: "baz", foo: @foo }
+  end
+end
+
 class TestDecorator < SerializableDecorator
   attr_accessor :bar
 end
@@ -11,6 +18,7 @@ end
 describe SerializableDecorator do
   before(:each) do
     @td = TestDecorator.new(Test.new)
+    @tdj = TestDecorator.new(TestJson.new)
   end
 
   it "Original attributes are still available" do
@@ -75,4 +83,12 @@ describe SerializableDecorator do
   it "Should not include any extraneous entries in the JSON output" do
     @td.to_json.should == "{}"
   end
+
+  it "Should use the decorated object's as_json if it exists" do
+    @tdj.foo = 12
+    @tdj.bar = 13
+    @tdj.to_json.should include('"foo":12')
+    @tdj.to_json.should include('"bar":13')
+    @tdj.to_json.should include('"extra":"baz"')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serializable_decorator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json