omniauth-google-apps 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/omniauth-google-apps/version.rb +1 -1
  2. data/lib/openid/gapps.rb +16 -12
  3. metadata +17 -17
data/lib/omniauth-google-apps/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Omniauth
2
2
  module GoogleApps
3
- VERSION = "0.0.1"
3
+ VERSION = "0.0.2"
4
4
  end
5
5
  end
data/lib/openid/gapps.rb CHANGED
@@ -7,21 +7,25 @@ module OpenID
7
7
  # we need to monkeypatch it to make it play nicely
8
8
  # with others.
9
9
  def self.discover(uri)
10
- discovered = self.default_discover(uri)
10
+ raise OpenID::DiscoveryFailure.new("No URL Provided", 422) if uri.nil?
11
11
 
12
- if discovered.last.empty?
13
- info = discover_google_apps(uri)
14
- return info if info
15
- end
12
+ begin
13
+ discovered = self.default_discover(uri)
16
14
 
17
- return discovered
18
- rescue OpenID::DiscoveryFailure => e
19
- info = discover_google_apps(uri)
15
+ if discovered.last.empty?
16
+ info = discover_google_apps(uri)
17
+ return info if info
18
+ end
19
+
20
+ return discovered
21
+ rescue OpenID::DiscoveryFailure => e
22
+ info = discover_google_apps(uri)
20
23
 
21
- if info.nil?
22
- raise e
23
- else
24
- return info
24
+ if info.nil?
25
+ raise e
26
+ else
27
+ return info
28
+ end
25
29
  end
26
30
  end
27
31
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omniauth-google-apps
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-20 00:00:00.000000000Z
12
+ date: 2012-05-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: omniauth
16
- requirement: &70161765972780 !ruby/object:Gem::Requirement
16
+ requirement: &70242807704660 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '1.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70161765972780
24
+ version_requirements: *70242807704660
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: omniauth-openid
27
- requirement: &70161765971800 !ruby/object:Gem::Requirement
27
+ requirement: &70242807704180 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70161765971800
35
+ version_requirements: *70242807704180
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: ruby-openid-apps-discovery
38
- requirement: &70161765970260 !ruby/object:Gem::Requirement
38
+ requirement: &70242807703720 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.2.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70161765970260
46
+ version_requirements: *70242807703720
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &70161765969580 !ruby/object:Gem::Requirement
49
+ requirement: &70242807703260 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '2.7'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70161765969580
57
+ version_requirements: *70242807703260
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rack-test
60
- requirement: &70161765968840 !ruby/object:Gem::Requirement
60
+ requirement: &70242807702880 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70161765968840
68
+ version_requirements: *70242807702880
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &70161765968020 !ruby/object:Gem::Requirement
71
+ requirement: &70242807702420 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70161765968020
79
+ version_requirements: *70242807702420
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: webmock
82
- requirement: &70161765967180 !ruby/object:Gem::Requirement
82
+ requirement: &70242807702000 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70161765967180
90
+ version_requirements: *70242807702000
91
91
  description: OmniAuth strategy for Google Apps.
92
92
  email:
93
93
  - yedingding@gmail.com
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
129
129
  version: '0'
130
130
  requirements: []
131
131
  rubyforge_project:
132
- rubygems_version: 1.8.10
132
+ rubygems_version: 1.8.11
133
133
  signing_key:
134
134
  specification_version: 3
135
135
  summary: OmniAuth strategy for Google Apps.