contour 2.2.1 → 2.3.0.beta1

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +13 -0
  3. data/app/controllers/contour/registrations_controller.rb +5 -5
  4. data/contour.gemspec +2 -2
  5. data/lib/contour/version.rb +3 -3
  6. data/test/dummy/config/initializers/devise.rb +2 -0
  7. data/test/dummy/db/test.sqlite3 +0 -0
  8. metadata +55 -55
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 74ffda46176e431b726aa9226da37ee4151dabeb
4
- data.tar.gz: 0884c25480a291e89075a4c7c5d25feb289a2993
3
+ metadata.gz: 78df0d8085a651b875010979f87cd72ffd584952
4
+ data.tar.gz: 513fb35a255c0c3cc793aa83d55cd522fd5365c8
5
5
  SHA512:
6
- metadata.gz: a22af3196b3634ed42a57c79b09390b1204a0acef942cfa8080d112ec48e701af3c8fd45c31ab341239f7a3e9e35b6191909208bf3124c498b199c228eac2b15
7
- data.tar.gz: ead3e287a4f3e41f254f7a402288cf1568009a6ba85b2834254d2d64d8c46a987651c0acef5ec9ad6d0d8691a8d49397f66c3dfe20ffd462e70925634964e324
6
+ metadata.gz: f7bc130ff814db8c9201e5c84492cc62961bedd56ca538119762cf7a9b245c5ac3dc40585e28b0a5b8e37e86c7ae3f26ba636424e6d579562f9e82f7283100de
7
+ data.tar.gz: d146785ba51bd122a320b77106628002894f7cf975985b86e3f62569cb347391baf3e497dd1adba4ee51c539b2bdc8a15245a6d6924f4ba962f4f489a34f9e4b
data/CHANGELOG.md CHANGED
@@ -1,3 +1,16 @@
1
+ ## 2.3.0
2
+
3
+ ### Enhancements
4
+ - Use of Ruby 2.1.0 is now recommended
5
+ - **Gem Changes**
6
+ - Updated to omniauth-facebook 1.6.0
7
+
8
+ ### Breaking Changes
9
+ - Updated to devise 3.1.2
10
+ - TokenAuthenticatable deprecated
11
+ - Set `config.allow_insecure_token_lookup = true` in production for a couple of days to aid migration
12
+ - http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
13
+
1
14
  ## 2.2.1 (January 7, 2014)
2
15
 
3
16
  ### Bug Fix
data/app/controllers/contour/registrations_controller.rb CHANGED
@@ -1,13 +1,14 @@
1
1
  class Contour::RegistrationsController < Devise::RegistrationsController
2
2
  prepend_before_filter :require_no_authentication, only: [ :new ]
3
+ before_filter :configure_permitted_parameters
3
4
 
4
5
  def create
5
6
  if signed_in?
6
7
  # TODO: Should use "Resource" and not "User"
7
8
  params[:user][:password] = params[:user][:password_confirmation] = Digest::SHA1.hexdigest(Time.now.usec.to_s)[0..19] if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
8
9
 
9
- # self.resource = build_resource(sign_up_params)
10
- @user = build_resource(sign_up_params)
10
+ # self.resource = build_resource
11
+ @user = build_resource
11
12
 
12
13
  if @user.save
13
14
  respond_to do |format|
@@ -22,7 +23,7 @@ class Contour::RegistrationsController < Devise::RegistrationsController
22
23
  end
23
24
  elsif spam_field_used?
24
25
  Rails.logger.info "SPAM BOT SIGNUP: #{params.inspect}"
25
- self.resource = build_resource(sign_up_params)
26
+ self.resource = build_resource
26
27
  redirect_to new_session_path(resource), notice: 'Thank you for your interest! Due to limited capacity you have been put on a waiting list. We will email you when we open up additional space.'
27
28
  else
28
29
  super
@@ -32,10 +33,9 @@ class Contour::RegistrationsController < Devise::RegistrationsController
32
33
 
33
34
  protected
34
35
 
35
- def sign_up_params
36
+ def configure_permitted_parameters
36
37
  permitted_fields = Contour::sign_up_fields.collect{|a| a[:attribute].to_sym} | [ :email, :password, :password_confirmation ]
37
38
  devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(*permitted_fields) }
38
- devise_parameter_sanitizer.for(:sign_up)
39
39
  end
40
40
 
41
41
  def build_resource(hash=nil)
data/contour.gemspec CHANGED
@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
27
27
  s.add_dependency 'rails', '~> 4.0.2'
28
28
  s.add_dependency 'jquery-rails', '>= 3.0.4'
29
29
  s.add_dependency 'coffee-rails', '~> 4.0.1'
30
- s.add_dependency 'devise', '~> 3.0.4'
30
+ s.add_dependency 'devise', '~> 3.1.2'
31
31
  s.add_dependency 'omniauth', '~> 1.1.4'
32
32
  s.add_dependency 'omniauth-cas', '~> 1.0.4'
33
- s.add_dependency 'omniauth-facebook', '~> 1.5.1'
33
+ s.add_dependency 'omniauth-facebook', '~> 1.6.0'
34
34
  s.add_dependency 'omniauth-ldap', '~> 1.0.3'
35
35
  s.add_dependency 'omniauth-linkedin', '~> 0.1.0'
36
36
  s.add_dependency 'omniauth-openid', '~> 1.0.1'
data/lib/contour/version.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  module Contour
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 2
4
- MINOR = 2
5
- TINY = 1
6
- BUILD = nil # nil, "pre", "rc", "rc2"
4
+ MINOR = 3
5
+ TINY = 0
6
+ BUILD = 'beta1' # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
data/test/dummy/config/initializers/devise.rb CHANGED
@@ -213,4 +213,6 @@ Devise.setup do |config|
213
213
  # manager.intercept_401 = false
214
214
  # manager.default_strategies(:scope => :user).unshift :some_external_strategy
215
215
  # end
216
+
217
+ config.secret_key = '2b5cb0af80cb772f0cbf8fab7475b0dca0f35f74dab8970d4504b2862a9f0d7f7679933afd8d39133442d7668af37432539591f9ad1c920bba165755636968b5'
216
218
  end
data/test/dummy/db/test.sqlite3 CHANGED
Binary file
metadata CHANGED
@@ -1,181 +1,181 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.1
4
+ version: 2.3.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Remo Mueller
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-07 00:00:00.000000000 Z
11
+ date: 2014-01-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.0.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: jquery-rails
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 3.0.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 3.0.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 4.0.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: 4.0.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: devise
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 3.0.4
61
+ version: 3.1.2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 3.0.4
68
+ version: 3.1.2
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: omniauth
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 1.1.4
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.1.4
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: omniauth-cas
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 1.0.4
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.0.4
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: omniauth-facebook
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.5.1
103
+ version: 1.6.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.5.1
110
+ version: 1.6.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: omniauth-ldap
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: 1.0.3
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 1.0.3
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: omniauth-linkedin
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 0.1.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 0.1.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: omniauth-openid
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: 1.0.1
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 1.0.1
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: omniauth-twitter
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.0.1
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: 1.0.1
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: sqlite3
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  description: Basic Rails Framework files and assets for layout and authentication
@@ -184,6 +184,10 @@ executables: []
184
184
  extensions: []
185
185
  extra_rdoc_files: []
186
186
  files:
187
+ - CHANGELOG.md
188
+ - LICENSE
189
+ - README.md
190
+ - Rakefile
187
191
  - app/assets/images/bootstrap/glyphicons-halflings-regular.eot
188
192
  - app/assets/images/bootstrap/glyphicons-halflings-regular.svg
189
193
  - app/assets/images/bootstrap/glyphicons-halflings-regular.ttf
@@ -219,17 +223,17 @@ files:
219
223
  - app/assets/images/contour/ui-icons_d8e7f3_256x240.png
220
224
  - app/assets/images/contour/ui-icons_f9bd01_256x240.png
221
225
  - app/assets/javascripts/bootstrap/v3.0.2/bootstrap.js
222
- - app/assets/javascripts/contour/global.js.coffee
223
226
  - app/assets/javascripts/contour.js
227
+ - app/assets/javascripts/contour/global.js.coffee
224
228
  - app/assets/javascripts/external/bootstrap-datepicker.js
225
229
  - app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js
226
230
  - app/assets/javascripts/external/typeahead.js
227
231
  - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
232
+ - app/assets/stylesheets/bootstrap-overrides.css
228
233
  - app/assets/stylesheets/bootstrap/bs-callout.css
229
234
  - app/assets/stylesheets/bootstrap/v3.0.2/bootstrap.css
230
- - app/assets/stylesheets/bootstrap-overrides.css
231
- - app/assets/stylesheets/contour/about.css
232
235
  - app/assets/stylesheets/contour.css
236
+ - app/assets/stylesheets/contour/about.css
233
237
  - app/assets/stylesheets/datepicker.css
234
238
  - app/assets/stylesheets/glyphicons-overrides.css.erb
235
239
  - app/assets/stylesheets/jquery-ui-1.10.0.custom.css
@@ -264,13 +268,6 @@ files:
264
268
  - app/views/contour/samples/index.html.erb
265
269
  - app/views/contour/sessions/new.html.erb
266
270
  - app/views/contour/unlocks/new.html.erb
267
- - app/views/kaminari/contour/_first_page.html.erb
268
- - app/views/kaminari/contour/_gap.html.erb
269
- - app/views/kaminari/contour/_last_page.html.erb
270
- - app/views/kaminari/contour/_next_page.html.erb
271
- - app/views/kaminari/contour/_page.html.erb
272
- - app/views/kaminari/contour/_paginator.html.erb
273
- - app/views/kaminari/contour/_prev_page.html.erb
274
271
  - app/views/kaminari/contour-large/_first_page.html.erb
275
272
  - app/views/kaminari/contour-large/_gap.html.erb
276
273
  - app/views/kaminari/contour-large/_last_page.html.erb
