Merge pull request #27 from fbandrey/master

fix callback issue #25

.rubocop_todo.yml

@@ -65,6 +65,9 @@ EmptyLinesAroundAccessModifier:
 EndAlignment:
   AlignWith: variable
 
+Metrics/AbcSize:
+  Max: 20
+
 # Indentation of when/else
 CaseIndentation:
   IndentWhenRelativeTo: end
@@ -75,4 +78,4 @@ Lambda:
 
 FileName:
   Exclude:
-    - 'lib/omniauth-gplus.rb'
+    - 'lib/omniauth-gplus.rb'

.travis.yml

@@ -5,7 +5,6 @@ before_install:
   - gem --version
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
@@ -23,4 +22,4 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
-  fast_finish: true
+  fast_finish: true

Rakefile

@@ -27,10 +27,10 @@ end
 
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
   task :rubocop do
-    $stderr.puts 'Rubocop is disabled'
+    $stderr.puts 'RuboCop is disabled'
   end
 end
 

lib/omniauth/strategies/gplus.rb

@@ -54,6 +54,10 @@ def authorize_params
         end
       end
 
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
       private
 
       def format_actions(actions)
@@ -82,7 +86,7 @@ def add_key_to_params(params, key)
 
       def add_openid_realm_if_present(params)
         realm = options.send(:openid_realm)
-        params['openid.realm'] = realm if realm.present?
+        params['openid.realm'] = realm if realm
       end
 
       def raw_info

omniauth-gplus.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'minitest'
 
   if RUBY_PLATFORM == 'rbx'
     s.add_development_dependency 'racc'