omniauth-gplus 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3b27c6b999a563a295475a758b28a5abb25615be
+  data.tar.gz: 3d50853471f6f69980a9e428da69b51171bf4ce2
+SHA512:
+  metadata.gz: 586765f643616bc55d40312d4d12cb4091e4075239651194ceae415d7b46d4a4885aad878c1e7f12226393e92c0bf19057ef6d0b96cd7ca4fc9be284af18341d
+  data.tar.gz: c117b95faca25542bfc7333cc956a21265d7f3c0157aea4353d4f3c63960f35e1dba149c8f33efbfdbb1e60354d899629b0b51ce42c8592273d39962fcd8420b

data/.ruby-gemset

@@ -0,0 +1 @@
+omniauth-gplus

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+  - ruby-head
   - rbx-19mode
   - jruby-19mode

data/README.md

@@ -22,12 +22,34 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-By default the gem uses the `email` scope, but you can get more information with:
+By default the gem uses the `userinfo.email` scope, but you can get more information by using this interface:
 
 ``` ruby
-provider :gplus, ENV['GPLUS_KEY'], ENV['GPLUS_SECRET'], scope: 'email, profile'
+provider :gplus, ENV['GPLUS_KEY'], ENV['GPLUS_SECRET'], scope: 'userinfo.email, userinfo.profile'
 ```
 
+Here are the different scopes:
+
+  - https://www.googleapis.com/auth/userinfo.email
+  - https://www.googleapis.com/auth/userinfo.profile
+
+To identify the user as "me" in all requests use this scope:
+
+  - https://www.googleapis.com/auth/plus.me
+
+To get all of these AND log the user in:
+
+  - https://www.googleapis.com/auth/plus.login
+
+If you use the `plus.login` scope you can request `visibleactions` in order to allow your app to post App Activities on behalf of your users.  To request `visibleactions`, use the following interface:
+
+```ruby
+provider :gplus, ENV['GPLUS_KEY'], ENV['GPLUS_SECRET'], scope: 'plus.login', request_visible_actions: 'AddActivity,BuyActivity'
+```
+
+To see and learn about all of the available App Activity types, visit: https://developers.google.com/+/api/moment-types/
+
+
 The information schema looks like this:
 
 ``` ruby
@@ -113,7 +135,8 @@ Contributing
 * **DO NOT CHANGE** ANY OF THESE (without making a new branch for *that* change):
   * `*.gemspec`
   * `Rakefile`
-  * `.rvmrc`
+  * `.ruby-version`
+  * `.ruby-gemset`
   * `.gitignore`
   * Any part of the git history
 * **Write tests** specifically for the changes you've made, if no test exist
@@ -125,7 +148,7 @@ Credits
 -------
 
   - [Sam Dunne](https://github.com/samdunne), for initial work and bug fixes
-  
+
 
 License
 -------

data/lib/omniauth/gplus/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GPlus
-      VERSION = "1.1.1"
+      VERSION = "1.2.0"
   end
 end

data/lib/omniauth/strategies/gplus.rb

@@ -7,10 +7,14 @@ module OmniAuth
         token_url: 'https://www.google.com/accounts/o8/oauth2/token'
       }
 
+      option :authorize_options, [:scope, :request_visible_actions]
+
       option :scope, 'userinfo.email'
 
+      option :request_visible_actions, nil
+
       option :uid_field, :uid
-      
+
       uid do
         raw_info['id']
       end
@@ -40,12 +44,23 @@ module OmniAuth
       def authorize_params
         super.tap do |params|
           params['scope'] = format_scopes(params['scope'])
+          if (params['request_visible_actions'])
+            params['request_visible_actions'] = format_actions(params['request_visible_actions'])
+          end 
           custom_parameters(params)
         end
       end
 
       private
 
+      def format_actions(actions)
+        actions.split(/,\s*/).map(&method(:format_action)).join(" ")
+      end
+
+      def format_action(action)
+        "http://schemas.google.com/#{action}"
+      end
+
       def format_scopes(scopes)
         scopes.split(/,\s*/).map(&method(:format_scope)).join(" ")
       end
@@ -55,11 +70,16 @@ module OmniAuth
       end
 
       def custom_parameters(params)
-        ["scope", "client_options"].each { |k| add_key_to_params(params, k) }
+        ["scope", "client_options", "state", "request_visible_actions"].each { |k| add_key_to_params(params, k) }
       end
 
       def add_key_to_params(params, key)
-        params[key] = request.params[key] if request.params[key]
+        if request.params[key]
+          params[key] = request.params[key]
+
+          # to support omniauth-oauth2's auto csrf protection
+          session['omniauth.state'] = params[:state] if key == 'state'
+        end
       end
 
       def raw_info

data/test/lib/omniauth/strategies/gplus_test.rb

@@ -36,6 +36,27 @@ class TestOmniAuthGPlus < MiniTest::Unit::TestCase
     assert_equal(expected, actual)
   end
 
+  def test_default_request_visible_actions_is_nil
+    expected = nil
+    actual = strategy.options['request_visible_actions']
+    assert_equal(expected, actual)
+  end
+
+  def test_state_state_is_included_in_request_params_when_present
+    expected = 'some_state'
+    @request.stubs(:params).returns({ 'state' => expected })
+    assert_equal expected, strategy.authorize_params[:state]
+  end
+
+  def test_stores_state_in_the_session_when_present
+    expected = 'some_state'
+    @request.stubs(:params).returns({ 'state' => expected })
+    refute_empty strategy.authorize_params['state']
+    assert_equal expected, strategy.authorize_params[:state]
+    refute_empty strategy.session['omniauth.state']
+    assert_equal expected, strategy.session['omniauth.state']
+  end
+
   def test_that_it_has_a_version_number
     refute_nil OmniAuth::GPlus::VERSION
   end
@@ -49,7 +70,7 @@ class TestOmniAuthGPlus < MiniTest::Unit::TestCase
     actual = new_oauth.options.uid_field
     assert_equal(expected, actual)
   end
-  
+
   def test_uid_not_nil
     refute_nil(new_oauth.options.uid_field)
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gplus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
@@ -10,136 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    none: false
-  prerelease: false
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Google+ OAuth2 solution for Omniauth
 email:
 - me@kurtisrainboltgreene.name
@@ -150,7 +133,8 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -165,33 +149,26 @@ files:
 homepage: http://krainboltgreene.github.com/omniauth-gplus
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 3554233067913369947
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 3554233067913369947
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Google+ OAuth2 solution for Omniauth
 test_files:
 - test/helper.rb

data/.rvmrc

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p392@omniauth-gplus"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.18.18 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi