omniauth-foursquare 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1862f1140a1e4b8b02305c144ddc2c96448f768c
-  data.tar.gz: cfe6b0b177ea5c32a92a0300915d9af422f238ed
+  metadata.gz: 4e4bdb46a5b1a4e1c0f5d517a64a16dfabc5e8bf
+  data.tar.gz: 2bf0da1f827a3e8d4ce1c3a89f317f7df1d4530b
 SHA512:
-  metadata.gz: 682dbe96f17ce36455ca62cea90a957bfee28c9e0c013d6555ca121c8190280e6a936f18c8824d34f410f5409378dea2646620893ea7cae2cf169b0708cf080f
-  data.tar.gz: 96251276c915d790998867689955f3f474fa7a4132bf1d2892d719cbe434127ffb14d3fe2b088aec6abc0fea23475a0a8cbc819e60ccc9f3c0c660df7ddfd404
+  metadata.gz: 85981ba234b5d03f4e475369bb09b98d07f4006ffb591a3d120134d30fd71e109327cbb47f9ca77b1b7fbb3d36052317b47f20cab11dc79707889c4eba2e3c50
+  data.tar.gz: 112d18cdca871b8a34c6409d0af88cc40bf662ad449733b22f0790c98d101bc76776f2ed7382f4bad535c8d6296c2f7996734267497e243e3a52c7b3b7d09145

data/README.md

@@ -39,4 +39,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/arunagw/omniauth-foursquare/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/omniauth-foursquare/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Foursquare
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/omniauth/strategies/foursquare.rb

@@ -8,20 +8,22 @@ module OmniAuth
         :authorize_url => '/oauth2/authenticate',
         :token_url => '/oauth2/access_token'
       }
-      
+
       uid { raw_info['id'] }
-      
+
       info do
         {
-          :first_name => raw_info['firstName'], 
-          :last_name  => raw_info['lastName'],
-          :name       => raw_info['name'],
-          :email      => (raw_info['contact'] || {})['email'],
-          :image      => raw_info['photo'],
-          :location   => raw_info['homeCity']
+          :first_name  => raw_info['firstName'],
+          :last_name   => raw_info['lastName'],
+          :name        => "#{raw_info['firstName']} #{raw_info['lastName']}",
+          :email       => (raw_info['contact'] || {})['email'],
+          :phone       => (raw_info['contact'] || {})['phone'],
+          :image       => raw_info['photo'],
+          :location    => raw_info['homeCity'],
+          :description => raw_info['bio']
         }
       end
-      
+
       extra do
         { :raw_info => raw_info }
       end
@@ -30,20 +32,20 @@ module OmniAuth
         options[:authorize_params] = client_params.merge(options[:authorize_params])
         super
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, client_params.merge({
           :grant_type => 'authorization_code'}))
       end
-      
+
       def raw_info
         access_token.options[:mode] = :query
         access_token.options[:param_name] = :oauth_token
         @raw_info ||= access_token.get('https://api.foursquare.com/v2/users/self?v=20140128').parsed['response']['user']
       end
-      
+
       private
-      
+
       def client_params
         {:client_id => options[:client_id], :redirect_uri => callback_url ,:response_type => "code"}
       end

data/spec/omniauth/strategies/foursquare_spec.rb

@@ -6,7 +6,7 @@ describe OmniAuth::Strategies::Foursquare do
     @request = double('Request')
     @request.stub(:params) { {} }
   end
-  
+
   subject do
     OmniAuth::Strategies::Foursquare.new(nil, @options || {}).tap do |strategy|
       strategy.stub(:request) { @request }
@@ -32,27 +32,28 @@ describe OmniAuth::Strategies::Foursquare do
   describe '#info' do
     before :each do
       @raw_info = {
-        'name' => 'Sir Fred Smith',
         'firstName' => 'Fred',
         'lastName' => 'Smith',
         'contact' => {
-          'email' => 'fred@example.com'
+          'email' => 'fred@example.com',
+          'phone' => '+1 555 555-5555',
         },
         'photo' => 'https://img-s.foursquare.com/userpix_thumbs/blank_boy.jpg',
-        'homeCity' => 'Chicago'
+        'homeCity' => 'Chicago',
+        'bio' => 'I am a guy from Chicago.'
       }
       subject.stub(:raw_info) { @raw_info }
     end
-    
+
     context 'when data is present in raw info' do
       it 'returns the combined name' do
-        subject.info[:name].should eq('Sir Fred Smith')
+        subject.info[:name].should eq('Fred Smith')
       end
 
       it 'returns the first name' do
         subject.info[:first_name].should eq('Fred')
       end
-    
+
       it 'returns the last name' do
         subject.info[:last_name].should eq('Smith')
       end
@@ -61,6 +62,10 @@ describe OmniAuth::Strategies::Foursquare do
         subject.info[:email].should eq('fred@example.com')
       end
 
+      it 'returns the phone number' do
+        subject.info[:phone].should eq('+1 555 555-5555')
+      end
+
       it "sets the email blank if contact block is missing in raw_info" do
         @raw_info.delete('contact')
         subject.info[:email].should be_nil
@@ -73,9 +78,13 @@ describe OmniAuth::Strategies::Foursquare do
       it 'returns the user location' do
         subject.info[:location].should eq('Chicago')
       end
+
+      it 'returns the user description' do
+        subject.info[:description].should eq('I am a guy from Chicago.')
+      end
     end
   end
-  
+
   describe '#credentials' do
     before :each do
       @access_token = double('OAuth2::AccessToken')
@@ -85,24 +94,24 @@ describe OmniAuth::Strategies::Foursquare do
       @access_token.stub(:refresh_token)
       subject.stub(:access_token) { @access_token }
     end
-    
+
     it 'returns a Hash' do
       subject.credentials.should be_a(Hash)
     end
-    
+
     it 'returns the token' do
       @access_token.stub(:token) { '123' }
       subject.credentials['token'].should eq('123')
     end
-    
+
     it 'returns the expiry status' do
       @access_token.stub(:expires?) { true }
       subject.credentials['expires'].should eq(true)
-      
+
       @access_token.stub(:expires?) { false }
       subject.credentials['expires'].should eq(false)
     end
-    
+
     it 'returns the refresh token and expiry time when expiring' do
       ten_mins_from_now = (Time.now + 360).to_i
       @access_token.stub(:expires?) { true }
@@ -111,14 +120,14 @@ describe OmniAuth::Strategies::Foursquare do
       subject.credentials['refresh_token'].should eq('321')
       subject.credentials['expires_at'].should eq(ten_mins_from_now)
     end
-    
+
     it 'does not return the refresh token when it is nil and expiring' do
       @access_token.stub(:expires?) { true }
       @access_token.stub(:refresh_token) { nil }
       subject.credentials['refresh_token'].should be_nil
       subject.credentials.should_not have_key('refresh_token')
     end
-    
+
     it 'does not return the refresh token when not expiring' do
       @access_token.stub(:expires?) { false }
       @access_token.stub(:refresh_token) { 'XXX' }

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-foursquare
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Arun Agrawal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Foursquare OAuth strategy for OmniAuth
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -123,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omniauth-foursquare
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Foursquare OAuth strategy for OmniAuth