authorizme 0.0.5 → 0.0.6

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 (6) hide show
  1. data/CHANGELOG.md +16 -0
  2. data/README.md +2 -0
  3. data/app/controllers/authorizme/authorizme_controller.rb +7 -0
  4. data/lib/authorizme/for_controllers.rb +8 -2
  5. data/lib/authorizme/version.rb +1 -1
  6. metadata +36 -30
data/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ ## 0.0.6
2
+
3
+ ### Features & Enhancements
4
+
5
+ * Synchronize without SynchronizeRequest
6
+
7
+ ### Bug Fixes
8
+
9
+ * Fix error with stack level too deep when synchronize 2 equal users
10
+
11
+ ## 0.0.5
12
+
13
+ ### Bug Fixes
14
+
15
+ * Errors on synchronize
16
+
1
17
  ## 0.0.4
2
18
 
3
19
  ### Features & Enhancements
data/README.md CHANGED
@@ -48,6 +48,8 @@ Also you can set roles. Just add some roles in Role model and then set it to use
48
48
 
49
49
  You can sync your accounts. If user login with another provider on existing user session, then plugin will set synchronize request. You can call `has_synchronize_request?` and check if there's any new request. Then you can call 'synchronize(user)' to user model.
50
50
 
51
+ Also you can use synchronize without requests (synchronous synchronize). Just add get param `synchronize=true` in login url (e.c. /authorizme/login/twitter?synchronize=true).
52
+
51
53
  #### Custom provider callback view
52
54
 
53
55
  By default providers use callback view which require JQuery and require `eventBus` in `window` dom element:
data/app/controllers/authorizme/authorizme_controller.rb CHANGED
@@ -2,12 +2,19 @@ module Authorizme
2
2
  class AuthorizmeController < ::ApplicationController
3
3
  respond_to :html, :json, :xml
4
4
  layout "authorizme/layouts/popup"
5
+ before_filter :check_synchronize, :only => [:auth]
5
6
 
6
7
  def index
7
8
  @user = current_user
8
9
  end
9
10
 
10
11
  protected
12
+
13
+ def check_synchronize
14
+ if params[:synchronize]
15
+ session[:synchronize] = true
16
+ end
17
+ end
11
18
 
12
19
  def logout
13
20
  session[:user_id] = nil
data/lib/authorizme/for_controllers.rb CHANGED
@@ -17,8 +17,14 @@ module Authorizme
17
17
  end
18
18
 
19
19
  def login user
20
- if current_user
21
- SynchronizeRequest.create!({user: current_user, requested_user: user})
20
+ if current_user && current_user.id != user.id
21
+ if session[:synchronize]
22
+ SynchronizeRequest.create!({user: current_user, requested_user: user, status: "accepted"})
23
+ current_user.synchronize user
24
+ session[:synchronize] = nil
25
+ else
26
+ SynchronizeRequest.create!({user: current_user, requested_user: user})
27
+ end
22
28
  else
23
29
  session[:user_id] = user.id
24
30
  end
data/lib/authorizme/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Authorizme
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: authorizme
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-04-05 00:00:00.000000000 Z
13
+ date: 2012-05-30 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rake
17
- requirement: &80195890 !ruby/object:Gem::Requirement
17
+ requirement: &80691990 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :development
24
24
  prerelease: false
25
- version_requirements: *80195890
25
+ version_requirements: *80691990
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: rspec
28
- requirement: &80195680 !ruby/object:Gem::Requirement
28
+ requirement: &80790180 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
- version_requirements: *80195680
36
+ version_requirements: *80790180
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rspec-rails
39
- requirement: &80195470 !ruby/object:Gem::Requirement
39
+ requirement: &80789800 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *80195470
47
+ version_requirements: *80789800
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: webrat
50
- requirement: &80195260 !ruby/object:Gem::Requirement
50
+ requirement: &80789480 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *80195260
58
+ version_requirements: *80789480
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: capybara
61
- requirement: &80195050 !ruby/object:Gem::Requirement
61
+ requirement: &80789020 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *80195050
69
+ version_requirements: *80789020
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl_rails
72
- requirement: &80194840 !ruby/object:Gem::Requirement
72
+ requirement: &80788440 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *80194840
80
+ version_requirements: *80788440
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: activesupport
83
- requirement: &80194630 !ruby/object:Gem::Requirement
83
+ requirement: &80788040 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :runtime
90
90
  prerelease: false
91
- version_requirements: *80194630
91
+ version_requirements: *80788040
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: rails
94
- requirement: &80194420 !ruby/object:Gem::Requirement
94
+ requirement: &80787420 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :runtime
101
101
  prerelease: false
102
- version_requirements: *80194420
102
+ version_requirements: *80787420
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: bcrypt-ruby
105
- requirement: &80194210 !ruby/object:Gem::Requirement
105
+ requirement: &80786710 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :runtime
112
112
  prerelease: false
113
- version_requirements: *80194210
113
+ version_requirements: *80786710
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: json
116
- requirement: &80194000 !ruby/object:Gem::Requirement
116
+ requirement: &80785840 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :runtime
123
123
  prerelease: false
124
- version_requirements: *80194000
124
+ version_requirements: *80785840
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: twitter_oauth
127
- requirement: &80193790 !ruby/object:Gem::Requirement
127
+ requirement: &80785380 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :runtime
134
134
  prerelease: false
135
- version_requirements: *80193790
135
+ version_requirements: *80785380
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: twitter
138
- requirement: &80193580 !ruby/object:Gem::Requirement
138
+ requirement: &80784810 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *80193580
146
+ version_requirements: *80784810
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: oauth2
149
- requirement: &80193370 !ruby/object:Gem::Requirement
149
+ requirement: &80784220 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *80193370
157
+ version_requirements: *80784220
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: fbgraph
160
- requirement: &80193160 !ruby/object:Gem::Requirement
160
+ requirement: &80783630 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
165
165
  version: '0'
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *80193160
168
+ version_requirements: *80783630
169
169
  description: Authorization that includes basic authorization and 3 social authorization
170
170
  with Latvia social network draugiem.lv, facebook.com and twitter.com.
171
171
  email:
@@ -235,12 +235,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
235
235
  - - ! '>='
236
236
  - !ruby/object:Gem::Version
237
237
  version: '0'
238
+ segments:
239
+ - 0
240
+ hash: 518828113
238
241
  required_rubygems_version: !ruby/object:Gem::Requirement
239
242
  none: false
240
243
  requirements:
241
244
  - - ! '>='
242
245
  - !ruby/object:Gem::Version
243
246
  version: '0'
247
+ segments:
248
+ - 0
249
+ hash: 518828113
244
250
  requirements: []
245
251
  rubyforge_project: authorizme
246
252
  rubygems_version: 1.8.15