citygate 0.0.4 → 0.0.5

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 (33) hide show
  1. data/README.rdoc +66 -1
  2. data/Rakefile +0 -1
  3. data/app/assets/javascripts/citygate/admin_users.coffee +1 -13
  4. data/app/assets/javascripts/citygate/application.js +3 -2
  5. data/app/assets/javascripts/citygate/jquery.pjax.js +688 -0
  6. data/app/controllers/citygate/admin/application_controller.rb +9 -1
  7. data/app/controllers/citygate/admin/users_controller.rb +1 -1
  8. data/app/controllers/citygate/application_controller.rb +2 -0
  9. data/app/controllers/citygate/users/omniauth_callbacks_controller.rb +10 -8
  10. data/app/controllers/citygate/users_controller.rb +2 -2
  11. data/app/models/citygate/user.rb +8 -1
  12. data/app/views/citygate/admin/users/index.html.erb +12 -1
  13. data/app/views/citygate/admin/users/show.html.erb +4 -2
  14. data/app/views/citygate/shared/_navigation.html.erb +2 -1
  15. data/app/views/citygate/users/show.html.erb +13 -2
  16. data/app/views/{citygate/devise → devise}/_links.erb +0 -0
  17. data/app/views/devise/registrations/edit.html.erb +32 -0
  18. data/app/views/devise/registrations/new.html.erb +18 -0
  19. data/app/views/layouts/admin/application.html.erb +1 -0
  20. data/config/accounts.yml +5 -0
  21. data/config/initializers/01_load_config.rb +1 -0
  22. data/config/initializers/devise.rb +22 -12
  23. data/config/routes.rb +9 -4
  24. data/lib/citygate/engine.rb +15 -1
  25. data/lib/citygate/version.rb +1 -1
  26. data/lib/gravatar.rb +8 -0
  27. metadata +67 -57
  28. data/app/assets/javascripts/citygate/global.coffee +0 -14
  29. data/app/views/citygate/admin/users/_user_show.html.erb +0 -2
  30. data/app/views/citygate/admin/users/_users.html.erb +0 -12
  31. data/app/views/citygate/admin/users/index.js.erb +0 -1
  32. data/app/views/citygate/admin/users/show.js.erb +0 -1
  33. data/app/views/citygate/devise/registrations/edit.html.haml +0 -31
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: citygate
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.0.4
5
+ version: 0.0.5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Group Buddies
@@ -10,14 +10,14 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-05-26 00:00:00 Z
13
+ date: 2012-06-13 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
17
  requirement: &id001 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
- - - ~>
20
+ - - ">="
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.2.2
23
23
  type: :runtime
@@ -35,216 +35,216 @@ dependencies:
35
35
  prerelease: false
36
36
  version_requirements: *id002
37
37
  - !ruby/object:Gem::Dependency
38
- name: devise
38
+ name: devise-encryptable
39
39
  requirement: &id003 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ">="
43
43
  - !ruby/object:Gem::Version
44
- version: 2.0.4
44
+ version: 0.1.1
45
45
  type: :runtime
46
46
  prerelease: false
47
47
  version_requirements: *id003
48
48
  - !ruby/object:Gem::Dependency
49
- name: devise-encryptable
49
+ name: devise_invitable
50
50
  requirement: &id004 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ">="
54
54
  - !ruby/object:Gem::Version
55
- version: 0.1.1
55
+ version: 1.0.0
56
56
  type: :runtime
57
57
  prerelease: false
58
58
  version_requirements: *id004
59
59
  - !ruby/object:Gem::Dependency
60
- name: devise_invitable
60
+ name: omniauth
61
61
  requirement: &id005 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
- - - ">="
64
+ - - ~>
65
65
  - !ruby/object:Gem::Version
66
- version: 1.0.0
66
+ version: 1.0.2
67
67
  type: :runtime
68
68
  prerelease: false
69
69
  version_requirements: *id005
