omniauth-angellist 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjFiNWM0NjhlYTExMzllZDczM2VkMmQzNWIwZmIwNGY4ZmY1MzJiYg==
-  data.tar.gz: !binary |-
-    ZmVhMjg0NjMzNTE3NmJjYTExZGFjZjNhNmJjNDE0YjBhYzg0NmRlYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjRlN2MyZWNmNjk1MGVkNWFhZjMxZDY4MDc3M2UzNDc3YWFmYTU3YjljMzdj
-    MzI2MzlkOWM4YjBhMjg1Y2MyNDgwZjVlNmJkODkyZDI2MGMwYjU3Mzg2ZmUy
-    OGUyMDg3ZWVjNmRkMWU0YmJiYWU2MWY0YjRjOWRjNTkyMzg4MGM=
-  data.tar.gz: !binary |-
-    NmI5MWU1OWFjMWU3YjZlODQ3NGY1YWU3MDA2NGFkYTI0OWE1NGFlYzc5Y2Qx
-    ZmRiMjg3OWNlN2E0MTcyY2E3MjhkZTRkYWQ5MTVkOTM0MTg4MjUzMjliNTUy
-    MTczY2JjMGRmZTgyY2ViMGFmZTM0N2M1YTJjNzFiN2RjYWI0Zjg=
+SHA1:
+  metadata.gz: 5d02de312e74a1c39067c64ec3795cce577d54e1
+  data.tar.gz: 461c3811dd49d2676db0b94c6b9416195b43bdad
+SHA512:
+  metadata.gz: 3575930f7915ae7b4c22d559da759e184ded99fe4dc0e36aa34a511604072bcb192c0aa5e49d87bf52ed2e8ef318adf358eb41404b7bd3f4fc5017789dcdc349
+  data.tar.gz: 767c0b1577b289ffe97e83f9df7b2b79ccef1f1e88963642491d5664d6fec051bce2334c017eb9af277f3124399164f7f9f002e4997acbdbc4b9f9c3671ba971

data/lib/omniauth-angellist/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module AngelList
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/omniauth/strategies/angellist.rb

@@ -25,7 +25,7 @@ module OmniAuth
       uid { raw_info['id'] }
 
       info do
-        {
+        prune!({
           "name" => raw_info["name"],
           "email" => raw_info["email"],
           "bio" => raw_info["bio"],
@@ -40,13 +40,25 @@ module OmniAuth
           "roles" => raw_info["roles"],
           "angellist_url" => raw_info["angellist_url"],
           "image" => raw_info["image"],
-          "skills" => raw_info["skills"],
-          "scopes" => raw_info["scopes"]
-        }
+          "skills" => raw_info["skills"]
+        })
+      end
+
+      credentials do
+        hash = {'token' => access_token.token}
+        hash.merge!('refresh_token' => access_token.refresh_token) if access_token.expires? && access_token.refresh_token
+        hash.merge!('expires_at' => access_token.expires_at) if access_token.expires?
+        hash.merge!('expires' => access_token.expires?)
+        hash.merge!('scope' => raw_info["scopes"] ? raw_info["scopes"].join(" ") : nil)
+        prune!(hash)
       end
 
       def raw_info
-        @raw_info ||= access_token.get('https://api.angel.co/1/me').parsed
+        unless skip_info?
+          @raw_info ||= access_token.get('https://api.angel.co/1/me').parsed
+        else
+          {}
+        end
       end
 
       def authorize_params
@@ -63,8 +75,16 @@ module OmniAuth
           params[:scope] ||= DEFAULT_SCOPE
         end
       end
+
+    private
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
     end
   end
 end
 
-OmniAuth.config.add_camelization 'angellist', 'AngelList'
+OmniAuth.config.add_camelization 'angellist', 'AngelList'

data/spec/omniauth/strategies/angellist_spec.rb

@@ -7,8 +7,41 @@ describe OmniAuth::Strategies::AngelList do
     @request.stub(:params) { {} }
     @client_id = '123'
     @client_secret = 'afalsf'
+    @raw_info = {
+      'name' => 'Sebastian Rabuini',
+      'email' => 'sebas@wasabit.com.ar',
+      'bio' => 'Sebas',
+      'blog_url' => 'sebas_blog',
+      'online_bio_url' => 'http://wasabitlabs.com',
+      'twitter_url' => 'http://twitter.com/#!/sebasr',
+      'facebook_url' => 'http://www.facebook.com/sebastian.rabuini',
+      'linkedin_url' => 'http://www.linkedin.com/in/srabuini',
+      'follower_count' => 6,
+      'investor' => false,
+      'locations' => [
+        {'id' => 1963, 'tag_type' => 'LocationTag', 'name' => 'buenos aires',
+          'display_name' => 'Buenos Aires',
+          'angellist_url' => 'https://angel.co/buenos-aires'}
+      ],
+      'roles' => [
+        {'id' => 14726, 'tag_type' => 'RoleTag', 'name' => 'developer',
+          'display_name' => 'Developer',
+          'angellist_url' => 'https://angel.co/developer'},
+        {'id' => 14725, 'tag_type' => 'RoleTag', 'name' => 'entrepreneur',
+          'display_name' => 'Entrepreneur',
+          'angellist_url' => 'https://angel.co/entrepreneur-1'}
+      ],
+      'skills' => [
+        {"id" => 82532, "tag_type" => "SkillTag", "name" => "ruby on rails",
+          "display_name" => "Ruby on Rails",
+          "angellist_url" => "https://angel.co/ruby-on-rails-1"}
+      ],
+      'scopes' => ["email","comment","message","talent"],
+      'angellist_url' => 'https://angel.co/sebasr',
+      'image' => 'https://s3.amazonaws.com/photos.angel.co/users/90585-medium_jpg?1327684569'
+    }
   end
-  
+
   subject do
     args = [@client_id, @client_secret, @options].compact
     OmniAuth::Strategies::AngelList.new(nil, *args).tap do |strategy|
@@ -34,42 +67,9 @@ describe OmniAuth::Strategies::AngelList do
 
   describe '#info' do
     before :each do
-      @raw_info = {
-        'name' => 'Sebastian Rabuini',
-        'email' => 'sebas@wasabit.com.ar',
-        'bio' => 'Sebas',
-        'blog_url' => 'sebas_blog',
-        'online_bio_url' => 'http://wasabitlabs.com',
-        'twitter_url' => 'http://twitter.com/#!/sebasr',
-        'facebook_url' => 'http://www.facebook.com/sebastian.rabuini',
-        'linkedin_url' => 'http://www.linkedin.com/in/srabuini',
-        'follower_count' => 6,
-        'investor' => false,
-        'locations' => [
-          {'id' => 1963, 'tag_type' => 'LocationTag', 'name' => 'buenos aires',
-            'display_name' => 'Buenos Aires',
-            'angellist_url' => 'https://angel.co/buenos-aires'}
-        ],
-        'roles' => [
-          {'id' => 14726, 'tag_type' => 'RoleTag', 'name' => 'developer',
-            'display_name' => 'Developer',
-            'angellist_url' => 'https://angel.co/developer'},
-          {'id' => 14725, 'tag_type' => 'RoleTag', 'name' => 'entrepreneur',
-            'display_name' => 'Entrepreneur',
-            'angellist_url' => 'https://angel.co/entrepreneur-1'}
-        ],
-        'skills' => [
-          {"id" => 82532, "tag_type" => "SkillTag", "name" => "ruby on rails",
-            "display_name" => "Ruby on Rails",
-            "angellist_url" => "https://angel.co/ruby-on-rails-1"}
-        ],
-        'scopes' => ["email","comment","message","talent"],
-        'angellist_url' => 'https://angel.co/sebasr',
-        'image' => 'https://s3.amazonaws.com/photos.angel.co/users/90585-medium_jpg?1327684569'
-      }
       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('Sebastian Rabuini')
@@ -78,7 +78,7 @@ describe OmniAuth::Strategies::AngelList do
       it 'returns the bio' do
         subject.info['bio'].should eq('Sebas')
       end
-    
+
       it 'returns the image' do
         subject.info['image'].should eq(@raw_info['image'])
       end
@@ -87,10 +87,6 @@ describe OmniAuth::Strategies::AngelList do
         subject.info['email'].should eq('sebas@wasabit.com.ar')
       end
 
-      it "return scopes" do
-        subject.info['scopes'].should eq(["email","comment","message","talent"])
-      end
-
       it "return skills" do
         subject.info['skills'].first['name'].should eq("ruby on rails")
       end
@@ -106,34 +102,38 @@ describe OmniAuth::Strategies::AngelList do
       subject.authorize_params['scope'].should eq('email')
     end
   end
-  
+
   describe '#credentials' do
     before :each do
       @access_token = double('OAuth2::AccessToken')
-      @access_token.stub(:token)
+      @access_token.stub(:token) { '123' } # Token is always required
       @access_token.stub(:expires?)
       @access_token.stub(:expires_at)
       @access_token.stub(:refresh_token)
       subject.stub(:access_token) { @access_token }
+      subject.stub(:raw_info) { @raw_info }
     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 "return scopes" do
+      subject.credentials['scope'].should eq("email comment message talent")
+    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 }
@@ -142,14 +142,14 @@ describe OmniAuth::Strategies::AngelList 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' }
@@ -157,4 +157,4 @@ describe OmniAuth::Strategies::AngelList do
       subject.credentials.should_not have_key('refresh_token')
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-angellist
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sebastian Rabuini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -42,42 +42,42 @@ dependencies:
   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: AngelList OAuth strategy for OmniAuth
@@ -107,12 +107,12 @@ 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: []