exvo-auth 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]

data/lib/exvo_auth/strategies/base.rb

@@ -1,12 +1,14 @@
 class ExvoAuth::Strategies::Base < OmniAuth::Strategies::OAuth2
-  def initialize(app, name, app_id = ExvoAuth::Config.client_id, app_secret = ExvoAuth::Config.client_secret, options = {})
-    options[:site] ||= ExvoAuth::Config.host
+  def initialize(app, name, options = {})
+    options[:site]          ||= ExvoAuth::Config.host
+    options[:client_id]     ||= ExvoAuth::Config.client_id
+    options[:client_secret] ||= ExvoAuth::Config.client_secret
     
-    if options[:site].nil? || app_id.nil? || app_secret.nil?
+    if options[:site].nil? || options[:client_id].nil? || options[:client_secret].nil?
       raise(ArgumentError, "Please configure host, client_id and client_secret")
     end
     
-    super(app, name, app_id, app_secret, options)
+    super(app, name, options.delete(:client_id), options.delete(:client_secret), options)
   end
   
   def user_data

data/lib/exvo_auth/strategies/interactive.rb

@@ -1,6 +1,6 @@
 class ExvoAuth::Strategies::Interactive < ExvoAuth::Strategies::Base
-  def initialize(app, app_id, app_secret, options = {})
-    super(app, :interactive, app_id, app_secret, options)
+  def initialize(app, options = {})
+    super(app, :interactive, options)
   end
   
   def request_phase(options = {})

data/lib/exvo_auth/strategies/non_interactive.rb

@@ -1,6 +1,6 @@
 class ExvoAuth::Strategies::NonInteractive < ExvoAuth::Strategies::Base
-  def initialize(app, app_id, app_secret, options = {})
-    super(app, :non_interactive, app_id, app_secret, options)
+  def initialize(app, options = {})
+    super(app, :non_interactive, options)
   end
   
   def request_phase(options = {})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jacek Becela