70
70
  - !ruby/object:Gem::Dependency
71
- name: omniauth
71
+ name: omniauth-facebook
72
72
  requirement: &id006 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.0.2
77
+ version: 1.2.0
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: *id006
81
81
  - !ruby/object:Gem::Dependency
82
- name: omniauth-facebook
82
+ name: omniauth-openid
83
83
  requirement: &id007 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
87
87
  - !ruby/object:Gem::Version
88
- version: 1.2.0
88
+ version: 1.0.1
89
89
  type: :runtime
90
90
  prerelease: false
91
91
  version_requirements: *id007
92
92
  - !ruby/object:Gem::Dependency
93
- name: omniauth-openid
93
+ name: uuidtools
94
94
  requirement: &id008 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
- - - ~>
97
+ - - ">="
98
98
  - !ruby/object:Gem::Version
99
- version: 1.0.1
99
+ version: 2.1.2
100
100
  type: :runtime
101
101
  prerelease: false
102
102
  version_requirements: *id008
103
103
  - !ruby/object:Gem::Dependency
104
- name: uuidtools
104
+ name: will_paginate
105
105
  requirement: &id009 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: 2.1.2
110
+ version: 3.0.3
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: *id009
114
114
  - !ruby/object:Gem::Dependency
115
- name: will_paginate
115
+ name: cancan
116
116
  requirement: &id010 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ">="
120
120
  - !ruby/object:Gem::Version
121
- version: 3.0.3
121
+ version: 1.6.7
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: *id010
125
125
  - !ruby/object:Gem::Dependency
126
- name: cancan
126
+ name: thin
127
127
  requirement: &id011 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ">="
131
131
  - !ruby/object:Gem::Version
132
- version: 1.6.7
133
- type: :runtime
132
+ version: 1.3.1
133
+ type: :development
134
134
  prerelease: false
135
135
  version_requirements: *id011
136
136
  - !ruby/object:Gem::Dependency
137
- name: thin
137
+ name: haml-rails
138
138
  requirement: &id012 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ">="
142
142
  - !ruby/object:Gem::Version
143
- version: 1.3.1
143
+ version: 0.3.4
144
144
  type: :development
145
145
  prerelease: false
146
146
  version_requirements: *id012
147
147
  - !ruby/object:Gem::Dependency
148
- name: haml-rails
148
+ name: rspec-rails
149
149
  requirement: &id013 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ">="
153
153
  - !ruby/object:Gem::Version
154
- version: 0.3.4
154
+ version: 2.8.1
155
155
  type: :development
156
156
  prerelease: false
157
157
  version_requirements: *id013
158
158
  - !ruby/object:Gem::Dependency
159
- name: rspec-rails
159
+ name: email_spec
160
160
  requirement: &id014 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ">="
164
164
  - !ruby/object:Gem::Version
165
- version: 2.8.1
165
+ version: 1.2.1
166
166
  type: :development
167
167
  prerelease: false
168
168
  version_requirements: *id014
169
169
  - !ruby/object:Gem::Dependency
170
- name: email_spec
170
+ name: factory_girl
171
171
  requirement: &id015 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
- - - ">="
174
+ - - "="
175
175
  - !ruby/object:Gem::Version
176
- version: 1.2.1
176
+ version: 2.6.4
177
177
  type: :development
178
178
  prerelease: false
179
179
  version_requirements: *id015
180
180
  - !ruby/object:Gem::Dependency
181
- name: factory_girl
181
+ name: cucumber-rails
182
182
  requirement: &id016 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
- - - "="
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
- version: 2.6.4
187
+ version: 1.3.0
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: *id016
191
191
  - !ruby/object:Gem::Dependency
192
- name: cucumber-rails
192
+ name: capybara
193
193
  requirement: &id017 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ">="
197
197
  - !ruby/object:Gem::Version
198
- version: 1.3.0
198
+ version: 1.1.2
199
199
  type: :development
200
200
  prerelease: false
201
201
  version_requirements: *id017
202
202
  - !ruby/object:Gem::Dependency
203
- name: capybara
203
+ name: database_cleaner
204
204
  requirement: &id018 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ">="
208
208
  - !ruby/object:Gem::Version
209
- version: 1.1.2
209
+ version: 0.7.1
210
210
  type: :development
211
211
  prerelease: false
212
212
  version_requirements: *id018
213
213
  - !ruby/object:Gem::Dependency
214
- name: database_cleaner
214
+ name: launchy
215
215
  requirement: &id019 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ">="
219
219
  - !ruby/object:Gem::Version
220
- version: 0.7.1
220
+ version: 2.0.5
221
221
  type: :development
222
222
  prerelease: false
223
223
  version_requirements: *id019
224
224
  - !ruby/object:Gem::Dependency
225
- name: launchy
225
+ name: jasmine-rails
226
226
  requirement: &id020 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ">="
230
230
  - !ruby/object:Gem::Version
231
- version: 2.0.5
231
+ version: 0.0.3
232
232
  type: :development
233
233
  prerelease: false
234
234
  version_requirements: *id020
235
235
  - !ruby/object:Gem::Dependency
236
- name: jasmine-rails
236
+ name: jasmine-jquery-rails
237
237
  requirement: &id021 !ruby/object:Gem::Requirement
238
238
  none: false
239
239
  requirements:
240
240
  - - ">="
241
241
  - !ruby/object:Gem::Version
242
- version: 0.0.3
242
+ version: "0"
243
243
  type: :development
244
244
  prerelease: false
245
245
  version_requirements: *id021
246
246
  - !ruby/object:Gem::Dependency
247
- name: jasmine-jquery-rails
247
+ name: capybara-webkit
248
248
  requirement: &id022 !ruby/object:Gem::Requirement
249
249
  none: false
250
250
  requirements:
@@ -254,6 +254,17 @@ dependencies:
254
254
  type: :development
255
255
  prerelease: false
256
256
  version_requirements: *id022
257
+ - !ruby/object:Gem::Dependency
258
+ name: headless
259
+ requirement: &id023 !ruby/object:Gem::Requirement
260
+ none: false
261
+ requirements:
262
+ - - ">="
263
+ - !ruby/object:Gem::Version
264
+ version: "0"
265
+ type: :development
266
+ prerelease: false
267
+ version_requirements: *id023
257
268
  description: Citygate is an Engine that provides user model with sign up and log in, admin backend for managing users.
258
269
  email:
259
270
  - zamith@groupbuddies.com
@@ -266,7 +277,7 @@ extra_rdoc_files: []
266
277
  files:
267
278
  - app/assets/javascripts/citygate/admin_users.coffee
268
279
  - app/assets/javascripts/citygate/application.js
269
- - app/assets/javascripts/citygate/global.coffee
280
+ - app/assets/javascripts/citygate/jquery.pjax.js
270
281
  - app/assets/stylesheets/citygate/application.css.scss
271
282
  - app/assets/stylesheets/citygate/main.sass
272
283
  - app/controllers/citygate/admin/application_controller.rb
@@ -280,20 +291,19 @@ files:
280
291
  - app/models/citygate/authorization.rb
281
292
  - app/models/citygate/role.rb
282
293
  - app/models/citygate/user.rb
283
- - app/views/citygate/admin/users/_user_show.html.erb
284
- - app/views/citygate/admin/users/_users.html.erb
285
294
  - app/views/citygate/admin/users/index.html.erb
286
- - app/views/citygate/admin/users/index.js.erb
287
295
  - app/views/citygate/admin/users/show.html.erb
288
- - app/views/citygate/admin/users/show.js.erb
289
- - app/views/citygate/devise/_links.erb
290
- - app/views/citygate/devise/registrations/edit.html.haml
291
296
  - app/views/citygate/home/index.html.erb
