From c077f2d2ee54d6e5573c859f4cbd4c1e753b1aa7 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Fri, 11 Nov 2011 03:21:52 +0100 Subject: [PATCH] make set_state protected again. it's not accessible on the object anyway --- lib/simple_states/event.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/simple_states/event.rb b/lib/simple_states/event.rb index 5763417..673b8b6 100644 --- a/lib/simple_states/event.rb +++ b/lib/simple_states/event.rb @@ -38,15 +38,6 @@ def merge(other, append = true) end end - def set_state(object) - if state = target_state(object) - object.past_states << object.state if object.state - object.state = state.to_sym - object.send(:"#{state}_at=", Time.now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil? - object.save! if @saving - end - end - protected def skip?(object, args) @@ -64,6 +55,15 @@ def run_callbacks(object, type, args) send_methods(object, options.send(type), args) end + def set_state(object) + if state = target_state(object) + object.past_states << object.state if object.state + object.state = state.to_sym + object.send(:"#{state}_at=", Time.now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil? + object.save! if @saving + end + end + def target_state(object) options.to || :"#{name}ed".tap do |state| raise_unknown_target_state(object) unless object.class.states.include?(state)