From 08a3e4c0367ebb19f1aefa92283de02ab36b97e0 Mon Sep 17 00:00:00 2001 From: Rae Bonfanti Date: Sun, 12 Oct 2014 18:31:47 -0700 Subject: [PATCH] simplifies OmniAuth::Strategy.default_options --- lib/omniauth/strategy.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/omniauth/strategy.rb b/lib/omniauth/strategy.rb index fb228f9..ece05e4 100644 --- a/lib/omniauth/strategy.rb +++ b/lib/omniauth/strategy.rb @@ -21,9 +21,8 @@ module OmniAuth # Returns an inherited set of default options set at the class-level # for each strategy. def default_options - return @default_options if instance_variable_defined?(:@default_options) && @default_options - existing = superclass.respond_to?(:default_options) ? superclass.default_options : {} - @default_options = OmniAuth::Strategy::Options.new(existing) + existing = superclass.default_options if superclass.respond_to?(:default_options) + @default_options ||= OmniAuth::Strategy::Options.new(existing) end # This allows for more declarative subclassing of strategies by allowing