omniauth-uber 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7b765857dcbd5da7cd1d928a8813f114ca9c7e
-  data.tar.gz: 3f66c6558523ebd777e2008cf484d9dba81dfa37
+  metadata.gz: 2115b8f7ca794091028aea53c1a0eb2f212a5107
+  data.tar.gz: febdd4eee0a60f5f7e9b64f47eaf3f6c00dc6bf1
 SHA512:
-  metadata.gz: 8de2b3989e02a36119232256131c4f23ab002bd50f75aff397114a2243f4854241f272553eac59818ce3177ff568203e29d2fbf32453d197b93ea76806b1446f
-  data.tar.gz: 715c1e057771a09ea2cb4a944189549d669c43fe548ac90818bb7d7aeb8d8a339d90f234ea30f8428a097ab3c7a8a9a8232504ab5b55562e17e3892f9161e88f
+  metadata.gz: 8e94401be58e4ebe82bcb493c043ae968bf882b2a96dbddb53de1cb2f416ff5bc8a617e8d7780cb755a1cfec9c0e4195c261154cd45da8a9fe5bb0ff709b69e2
+  data.tar.gz: bea9bf156f8b5d503cec1985de66501af6b4a8536c83a23e51619966a888bf600578a2ee8c5bffcfccc5bf6ec9c4698cfbb9de2a316d0f28f99abf88528b8fe0

data/.rubocop-https---raw-githubusercontent-com-tmilewski-rubocop-defaults-master-rubocop-yml

@@ -0,0 +1,58 @@
+# see https://github.com/bbatsov/rubocop/blob/master/config/default.yml
+# for default configuration
+
+AllCops:
+  TargetRubyVersion: 2.4
+  DisplayCopNames: true
+  Exclude:
+    - 'db/schema.rb'
+    - 'bin/*'
+    - 'vendor/**/*'
+
+Rails:
+  Enabled: true
+
+Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 125
+  Exclude:
+    - 'db/migrate/*'
+    - 'config/initializers/devise.rb'
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 10
+  Exclude:
+    - 'db/migrate/*'
+
+Metrics/ModuleLength:
+  CountComments: false
+  Max: 100
+
+Metrics/AbcSize:
+  # The ABC size is a calculated magnitude, so this number can be a Fixnum or a Float.
+  # http://c2.com/cgi/wiki?AbcMetric
+  Max: 15
+
+Metrics/CyclomaticComplexity:
+  # http://www.rubydoc.info/github/bbatsov/rubocop/Rubocop/Cop/Style/CyclomaticComplexity
+  Max: 6
+
+Metrics/PerceivedComplexity:
+  # http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Metrics/PerceivedComplexity
+  Max: 7
+
+Metrics/ClassLength:
+  CountComments: false
+  Max: 100
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false

data/.rubocop.yml

@@ -1,84 +1,9 @@
-AllCops:
-  Include:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'omniauth-venmo.gemspec'
-  Exclude:
-    - 'lib/omniauth-venmo.rb'
-
-# Avoid long parameter lists
-ParameterLists:
-  Max: 4
-  CountKeywordArgs: true
-
-MethodLength:
-  CountComments: false
-  Max: 14
-
-# Avoid more than `Max` levels of nesting.
-BlockNesting:
-  Max: 2
-
-# Align with the style guide.
-CollectionMethods:
-  PreferredMethods:
-    map:      'collect'
-    reduce:   'inject'
-    find:     'detect'
-    find_all: 'select'
-
-# Limit line length
-LineLength:
-  Enabled: false
-
-# Disable documentation checking until a class needs to be documented once
-Documentation:
-  Enabled: false
-
-# Enforce Ruby 1.8-compatible hash syntax
-HashSyntax:
-  EnforcedStyle: hash_rockets
-
-# No spaces inside hash literals
-SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-# Allow dots at the end of lines
-DotPosition:
-  Enabled: false
+inherit_from:
+  - https://raw.githubusercontent.com/tmilewski/rubocop-defaults/master/rubocop.yml
 
-# Don't require magic comment at the top of every file
-Encoding:
-  Enabled: false
-
-# Enforce outdenting of access modifiers (i.e. public, private, protected)
-AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-EmptyLinesAroundAccessModifier:
-  Enabled: true
-
-# Align ends correctly
-EndAlignment:
-  AlignWith: variable
-
-# Indentation of when/else
-CaseIndentation:
-  IndentWhenRelativeTo: end
-  IndentOneStep: false
-
-Lambda:
-  Enabled: false
-
-HandleExceptions:
-  Enabled: false
-
-RaiseArgs:
-  EnforcedStyle: compact
-
-TrailingComma:
+Style/FileName:
   Enabled: false
 
