friendly_id-method_scopes 0.2.6 → 0.3.7

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 (25) hide show
  1. checksums.yaml +5 -5
  2. data/.ruby-version +1 -1
  3. data/Gemfile +9 -9
  4. data/Rakefile +0 -2
  5. data/VERSION +1 -1
  6. data/coverage/.resultset.json +84 -79
  7. data/friendly_id-method_scopes.gemspec +32 -31
  8. data/lib/friendly_id/method_scopes.rb +1 -1
  9. data/spec/controllers/books_controller_spec.rb +4 -2
  10. data/spec/dummy/app/assets/config/manifest.js +0 -0
  11. data/spec/dummy/config/application.rb +4 -1
  12. data/spec/dummy/config/initializers/new_framework_defaults.rb +0 -3
  13. data/spec/dummy/db/migrate/20150621221655_create_books.rb +1 -1
  14. data/spec/dummy/db/migrate/20150621221732_create_authors.rb +1 -1
  15. data/spec/dummy/db/migrate/20150622182214_rolify_create_roles.rb +1 -1
  16. data/spec/dummy/db/schema.rb +8 -8
  17. data/spec/dummy/db/seeds/authors.seeds.rb +2 -2
  18. data/spec/dummy/db/seeds/books.seeds.rb +4 -4
  19. data/spec/dummy/db/test.sqlite3 +0 -0
  20. data/spec/factories/author.rb +1 -1
  21. data/spec/factories/book.rb +1 -1
  22. data/spec/rails_helper.rb +13 -10
  23. data/spec/support/authors.rb +2 -2
  24. data/spec/support/books_with_authors.rb +4 -4
  25. metadata +69 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: b8843d7684e08e702a22f3c7ef88cde451df3207
4
- data.tar.gz: 52030148363f1db896bf5533d05046c47510b271
2
+ SHA256:
3
+ metadata.gz: 43702a865a842e6c001d354f02a7c5bc016f94dc0942feadaee5871109de5a2d
4
+ data.tar.gz: a448d94758b8b37af38b63793b6466f8f1571e298bcb6712938bea561939e530
5
5
  SHA512:
6
- metadata.gz: 850a4b9bbe0b5e54485c07a146f8e48179cb7724c906f95a8a02a7965012db56f12362ac41da5ffe97501960d62f2d3cf7ee0fe2d358fde3d20c78cd5962a093
7
- data.tar.gz: 4dca7ba2c92b85a6e3e3d59095aa324234fc4c3f8b064ecec63166ee5d3d659ba8c00435cf128c29e64d42d1c61f3b2f99b656cc6189eb88f01e97a7308fde48
6
+ metadata.gz: af5935b55f5c883bd1a82cf31822fd86c8677956070217379d44c5ee3e8b24fd49ad2dcccd667fc83e256c8aeb9e1a4dec37827663fa69b4a7ddc3a7a32f130b
7
+ data.tar.gz: '081d888216f224f064d0c0ed5c0332adc0b6b71054311ec53970b03c72ba718c3ea562f787e91d888b23bb73316cdc7fb0b73e41b6e547791b0bd49a585a9647'
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.4.1
1
+ 2.6.3
data/Gemfile CHANGED
@@ -1,20 +1,20 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
- gem 'rails', '>= 4', '< 6'
4
- gem 'friendly_id', '>= 5'
3
+ gem 'rails', '>= 4', '< 7'
4
+ gem 'friendly_id', '>= 5', '< 6'
5
5
 
6
6
  group :development, :test do
7
7
  gem 'juwelier', '~> 2'
8
8
  gem 'sqlite3', '~> 1'
9
- gem 'rspec-rails', '~> 3.3'
10
- gem 'shoulda-matchers', '>= 2.8'
11
- gem 'rolify', '>= 4'
9
+ gem 'rspec-rails', '>= 4.0.1', '< 5'
10
+ gem 'shoulda-matchers', '>= 4.3', '< 5'
11
+ gem 'rolify', '>= 4', '< 6'
12
12
  gem 'seedbank', '~> 0.3'
13
- gem 'factory_girl_rails', '~> 4.5'
14
- gem 'faker', '~> 1.4'
15
- gem 'haml', '~> 4'
13
+ gem 'factory_bot_rails', '>= 4.8.2', '< 6'
14
+ gem 'faker', '>= 2.12', '< 3'
15
+ gem 'haml', '~> 5'
16
16
  gem 'database_cleaner', '~> 1.4'
17
- gem 'rails-controller-testing', '>= 1'
17
+ gem 'rails-controller-testing', '>= 1', '< 2'
18
18
  gem 'coveralls', '~> 0.8', require: false
19
19
  end
20
20
 
data/Rakefile CHANGED
@@ -35,5 +35,3 @@ rescue LoadError
35
35
  end
36
36
  task :default => [:spec]
37
37
 
38
- Bundler::GemHelper.install_tasks
39
-
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.6
1
+ 0.3.7
data/coverage/.resultset.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "RSpec": {
3
3
  "coverage": {
4
- "/Users/karen/Gems/friendly_id-method_scopes/spec/controllers/authors_controller_spec.rb": [
4
+ "/home/karen/Code/friendly_id-method_scopes/spec/controllers/authors_controller_spec.rb": [
5
5
  1,
6
6
  null,
7
7
  1,
@@ -23,7 +23,7 @@
23
23
  null,
24
24
  null
25
25
  ],
26
- "/Users/karen/Gems/friendly_id-method_scopes/spec/rails_helper.rb": [
26
+ "/home/karen/Code/friendly_id-method_scopes/spec/rails_helper.rb": [
27
27
  null,
28
28
  1,
29
29
  1,
@@ -33,7 +33,7 @@
33
33
  1,
34
34
  1,
35
35
  1,
36
- 1,
36
+ null,
37
37
  null,
38
38
  null,
39
39
  null,
@@ -57,27 +57,30 @@
57
57
  null,
58
58
  1,
59
59
  1,
60
+ null,
60
61
  1,
61
- 1,
62
- 1,
63
- 1,
62
+ 11,
63
+ null,
64
64
  null,
65
65
  1,
66
66
  11,
67
+ null,
68
+ null,
69
+ 1,
67
70
  11,
68
71
  null,
69
72
  null,
70
73
  1,
71
74
  null
72
75
  ],
73
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/environment.rb": [
76
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/environment.rb": [
74
77
  null,
75
78
  1,
76
79
  null,
77
80
  null,
78
81
  1
79
82
  ],
80
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/application.rb": [
83
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/application.rb": [
81
84
  1,
82
85
  null,
83
86
  null,
@@ -119,16 +122,19 @@
119
122
  1,
120
123
  null,
121
124
  null,
125
+ null,
126
+ null,
127
+ null,
122
128
  null
123
129
  ],
124
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/boot.rb": [
130
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/boot.rb": [
125
131
  null,
126
132
  1,
127
133
  null,
128
134
  1,
129
135
  1
130
136
  ],
131
- "/Users/karen/Gems/friendly_id-method_scopes/lib/friendly_id/method_scopes.rb": [
137
+ "/home/karen/Code/friendly_id-method_scopes/lib/friendly_id/method_scopes.rb": [
132
138
  1,
133
139
  1,
134
140
  null,
@@ -152,17 +158,17 @@
152
158
  null,
153
159
  null,
154
160
  1,
155
- 4,
156
- 4,
157
- 4,
161
+ 5,
162
+ 5,
163
+ 5,
158
164
  null,
159
- 4,
160
- 4,
165
+ 5,
166
+ 5,
161
167
  null,
162
168
  1,
163
169
  null,
164
170
  1,
165
- 4,
171
+ 5,
166
172
  null,
167
173
  1,
168
174
  null,
@@ -170,36 +176,36 @@
170
176
  1,
171
177
  null,
172
178
  1,
173
- 4,
174
- 4,
175
- 4,
176
- 4,
179
+ 5,
180
+ 5,
181
+ 5,
182
+ 5,
177
183
  null,
178
184
  null,
179
185
  null,
180
186
  1,
181
187
  null,
182
188
  1,
183
- 4,
184
- 4,
189
+ 5,
190
+ 5,
185
191
  null,
186
192
  null,
187
193
  null,
188
194
  1,
189
- 4,
190
- 4,
195
+ 5,
196
+ 5,
191
197
  null,
192
198
  null,
193
199
  null,
194
200
  1,
195
- 8,
196
- 8,
201
+ 10,
202
+ 10,
197
203
  null,
198
204
  null,
199
205
  null,
200
206
  null
201
207
  ],
202
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/environments/test.rb": [
208
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/environments/test.rb": [
203
209
  1,
204
210
  null,
205
211
  null,
@@ -243,7 +249,7 @@
243
249
  null,
244
250
  null
245
251
  ],
246
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/application_controller_renderer.rb": [
252
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/application_controller_renderer.rb": [
247
253
  null,
248
254
  null,
249
255
  null,
@@ -251,7 +257,7 @@
251
257
  null,
252
258
  null
253
259
  ],
254
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/assets.rb": [
260
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/assets.rb": [
255
261
  null,
256
262
  null,
257
263
  null,
@@ -264,7 +270,7 @@
264
270
  null,
265
271
  null
266
272
  ],
267
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/backtrace_silencers.rb": [
273
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/backtrace_silencers.rb": [
268
274
  null,
269
275
  null,
270
276
  null,
@@ -273,20 +279,20 @@
273
279
  null,
274
280
  null
275
281
  ],
276
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/cookies_serializer.rb": [
282
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/cookies_serializer.rb": [
277
283
  null,
278
284
  null,
279
285
  null,
280
286
  null,
281
287
  1
282
288
  ],
283
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/filter_parameter_logging.rb": [
289
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/filter_parameter_logging.rb": [
284
290
  null,
285
291
  null,
286
292
  null,
287
293
  1
288
294
  ],
289
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/inflections.rb": [
295
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/inflections.rb": [
290
296
  null,
291
297
  null,
292
298
  null,
@@ -304,13 +310,13 @@
304
310
  null,
305
311
  null
306
312
  ],
307
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/mime_types.rb": [
313
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/mime_types.rb": [
308
314
  null,
309
315
  null,
310
316
  null,
311
317
  null
312
318
  ],
313
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/new_framework_defaults.rb": [
319
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/new_framework_defaults.rb": [
314
320
  null,
315
321
  null,
316
322
  null,
@@ -330,12 +336,9 @@
330
336
  1,
331
337
  null,
332
338
  null,
333
- 1,
334
- null,
335
- null,
336
339
  1
337
340
  ],
338
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/rolify.rb": [
341
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/rolify.rb": [
339
342
  1,
340
343
  null,
341
344
  null,
@@ -344,24 +347,12 @@
344
347
  null,
345
348
  null
346
349
  ],
347
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/models/role.rb": [
348
- 1,
349
- 1,
350
- 1,
351
- null,
352
- 1,
353
- null,
354
- null,
355
- null,
356
- 1,
357
- null
358
- ],
359
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/session_store.rb": [
350
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/session_store.rb": [
360
351
  null,
361
352
  null,
362
353
  1
363
354
  ],
364
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/initializers/wrap_parameters.rb": [
355
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/initializers/wrap_parameters.rb": [
365
356
  null,
366
357
  null,
367
358
  null,
@@ -377,15 +368,15 @@
377
368
  null,
378
369
  null
379
370
  ],
380
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/spec/factories/author.rb": [
371
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/spec/factories/author.rb": [
381
372
  1,
382
373
  1,
383
374
  1,
384
- 3,
375
+ 9,
385
376
  null,
386
377
  null
387
378
  ],
388
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/spec/factories/book.rb": [
379
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/spec/factories/book.rb": [
389
380
  1,
390
381
  1,
391
382
  1,
@@ -397,12 +388,12 @@
397
388
  null,
398
389
  null,
399
390
  1,
400
- 4,
391
+ 5,
401
392
  null,
402
393
  null,
403
394
  null
404
395
  ],
405
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/config/routes.rb": [
396
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/config/routes.rb": [
406
397
  1,
407
398
  1,
408
399
  1,
@@ -410,13 +401,7 @@
410
401
  1,
411
402
  null
412
403
  ],
413
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/spec/support/authors.rb": [
414
- 1,
415
- 10,
416
- 6,
417
- null
418
- ],
419
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/spec/support/books_with_authors.rb": [
404
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/spec/support/books_with_authors.rb": [
420
405
  1,
421
406
  4,
422
407
  5,
@@ -425,7 +410,13 @@
425
410
  4,
426
411
  null
427
412
  ],
428
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/controllers/authors_controller.rb": [
413
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/spec/support/authors.rb": [
414
+ 1,
415
+ 10,
416
+ 6,
417
+ null
418
+ ],
419
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/controllers/authors_controller.rb": [
429
420
  1,
430
421
  1,
431
422
  null,
@@ -445,20 +436,21 @@
445
436
  null,
446
437
  null
447
438
  ],
448
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/controllers/application_controller.rb": [
439
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/controllers/application_controller.rb": [
449
440
  1,
450
441
  null,
451
442
  null,
452
443
  1,
453
444
  null
454
445
  ],
455
- "/Users/karen/Gems/friendly_id-method_scopes/spec/controllers/books_controller_spec.rb": [
446
+ "/home/karen/Code/friendly_id-method_scopes/spec/controllers/books_controller_spec.rb": [
456
447
  1,
457
448
  null,
458
449
  1,
459
450
  1,
460
451
  null,
461
452
  1,
453
+ 2,
462
454
  1,
463
455
  1,
464
456
  1,
@@ -466,6 +458,7 @@
466
458
  null,
467
459
  null,
468
460
  1,
461
+ 2,
469
462
  1,
470
463
  1,
471
464
  null,
@@ -476,7 +469,7 @@
476
469
  null,
477
470
  null
478
471
  ],
479
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/controllers/books_controller.rb": [
472
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/controllers/books_controller.rb": [
480
473
  1,
481
474
  1,
482
475
  1,
@@ -501,7 +494,7 @@
501
494
  null,
502
495
  null
503
496
  ],
504
- "/Users/karen/Gems/friendly_id-method_scopes/spec/models/author_spec.rb": [
497
+ "/home/karen/Code/friendly_id-method_scopes/spec/models/author_spec.rb": [
505
498
  1,
506
499
  null,
507
500
  1,
@@ -514,7 +507,7 @@
514
507
  null,
515
508
  null
516
509
  ],
517
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/models/author.rb": [
510
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/models/author.rb": [
518
511
  1,
519
512
  null,
520
513
  1,
@@ -524,11 +517,11 @@
524
517
  1,
525
518
  null,
526
519
  1,
527
- 7,
520
+ 2,
528
521
  null,
529
522
  null
530
523
  ],
531
- "/Users/karen/Gems/friendly_id-method_scopes/spec/models/book_spec.rb": [
524
+ "/home/karen/Code/friendly_id-method_scopes/spec/models/book_spec.rb": [
532
525
  1,
533
526
  null,
534
527
  1,
@@ -545,7 +538,7 @@
545
538
  null,
546
539
  null
547
540
  ],
548
- "/Users/karen/Gems/friendly_id-method_scopes/spec/dummy/app/models/book.rb": [
541
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/models/book.rb": [
549
542
  1,
550
543
  null,
551
544
  1,
@@ -555,15 +548,15 @@
555
548
  1,
556
549
  null,
557
550
  1,
558
- 4,
551
+ 5,
559
552
  null,
560
553
  null,
561
554
  1,
562
- 4,
555
+ 5,
563
556
  null,
564
557
  null
565
558
  ],
566
- "/Users/karen/Gems/friendly_id-method_scopes/spec/routing/authors_routing_spec.rb": [
559
+ "/home/karen/Code/friendly_id-method_scopes/spec/routing/authors_routing_spec.rb": [
567
560
  1,
568
561
  null,
569
562
  1,
@@ -580,7 +573,7 @@
580
573
  null,
581
574
  null
582
575
  ],
583
- "/Users/karen/Gems/friendly_id-method_scopes/spec/routing/books_routing_spec.rb": [
576
+ "/home/karen/Code/friendly_id-method_scopes/spec/routing/books_routing_spec.rb": [
584
577
  1,
585
578
  null,
586
579
  1,
@@ -596,8 +589,20 @@
596
589
  null,
597
590
  null,
598
591
  null
592
+ ],
593
+ "/home/karen/Code/friendly_id-method_scopes/spec/dummy/app/models/role.rb": [
594
+ 1,
595
+ 1,
596
+ 1,
597
+ null,
598
+ 1,
599
+ null,
600
+ null,
601
+ null,
602
+ 1,
603
+ null
599
604
  ]
600
605
  },
601
- "timestamp": 1492304651
606
+ "timestamp": 1591637921
602
607
  }
603
608
  }
data/friendly_id-method_scopes.gemspec CHANGED
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: friendly_id-method_scopes 0.2.6 ruby lib
5
+ # stub: friendly_id-method_scopes 0.3.7 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "friendly_id-method_scopes".freeze
9
- s.version = "0.2.6"
9
+ s.version = "0.3.7"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib".freeze]
13
13
  s.authors = ["Karen Lundgren".freeze]
14
- s.date = "2017-04-20"
14
+ s.date = "2020-06-08"
15
15
  s.description = "FriendlyId Extension to allow method scopes, in addition to column and relationship scopes.".freeze
16
16
  s.email = "karen.e.lundgren@gmail.com".freeze
17
17
  s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
36
36
  "spec/controllers/authors_controller_spec.rb",
37
37
  "spec/controllers/books_controller_spec.rb",
38
38
  "spec/dummy/Rakefile",
39
+ "spec/dummy/app/assets/config/manifest.js",
39
40
  "spec/dummy/app/assets/javascripts/application.js",
40
41
  "spec/dummy/app/assets/stylesheets/application.css",
41
42
  "spec/dummy/app/assets/stylesheets/scaffold.css",
@@ -106,57 +107,57 @@ Gem::Specification.new do |s|
106
107
  ]
107
108
  s.homepage = "http://www.gemvein.com/museum/cases/friendly_id-method_scopes".freeze
108
109
  s.licenses = ["MIT".freeze]
109
- s.rubygems_version = "2.6.11".freeze
110
+ s.rubygems_version = "3.0.3".freeze
110
111
  s.summary = "FriendlyId Extension to allow method scopes.".freeze
111
112
 
112
113
  if s.respond_to? :specification_version then
113
114
  s.specification_version = 4
114
115
 
115
116
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
116
- s.add_runtime_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
117
- s.add_runtime_dependency(%q<friendly_id>.freeze, [">= 5"])
117
+ s.add_runtime_dependency(%q<rails>.freeze, [">= 4", "< 7"])
118
+ s.add_runtime_dependency(%q<friendly_id>.freeze, [">= 5", "< 6"])
118
119
  s.add_development_dependency(%q<juwelier>.freeze, ["~> 2"])
119
120
  s.add_development_dependency(%q<sqlite3>.freeze, ["~> 1"])
120
- s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
121
- s.add_development_dependency(%q<shoulda-matchers>.freeze, [">= 2.8"])
122
- s.add_development_dependency(%q<rolify>.freeze, [">= 4"])
121
+ s.add_development_dependency(%q<rspec-rails>.freeze, [">= 4.0.1", "< 5"])
122
+ s.add_development_dependency(%q<shoulda-matchers>.freeze, [">= 4.3", "< 5"])
123
+ s.add_development_dependency(%q<rolify>.freeze, [">= 4", "< 6"])
123
124
  s.add_development_dependency(%q<seedbank>.freeze, ["~> 0.3"])
124
- s.add_development_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
125
- s.add_development_dependency(%q<faker>.freeze, ["~> 1.4"])
126
- s.add_development_dependency(%q<haml>.freeze, ["~> 4"])
125
+ s.add_development_dependency(%q<factory_bot_rails>.freeze, [">= 4.8.2", "< 6"])
126
+ s.add_development_dependency(%q<faker>.freeze, [">= 2.12", "< 3"])
127
+ s.add_development_dependency(%q<haml>.freeze, ["~> 5"])
127
128
  s.add_development_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
128
- s.add_development_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
129
+ s.add_development_dependency(%q<rails-controller-testing>.freeze, [">= 1", "< 2"])
129
130
  s.add_development_dependency(%q<coveralls>.freeze, ["~> 0.8"])
130
131
  else
131
- s.add_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
132
- s.add_dependency(%q<friendly_id>.freeze, [">= 5"])
132
+ s.add_dependency(%q<rails>.freeze, [">= 4", "< 7"])
133
+ s.add_dependency(%q<friendly_id>.freeze, [">= 5", "< 6"])
133
134
  s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
134
135
  s.add_dependency(%q<sqlite3>.freeze, ["~> 1"])
135
- s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
136
- s.add_dependency(%q<shoulda-matchers>.freeze, [">= 2.8"])
137
- s.add_dependency(%q<rolify>.freeze, [">= 4"])
136
+ s.add_dependency(%q<rspec-rails>.freeze, [">= 4.0.1", "< 5"])
137
+ s.add_dependency(%q<shoulda-matchers>.freeze, [">= 4.3", "< 5"])
138
+ s.add_dependency(%q<rolify>.freeze, [">= 4", "< 6"])
138
139
  s.add_dependency(%q<seedbank>.freeze, ["~> 0.3"])
139
- s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
140
- s.add_dependency(%q<faker>.freeze, ["~> 1.4"])
141
- s.add_dependency(%q<haml>.freeze, ["~> 4"])
140
+ s.add_dependency(%q<factory_bot_rails>.freeze, [">= 4.8.2", "< 6"])
141
+ s.add_dependency(%q<faker>.freeze, [">= 2.12", "< 3"])
142
+ s.add_dependency(%q<haml>.freeze, ["~> 5"])
142
143
  s.add_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
143
- s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
144
+ s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1", "< 2"])
144
145
  s.add_dependency(%q<coveralls>.freeze, ["~> 0.8"])
145
146
  end
146
147
  else
147
- s.add_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
148
- s.add_dependency(%q<friendly_id>.freeze, [">= 5"])
148
+ s.add_dependency(%q<rails>.freeze, [">= 4", "< 7"])
149
+ s.add_dependency(%q<friendly_id>.freeze, [">= 5", "< 6"])
149
150
  s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
150
151
  s.add_dependency(%q<sqlite3>.freeze, ["~> 1"])
151
- s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
152
- s.add_dependency(%q<shoulda-matchers>.freeze, [">= 2.8"])
153
- s.add_dependency(%q<rolify>.freeze, [">= 4"])
152
+ s.add_dependency(%q<rspec-rails>.freeze, [">= 4.0.1", "< 5"])
153
+ s.add_dependency(%q<shoulda-matchers>.freeze, [">= 4.3", "< 5"])
154
+ s.add_dependency(%q<rolify>.freeze, [">= 4", "< 6"])
154
155
  s.add_dependency(%q<seedbank>.freeze, ["~> 0.3"])
155
- s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
156
- s.add_dependency(%q<faker>.freeze, ["~> 1.4"])
157
- s.add_dependency(%q<haml>.freeze, ["~> 4"])
156
+ s.add_dependency(%q<factory_bot_rails>.freeze, [">= 4.8.2", "< 6"])
157
+ s.add_dependency(%q<faker>.freeze, [">= 2.12", "< 3"])
158
+ s.add_dependency(%q<haml>.freeze, ["~> 5"])
158
159
  s.add_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
159
- s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
160
+ s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1", "< 2"])
160
161
  s.add_dependency(%q<coveralls>.freeze, ["~> 0.8"])
161
162
  end
162
163
  end
data/lib/friendly_id/method_scopes.rb CHANGED
@@ -31,7 +31,7 @@ module FriendlyId
31
31
  private :scope_for_slug_generator
32
32
 
33
33
  def slug_generator
34
- friendly_id_config.slug_generator_class.new(scope_for_slug_generator)
34
+ friendly_id_config.slug_generator_class.new(scope_for_slug_generator, friendly_id_config)
35
35
  end
36
36
  private :slug_generator
37
37
 
data/spec/controllers/books_controller_spec.rb CHANGED
@@ -4,18 +4,20 @@ RSpec.describe BooksController do
4
4
  include_context 'books with authors'
5
5
 
6
6
  describe "GET #index" do
7
+ let!(:books) { [book_a, book_b_first] }
7
8
  it "assigns author's books as @books" do
8
9
  get :index, params: { author_id: first_author.to_param }
9
- expect(assigns(:books)).to eq([book_a, book_b_first])
10
+ expect(assigns(:books)).to eq(books)
10
11
  end
11
12
  end
12
13
 
13
14
  describe "GET #show" do
15
+ let!(:book) { book_b_first }
14
16
  it "assigns the requested book as @book" do
15
17
  get :show, params: {
16
18
  author_id: first_author.to_param, id: book_b_first.to_param
17
19
  }
18
- expect(assigns(:book)).to eq(book_b_first)
20
+ expect(assigns(:book)).to eq(book)
19
21
  end
20
22
  end
21
23
 
data/spec/dummy/config/application.rb CHANGED
@@ -38,5 +38,8 @@ module Dummy
38
38
  g.view_specs false
39
39
  g.helper_specs false
40
40
  end
41
+
42
+ end
41
43
  end
42
- end
44
+
45
+
data/spec/dummy/config/initializers/new_framework_defaults.rb CHANGED
@@ -18,6 +18,3 @@ ActiveSupport.to_time_preserves_timezone = false
18
18
 
19
19
  # Require `belongs_to` associations by default. Previous versions had false.
20
20
  Rails.application.config.active_record.belongs_to_required_by_default = false
21
-
22
- # Do not halt callback chains when a callback returns false. Previous versions had true.
23
- ActiveSupport.halt_callback_chains_on_return_false = true
data/spec/dummy/db/migrate/20150621221655_create_books.rb CHANGED
@@ -1,4 +1,4 @@
1
- class CreateBooks < ActiveRecord::Migration
1
+ class CreateBooks < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table :books do |t|
4
4
  t.string :title
data/spec/dummy/db/migrate/20150621221732_create_authors.rb CHANGED
@@ -1,4 +1,4 @@
1
- class CreateAuthors < ActiveRecord::Migration
1
+ class CreateAuthors < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table :authors do |t|
4
4
  t.string :full_name
data/spec/dummy/db/migrate/20150622182214_rolify_create_roles.rb CHANGED
@@ -1,4 +1,4 @@
1
- class RolifyCreateRoles < ActiveRecord::Migration
1
+ class RolifyCreateRoles < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table(:roles) do |t|
4
4
  t.string :name
data/spec/dummy/db/schema.rb CHANGED
@@ -10,11 +10,11 @@
10
10
  #
11
11
  # It's strongly recommended that you check this file into your version control system.
12
12
 
13
- ActiveRecord::Schema.define(version: 20150622182214) do
13
+ ActiveRecord::Schema.define(version: 2015_06_22_182214) do
14
14
 
15
15
  create_table "authors", force: :cascade do |t|
16
- t.string "full_name"
17
- t.string "slug"
16
+ t.string "full_name"
17
+ t.string "slug"
18
18
  t.datetime "created_at", null: false
19
19
  t.datetime "updated_at", null: false
20
20
  end
@@ -26,16 +26,16 @@ ActiveRecord::Schema.define(version: 20150622182214) do
26
26
  end
27
27
 
28
28
  create_table "books", force: :cascade do |t|
29
- t.string "title"
30
- t.string "slug"
29
+ t.string "title"
30
+ t.string "slug"
31
31
  t.datetime "created_at", null: false
32
32
  t.datetime "updated_at", null: false
33
33
  end
34
34
 
35
35
  create_table "roles", force: :cascade do |t|
36
- t.string "name"
37
- t.string "resource_type"
38
- t.integer "resource_id"
36
+ t.string "name"
37
+ t.string "resource_type"
38
+ t.integer "resource_id"
39
39
  t.datetime "created_at"
40
40
  t.datetime "updated_at"
41
41
  t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
data/spec/dummy/db/seeds/authors.seeds.rb CHANGED
@@ -1,2 +1,2 @@
1
- first_author = FactoryGirl.create(:author, full_name: 'First Author')
2
- second_author = FactoryGirl.create(:author, full_name: 'Second Author')
1
+ first_author = FactoryBot.create(:author, full_name: 'First Author')
2
+ second_author = FactoryBot.create(:author, full_name: 'Second Author')
data/spec/dummy/db/seeds/books.seeds.rb CHANGED
@@ -2,8 +2,8 @@ after :authors do
2
2
  first_author = Author.friendly.find('first-author')
3
3
  second_author = Author.friendly.find('second-author')
4
4
 
5
- FactoryGirl.create(:book, title: 'Book A', author: first_author)
6
- FactoryGirl.create(:book, title: 'Book B', author: first_author)
7
- FactoryGirl.create(:book, title: 'Book C', author: second_author)
8
- FactoryGirl.create(:book, title: 'Book B', author: second_author)
5
+ FactoryBot.create(:book, title: 'Book A', author: first_author)
6
+ FactoryBot.create(:book, title: 'Book B', author: first_author)
7
+ FactoryBot.create(:book, title: 'Book C', author: second_author)
8
+ FactoryBot.create(:book, title: 'Book B', author: second_author)
9
9
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/factories/author.rb CHANGED
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :author do
3
3
  full_name { Faker::Name.name }
4
4
  initialize_with { Author.where(full_name: full_name).first_or_create }
data/spec/factories/book.rb CHANGED
@@ -1,4 +1,4 @@
1
- FactoryGirl.define do
1
+ FactoryBot.define do
2
2
  factory :book do
3
3
  title { Faker::Company.catch_phrase }
4
4
  transient do
data/spec/rails_helper.rb CHANGED
@@ -7,7 +7,7 @@ require 'spec_helper'
7
7
  require 'rspec/rails'
8
8
  require 'shoulda/matchers'
9
9
  require 'database_cleaner'
10
- require 'rake'
10
+ # require 'rake'
11
11
  # Add additional requires below this line. Rails is not loaded until this point!
12
12
 
13
13
  # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -30,16 +30,19 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
30
30
  ActiveRecord::Migration.maintain_test_schema!
31
31
 
32
32
  RSpec.configure do |config|
33
- config.before(:suite) do
34
- DatabaseCleaner.strategy = :transaction
35
- DatabaseCleaner.clean_with(:truncation)
36
- Dummy::Application.load_tasks
37
- Rake::Task['db:seed'].invoke # loading seeds
33
+ config.use_transactional_fixtures = false
34
+
35
+ config.before(:each) do
36
+ DatabaseCleaner.strategy = :transaction # Transaction is faster than truncation
38
37
  end
39
- config.around(:each) do |example|
40
- DatabaseCleaner.cleaning do
41
- example.run
42
- end
38
+
39
+ config.before(:each) do
40
+ DatabaseCleaner.start
43
41
  end
42
+
43
+ config.append_after(:each) do
44
+ DatabaseCleaner.clean
45
+ end
46
+
44
47
  config.infer_spec_type_from_file_location!
45
48
  end
data/spec/support/authors.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  shared_context 'authors' do
2
- let(:first_author) { Author.friendly.find('first-author') }
3
- let(:second_author) { Author.friendly.find('second-author') }
2
+ let(:first_author) { FactoryBot.create(:author, full_name: 'First Author') }
3
+ let(:second_author) { FactoryBot.create(:author, full_name: 'Second Author') }
4
4
  end
data/spec/support/books_with_authors.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  shared_context 'books with authors' do
2
2
  include_context 'authors'
3
- let(:book_a) { first_author.books.friendly.find('book-a') }
4
- let(:book_b_first) { first_author.books.friendly.find('book-b') }
5
- let(:book_b_second) { second_author.books.friendly.find('book-b') }
6
- let(:book_c) { second_author.books.friendly.find('book-c') }
3
+ let(:book_a) { FactoryBot.create(:book, title: 'Book A', author: first_author) }
4
+ let(:book_b_first) { FactoryBot.create(:book, title: 'Book B', author: first_author) }
5
+ let(:book_b_second) { FactoryBot.create(:book, title: 'Book B', author: second_author) }
6
+ let(:book_c) { FactoryBot.create(:book, title: 'Book C', author: second_author) }
7
7
  end
metadata CHANGED
@@ -1,35 +1,35 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: friendly_id-method_scopes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karen Lundgren
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-20 00:00:00.000000000 Z
11
+ date: 2020-06-08 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
- - - "<"
18
- - !ruby/object:Gem::Version
19
- version: '6'
20
17
  - - ">="
21
18
  - !ruby/object:Gem::Version
22
19
  version: '4'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '7'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - "<"
28
- - !ruby/object:Gem::Version
29
- version: '6'
30
27
  - - ">="
31
28
  - !ruby/object:Gem::Version
32
29
  version: '4'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '7'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: friendly_id
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -37,6 +37,9 @@ dependencies:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
39
  version: '5'
40
+ - - "<"
41
+ - !ruby/object:Gem::Version
42
+ version: '6'
40
43
  type: :runtime
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
44
47
  - - ">="
45
48
  - !ruby/object:Gem::Version
46
49
  version: '5'
50
+ - - "<"
51
+ - !ruby/object:Gem::Version
52
+ version: '6'
47
53
  - !ruby/object:Gem::Dependency
48
54
  name: juwelier
49
55
  requirement: !ruby/object:Gem::Requirement
@@ -76,30 +82,42 @@ dependencies:
76
82
  name: rspec-rails
77
83
  requirement: !ruby/object:Gem::Requirement
78
84
  requirements:
79
- - - "~>"
85
+ - - ">="
86
+ - !ruby/object:Gem::Version
87
+ version: 4.0.1
88
+ - - "<"
80
89
  - !ruby/object:Gem::Version
81
- version: '3.3'
90
+ version: '5'
82
91
  type: :development
83
92
  prerelease: false
84
93
  version_requirements: !ruby/object:Gem::Requirement
85
94
  requirements:
86
- - - "~>"
95
+ - - ">="
96
+ - !ruby/object:Gem::Version
97
+ version: 4.0.1
98
+ - - "<"
87
99
  - !ruby/object:Gem::Version
88
- version: '3.3'
100
+ version: '5'
89
101
  - !ruby/object:Gem::Dependency
90
102
  name: shoulda-matchers
91
103
  requirement: !ruby/object:Gem::Requirement
92
104
  requirements:
93
105
  - - ">="
94
106
  - !ruby/object:Gem::Version
95
- version: '2.8'
107
+ version: '4.3'
108
+ - - "<"
109
+ - !ruby/object:Gem::Version
110
+ version: '5'
96
111
  type: :development
97
112
  prerelease: false
98
113
  version_requirements: !ruby/object:Gem::Requirement
99
114
  requirements:
100
115
  - - ">="
101
116
  - !ruby/object:Gem::Version
102
- version: '2.8'
117
+ version: '4.3'
118
+ - - "<"
119
+ - !ruby/object:Gem::Version
120
+ version: '5'
103
121
  - !ruby/object:Gem::Dependency
104
122
  name: rolify
105
123
  requirement: !ruby/object:Gem::Requirement
@@ -107,6 +125,9 @@ dependencies:
107
125
  - - ">="
108
126
  - !ruby/object:Gem::Version
109
127
  version: '4'
128
+ - - "<"
129
+ - !ruby/object:Gem::Version
130
+ version: '6'
110
131
  type: :development
111
132
  prerelease: false
112
133
  version_requirements: !ruby/object:Gem::Requirement
@@ -114,6 +135,9 @@ dependencies:
114
135
  - - ">="
115
136
  - !ruby/object:Gem::Version
116
137
  version: '4'
138
+ - - "<"
139
+ - !ruby/object:Gem::Version
140
+ version: '6'
117
141
  - !ruby/object:Gem::Dependency
118
142
  name: seedbank
119
143
  requirement: !ruby/object:Gem::Requirement
@@ -129,47 +153,59 @@ dependencies:
129
153
  - !ruby/object:Gem::Version
130
154
  version: '0.3'
131
155
  - !ruby/object:Gem::Dependency
132
- name: factory_girl_rails
156
+ name: factory_bot_rails
133
157
  requirement: !ruby/object:Gem::Requirement
134
158
  requirements:
135
- - - "~>"
159
+ - - ">="
160
+ - !ruby/object:Gem::Version
161
+ version: 4.8.2
162
+ - - "<"
136
163
  - !ruby/object:Gem::Version
137
- version: '4.5'
164
+ version: '6'
138
165
  type: :development
139
166
  prerelease: false
140
167
  version_requirements: !ruby/object:Gem::Requirement
141
168
  requirements:
142
- - - "~>"
169
+ - - ">="
170
+ - !ruby/object:Gem::Version
171
+ version: 4.8.2
172
+ - - "<"
143
173
  - !ruby/object:Gem::Version
144
- version: '4.5'
174
+ version: '6'
145
175
  - !ruby/object:Gem::Dependency
146
176
  name: faker
147
177
  requirement: !ruby/object:Gem::Requirement
148
178
  requirements:
149
- - - "~>"
179
+ - - ">="
150
180
  - !ruby/object:Gem::Version
151
- version: '1.4'
181
+ version: '2.12'
182
+ - - "<"
183
+ - !ruby/object:Gem::Version
184
+ version: '3'
152
185
  type: :development
153
186
  prerelease: false
154
187
  version_requirements: !ruby/object:Gem::Requirement
155
188
  requirements:
156
- - - "~>"
189
+ - - ">="
157
190
  - !ruby/object:Gem::Version
158
- version: '1.4'
191
+ version: '2.12'
192
+ - - "<"
193
+ - !ruby/object:Gem::Version
194
+ version: '3'
159
195
  - !ruby/object:Gem::Dependency
160
196
  name: haml
161
197
  requirement: !ruby/object:Gem::Requirement
162
198
  requirements:
163
199
  - - "~>"
164
200
  - !ruby/object:Gem::Version
165
- version: '4'
201
+ version: '5'
166
202
  type: :development
167
203
  prerelease: false
168
204
  version_requirements: !ruby/object:Gem::Requirement
169
205
  requirements:
170
206
  - - "~>"
171
207
  - !ruby/object:Gem::Version
172
- version: '4'
208
+ version: '5'
173
209
  - !ruby/object:Gem::Dependency
174
210
  name: database_cleaner
175
211
  requirement: !ruby/object:Gem::Requirement
@@ -191,6 +227,9 @@ dependencies:
191
227
  - - ">="
192
228
  - !ruby/object:Gem::Version
193
229
  version: '1'
230
+ - - "<"
231
+ - !ruby/object:Gem::Version
232
+ version: '2'
194
233
  type: :development
195
234
  prerelease: false
196
235
  version_requirements: !ruby/object:Gem::Requirement
@@ -198,6 +237,9 @@ dependencies:
198
237
  - - ">="
199
238
  - !ruby/object:Gem::Version
200
239
  version: '1'
240
+ - - "<"
241
+ - !ruby/object:Gem::Version
242
+ version: '2'
201
243
  - !ruby/object:Gem::Dependency
202
244
  name: coveralls
203
245
  requirement: !ruby/object:Gem::Requirement
@@ -238,6 +280,7 @@ files:
238
280
  - spec/controllers/authors_controller_spec.rb
239
281
  - spec/controllers/books_controller_spec.rb
240
282
  - spec/dummy/Rakefile
283
+ - spec/dummy/app/assets/config/manifest.js
241
284
  - spec/dummy/app/assets/javascripts/application.js
242
285
  - spec/dummy/app/assets/stylesheets/application.css
243
286
  - spec/dummy/app/assets/stylesheets/scaffold.css
@@ -324,8 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
324
367
  - !ruby/object:Gem::Version
325
368
  version: '0'
326
369
  requirements: []
327
- rubyforge_project:
328
- rubygems_version: 2.6.11
370
+ rubygems_version: 3.0.3
329
371
  signing_key:
330
372
  specification_version: 4
331
373
  summary: FriendlyId Extension to allow method scopes.