292
297
  - app/views/citygate/shared/_navigation.html.erb
293
298
  - app/views/citygate/users/show.html.erb
299
+ - app/views/devise/_links.erb
300
+ - app/views/devise/registrations/edit.html.erb
301
+ - app/views/devise/registrations/new.html.erb
294
302
  - app/views/layouts/admin/application.html.erb
295
303
  - app/views/layouts/application.html.erb
304
+ - config/accounts.yml
296
305
  - config/cucumber.yml
306
+ - config/initializers/01_load_config.rb
297
307
  - config/initializers/devise.rb
298
308
  - config/locales/devise.en.yml
299
309
  - config/locales/devise_invitable.en.yml
@@ -328,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
328
338
  requirements:
329
339
  - - ">="
330
340
  - !ruby/object:Gem::Version
331
- hash: 1496931421819216404
341
+ hash: 3837049485322413981
332
342
  segments:
333
343
  - 0
334
344
  version: "0"
@@ -337,14 +347,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
337
347
  requirements:
338
348
  - - ">="
339
349
  - !ruby/object:Gem::Version
340
- hash: 1496931421819216404
350
+ hash: 3837049485322413981
341
351
  segments:
342
352
  - 0
343
353
  version: "0"
344
354
  requirements: []
345
355
 
346
356
  rubyforge_project:
347
- rubygems_version: 1.8.24
357
+ rubygems_version: 1.8.5
348
358
  signing_key:
349
359
  specification_version: 3
350
360
  summary: Simple authentication and user management Engine.
@@ -1,14 +0,0 @@
1
- $ ->
2
- # Is triggered every time the user clicks the browser's back button or at page load (except for firefox)
3
- window.onpopstate = (event) ->
4
- # If there is a state on the stack use to populate the container
5
- $(event.state.holder).html(event.state.html) if event.state?
6
-
7
- # Helper to build the state JSON object
8
- buildState = ->
9
- {
10
- html: $("#container").html(),
11
- holder: "#container",
12
- page: window.location.href
13
- }
14
-
@@ -1,2 +0,0 @@
1
- <p>User: <%= @user.name %></p>
2
- <p>Email: <%= @user.email if @user.email %></p>
@@ -1,12 +0,0 @@
1
- <% @users.each do |user| %>
2
- <div class="user">
3
- <span class="email"><%= user.email %></span>
4
- <%= content_tag(:span, user.name) if user.name %>
5
- <div class="user-links">
6
- <%= link_to "Show", admin_user_path(user), :class => "show-link" %>
7
- <%= link_to "Edit", edit_admin_user_path(user), :class => "edit-link" if can? :update, user %>
8
- </div>
9
- </div>
10
- <% end %>
11
-
12
- <%= will_paginate @users %>
@@ -1 +0,0 @@
1
- $("#users").html("<%= escape_javascript(render("users")) %>");
@@ -1 +0,0 @@
1
- $("#container").html("<%= escape_javascript(render("user_show")) %>");
@@ -1,31 +0,0 @@
1
- %h2
2
- Edit #{resource_name.to_s.humanize}
3
- = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
4
- = devise_error_messages!
5
- %p
6
- = f.label :name
7
- %br/
8
- = f.text_field :name
9
- %p
10
- = f.label :email
11
- %br/
12
- = f.email_field :email
13
- %p
14
- = f.label :password
15
- %i (leave blank if you don't want to change it)
16
- %br/
17
- = f.password_field :password
18
- %p
19
- = f.label :password_confirmation
20
- %br/
21
- = f.password_field :password_confirmation
22
- %p
23
- = f.label :current_password
24
- %i (we need your current password to confirm your changes)
25
- %br/
26
- = f.password_field :current_password
27
- %p= f.submit "Update"
28
- %h3 Cancel my account
29
- %p
30
- Unhappy? #{link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete}.
31
- = link_to "Back", :back