omniauth-github 1.0.2 → 1.0.3

data/Rakefile

@@ -2,10 +2,6 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-desc 'Default: run specs.'
-task :default => :spec
-
-desc "Run specs"
 RSpec::Core::RakeTask.new
 
 desc 'Run specs'

data/lib/omniauth-github/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GitHub
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/omniauth/strategies/github.rb

@@ -13,7 +13,7 @@ module OmniAuth
         super
       end
 
-      uid { raw_info['id'] }
+      uid { raw_info['id'].to_s }
 
       info do
         {
@@ -38,13 +38,18 @@ module OmniAuth
       end
 
       def email
-        raw_info['email'] || emails.first
+        raw_info['email'] || (email_access_allowed? ? emails.first : nil)
       end
 
       def emails
         access_token.options[:mode] = :query
         @emails ||= access_token.get('/user/emails').parsed
       end
+
+      def email_access_allowed?
+        options['scope'] && !(options['scope'] == 'public')
+      end
+
     end
   end
 end

data/spec/omniauth/strategies/github_spec.rb

@@ -18,4 +18,51 @@ describe OmniAuth::Strategies::GitHub do
       subject.options.client_options.token_url.should eq('https://github.com/login/oauth/access_token')
     end
   end
+
+  context "#email_access_allowed?" do
+    it "should not allow email if scope is nil" do
+      subject.options['scope'].should be_nil
+      subject.should_not be_email_access_allowed
+    end
+
+    it "should not allow email if scope is 'public'" do
+      subject.options['scope'] = 'public'
+      subject.should_not be_email_access_allowed
+    end
+
+    it "should allow email if scope is user" do
+      subject.options['scope'] = 'user'
+      subject.should be_email_access_allowed
+    end
+
+    it "should allow email if scope is scope is a bunch of stuff" do
+      subject.options['scope'] = 'user,public_repo,repo,delete_repo,gist'
+      subject.should be_email_access_allowed
+    end
+
+    it "should assume email access allowed if scope is scope is something currently not documented " do
+      subject.options['scope'] = 'currently_not_documented'
+      subject.should be_email_access_allowed
+    end
+  end
+
+  context "#email" do
+    it "should return email from raw_info if available" do
+      subject.stub!(:raw_info).and_return({'email' => 'you@example.com'})
+      subject.email.should eq('you@example.com')
+    end
+
+    it "should return nil if there is no raw_info and email access is not allowed" do
+      subject.stub!(:raw_info).and_return({})
+      subject.email.should be_nil
+    end
+
+    it "should return the first email if there is no raw_info and email access is allowed" do
+      subject.stub!(:raw_info).and_return({})
+      subject.options['scope'] = 'user'
+      subject.stub!(:emails).and_return([ 'you@example.com' ])
+      subject.email.should eq('you@example.com')
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-github
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth