accept options as default arg values

lib/omniauth/strategy.rb

@@ -136,6 +136,7 @@ def initialize(app, *args, &block)
       options.name ||= self.class.to_s.split('::').last.downcase
 
       self.class.args.each do |arg|
+        break if args.empty?
         options[arg] = args.shift
       end
 

spec/omniauth/strategy_spec.rb

@@ -87,7 +87,8 @@ def make_env(path = '/auth/test', props = {})
   end
 
   describe ".args" do
-    subject{ c = Class.new; c.send :include, OmniAuth::Strategy; c }
+    subject { c = Class.new; c.send :include, OmniAuth::Strategy; c }
+
     it "sets args to the specified argument if there is one" do
       subject.args [:abc, :def]
       expect(subject.args).to eq([:abc, :def])
@@ -98,6 +99,17 @@ def make_env(path = '/auth/test', props = {})
       c = Class.new(subject)
       expect(c.args).to eq([:abc, :def])
     end
+
+    it "accepts corresponding options as default arg values" do
+      subject.args [:a, :b]
+      subject.option :a, "1"
+      subject.option :b, "2"
+
+      expect(subject.new(nil).options.a).to eq "1"
+      expect(subject.new(nil).options.b).to eq "2"
+      expect(subject.new(nil, "3", "4").options.b).to eq "4"
+      expect(subject.new(nil, nil, "4").options.a).to eq nil
+    end
   end
 
   context "fetcher procs" do
@@ -700,7 +712,7 @@ def make_env(path = '/auth/test', props = {})
         end
       end
 
-      let(:strategy){ ExampleStrategy.new(app, :setup => setup_proc) }
+      let(:strategy) { ExampleStrategy.new(app, :setup => setup_proc) }
 
       it "does not call the app on a non-omniauth endpoint" do
         strategy.call(make_env('/somehwere/else'))