From b58e7eb963af6416e569aa037d21261a623829f5 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Wed, 9 May 2012 18:51:58 -0400 Subject: [PATCH] Change #to_model -> #wrapped_object This is a breaking change, but ActiveModel already uses to_model in a certain way. --- CHANGELOG.txt | 2 ++ lib/draper/base.rb | 2 +- spec/draper/base_spec.rb | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d46a54e..89b64a7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,8 @@ * Dropped support for Rubies < 1.9.3 +* #to_model has been renamed to #wrapped_object + == 0.12.1 * Added Changelog diff --git a/lib/draper/base.rb b/lib/draper/base.rb index b9d3f1c..cb3ba16 100644 --- a/lib/draper/base.rb +++ b/lib/draper/base.rb @@ -191,7 +191,7 @@ module Draper # Fetch the original wrapped model. # # @return [Object] original_model - def to_model + def wrapped_object @model end diff --git a/spec/draper/base_spec.rb b/spec/draper/base_spec.rb index 43d3642..cec1b6f 100644 --- a/spec/draper/base_spec.rb +++ b/spec/draper/base_spec.rb @@ -182,10 +182,9 @@ describe Draper::Base do end end - context(".model / .to_model") do + context(".wrapped_object") do it "should return the wrapped object" do - subject.to_model.should == source - subject.model.should == source + subject.wrapped_object.should == source end end