devise-better_routes 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 04f28e42c1d62494a93da73001067b8252aba1f6
4
+ data.tar.gz: 438c42fea711001c0ca8400e5ec5a3d5e00fad89
5
+ SHA512:
6
+ metadata.gz: 55efa76cec560411bf91c6207e1a593a1aabe35f2d32b8ded4e3282f9833c8bc86253f5d564eaf48a8afe914cbe53dfffc678d1a3182b5f28aa41318b8dc1092
7
+ data.tar.gz: 6ab5c52d4e1e3c6ebbea2590848c6a782d105b9ea3a9b1b73dea0a47cbf7f7e72c7975c3e8dafa71110d0f087d15db468bff0126824e232c5bc4423494a160c5
@@ -1,3 +1,4 @@
1
1
  language: ruby
2
2
  rvm:
3
- - 1.9.3
3
+ - 2.4
4
+ - 2.2
data/README.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Devise::BetterRoutes
2
2
 
3
+ [![Build Status](https://travis-ci.org/tkawa/devise-better_routes.png)](https://travis-ci.org/tkawa/devise-better_routes)
4
+ [![Gem Version](https://badge.fury.io/rb/devise-better_routes.png)](http://badge.fury.io/rb/devise-better_routes)
5
+
3
6
  Better routes patch for Devise
4
7
 
5
8
  ## One of the issues of Devise
@@ -75,6 +78,10 @@ Do you like this one?
75
78
 
76
79
  ## Changes
77
80
 
81
+ ### 0.0.5
82
+
83
+ * Support Rails 5
84
+
78
85
  ### 0.0.4
79
86
 
80
87
  * __Add password routes__
data/Rakefile CHANGED
@@ -1 +1,10 @@
1
- require "bundler/gem_tasks"
1
+ require 'rubygems'
2
+ require 'rspec/core/rake_task'
3
+ require 'bundler/gem_tasks'
4
+
5
+ desc 'Run all examples'
6
+ RSpec::Core::RakeTask.new(:spec) do |t|
7
+ t.rspec_opts = %w[--color]
8
+ end
9
+
10
+ task :default => [:spec]
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_dependency 'devise', '>= 3.0.0.rc'
22
- spec.add_dependency 'rails', '>= 4.0.0.rc1'
21
+ spec.add_dependency 'devise', '>= 3.0.0'
22
+ spec.add_dependency 'rails', '>= 4.0.0'
23
23
  spec.add_development_dependency 'bundler', '~> 1.3'
24
24
  spec.add_development_dependency 'rake'
25
25
  spec.add_development_dependency 'rspec'
@@ -93,7 +93,13 @@ module ActionDispatch
93
93
  protected
94
94
  def devise_session(mapping, controllers)
95
95
  current_resource_name = mapping.path_names["current_#{mapping.singular}".to_sym]
96
- path, as, @scope[:path], @scope[:as] = @scope[:path], @scope[:as], nil, nil
96
+ current_scope = @scope.dup
97
+ if @scope.respond_to? :new
98
+ @scope = @scope.new(path: nil, as: nil)
99
+ else
100
+ @scope[:path] = nil
101
+ @scope[:as] = nil
102
+ end
97
103
  resource current_resource_name, only: [] do
98
104
  resource :session, only: [:create, :destroy], controller: controllers[:sessions]
99
105
  resource :session, only: [], controller: controllers[:sessions], path: '' do
@@ -101,22 +107,34 @@ module ActionDispatch
101
107
  end
102
108
  end
103
109
  ensure
104
- @scope[:path], @scope[:as] = path, as
110
+ @scope = current_scope
105
111
  end
106
112
 
107
113
  def devise_password(mapping, controllers)
108
114
  current_resource_name = mapping.path_names["current_#{mapping.singular}".to_sym]
109
- path, as, @scope[:path], @scope[:as] = @scope[:path], @scope[:as], nil, nil
115
+ current_scope = @scope.dup
116
+ if @scope.respond_to? :new
117
+ @scope = @scope.new(path: nil, as: nil)
118
+ else
119
+ @scope[:path] = nil
120
+ @scope[:as] = nil
121
+ end
110
122
  resource current_resource_name, only: [] do
111
123
  resource :password, :only => [:new, :create, :edit, :update],
112
124
  :path => mapping.path_names[:password], :controller => controllers[:passwords]
113
125
  end
114
126
  ensure
115
- @scope[:path], @scope[:as] = path, as
127
+ @scope = current_scope
116
128
  end
117
129
 
118
130
  def devise_registration(mapping, controllers)
119
- path, as, @scope[:path], @scope[:as] = @scope[:path], @scope[:as], nil, nil
131
+ current_scope = @scope.dup
132
+ if @scope.respond_to? :new
133
+ @scope = @scope.new(path: nil, as: nil)
134
+ else
135
+ @scope[:path] = nil
136
+ @scope[:as] = nil
137
+ end
120
138
  current_resource_name = mapping.path_names["current_#{mapping.name}".to_sym]
121
139
  resources_controller_name =
122
140
  if controllers.include?(mapping.path.to_sym)
@@ -139,7 +157,7 @@ module ActionDispatch
139
157
  get :cancel
140
158
  end
141
159
  ensure
142
- @scope[:path], @scope[:as] = path, as
160
+ @scope = current_scope
143
161
  end
144
162
  end
145
163
  end
@@ -1,5 +1,5 @@
1
1
  module Devise
2
2
  module BetterRoutes
3
- VERSION = "0.0.4"
3
+ VERSION = "0.0.5"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,126 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise-better_routes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
5
- prerelease:
4
+ version: 0.0.5
6
5
  platform: ruby
7
6
  authors:
8
7
  - Toru KAWAMURA
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-07-14 00:00:00.000000000 Z
11
+ date: 2017-12-29 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: devise
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - ">="
20
18
  - !ruby/object:Gem::Version
21
- version: 3.0.0.rc
19
+ version: 3.0.0
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - ">="
28
25
  - !ruby/object:Gem::Version
29
- version: 3.0.0.rc
26
+ version: 3.0.0
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rails
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
- version: 4.0.0.rc1
33
+ version: 4.0.0
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
- version: 4.0.0.rc1
40
+ version: 4.0.0
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: bundler
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ~>
45
+ - - "~>"
52
46
  - !ruby/object:Gem::Version
53
47
  version: '1.3'
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ~>
52
+ - - "~>"
60
53
  - !ruby/object:Gem::Version
61
54
  version: '1.3'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: rake
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - ">="
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - ">="
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: rspec
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - ">="
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - ">="
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: rspec-rails
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
- - - ! '>='
87
+ - - ">="
100
88
  - !ruby/object:Gem::Version
101
89
  version: '0'
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
- - - ! '>='
94
+ - - ">="
108
95
  - !ruby/object:Gem::Version
109
96
  version: '0'
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: sqlite3
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
- - - ! '>='
101
+ - - ">="
116
102
  - !ruby/object:Gem::Version
117
103
  version: '0'
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
- - - ! '>='
108
+ - - ">="
124
109
  - !ruby/object:Gem::Version
125
110
  version: '0'
126
111
  description: Better routes patch for Devise
@@ -130,9 +115,9 @@ executables: []
130
115
  extensions: []
131
116
  extra_rdoc_files: []
132
117
  files:
133
- - .gitignore
134
- - .rspec
135
- - .travis.yml
118
+ - ".gitignore"
119
+ - ".rspec"
120
+ - ".travis.yml"
136
121
  - Gemfile
137
122
  - LICENSE.txt
138
123
  - README.md
@@ -188,33 +173,26 @@ files:
188
173
  homepage: https://github.com/tkawa/devise-better_routes
189
174
  licenses:
190
175
  - MIT
176
+ metadata: {}
191
177
  post_install_message:
192
178
  rdoc_options: []
193
179
  require_paths:
194
180
  - lib
195
181
  required_ruby_version: !ruby/object:Gem::Requirement
196
- none: false
197
182
  requirements:
198
- - - ! '>='
183
+ - - ">="
199
184
  - !ruby/object:Gem::Version
200
185
  version: '0'
201
- segments:
202
- - 0
203
- hash: -4129266091696730390
204
186
  required_rubygems_version: !ruby/object:Gem::Requirement
205
- none: false
206
187
  requirements:
207
- - - ! '>='
188
+ - - ">="
208
189
  - !ruby/object:Gem::Version
209
190
  version: '0'
210
- segments:
211
- - 0
212
- hash: -4129266091696730390
213
191
  requirements: []
214
192
  rubyforge_project:
215
- rubygems_version: 1.8.24
193
+ rubygems_version: 2.6.14
216
194
  signing_key:
217
- specification_version: 3
195
+ specification_version: 4
218
196
  summary: Better routes patch for Devise
219
197
  test_files:
220
198
  - spec/devise/better_routes_helpers_spec.rb
@@ -262,3 +240,4 @@ test_files:
262
240
  - spec/rails_app/public/500.html
263
241
  - spec/rails_app/public/favicon.ico
264
242
  - spec/spec_helper.rb
243
+ has_rdoc: