Include ActiveModel::Serialization in Draper::Decorator.

drapergem · Nov 20, 2012 · c4b3527 · c4b3527
1 parent d2e4d21
commit c4b3527
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/draper/decorator.rb b/lib/draper/decorator.rb
@@ -26,7 +26,8 @@ def initialize(source, options = {})
       source.to_a if source.respond_to?(:to_a) # forces evaluation of a lazy query from AR
       @source = source
       @options = options
-      handle_multiple_decoration if source.is_a?(Draper::Decorator)
+      handle_multiple_decoration if source.is_a?(Draper::Decorator)      
+      self.class.send(:include, ActiveModel::Serialization) if defined?(ActiveModel::Serialization)
     end
 
     class << self

diff --git a/spec/draper/decorator_spec.rb b/spec/draper/decorator_spec.rb
@@ -11,6 +11,12 @@
       subject.source.should be source
     end
 
+    if defined?(ActiveModel::Serialization)
+      it "includes ActiveModel::Serialization if present" do
+        subject.should respond_to(:serializable_hash)
+      end
+    end
+
     it "stores options" do
       decorator = decorator_class.new(source, some: "options")
       decorator.options.should == {some: "options"}