@@ -285,19 +282,28 @@ files:
285
282
  - app/views/kaminari/contour-small/_page.html.erb
286
283
  - app/views/kaminari/contour-small/_paginator.html.erb
287
284
  - app/views/kaminari/contour-small/_prev_page.html.erb
285
+ - app/views/kaminari/contour/_first_page.html.erb
286
+ - app/views/kaminari/contour/_gap.html.erb
287
+ - app/views/kaminari/contour/_last_page.html.erb
288
+ - app/views/kaminari/contour/_next_page.html.erb
289
+ - app/views/kaminari/contour/_page.html.erb
290
+ - app/views/kaminari/contour/_paginator.html.erb
291
+ - app/views/kaminari/contour/_prev_page.html.erb
288
292
  - config/initializers/devise.rb
289
293
  - config/routes.rb
294
+ - contour.gemspec
295
+ - lib/contour.rb
290
296
  - lib/contour/engine.rb
297
+ - lib/contour/fixes.rb
291
298
  - lib/contour/fixes/devise.rb
292
299
  - lib/contour/fixes/omniauth.rb
293
300
  - lib/contour/fixes/rack.rb
294
- - lib/contour/fixes.rb
295
301
  - lib/contour/version.rb
296
- - lib/contour.rb
297
302
  - lib/generators/contour/install/install_generator.rb
303
+ - lib/generators/contour/install/templates/README
298
304
  - lib/generators/contour/install/templates/contour.rb
299
305
  - lib/generators/contour/install/templates/omniauth.rb
300
- - lib/generators/contour/install/templates/README
306
+ - lib/generators/contour/scaffold/USAGE
301
307
  - lib/generators/contour/scaffold/scaffold_generator.rb
302
308
  - lib/generators/contour/scaffold/templates/_form.html.erb
303
309
  - lib/generators/contour/scaffold/templates/_paginate.html.erb
@@ -307,17 +313,12 @@ files:
307
313
  - lib/generators/contour/scaffold/templates/index.js.erb
308
314
  - lib/generators/contour/scaffold/templates/new.html.erb
309
315
  - lib/generators/contour/scaffold/templates/show.html.erb
310
- - lib/generators/contour/scaffold/USAGE
311
- - CHANGELOG.md
312
- - contour.gemspec
313
- - LICENSE
314
- - Rakefile
315
- - README.md
316
316
  - test/contour_test.rb
317
317
  - test/controllers/authentications_controller_test.rb
318
318
  - test/controllers/passwords_controller_test.rb
319
319
  - test/controllers/registrations_controller_test.rb
320
320
  - test/controllers/sessions_controller_test.rb
321
+ - test/dummy/Rakefile
321
322
  - test/dummy/app/assets/javascripts/application.js
322
323
  - test/dummy/app/assets/stylesheets/application.css
323
324
  - test/dummy/app/controllers/application_controller.rb
@@ -327,6 +328,7 @@ files:
327
328
  - test/dummy/app/models/user.rb
328
329
  - test/dummy/app/views/layouts/application.html.erb
329
330
  - test/dummy/app/views/welcome/index.html.erb
331
+ - test/dummy/config.ru
330
332
  - test/dummy/config/application.rb
331
333
  - test/dummy/config/boot.rb
332
334
  - test/dummy/config/database.yml
@@ -347,7 +349,6 @@ files:
347
349
  - test/dummy/config/initializers/wrap_parameters.rb
348
350
  - test/dummy/config/locales/en.yml
349
351
  - test/dummy/config/routes.rb
350
- - test/dummy/config.ru
351
352
  - test/dummy/db/migrate/20111203203123_devise_create_users.rb
352
353
  - test/dummy/db/migrate/20111203203307_create_authentications.rb
353
354
  - test/dummy/db/schema.rb
@@ -356,7 +357,6 @@ files:
356
357
  - test/dummy/public/422.html
357
358
  - test/dummy/public/500.html
358
359
  - test/dummy/public/favicon.ico
359
- - test/dummy/Rakefile
360
360
  - test/dummy/script/rails
361
361
  - test/dummy/test/fixtures/authentications.yml
362
362
  - test/dummy/test/fixtures/users.yml
@@ -375,17 +375,17 @@ require_paths:
375
375
  - lib
376
376
  required_ruby_version: !ruby/object:Gem::Requirement
377
377
  requirements:
378
- - - '>='
378
+ - - ">="
379
379
  - !ruby/object:Gem::Version
380
380
  version: '0'
381
381
  required_rubygems_version: !ruby/object:Gem::Requirement
382
382
  requirements:
383
- - - '>='
383
+ - - ">"
384
384
  - !ruby/object:Gem::Version
385
- version: '0'
385
+ version: 1.3.1
386
386
  requirements: []
387
387
  rubyforge_project:
388
- rubygems_version: 2.1.11
388
+ rubygems_version: 2.2.0
389
389
  signing_key:
390
390
  specification_version: 4
391
391
  summary: Basic Rails framework files and assets for layout and authentication