-Style/FileName:
+AllCops:
   Exclude:
-    - 'lib/omniauth-uber.rb'
+    - 'tmp/**/*'

data/.travis.yml

@@ -1,17 +1,17 @@
 bundler_args: --without development
-gemfile:
-  - Gemfile
+before_install: gem update bundler
+cache: bundler
+env:
+  global:
+    - JRUBY_OPTS="$JRUBY_OPTS --debug"
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx-2
+  - 2.2.6
+  - 2.3.3
+  - 2.4.1
   - ruby-head
-  - jruby-19mode
-  - jruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-head
     - rvm: ruby-head
+  fast_finish: true
+sudo: false

data/Gemfile

@@ -3,14 +3,14 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :development do
-  gem 'rubocop'
+  gem 'rubocop', '>= 0.48.1'
 end
 
 group :test do
-  gem 'coveralls', :require => false
+  gem 'coveralls', require: false
   gem 'rack-test'
-  gem 'rspec', '~> 2.7'
-  gem 'simplecov', :require => false
+  gem 'rspec', '~> 3.6.0'
+  gem 'simplecov', require: false
 end
 
 gemspec

data/README.md

@@ -1,8 +1,8 @@
 omniauth-uber
 ==============
 
-[![Gem Version](https://badge.fury.io/rb/omniauth-uber.png)](http://badge.fury.io/rb/omniauth-uber)
-[![Build Status](https://travis-ci.org/tmilewski/omniauth-uber.png?branch=master)](https://travis-ci.org/tmilewski/omniauth-uber)
+[![Gem Version](https://badge.fury.io/rb/omniauth-uber.svg)](http://badge.fury.io/rb/omniauth-uber)
+[![Build Status](https://travis-ci.org/omniauth/omniauth-uber.svg?branch=master)](https://travis-ci.org/omniauth/omniauth-uber)
 
 Uber OAuth2 Strategy for OmniAuth 1.x and supports the OAuth 2.0 server-side flow.
 
@@ -21,7 +21,7 @@ Then `bundle install`.
 
 ## Usage
 
-`OmniAuth::Strategies::Uber` is simply a Rack middleware. Read the OmniAuth 1.0 docs for detailed instructions: https://github.com/intridea/omniauth.
+`OmniAuth::Strategies::Uber` is simply Rack middleware. Read the OmniAuth 1.0 docs for detailed instructions: https://github.com/intridea/omniauth.
 
 Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
 
@@ -35,14 +35,20 @@ end
 
 Currently, there is only one configuration option that needs to be set:
 
-* `scope`: A comma-separated list of permissions you want to request from the user. The available permissions are as follows: `access_email`, `access_phone`, `access_balance`, `access_feed`, `access_profile`, `access_friends`, and `make_payments`.  Default: `access_profile`
+* `scope`: A comma-separated list of permissions you want to request from the user. The available permissions are as follows: `profile`, `history`.  Default: `profile`
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :uber, ENV['UBER_CLIENT_ID'], ENV['UBER_CLIENT_SECRET'], :scope => 'profile,history'
 end
+
 ```
 
+## Scope Details
+
+* `profile`:	Access the basic profile information on a user's Uber account including their first name, email address, and profile picture.
+* `history`:	Pull trip data including the locations, times, and product type of a user's historical pickups and drop-offs.
+
 ## Auth Hash
 
 Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
@@ -50,20 +56,33 @@ Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
 ```ruby
 {
   :provider => 'uber',
-  :uid => nil,
-  :info => {}, # Being worked on
+  :uid => 'xxxxxx-yyyyy-zzzz-aaaa-bbbbbbbbbb',
+  :info => {
+    :email => 'foo@bar.com',
+    :first_name => 'Tom',
+    :last_name => 'Milewski',
+    :picture => 'https://d1w2poirtb3as9.cloudfront.net/default.jpeg',
+    :promo_code => 'xxxxx',
+  },
   :credentials => {
     :token => 'ABCDEF...',
+    :refresh_token => 'ABCDEF...',
     :expires => true
   },
-  :extra => {}  # Being worked on
+  :extra => {
+    :email => 'foo@bar.com',
+    :first_name => 'Tom',
+    :last_name => 'Milewski',
+    :picture => 'https://d1w2poirtb3as9.cloudfront.net/default.jpeg',
+    :promo_code => 'xxxxx',
+    :uuid => 'xxxxxx-yyyyy-zzzz-aaaa-bbbbbbbbbb'
   }
 }
 ```
 
 ## Supported Ruby Versions
-`omniauth-uber` is tested under 1.8.7, 1.9.2, 1.9.3, 2.0.0, JRuby (1.8 mode), and Rubinius
-(1.8 and 1.9 modes).
+`omniauth-uber` is tested under 1.9.2, 1.9.3, 2.0.0, 2.1.0, MRI Ruby HEAD, JRuby (1.9 mode and HEAD), and Rubinius
+(2.0 mode).
 
 ## Versioning
 This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations
@@ -83,7 +102,7 @@ Constraint][pvc] with two digits of precision. For example:
 
 ## License
 
-Copyright (c) 2013 by Tom Milewski
+Copyright (c) 2014 by Tom Milewski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :test => :spec
+task test: :spec
 
 begin
   require 'rubocop/rake_task'
@@ -14,4 +14,4 @@ rescue LoadError
   end
 end
 
-task :default => [:spec, :rubocop]
+task default: %i[spec rubocop]

data/lib/omniauth/strategies/uber.rb

@@ -3,27 +3,27 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Uber < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = 'profile'
+      DEFAULT_SCOPE = 'profile'.freeze
 
-      option :client_options, :site          => 'https://api.uber.com',
-                              :authorize_url => 'https://login.uber.com/oauth/authorize',
-                              :token_url     => 'https://login.uber.com/oauth/token'
+      option :client_options, site: 'https://api.uber.com',
+                              authorize_url: 'https://login.uber.com/oauth/authorize',
+                              token_url: 'https://login.uber.com/oauth/token'
 
       uid { raw_info['uuid'] }
 
       info do
         {
-          :first_name => raw_info['first_name'],
-          :last_name  => raw_info['last_name'],
-          :email      => raw_info['email'],
-          :picture    => raw_info['picture'],
-          :promo_code => raw_info['promo_code']
+          first_name: raw_info['first_name'],
+          last_name: raw_info['last_name'],
+          email: raw_info['email'],
+          picture: raw_info['picture'],
+          promo_code: raw_info['promo_code']
         }
       end
 
       extra do
         {
-          :raw_info => raw_info
+          raw_info: raw_info
         }
       end
 
@@ -33,9 +33,9 @@ module OmniAuth
 
       def request_phase
         options[:authorize_params] = {
-          :client_id     => options['client_id'],
-          :response_type => 'code',
-          :scopes        => (options['scope'] || DEFAULT_SCOPE)
+          client_id: options['client_id'],
+          response_type: 'code',
+          scopes: (options['scope'] || DEFAULT_SCOPE)
         }
 
         super

data/lib/omniauth/uber/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Uber
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'.freeze
   end
 end

data/omniauth-uber.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'omniauth/uber/version'
 
@@ -20,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'omniauth', '~> 1.2'
   s.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
 
-  s.add_development_dependency 'dotenv', '~> 0'
-  s.add_development_dependency 'sinatra', '~> 0'
+  s.add_development_dependency 'dotenv', '>= 2.0'
+  s.add_development_dependency 'sinatra', '>= 2.0'
 end

data/spec/app.rb

@@ -31,8 +31,8 @@ get '/auth/:name/callback' do
     >> UID
       #{auth.uid.inspect}
 
-    >> ACCESS TOKEN
-      #{auth.credentials.token.inspect}
+    >> CREDENTIALS
+      #{auth.credentials.inspect}
 
     >> INFO
       #{auth.info.inspect}

data/spec/omniauth/strategies/uber_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe OmniAuth::Strategies::Uber do
   subject do
     @subject ||= begin
-      args = ['client_id', 'client_secret', @options || {}].compact
+      @options ||= {}
+      args = ['client_id', 'client_secret', @options].compact
       OmniAuth::Strategies::Uber.new(*args)
     end
   end

data/spec/spec_helper.rb

@@ -9,5 +9,5 @@ require 'omniauth'
 require 'omniauth-uber'
 
 RSpec.configure do |config|
-  config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.extend OmniAuth::Test::StrategyMacros, type: :strategy
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-uber
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Milewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -42,30 +42,30 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Uber strategy for OmniAuth v1.2
 email:
 - tmilewski@gmail.com
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop-https---raw-githubusercontent-com-tmilewski-rubocop-defaults-master-rubocop-yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Uber strategy for OmniAuth
@@ -114,4 +115,3 @@ test_files:
 - spec/app.rb
 - spec/omniauth/strategies/uber_spec.rb
 - spec/spec_helper.rb
-has_rdoc: