trusty-cms 3.0.4 → 3.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.
- checksums.yaml +4 -4
- data/Gemfile +0 -1
- data/Gemfile.lock +2 -5
- data/app/controllers/admin/page_fields_controller.rb +8 -1
- data/app/controllers/admin/page_parts_controller.rb +8 -1
- data/app/controllers/admin/preferences_controller.rb +5 -1
- data/app/controllers/admin/resource_controller.rb +10 -1
- data/app/models/layout.rb +0 -1
- data/app/models/page.rb +4 -3
- data/app/models/page_field.rb +0 -1
- data/app/models/page_part.rb +0 -1
- data/app/models/trusty_cms/config.rb +0 -1
- data/app/models/user.rb +0 -1
- data/coverage/index.html +257 -203
- data/lib/trusty_cms.rb +1 -1
- data/spec/dummy/log/test.log +78808 -0
- data/spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
- data/spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
- metadata +2 -2
data/coverage/index.html
CHANGED
@@ -14,26 +14,26 @@
|
|
14
14
|
<img src="./assets/0.10.1/loading.gif" alt="loading"/>
|
15
15
|
</div>
|
16
16
|
<div id="wrapper" style="display:none;">
|
17
|
-
<div class="timestamp">Generated <abbr class="timeago" title="2017-06-
|
17
|
+
<div class="timestamp">Generated <abbr class="timeago" title="2017-06-29T15:23:32-04:00">2017-06-29T15:23:32-04:00</abbr></div>
|
18
18
|
<ul class="group_tabs"></ul>
|
19
19
|
|
20
20
|
<div id="content">
|
21
21
|
<div class="file_list_container" id="AllFiles">
|
22
22
|
<h2>
|
23
23
|
<span class="group_name">All Files</span>
|
24
|
-
(<span class="covered_percent"><span class="yellow">82.
|
24
|
+
(<span class="covered_percent"><span class="yellow">82.75%</span></span>
|
25
25
|
covered at
|
26
26
|
<span class="covered_strength">
|
27
27
|
<span class="green">
|
28
|
-
14.
|
28
|
+
14.47
|
29
29
|
</span>
|
30
30
|
</span> hits/line)
|
31
31
|
</h2>
|
32
32
|
<a name="AllFiles"></a>
|
33
33
|
<div>
|
34
34
|
<b>51</b> files in total.
|
35
|
-
<b>
|
36
|
-
<span class="green"><b>
|
35
|
+
<b>1368</b> relevant lines.
|
36
|
+
<span class="green"><b>1132</b> lines covered</span> and
|
37
37
|
<span class="red"><b>236</b> lines missed </span>
|
38
38
|
</div>
|
39
39
|
<table class="file_list">
|
@@ -92,20 +92,20 @@
|
|
92
92
|
|
93
93
|
<tr>
|
94
94
|
<td class="strong"><a href="#ffc0ea6768b2d6709d4896039faa4e70ac4ac143" class="src_link" title="app/controllers/admin/preferences_controller.rb">app/controllers/admin/preferences_controller.rb</a></td>
|
95
|
-
<td class="yellow strong">
|
96
|
-
<td>
|
97
|
-
<td>
|
98
|
-
<td>
|
95
|
+
<td class="yellow strong">84.21 %</td>
|
96
|
+
<td>33</td>
|
97
|
+
<td>19</td>
|
98
|
+
<td>16</td>
|
99
99
|
<td>3</td>
|
100
100
|
<td>1.0</td>
|
101
101
|
</tr>
|
102
102
|
|
103
103
|
<tr>
|
104
104
|
<td class="strong"><a href="#f692fbf97e936f3bd45af3c90782168361ccc8cc" class="src_link" title="app/controllers/admin/resource_controller.rb">app/controllers/admin/resource_controller.rb</a></td>
|
105
|
-
<td class="yellow strong">86.
|
106
|
-
<td>
|
107
|
-
<td>
|
108
|
-
<td>
|
105
|
+
<td class="yellow strong">86.82 %</td>
|
106
|
+
<td>253</td>
|
107
|
+
<td>129</td>
|
108
|
+
<td>112</td>
|
109
109
|
<td>17</td>
|
110
110
|
<td>5.4</td>
|
111
111
|
</tr>
|
@@ -283,11 +283,11 @@
|
|
283
283
|
<tr>
|
284
284
|
<td class="strong"><a href="#ce84beeca2a57c15d5da143808d6f6e6eb85e430" class="src_link" title="app/models/layout.rb">app/models/layout.rb</a></td>
|
285
285
|
<td class="green strong">100.0 %</td>
|
286
|
-
<td>
|
287
|
-
<td>
|
288
|
-
<td>
|
286
|
+
<td>15</td>
|
287
|
+
<td>8</td>
|
288
|
+
<td>8</td>
|
289
289
|
<td>0</td>
|
290
|
-
<td>
|
290
|
+
<td>4.1</td>
|
291
291
|
</tr>
|
292
292
|
|
293
293
|
<tr>
|
@@ -303,21 +303,21 @@
|
|
303
303
|
<tr>
|
304
304
|
<td class="strong"><a href="#49c0d6cdd80063237788139caa212ff3b99f0569" class="src_link" title="app/models/page_field.rb">app/models/page_field.rb</a></td>
|
305
305
|
<td class="green strong">100.0 %</td>
|
306
|
-
<td>4</td>
|
307
|
-
<td>3</td>
|
308
306
|
<td>3</td>
|
307
|
+
<td>2</td>
|
308
|
+
<td>2</td>
|
309
309
|
<td>0</td>
|
310
310
|
<td>1.0</td>
|
311
311
|
</tr>
|
312
312
|
|
313
313
|
<tr>
|
314
314
|
<td class="strong"><a href="#bd093ce629db1b261871cea3d4882c14d0edc165" class="src_link" title="app/models/page_part.rb">app/models/page_part.rb</a></td>
|
315
|
-
<td class="yellow strong">
|
316
|
-
<td>
|
317
|
-
<td>10</td>
|
315
|
+
<td class="yellow strong">88.89 %</td>
|
316
|
+
<td>19</td>
|
318
317
|
<td>9</td>
|
318
|
+
<td>8</td>
|
319
319
|
<td>1</td>
|
320
|
-
<td>2.
|
320
|
+
<td>2.7</td>
|
321
321
|
</tr>
|
322
322
|
|
323
323
|
<tr>
|
@@ -342,10 +342,10 @@
|
|
342
342
|
|
343
343
|
<tr>
|
344
344
|
<td class="strong"><a href="#81a323fefe55031208374870d21243beae4e4565" class="src_link" title="app/models/user.rb">app/models/user.rb</a></td>
|
345
|
-
<td class="yellow strong">82.
|
346
|
-
<td>
|
347
|
-
<td>
|
348
|
-
<td>
|
345
|
+
<td class="yellow strong">82.35 %</td>
|
346
|
+
<td>96</td>
|
347
|
+
<td>51</td>
|
348
|
+
<td>42</td>
|
349
349
|
<td>9</td>
|
350
350
|
<td>5.3</td>
|
351
351
|
</tr>
|
@@ -357,7 +357,7 @@
|
|
357
357
|
<td>14</td>
|
358
358
|
<td>14</td>
|
359
359
|
<td>0</td>
|
360
|
-
<td>21.
|
360
|
+
<td>21.6</td>
|
361
361
|
</tr>
|
362
362
|
|
363
363
|
<tr>
|
@@ -1753,10 +1753,10 @@
|
|
1753
1753
|
<div class="source_table" id="ffc0ea6768b2d6709d4896039faa4e70ac4ac143">
|
1754
1754
|
<div class="header">
|
1755
1755
|
<h3>app/controllers/admin/preferences_controller.rb</h3>
|
1756
|
-
<h4><span class="yellow">
|
1756
|
+
<h4><span class="yellow">84.21 %</span> covered</h4>
|
1757
1757
|
<div>
|
1758
|
-
<b>
|
1759
|
-
<span class="green"><b>
|
1758
|
+
<b>19</b> relevant lines.
|
1759
|
+
<span class="green"><b>16</b> lines covered</span> and
|
1760
1760
|
<span class="red"><b>3</b> lines missed.</span>
|
1761
1761
|
</div>
|
1762
1762
|
</div>
|
@@ -1845,7 +1845,7 @@
|
|
1845
1845
|
<li class="covered" data-hits="1" data-linenumber="14">
|
1846
1846
|
<span class="hits">1</span>
|
1847
1847
|
|
1848
|
-
<code class="ruby"> if @user.update_attributes(
|
1848
|
+
<code class="ruby"> if @user.update_attributes(preferences_params)</code>
|
1849
1849
|
</li>
|
1850
1850
|
|
1851
1851
|
<li class="covered" data-hits="1" data-linenumber="15">
|
@@ -1935,6 +1935,30 @@
|
|
1935
1935
|
<li class="never" data-hits="" data-linenumber="29">
|
1936
1936
|
|
1937
1937
|
|
1938
|
+
<code class="ruby"></code>
|
1939
|
+
</li>
|
1940
|
+
|
1941
|
+
<li class="covered" data-hits="1" data-linenumber="30">
|
1942
|
+
<span class="hits">1</span>
|
1943
|
+
|
1944
|
+
<code class="ruby"> def preferences_params</code>
|
1945
|
+
</li>
|
1946
|
+
|
1947
|
+
<li class="covered" data-hits="1" data-linenumber="31">
|
1948
|
+
<span class="hits">1</span>
|
1949
|
+
|
1950
|
+
<code class="ruby"> params.require(:user).permit(:name, :email, :login, :password, :password_confirmation, :locale)</code>
|
1951
|
+
</li>
|
1952
|
+
|
1953
|
+
<li class="never" data-hits="" data-linenumber="32">
|
1954
|
+
|
1955
|
+
|
1956
|
+
<code class="ruby"> end</code>
|
1957
|
+
</li>
|
1958
|
+
|
1959
|
+
<li class="never" data-hits="" data-linenumber="33">
|
1960
|
+
|
1961
|
+
|
1938
1962
|
<code class="ruby">end</code>
|
1939
1963
|
</li>
|
1940
1964
|
|
@@ -1946,10 +1970,10 @@
|
|
1946
1970
|
<div class="source_table" id="f692fbf97e936f3bd45af3c90782168361ccc8cc">
|
1947
1971
|
<div class="header">
|
1948
1972
|
<h3>app/controllers/admin/resource_controller.rb</h3>
|
1949
|
-
<h4><span class="yellow">86.
|
1973
|
+
<h4><span class="yellow">86.82 %</span> covered</h4>
|
1950
1974
|
<div>
|
1951
|
-
<b>
|
1952
|
-
<span class="green"><b>
|
1975
|
+
<b>129</b> relevant lines.
|
1976
|
+
<span class="green"><b>112</b> lines covered</span> and
|
1953
1977
|
<span class="red"><b>17</b> lines missed.</span>
|
1954
1978
|
</div>
|
1955
1979
|
</div>
|
@@ -2320,7 +2344,7 @@
|
|
2320
2344
|
<li class="never" data-hits="" data-linenumber="61">
|
2321
2345
|
|
2322
2346
|
|
2323
|
-
<code class="ruby"> model.update_attributes!(
|
2347
|
+
<code class="ruby"> model.update_attributes!(permitted_params[model_symbol]) # model.update_attributes!(params[model_symbol])</code>
|
2324
2348
|
</li>
|
2325
2349
|
|
2326
2350
|
<li class="never" data-hits="" data-linenumber="62">
|
@@ -3409,13 +3433,67 @@
|
|
3409
3433
|
<code class="ruby"></code>
|
3410
3434
|
</li>
|
3411
3435
|
|
3412
|
-
<li class="
|
3436
|
+
<li class="covered" data-hits="1" data-linenumber="243">
|
3437
|
+
<span class="hits">1</span>
|
3438
|
+
|
3439
|
+
<code class="ruby"> def permitted_params</code>
|
3440
|
+
</li>
|
3441
|
+
|
3442
|
+
<li class="covered" data-hits="18" data-linenumber="244">
|
3443
|
+
<span class="hits">18</span>
|
3444
|
+
|
3445
|
+
<code class="ruby"> model_symbols = ActiveRecord::Base.descendants.map{|a| a.name.underscore.to_sym}</code>
|
3446
|
+
</li>
|
3447
|
+
|
3448
|
+
<li class="covered" data-hits="14" data-linenumber="245">
|
3449
|
+
<span class="hits">14</span>
|
3450
|
+
|
3451
|
+
<code class="ruby"> keys = params.keys.map{|k| k.underscore.to_sym}</code>
|
3452
|
+
</li>
|
3453
|
+
|
3454
|
+
<li class="covered" data-hits="2" data-linenumber="246">
|
3455
|
+
<span class="hits">2</span>
|
3456
|
+
|
3457
|
+
<code class="ruby"> valid_symbols = model_symbols & keys</code>
|
3458
|
+
</li>
|
3459
|
+
|
3460
|
+
<li class="covered" data-hits="2" data-linenumber="247">
|
3461
|
+
<span class="hits">2</span>
|
3462
|
+
|
3463
|
+
<code class="ruby"> valid_symbols.each do |symbol|</code>
|
3464
|
+
</li>
|
3465
|
+
|
3466
|
+
<li class="covered" data-hits="2" data-linenumber="248">
|
3467
|
+
<span class="hits">2</span>
|
3468
|
+
|
3469
|
+
<code class="ruby"> params[symbol].permit!</code>
|
3470
|
+
</li>
|
3471
|
+
|
3472
|
+
<li class="never" data-hits="" data-linenumber="249">
|
3473
|
+
|
3474
|
+
|
3475
|
+
<code class="ruby"> end</code>
|
3476
|
+
</li>
|
3477
|
+
|
3478
|
+
<li class="covered" data-hits="2" data-linenumber="250">
|
3479
|
+
<span class="hits">2</span>
|
3480
|
+
|
3481
|
+
<code class="ruby"> params</code>
|
3482
|
+
</li>
|
3483
|
+
|
3484
|
+
<li class="never" data-hits="" data-linenumber="251">
|
3485
|
+
|
3486
|
+
|
3487
|
+
<code class="ruby"> end</code>
|
3488
|
+
</li>
|
3489
|
+
|
3490
|
+
<li class="never" data-hits="" data-linenumber="252">
|
3413
3491
|
|
3414
3492
|
|
3415
3493
|
<code class="ruby"></code>
|
3416
3494
|
</li>
|
3417
3495
|
|
3418
|
-
<li class="never" data-hits="" data-linenumber="
|
3496
|
+
<li class="never" data-hits="" data-linenumber="253">
|
3419
3497
|
|
3420
3498
|
|
3421
3499
|
<code class="ruby">end</code>
|
@@ -8536,8 +8614,8 @@
|
|
8536
8614
|
<h3>app/models/layout.rb</h3>
|
8537
8615
|
<h4><span class="green">100.0 %</span> covered</h4>
|
8538
8616
|
<div>
|
8539
|
-
<b>
|
8540
|
-
<span class="green"><b>
|
8617
|
+
<b>8</b> relevant lines.
|
8618
|
+
<span class="green"><b>8</b> lines covered</span> and
|
8541
8619
|
<span class="red"><b>0</b> lines missed.</span>
|
8542
8620
|
</div>
|
8543
8621
|
</div>
|
@@ -8551,91 +8629,85 @@
|
|
8551
8629
|
<code class="ruby">class Layout < ActiveRecord::Base</code>
|
8552
8630
|
</li>
|
8553
8631
|
|
8554
|
-
<li class="
|
8555
|
-
<span class="hits">1</span>
|
8556
|
-
|
8557
|
-
<code class="ruby"> attr_protected :created_at, :updated_at</code>
|
8558
|
-
</li>
|
8559
|
-
|
8560
|
-
<li class="never" data-hits="" data-linenumber="3">
|
8632
|
+
<li class="never" data-hits="" data-linenumber="2">
|
8561
8633
|
|
8562
8634
|
|
8563
8635
|
<code class="ruby"></code>
|
8564
8636
|
</li>
|
8565
8637
|
|
8566
|
-
<li class="never" data-hits="" data-linenumber="
|
8638
|
+
<li class="never" data-hits="" data-linenumber="3">
|
8567
8639
|
|
8568
8640
|
|
8569
8641
|
<code class="ruby"> # Default Order</code>
|
8570
8642
|
</li>
|
8571
8643
|
|
8572
|
-
<li class="covered" data-hits="26" data-linenumber="
|
8644
|
+
<li class="covered" data-hits="26" data-linenumber="4">
|
8573
8645
|
<span class="hits">26</span>
|
8574
8646
|
|
8575
8647
|
<code class="ruby"> default_scope {order("name")}</code>
|
8576
8648
|
</li>
|
8577
8649
|
|
8578
|
-
<li class="never" data-hits="" data-linenumber="
|
8650
|
+
<li class="never" data-hits="" data-linenumber="5">
|
8579
8651
|
|
8580
8652
|
|
8581
8653
|
<code class="ruby"></code>
|
8582
8654
|
</li>
|
8583
8655
|
|
8584
|
-
<li class="never" data-hits="" data-linenumber="
|
8656
|
+
<li class="never" data-hits="" data-linenumber="6">
|
8585
8657
|
|
8586
8658
|
|
8587
8659
|
<code class="ruby"> # Associations</code>
|
8588
8660
|
</li>
|
8589
8661
|
|
8590
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8662
|
+
<li class="covered" data-hits="1" data-linenumber="7">
|
8591
8663
|
<span class="hits">1</span>
|
8592
8664
|
|
8593
8665
|
<code class="ruby"> has_many :pages</code>
|
8594
8666
|
</li>
|
8595
8667
|
|
8596
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8668
|
+
<li class="covered" data-hits="1" data-linenumber="8">
|
8597
8669
|
<span class="hits">1</span>
|
8598
8670
|
|
8599
8671
|
<code class="ruby"> belongs_to :created_by, :class_name => 'User'</code>
|
8600
8672
|
</li>
|
8601
8673
|
|
8602
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8674
|
+
<li class="covered" data-hits="1" data-linenumber="9">
|
8603
8675
|
<span class="hits">1</span>
|
8604
8676
|
|
8605
8677
|
<code class="ruby"> belongs_to :updated_by, :class_name => 'User'</code>
|
8606
8678
|
</li>
|
8607
8679
|
|
8608
|
-
<li class="never" data-hits="" data-linenumber="
|
8680
|
+
<li class="never" data-hits="" data-linenumber="10">
|
8609
8681
|
|
8610
8682
|
|
8611
8683
|
<code class="ruby"></code>
|
8612
8684
|
</li>
|
8613
8685
|
|
8614
|
-
<li class="never" data-hits="" data-linenumber="
|
8686
|
+
<li class="never" data-hits="" data-linenumber="11">
|
8615
8687
|
|
8616
8688
|
|
8617
8689
|
<code class="ruby"> # Validations</code>
|
8618
8690
|
</li>
|
8619
8691
|
|
8620
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8692
|
+
<li class="covered" data-hits="1" data-linenumber="12">
|
8621
8693
|
<span class="hits">1</span>
|
8622
8694
|
|
8623
8695
|
<code class="ruby"> validates_presence_of :name</code>
|
8624
8696
|
</li>
|
8625
8697
|
|
8626
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8698
|
+
<li class="covered" data-hits="1" data-linenumber="13">
|
8627
8699
|
<span class="hits">1</span>
|
8628
8700
|
|
8629
8701
|
<code class="ruby"> validates_uniqueness_of :name</code>
|
8630
8702
|
</li>
|
8631
8703
|
|
8632
|
-
<li class="covered" data-hits="1" data-linenumber="
|
8704
|
+
<li class="covered" data-hits="1" data-linenumber="14">
|
8633
8705
|
<span class="hits">1</span>
|
8634
8706
|
|
8635
8707
|
<code class="ruby"> validates_length_of :name, :maximum => 100</code>
|
8636
8708
|
</li>
|
8637
8709
|
|
8638
|
-
<li class="never" data-hits="" data-linenumber="
|
8710
|
+
<li class="never" data-hits="" data-linenumber="15">
|
8639
8711
|
|
8640
8712
|
|
8641
8713
|
<code class="ruby">end</code>
|
@@ -9510,8 +9582,8 @@
|
|
9510
9582
|
<h3>app/models/page_field.rb</h3>
|
9511
9583
|
<h4><span class="green">100.0 %</span> covered</h4>
|
9512
9584
|
<div>
|
9513
|
-
<b>
|
9514
|
-
<span class="green"><b>
|
9585
|
+
<b>2</b> relevant lines.
|
9586
|
+
<span class="green"><b>2</b> lines covered</span> and
|
9515
9587
|
<span class="red"><b>0</b> lines missed.</span>
|
9516
9588
|
</div>
|
9517
9589
|
</div>
|
@@ -9528,16 +9600,10 @@
|
|
9528
9600
|
<li class="covered" data-hits="1" data-linenumber="2">
|
9529
9601
|
<span class="hits">1</span>
|
9530
9602
|
|
9531
|
-
<code class="ruby"> attr_accessible :name, :content</code>
|
9532
|
-
</li>
|
9533
|
-
|
9534
|
-
<li class="covered" data-hits="1" data-linenumber="3">
|
9535
|
-
<span class="hits">1</span>
|
9536
|
-
|
9537
9603
|
<code class="ruby"> validates_presence_of :name</code>
|
9538
9604
|
</li>
|
9539
9605
|
|
9540
|
-
<li class="never" data-hits="" data-linenumber="
|
9606
|
+
<li class="never" data-hits="" data-linenumber="3">
|
9541
9607
|
|
9542
9608
|
|
9543
9609
|
<code class="ruby">end</code>
|
@@ -9551,10 +9617,10 @@
|
|
9551
9617
|
<div class="source_table" id="bd093ce629db1b261871cea3d4882c14d0edc165">
|
9552
9618
|
<div class="header">
|
9553
9619
|
<h3>app/models/page_part.rb</h3>
|
9554
|
-
<h4><span class="yellow">
|
9620
|
+
<h4><span class="yellow">88.89 %</span> covered</h4>
|
9555
9621
|
<div>
|
9556
|
-
<b>
|
9557
|
-
<span class="green"><b>
|
9622
|
+
<b>9</b> relevant lines.
|
9623
|
+
<span class="green"><b>8</b> lines covered</span> and
|
9558
9624
|
<span class="red"><b>1</b> lines missed.</span>
|
9559
9625
|
</div>
|
9560
9626
|
</div>
|
@@ -9568,115 +9634,109 @@
|
|
9568
9634
|
<code class="ruby">class PagePart < ActiveRecord::Base</code>
|
9569
9635
|
</li>
|
9570
9636
|
|
9571
|
-
<li class="
|
9572
|
-
<span class="hits">1</span>
|
9573
|
-
|
9574
|
-
<code class="ruby"> attr_accessible :name, :filter_id, :content</code>
|
9575
|
-
</li>
|
9576
|
-
|
9577
|
-
<li class="never" data-hits="" data-linenumber="3">
|
9637
|
+
<li class="never" data-hits="" data-linenumber="2">
|
9578
9638
|
|
9579
9639
|
|
9580
9640
|
<code class="ruby"></code>
|
9581
9641
|
</li>
|
9582
9642
|
|
9583
|
-
<li class="never" data-hits="" data-linenumber="
|
9643
|
+
<li class="never" data-hits="" data-linenumber="3">
|
9584
9644
|
|
9585
9645
|
|
9586
9646
|
<code class="ruby"> # Default Order</code>
|
9587
9647
|
</li>
|
9588
9648
|
|
9589
|
-
<li class="covered" data-hits="17" data-linenumber="
|
9649
|
+
<li class="covered" data-hits="17" data-linenumber="4">
|
9590
9650
|
<span class="hits">17</span>
|
9591
9651
|
|
9592
9652
|
<code class="ruby"> default_scope {order("name")}</code>
|
9593
9653
|
</li>
|
9594
9654
|
|
9595
|
-
<li class="never" data-hits="" data-linenumber="
|
9655
|
+
<li class="never" data-hits="" data-linenumber="5">
|
9596
9656
|
|
9597
9657
|
|
9598
9658
|
<code class="ruby"></code>
|
9599
9659
|
</li>
|
9600
9660
|
|
9601
|
-
<li class="never" data-hits="" data-linenumber="
|
9661
|
+
<li class="never" data-hits="" data-linenumber="6">
|
9602
9662
|
|
9603
9663
|
|
9604
9664
|
<code class="ruby"> # Associations</code>
|
9605
9665
|
</li>
|
9606
9666
|
|
9607
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9667
|
+
<li class="covered" data-hits="1" data-linenumber="7">
|
9608
9668
|
<span class="hits">1</span>
|
9609
9669
|
|
9610
9670
|
<code class="ruby"> belongs_to :page</code>
|
9611
9671
|
</li>
|
9612
9672
|
|
9613
|
-
<li class="never" data-hits="" data-linenumber="
|
9673
|
+
<li class="never" data-hits="" data-linenumber="8">
|
9614
9674
|
|
9615
9675
|
|
9616
9676
|
<code class="ruby"></code>
|
9617
9677
|
</li>
|
9618
9678
|
|
9619
|
-
<li class="never" data-hits="" data-linenumber="
|
9679
|
+
<li class="never" data-hits="" data-linenumber="9">
|
9620
9680
|
|
9621
9681
|
|
9622
9682
|
<code class="ruby"> # Validations</code>
|
9623
9683
|
</li>
|
9624
9684
|
|
9625
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9685
|
+
<li class="covered" data-hits="1" data-linenumber="10">
|
9626
9686
|
<span class="hits">1</span>
|
9627
9687
|
|
9628
9688
|
<code class="ruby"> validates_presence_of :name</code>
|
9629
9689
|
</li>
|
9630
9690
|
|
9631
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9691
|
+
<li class="covered" data-hits="1" data-linenumber="11">
|
9632
9692
|
<span class="hits">1</span>
|
9633
9693
|
|
9634
9694
|
<code class="ruby"> validates_length_of :name, :maximum => 100</code>
|
9635
9695
|
</li>
|
9636
9696
|
|
9637
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9697
|
+
<li class="covered" data-hits="1" data-linenumber="12">
|
9638
9698
|
<span class="hits">1</span>
|
9639
9699
|
|
9640
9700
|
<code class="ruby"> validates_length_of :filter_id, :maximum => 25, :allow_nil => true</code>
|
9641
9701
|
</li>
|
9642
9702
|
|
9643
|
-
<li class="never" data-hits="" data-linenumber="
|
9703
|
+
<li class="never" data-hits="" data-linenumber="13">
|
9644
9704
|
|
9645
9705
|
|
9646
9706
|
<code class="ruby"></code>
|
9647
9707
|
</li>
|
9648
9708
|
|
9649
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9709
|
+
<li class="covered" data-hits="1" data-linenumber="14">
|
9650
9710
|
<span class="hits">1</span>
|
9651
9711
|
|
9652
9712
|
<code class="ruby"> object_id_attr :filter, TextFilter</code>
|
9653
9713
|
</li>
|
9654
9714
|
|
9655
|
-
<li class="never" data-hits="" data-linenumber="
|
9715
|
+
<li class="never" data-hits="" data-linenumber="15">
|
9656
9716
|
|
9657
9717
|
|
9658
9718
|
<code class="ruby"></code>
|
9659
9719
|
</li>
|
9660
9720
|
|
9661
|
-
<li class="covered" data-hits="1" data-linenumber="
|
9721
|
+
<li class="covered" data-hits="1" data-linenumber="16">
|
9662
9722
|
<span class="hits">1</span>
|
9663
9723
|
|
9664
9724
|
<code class="ruby"> def after_initialize</code>
|
9665
9725
|
</li>
|
9666
9726
|
|
9667
|
-
<li class="missed" data-hits="0" data-linenumber="
|
9727
|
+
<li class="missed" data-hits="0" data-linenumber="17">
|
9668
9728
|
|
9669
9729
|
|
9670
9730
|
<code class="ruby"> self.filter_id ||= TrustyCms::Config['defaults.page.filter'] if new_record?</code>
|
9671
9731
|
</li>
|
9672
9732
|
|
9673
|
-
<li class="never" data-hits="" data-linenumber="
|
9733
|
+
<li class="never" data-hits="" data-linenumber="18">
|
9674
9734
|
|
9675
9735
|
|
9676
9736
|
<code class="ruby"> end</code>
|
9677
9737
|
</li>
|
9678
9738
|
|
9679
|
-
<li class="never" data-hits="" data-linenumber="
|
9739
|
+
<li class="never" data-hits="" data-linenumber="19">
|
9680
9740
|
|
9681
9741
|
|
9682
9742
|
<code class="ruby">end</code>
|
@@ -10160,10 +10220,10 @@
|
|
10160
10220
|
<div class="source_table" id="81a323fefe55031208374870d21243beae4e4565">
|
10161
10221
|
<div class="header">
|
10162
10222
|
<h3>app/models/user.rb</h3>
|
10163
|
-
<h4><span class="yellow">82.
|
10223
|
+
<h4><span class="yellow">82.35 %</span> covered</h4>
|
10164
10224
|
<div>
|
10165
|
-
<b>
|
10166
|
-
<span class="green"><b>
|
10225
|
+
<b>51</b> relevant lines.
|
10226
|
+
<span class="green"><b>42</b> lines covered</span> and
|
10167
10227
|
<span class="red"><b>9</b> lines missed.</span>
|
10168
10228
|
</div>
|
10169
10229
|
</div>
|
@@ -10195,559 +10255,553 @@
|
|
10195
10255
|
<code class="ruby"> has_many :pages, :foreign_key => :created_by_id</code>
|
10196
10256
|
</li>
|
10197
10257
|
|
10198
|
-
<li class="
|
10199
|
-
<span class="hits">1</span>
|
10200
|
-
|
10201
|
-
<code class="ruby"> attr_protected 'why_is_this_needed'</code>
|
10202
|
-
</li>
|
10203
|
-
|
10204
|
-
<li class="never" data-hits="" data-linenumber="6">
|
10258
|
+
<li class="never" data-hits="" data-linenumber="5">
|
10205
10259
|
|
10206
10260
|
|
10207
10261
|
<code class="ruby"></code>
|
10208
10262
|
</li>
|
10209
10263
|
|
10210
|
-
<li class="never" data-hits="" data-linenumber="
|
10264
|
+
<li class="never" data-hits="" data-linenumber="6">
|
10211
10265
|
|
10212
10266
|
|
10213
10267
|
<code class="ruby"> # Default Order</code>
|
10214
10268
|
</li>
|
10215
10269
|
|
10216
|
-
<li class="covered" data-hits="26" data-linenumber="
|
10270
|
+
<li class="covered" data-hits="26" data-linenumber="7">
|
10217
10271
|
<span class="hits">26</span>
|
10218
10272
|
|
10219
10273
|
<code class="ruby"> default_scope {order("name")}</code>
|
10220
10274
|
</li>
|
10221
10275
|
|
10222
|
-
<li class="never" data-hits="" data-linenumber="
|
10276
|
+
<li class="never" data-hits="" data-linenumber="8">
|
10223
10277
|
|
10224
10278
|
|
10225
10279
|
<code class="ruby"></code>
|
10226
10280
|
</li>
|
10227
10281
|
|
10228
|
-
<li class="never" data-hits="" data-linenumber="
|
10282
|
+
<li class="never" data-hits="" data-linenumber="9">
|
10229
10283
|
|
10230
10284
|
|
10231
10285
|
<code class="ruby"> # Associations</code>
|
10232
10286
|
</li>
|
10233
10287
|
|
10234
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10288
|
+
<li class="covered" data-hits="1" data-linenumber="10">
|
10235
10289
|
<span class="hits">1</span>
|
10236
10290
|
|
10237
10291
|
<code class="ruby"> belongs_to :created_by, :class_name => 'User'</code>
|
10238
10292
|
</li>
|
10239
10293
|
|
10240
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10294
|
+
<li class="covered" data-hits="1" data-linenumber="11">
|
10241
10295
|
<span class="hits">1</span>
|
10242
10296
|
|
10243
10297
|
<code class="ruby"> belongs_to :updated_by, :class_name => 'User'</code>
|
10244
10298
|
</li>
|
10245
10299
|
|
10246
|
-
<li class="never" data-hits="" data-linenumber="
|
10300
|
+
<li class="never" data-hits="" data-linenumber="12">
|
10247
10301
|
|
10248
10302
|
|
10249
10303
|
<code class="ruby"></code>
|
10250
10304
|
</li>
|
10251
10305
|
|
10252
|
-
<li class="never" data-hits="" data-linenumber="
|
10306
|
+
<li class="never" data-hits="" data-linenumber="13">
|
10253
10307
|
|
10254
10308
|
|
10255
10309
|
<code class="ruby"> # Validations</code>
|
10256
10310
|
</li>
|
10257
10311
|
|
10258
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10312
|
+
<li class="covered" data-hits="1" data-linenumber="14">
|
10259
10313
|
<span class="hits">1</span>
|
10260
10314
|
|
10261
10315
|
<code class="ruby"> validates_uniqueness_of :login</code>
|
10262
10316
|
</li>
|
10263
10317
|
|
10264
|
-
<li class="never" data-hits="" data-linenumber="
|
10318
|
+
<li class="never" data-hits="" data-linenumber="15">
|
10265
10319
|
|
10266
10320
|
|
10267
10321
|
<code class="ruby"></code>
|
10268
10322
|
</li>
|
10269
10323
|
|
10270
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10324
|
+
<li class="covered" data-hits="1" data-linenumber="16">
|
10271
10325
|
<span class="hits">1</span>
|
10272
10326
|
|
10273
10327
|
<code class="ruby"> validates_confirmation_of :password, :if => :confirm_password?</code>
|
10274
10328
|
</li>
|
10275
10329
|
|
10276
|
-
<li class="never" data-hits="" data-linenumber="
|
10330
|
+
<li class="never" data-hits="" data-linenumber="17">
|
10277
10331
|
|
10278
10332
|
|
10279
10333
|
<code class="ruby"></code>
|
10280
10334
|
</li>
|
10281
10335
|
|
10282
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10336
|
+
<li class="covered" data-hits="1" data-linenumber="18">
|
10283
10337
|
<span class="hits">1</span>
|
10284
10338
|
|
10285
10339
|
<code class="ruby"> validates_presence_of :name, :login</code>
|
10286
10340
|
</li>
|
10287
10341
|
|
10288
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10342
|
+
<li class="covered" data-hits="1" data-linenumber="19">
|
10289
10343
|
<span class="hits">1</span>
|
10290
10344
|
|
10291
10345
|
<code class="ruby"> validates_presence_of :password, :password_confirmation, :if => :new_record?</code>
|
10292
10346
|
</li>
|
10293
10347
|
|
10294
|
-
<li class="never" data-hits="" data-linenumber="
|
10348
|
+
<li class="never" data-hits="" data-linenumber="20">
|
10295
10349
|
|
10296
10350
|
|
10297
10351
|
<code class="ruby"></code>
|
10298
10352
|
</li>
|
10299
10353
|
|
10300
|
-
<li class="never" data-hits="" data-linenumber="
|
10354
|
+
<li class="never" data-hits="" data-linenumber="21">
|
10301
10355
|
|
10302
10356
|
|
10303
10357
|
<code class="ruby"></code>
|
10304
10358
|
</li>
|
10305
10359
|
|
10306
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10360
|
+
<li class="covered" data-hits="1" data-linenumber="22">
|
10307
10361
|
<span class="hits">1</span>
|
10308
10362
|
|
10309
10363
|
<code class="ruby"> validates_length_of :name, :maximum => 100, :allow_nil => true</code>
|
10310
10364
|
</li>
|
10311
10365
|
|
10312
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10366
|
+
<li class="covered" data-hits="1" data-linenumber="23">
|
10313
10367
|
<span class="hits">1</span>
|
10314
10368
|
|
10315
10369
|
<code class="ruby"> validates_length_of :login, :within => 3..40, :allow_nil => true</code>
|
10316
10370
|
</li>
|
10317
10371
|
|
10318
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10372
|
+
<li class="covered" data-hits="1" data-linenumber="24">
|
10319
10373
|
<span class="hits">1</span>
|
10320
10374
|
|
10321
10375
|
<code class="ruby"> validates_length_of :password, :within => 5..40, :allow_nil => true, :if => :validate_length_of_password?</code>
|
10322
10376
|
</li>
|
10323
10377
|
|
10324
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10378
|
+
<li class="covered" data-hits="1" data-linenumber="25">
|
10325
10379
|
<span class="hits">1</span>
|
10326
10380
|
|
10327
10381
|
<code class="ruby"> validates_length_of :email, :maximum => 255, :allow_nil => true</code>
|
10328
10382
|
</li>
|
10329
10383
|
|
10330
|
-
<li class="never" data-hits="" data-linenumber="
|
10384
|
+
<li class="never" data-hits="" data-linenumber="26">
|
10331
10385
|
|
10332
10386
|
|
10333
10387
|
<code class="ruby"></code>
|
10334
10388
|
</li>
|
10335
10389
|
|
10336
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10390
|
+
<li class="covered" data-hits="1" data-linenumber="27">
|
10337
10391
|
<span class="hits">1</span>
|
10338
10392
|
|
10339
10393
|
<code class="ruby"> attr_writer :confirm_password</code>
|
10340
10394
|
</li>
|
10341
10395
|
|
10342
|
-
<li class="never" data-hits="" data-linenumber="
|
10396
|
+
<li class="never" data-hits="" data-linenumber="28">
|
10343
10397
|
|
10344
10398
|
|
10345
10399
|
<code class="ruby"></code>
|
10346
10400
|
</li>
|
10347
10401
|
|
10348
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10402
|
+
<li class="covered" data-hits="1" data-linenumber="29">
|
10349
10403
|
<span class="hits">1</span>
|
10350
10404
|
|
10351
10405
|
<code class="ruby"> def has_role?(role)</code>
|
10352
10406
|
</li>
|
10353
10407
|
|
10354
|
-
<li class="covered" data-hits="128" data-linenumber="
|
10408
|
+
<li class="covered" data-hits="128" data-linenumber="30">
|
10355
10409
|
<span class="hits">128</span>
|
10356
10410
|
|
10357
10411
|
<code class="ruby"> respond_to?("#{role}?") && send("#{role}?")</code>
|
10358
10412
|
</li>
|
10359
10413
|
|
10360
|
-
<li class="never" data-hits="" data-linenumber="
|
10414
|
+
<li class="never" data-hits="" data-linenumber="31">
|
10361
10415
|
|
10362
10416
|
|
10363
10417
|
<code class="ruby"> end</code>
|
10364
10418
|
</li>
|
10365
10419
|
|
10366
|
-
<li class="never" data-hits="" data-linenumber="
|
10420
|
+
<li class="never" data-hits="" data-linenumber="32">
|
10367
10421
|
|
10368
10422
|
|
10369
10423
|
<code class="ruby"></code>
|
10370
10424
|
</li>
|
10371
10425
|
|
10372
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10426
|
+
<li class="covered" data-hits="1" data-linenumber="33">
|
10373
10427
|
<span class="hits">1</span>
|
10374
10428
|
|
10375
10429
|
<code class="ruby"> def sha1(phrase)</code>
|
10376
10430
|
</li>
|
10377
10431
|
|
10378
|
-
<li class="covered" data-hits="19" data-linenumber="
|
10432
|
+
<li class="covered" data-hits="19" data-linenumber="34">
|
10379
10433
|
<span class="hits">19</span>
|
10380
10434
|
|
10381
10435
|
<code class="ruby"> Digest::SHA1.hexdigest("--#{salt}--#{phrase}--")</code>
|
10382
10436
|
</li>
|
10383
10437
|
|
10384
|
-
<li class="never" data-hits="" data-linenumber="
|
10438
|
+
<li class="never" data-hits="" data-linenumber="35">
|
10385
10439
|
|
10386
10440
|
|
10387
10441
|
<code class="ruby"> end</code>
|
10388
10442
|
</li>
|
10389
10443
|
|
10390
|
-
<li class="never" data-hits="" data-linenumber="
|
10444
|
+
<li class="never" data-hits="" data-linenumber="36">
|
10391
10445
|
|
10392
10446
|
|
10393
10447
|
<code class="ruby"></code>
|
10394
10448
|
</li>
|
10395
10449
|
|
10396
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10450
|
+
<li class="covered" data-hits="1" data-linenumber="37">
|
10397
10451
|
<span class="hits">1</span>
|
10398
10452
|
|
10399
10453
|
<code class="ruby"> def self.authenticate(login_or_email, password)</code>
|
10400
10454
|
</li>
|
10401
10455
|
|
10402
|
-
<li class="covered" data-hits="20" data-linenumber="
|
10456
|
+
<li class="covered" data-hits="20" data-linenumber="38">
|
10403
10457
|
<span class="hits">20</span>
|
10404
10458
|
|
10405
10459
|
<code class="ruby"> user = where(["login = ? OR email = ?", login_or_email, login_or_email]).first</code>
|
10406
10460
|
</li>
|
10407
10461
|
|
10408
|
-
<li class="covered" data-hits="20" data-linenumber="
|
10462
|
+
<li class="covered" data-hits="20" data-linenumber="39">
|
10409
10463
|
<span class="hits">20</span>
|
10410
10464
|
|
10411
10465
|
<code class="ruby"> user if user && user.authenticated?(password)</code>
|
10412
10466
|
</li>
|
10413
10467
|
|
10414
|
-
<li class="never" data-hits="" data-linenumber="
|
10468
|
+
<li class="never" data-hits="" data-linenumber="40">
|
10415
10469
|
|
10416
10470
|
|
10417
10471
|
<code class="ruby"> end</code>
|
10418
10472
|
</li>
|
10419
10473
|
|
10420
|
-
<li class="never" data-hits="" data-linenumber="
|
10474
|
+
<li class="never" data-hits="" data-linenumber="41">
|
10421
10475
|
|
10422
10476
|
|
10423
10477
|
<code class="ruby"></code>
|
10424
10478
|
</li>
|
10425
10479
|
|
10426
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10480
|
+
<li class="covered" data-hits="1" data-linenumber="42">
|
10427
10481
|
<span class="hits">1</span>
|
10428
10482
|
|
10429
10483
|
<code class="ruby"> def authenticated?(password)</code>
|
10430
10484
|
</li>
|
10431
10485
|
|
10432
|
-
<li class="covered" data-hits="19" data-linenumber="
|
10486
|
+
<li class="covered" data-hits="19" data-linenumber="43">
|
10433
10487
|
<span class="hits">19</span>
|
10434
10488
|
|
10435
10489
|
<code class="ruby"> self.password == sha1(password)</code>
|
10436
10490
|
</li>
|
10437
10491
|
|
10438
|
-
<li class="never" data-hits="" data-linenumber="
|
10492
|
+
<li class="never" data-hits="" data-linenumber="44">
|
10439
10493
|
|
10440
10494
|
|
10441
10495
|
<code class="ruby"> end</code>
|
10442
10496
|
</li>
|
10443
10497
|
|
10444
|
-
<li class="never" data-hits="" data-linenumber="
|
10498
|
+
<li class="never" data-hits="" data-linenumber="45">
|
10445
10499
|
|
10446
10500
|
|
10447
10501
|
<code class="ruby"></code>
|
10448
10502
|
</li>
|
10449
10503
|
|
10450
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10504
|
+
<li class="covered" data-hits="1" data-linenumber="46">
|
10451
10505
|
<span class="hits">1</span>
|
10452
10506
|
|
10453
10507
|
<code class="ruby"> def after_initialize</code>
|
10454
10508
|
</li>
|
10455
10509
|
|
10456
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10510
|
+
<li class="missed" data-hits="0" data-linenumber="47">
|
10457
10511
|
|
10458
10512
|
|
10459
10513
|
<code class="ruby"> @confirm_password = true</code>
|
10460
10514
|
</li>
|
10461
10515
|
|
10462
|
-
<li class="never" data-hits="" data-linenumber="
|
10516
|
+
<li class="never" data-hits="" data-linenumber="48">
|
10463
10517
|
|
10464
10518
|
|
10465
10519
|
<code class="ruby"> end</code>
|
10466
10520
|
</li>
|
10467
10521
|
|
10468
|
-
<li class="never" data-hits="" data-linenumber="
|
10522
|
+
<li class="never" data-hits="" data-linenumber="49">
|
10469
10523
|
|
10470
10524
|
|
10471
10525
|
<code class="ruby"></code>
|
10472
10526
|
</li>
|
10473
10527
|
|
10474
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10528
|
+
<li class="covered" data-hits="1" data-linenumber="50">
|
10475
10529
|
<span class="hits">1</span>
|
10476
10530
|
|
10477
10531
|
<code class="ruby"> def confirm_password?</code>
|
10478
10532
|
</li>
|
10479
10533
|
|
10480
|
-
<li class="covered" data-hits="3" data-linenumber="
|
10534
|
+
<li class="covered" data-hits="3" data-linenumber="51">
|
10481
10535
|
<span class="hits">3</span>
|
10482
10536
|
|
10483
10537
|
<code class="ruby"> @confirm_password</code>
|
10484
10538
|
</li>
|
10485
10539
|
|
10486
|
-
<li class="never" data-hits="" data-linenumber="
|
10540
|
+
<li class="never" data-hits="" data-linenumber="52">
|
10487
10541
|
|
10488
10542
|
|
10489
10543
|
<code class="ruby"> end</code>
|
10490
10544
|
</li>
|
10491
10545
|
|
10492
|
-
<li class="never" data-hits="" data-linenumber="
|
10546
|
+
<li class="never" data-hits="" data-linenumber="53">
|
10493
10547
|
|
10494
10548
|
|
10495
10549
|
<code class="ruby"></code>
|
10496
10550
|
</li>
|
10497
10551
|
|
10498
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10552
|
+
<li class="covered" data-hits="1" data-linenumber="54">
|
10499
10553
|
<span class="hits">1</span>
|
10500
10554
|
|
10501
10555
|
<code class="ruby"> def remember_me</code>
|
10502
10556
|
</li>
|
10503
10557
|
|
10504
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10558
|
+
<li class="missed" data-hits="0" data-linenumber="55">
|
10505
10559
|
|
10506
10560
|
|
10507
10561
|
<code class="ruby"> update_attribute(:session_token, sha1(Time.now + TrustyCms::Config['session_timeout'].to_i)) unless self.session_token?</code>
|
10508
10562
|
</li>
|
10509
10563
|
|
10510
|
-
<li class="never" data-hits="" data-linenumber="
|
10564
|
+
<li class="never" data-hits="" data-linenumber="56">
|
10511
10565
|
|
10512
10566
|
|
10513
10567
|
<code class="ruby"> end</code>
|
10514
10568
|
</li>
|
10515
10569
|
|
10516
|
-
<li class="never" data-hits="" data-linenumber="
|
10570
|
+
<li class="never" data-hits="" data-linenumber="57">
|
10517
10571
|
|
10518
10572
|
|
10519
10573
|
<code class="ruby"></code>
|
10520
10574
|
</li>
|
10521
10575
|
|
10522
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10576
|
+
<li class="covered" data-hits="1" data-linenumber="58">
|
10523
10577
|
<span class="hits">1</span>
|
10524
10578
|
|
10525
10579
|
<code class="ruby"> def forget_me</code>
|
10526
10580
|
</li>
|
10527
10581
|
|
10528
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10582
|
+
<li class="covered" data-hits="1" data-linenumber="59">
|
10529
10583
|
<span class="hits">1</span>
|
10530
10584
|
|
10531
10585
|
<code class="ruby"> update_attribute(:session_token, nil)</code>
|
10532
10586
|
</li>
|
10533
10587
|
|
10534
|
-
<li class="never" data-hits="" data-linenumber="
|
10588
|
+
<li class="never" data-hits="" data-linenumber="60">
|
10535
10589
|
|
10536
10590
|
|
10537
10591
|
<code class="ruby"> end</code>
|
10538
10592
|
</li>
|
10539
10593
|
|
10540
|
-
<li class="never" data-hits="" data-linenumber="
|
10594
|
+
<li class="never" data-hits="" data-linenumber="61">
|
10541
10595
|
|
10542
10596
|
|
10543
10597
|
<code class="ruby"></code>
|
10544
10598
|
</li>
|
10545
10599
|
|
10546
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10600
|
+
<li class="covered" data-hits="1" data-linenumber="62">
|
10547
10601
|
<span class="hits">1</span>
|
10548
10602
|
|
10549
10603
|
<code class="ruby"> def send_password_reset</code>
|
10550
10604
|
</li>
|
10551
10605
|
|
10552
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10606
|
+
<li class="missed" data-hits="0" data-linenumber="63">
|
10553
10607
|
|
10554
10608
|
|
10555
10609
|
<code class="ruby"> generate_token(:password_reset_token)</code>
|
10556
10610
|
</li>
|
10557
10611
|
|
10558
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10612
|
+
<li class="missed" data-hits="0" data-linenumber="64">
|
10559
10613
|
|
10560
10614
|
|
10561
10615
|
<code class="ruby"> update_attribute(:password_reset_sent_at, Time.zone.now)</code>
|
10562
10616
|
</li>
|
10563
10617
|
|
10564
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10618
|
+
<li class="missed" data-hits="0" data-linenumber="65">
|
10565
10619
|
|
10566
10620
|
|
10567
10621
|
<code class="ruby"> PasswordMailer.password_reset(self).deliver_now</code>
|
10568
10622
|
</li>
|
10569
10623
|
|
10570
|
-
<li class="never" data-hits="" data-linenumber="
|
10624
|
+
<li class="never" data-hits="" data-linenumber="66">
|
10571
10625
|
|
10572
10626
|
|
10573
10627
|
<code class="ruby"> end</code>
|
10574
10628
|
</li>
|
10575
10629
|
|
10576
|
-
<li class="never" data-hits="" data-linenumber="
|
10630
|
+
<li class="never" data-hits="" data-linenumber="67">
|
10577
10631
|
|
10578
10632
|
|
10579
10633
|
<code class="ruby"></code>
|
10580
10634
|
</li>
|
10581
10635
|
|
10582
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10636
|
+
<li class="covered" data-hits="1" data-linenumber="68">
|
10583
10637
|
<span class="hits">1</span>
|
10584
10638
|
|
10585
10639
|
<code class="ruby"> private</code>
|
10586
10640
|
</li>
|
10587
10641
|
|
10588
|
-
<li class="never" data-hits="" data-linenumber="
|
10642
|
+
<li class="never" data-hits="" data-linenumber="69">
|
10589
10643
|
|
10590
10644
|
|
10591
10645
|
<code class="ruby"></code>
|
10592
10646
|
</li>
|
10593
10647
|
|
10594
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10648
|
+
<li class="covered" data-hits="1" data-linenumber="70">
|
10595
10649
|
<span class="hits">1</span>
|
10596
10650
|
|
10597
10651
|
<code class="ruby"> def generate_token(column)</code>
|
10598
10652
|
</li>
|
10599
10653
|
|
10600
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10654
|
+
<li class="missed" data-hits="0" data-linenumber="71">
|
10601
10655
|
|
10602
10656
|
|
10603
10657
|
<code class="ruby"> self[column] = SecureRandom.urlsafe_base64 if User.exists?(column => self[column])</code>
|
10604
10658
|
</li>
|
10605
10659
|
|
10606
|
-
<li class="never" data-hits="" data-linenumber="
|
10660
|
+
<li class="never" data-hits="" data-linenumber="72">
|
10607
10661
|
|
10608
10662
|
|
10609
10663
|
<code class="ruby"> end</code>
|
10610
10664
|
</li>
|
10611
10665
|
|
10612
|
-
<li class="never" data-hits="" data-linenumber="
|
10666
|
+
<li class="never" data-hits="" data-linenumber="73">
|
10613
10667
|
|
10614
10668
|
|
10615
10669
|
<code class="ruby"></code>
|
10616
10670
|
</li>
|
10617
10671
|
|
10618
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10672
|
+
<li class="covered" data-hits="1" data-linenumber="74">
|
10619
10673
|
<span class="hits">1</span>
|
10620
10674
|
|
10621
10675
|
<code class="ruby"> def validate_length_of_password?</code>
|
10622
10676
|
</li>
|
10623
10677
|
|
10624
|
-
<li class="covered" data-hits="3" data-linenumber="
|
10678
|
+
<li class="covered" data-hits="3" data-linenumber="75">
|
10625
10679
|
<span class="hits">3</span>
|
10626
10680
|
|
10627
10681
|
<code class="ruby"> new_record? or not password.to_s.empty?</code>
|
10628
10682
|
</li>
|
10629
10683
|
|
10630
|
-
<li class="never" data-hits="" data-linenumber="
|
10684
|
+
<li class="never" data-hits="" data-linenumber="76">
|
10631
10685
|
|
10632
10686
|
|
10633
10687
|
<code class="ruby"> end</code>
|
10634
10688
|
</li>
|
10635
10689
|
|
10636
|
-
<li class="never" data-hits="" data-linenumber="
|
10690
|
+
<li class="never" data-hits="" data-linenumber="77">
|
10637
10691
|
|
10638
10692
|
|
10639
10693
|
<code class="ruby"></code>
|
10640
10694
|
</li>
|
10641
10695
|
|
10642
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10696
|
+
<li class="covered" data-hits="1" data-linenumber="78">
|
10643
10697
|
<span class="hits">1</span>
|
10644
10698
|
|
10645
10699
|
<code class="ruby"> before_create :encrypt_password</code>
|
10646
10700
|
</li>
|
10647
10701
|
|
10648
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10702
|
+
<li class="covered" data-hits="1" data-linenumber="79">
|
10649
10703
|
<span class="hits">1</span>
|
10650
10704
|
|
10651
10705
|
<code class="ruby"> def encrypt_password</code>
|
10652
10706
|
</li>
|
10653
10707
|
|
10654
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10708
|
+
<li class="missed" data-hits="0" data-linenumber="80">
|
10655
10709
|
|
10656
10710
|
|
10657
10711
|
<code class="ruby"> self.salt = Digest::SHA1.hexdigest("--#{Time.now}--#{login}--sweet harmonious biscuits--")</code>
|
10658
10712
|
</li>
|
10659
10713
|
|
10660
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10714
|
+
<li class="missed" data-hits="0" data-linenumber="81">
|
10661
10715
|
|
10662
10716
|
|
10663
10717
|
<code class="ruby"> self.password = sha1(password)</code>
|
10664
10718
|
</li>
|
10665
10719
|
|
10666
|
-
<li class="never" data-hits="" data-linenumber="
|
10720
|
+
<li class="never" data-hits="" data-linenumber="82">
|
10667
10721
|
|
10668
10722
|
|
10669
10723
|
<code class="ruby"> end</code>
|
10670
10724
|
</li>
|
10671
10725
|
|
10672
|
-
<li class="never" data-hits="" data-linenumber="
|
10726
|
+
<li class="never" data-hits="" data-linenumber="83">
|
10673
10727
|
|
10674
10728
|
|
10675
10729
|
<code class="ruby"></code>
|
10676
10730
|
</li>
|
10677
10731
|
|
10678
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10732
|
+
<li class="covered" data-hits="1" data-linenumber="84">
|
10679
10733
|
<span class="hits">1</span>
|
10680
10734
|
|
10681
10735
|
<code class="ruby"> before_update :encrypt_password_unless_empty_or_unchanged</code>
|
10682
10736
|
</li>
|
10683
10737
|
|
10684
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10738
|
+
<li class="covered" data-hits="1" data-linenumber="85">
|
10685
10739
|
<span class="hits">1</span>
|
10686
10740
|
|
10687
10741
|
<code class="ruby"> def encrypt_password_unless_empty_or_unchanged</code>
|
10688
10742
|
</li>
|
10689
10743
|
|
10690
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10744
|
+
<li class="covered" data-hits="1" data-linenumber="86">
|
10691
10745
|
<span class="hits">1</span>
|
10692
10746
|
|
10693
10747
|
<code class="ruby"> user = self.class.find(self.id)</code>
|
10694
10748
|
</li>
|
10695
10749
|
|
10696
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10750
|
+
<li class="covered" data-hits="1" data-linenumber="87">
|
10697
10751
|
<span class="hits">1</span>
|
10698
10752
|
|
10699
10753
|
<code class="ruby"> case password</code>
|
10700
10754
|
</li>
|
10701
10755
|
|
10702
|
-
<li class="never" data-hits="" data-linenumber="
|
10756
|
+
<li class="never" data-hits="" data-linenumber="88">
|
10703
10757
|
|
10704
10758
|
|
10705
10759
|
<code class="ruby"> when ''</code>
|
10706
10760
|
</li>
|
10707
10761
|
|
10708
|
-
<li class="covered" data-hits="1" data-linenumber="
|
10762
|
+
<li class="covered" data-hits="1" data-linenumber="89">
|
10709
10763
|
<span class="hits">1</span>
|
10710
10764
|
|
10711
10765
|
<code class="ruby"> self.password = user.password</code>
|
10712
10766
|
</li>
|
10713
10767
|
|
10714
|
-
<li class="never" data-hits="" data-linenumber="
|
10768
|
+
<li class="never" data-hits="" data-linenumber="90">
|
10715
10769
|
|
10716
10770
|
|
10717
10771
|
<code class="ruby"> when user.password</code>
|
10718
10772
|
</li>
|
10719
10773
|
|
10720
|
-
<li class="never" data-hits="" data-linenumber="
|
10774
|
+
<li class="never" data-hits="" data-linenumber="91">
|
10721
10775
|
|
10722
10776
|
|
10723
10777
|
<code class="ruby"> else</code>
|
10724
10778
|
</li>
|
10725
10779
|
|
10726
|
-
<li class="missed" data-hits="0" data-linenumber="
|
10780
|
+
<li class="missed" data-hits="0" data-linenumber="92">
|
10727
10781
|
|
10728
10782
|
|
10729
10783
|
<code class="ruby"> encrypt_password</code>
|
10730
10784
|
</li>
|
10731
10785
|
|
10732
|
-
<li class="never" data-hits="" data-linenumber="
|
10786
|
+
<li class="never" data-hits="" data-linenumber="93">
|
10733
10787
|
|
10734
10788
|
|
10735
10789
|
<code class="ruby"> end</code>
|
10736
10790
|
</li>
|
10737
10791
|
|
10738
|
-
<li class="never" data-hits="" data-linenumber="
|
10792
|
+
<li class="never" data-hits="" data-linenumber="94">
|
10739
10793
|
|
10740
10794
|
|
10741
10795
|
<code class="ruby"> end</code>
|
10742
10796
|
</li>
|
10743
10797
|
|
10744
|
-
<li class="never" data-hits="" data-linenumber="
|
10798
|
+
<li class="never" data-hits="" data-linenumber="95">
|
10745
10799
|
|
10746
10800
|
|
10747
10801
|
<code class="ruby"></code>
|
10748
10802
|
</li>
|
10749
10803
|
|
10750
|
-
<li class="never" data-hits="" data-linenumber="
|
10804
|
+
<li class="never" data-hits="" data-linenumber="96">
|
10751
10805
|
|
10752
10806
|
|
10753
10807
|
<code class="ruby">end</code>
|
@@ -10838,8 +10892,8 @@
|
|
10838
10892
|
<code class="ruby"> def current_user</code>
|
10839
10893
|
</li>
|
10840
10894
|
|
10841
|
-
<li class="covered" data-hits="
|
10842
|
-
<span class="hits">
|
10895
|
+
<li class="covered" data-hits="8" data-linenumber="12">
|
10896
|
+
<span class="hits">8</span>
|
10843
10897
|
|
10844
10898
|
<code class="ruby"> self.class.current_user</code>
|
10845
10899
|
</li>
|
@@ -10856,8 +10910,8 @@
|
|
10856
10910
|
<code class="ruby"> def self.current_user</code>
|
10857
10911
|
</li>
|
10858
10912
|
|
10859
|
-
<li class="covered" data-hits="
|
10860
|
-
<span class="hits">
|
10913
|
+
<li class="covered" data-hits="8" data-linenumber="15">
|
10914
|
+
<span class="hits">8</span>
|
10861
10915
|
|
10862
10916
|
<code class="ruby"> Thread.current[:current_user]</code>
|
10863
10917
|
</li>
|
@@ -10880,8 +10934,8 @@
|
|
10880
10934
|
<code class="ruby"> def before_create(model)</code>
|
10881
10935
|
</li>
|
10882
10936
|
|
10883
|
-
<li class="covered" data-hits="
|
10884
|
-
<span class="hits">
|
10937
|
+
<li class="covered" data-hits="7" data-linenumber="19">
|
10938
|
+
<span class="hits">7</span>
|
10885
10939
|
|
10886
10940
|
<code class="ruby"> model.created_by = self.current_user</code>
|
10887
10941
|
</li>
|