rails_select_on_includes 0.4.3 → 0.4.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1cf5e91c68641c9111a1d15569b0d9b0d3e901df
4
- data.tar.gz: 746c71f794fc21a04545778e4f26a87e2ae1b212
3
+ metadata.gz: 5282032568e76b71d4f01e390162d7dde6b59a56
4
+ data.tar.gz: c6655e370ce7446e325af753b2ccb79d2396302c
5
5
  SHA512:
6
- metadata.gz: 8a6772fe8d58d4e7f70acf7a7dcd493bbbbeb731e71f945df11f43abadd8c160a0fc6c4f3907d8fdc1402de46562f83ad74b61466aef34cdddd60c9222d04373
7
- data.tar.gz: 26db77bc0969d8652a3e9fec370487197952ff513b314ae6c9d8b019b17b11c5e704f93f8c126fdca34803124ae61d8869847897783c106e51a8d7b5ab703ebc
6
+ metadata.gz: d0eaa6f6f132be944c760b58f9b1810bfbbff6ba83c63f4e5f96d1501be84d0c0499be9be5e818b5a9991d81a4c7894bf4963d2d5c214e6076600dbbed63a814
7
+ data.tar.gz: ca40dc9edb3edce66f1c1f327f726744d7604a4684313478f7b3237145f685a0d4163eff1ad6e292b2ff5046e955da7a3c1e0c671958f02199199b20cdd2eeb8
data/.idea/workspace.xml CHANGED
@@ -3,13 +3,12 @@
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="e9b8aeec-46b7-4241-ab0a-cc8285e66518" name="Default" comment="">
5
5
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" />
6
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bin/console" />
7
6
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
8
7
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
9
8
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/rails_select_on_includes.iml" />
10
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bin/setup" />
11
9
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
12
10
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
11
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/rails_select_on_includes.rb" afterPath="$PROJECT_DIR$/lib/rails_select_on_includes.rb" />
13
12
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/rails_select_on_includes/version.rb" afterPath="$PROJECT_DIR$/lib/rails_select_on_includes/version.rb" />
14
13
  </list>
15
14
  <ignored path="rails_select_on_includes.iws" />
@@ -32,21 +31,33 @@
32
31
  </component>
33
32
  <component name="FileEditorManager">
34
33
  <leaf>
35
- <file leaf-file-name="rails_select_on_includes.rb" pinned="false" current-in-tab="false">
34
+ <file leaf-file-name="rails_select_on_includes.rb" pinned="false" current-in-tab="true">
36
35
  <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes.rb">
37
36
  <provider selected="true" editor-type-id="text-editor">
38
- <state vertical-scroll-proportion="0.0">
39
- <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="37" />
40
- <folding />
37
+ <state vertical-scroll-proportion="0.6618465">
38
+ <caret line="83" column="32" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="32" />
39
+ <folding>
40
+ <element signature="e#170#2269#0" expanded="false" />
41
+ </folding>
41
42
  </state>
42
43
  </provider>
43
44
  </entry>
44
45
  </file>
45
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
46
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
46
47
  <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes/version.rb">
47
48
  <provider selected="true" editor-type-id="text-editor">
48
- <state vertical-scroll-proportion="0.06006674">
49
- <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
49
+ <state vertical-scroll-proportion="-0.62068963">
50
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
51
+ <folding />
52
+ </state>
53
+ </provider>
54
+ </entry>
55
+ </file>
56
+ <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
57
+ <entry file="file://$PROJECT_DIR$/Gemfile">
58
+ <provider selected="true" editor-type-id="text-editor">
59
+ <state vertical-scroll-proportion="0.0">
60
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
50
61
  <folding />
51
62
  </state>
52
63
  </provider>
@@ -55,8 +66,8 @@
55
66
  <file leaf-file-name="rails_select_on_includes.gemspec" pinned="false" current-in-tab="false">
56
67
  <entry file="file://$PROJECT_DIR$/rails_select_on_includes.gemspec">
57
68
  <provider selected="true" editor-type-id="text-editor">
58
- <state vertical-scroll-proportion="0.0">
59
- <caret line="19" column="35" selection-start-line="19" selection-start-column="35" selection-end-line="19" selection-end-column="35" />
69
+ <state vertical-scroll-proportion="-11.793103">
70
+ <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
60
71
  <folding />
61
72
  </state>
62
73
  </provider>
@@ -74,6 +85,9 @@
74
85
  </file>
75
86
  <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
76
87
  <entry file="file://$PROJECT_DIR$/README.md">
88
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
89
+ <state />
90
+ </provider>
77
91
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
78
92
  <state split_layout="FIRST">
79
93
  <first_editor vertical-scroll-proportion="0.0">
@@ -83,9 +97,6 @@
83
97
  <second_editor />
84
98
  </state>
85
99
  </provider>
86
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
87
- <state />
88
- </provider>
89
100
  </entry>
90
101
  </file>
91
102
  <file leaf-file-name="console" pinned="false" current-in-tab="false">
@@ -112,15 +123,20 @@
112
123
  </component>
113
124
  <component name="Git.Settings">
114
125
  <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
126
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
127
+ <map>
128
+ <entry key="$PROJECT_DIR$" value="master" />
129
+ </map>
130
+ </option>
115
131
  </component>
116
132
  <component name="IdeDocumentHistory">
117
133
  <option name="CHANGED_PATHS">
118
134
  <list>
119
135
  <option value="$PROJECT_DIR$/.gitignore" />
120
- <option value="$PROJECT_DIR$/rails_select_on_includes.gemspec" />
121
136
  <option value="$PROJECT_DIR$/README.md" />
122
- <option value="$PROJECT_DIR$/lib/rails_select_on_includes.rb" />
137
+ <option value="$PROJECT_DIR$/rails_select_on_includes.gemspec" />
123
138
  <option value="$PROJECT_DIR$/lib/rails_select_on_includes/version.rb" />
139
+ <option value="$PROJECT_DIR$/lib/rails_select_on_includes.rb" />
124
140
  </list>
125
141
  </option>
126
142
  </component>
@@ -133,9 +149,9 @@
133
149
  </component>
134
150
  <component name="ProjectFrameBounds">
135
151
  <option name="x" value="65" />
136
- <option name="y" value="24" />
152
+ <option name="y" value="-4" />
137
153
  <option name="width" value="1855" />
138
- <option name="height" value="1056" />
154
+ <option name="height" value="1084" />
139
155
  </component>
140
156
  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
141
157
  <OptionsSetting value="true" id="Add" />
@@ -160,6 +176,7 @@
160
176
  <sortByType />
161
177
  </navigator>
162
178
  <panes>
179
+ <pane id="Scope" />
163
180
  <pane id="ProjectPane">
164
181
  <subPane>
165
182
  <PATH>
@@ -226,12 +243,12 @@
226
243
  </PATH>
227
244
  </subPane>
228
245
  </pane>
229
- <pane id="Scope" />
230
246
  <pane id="Scratches" />
231
247
  </panes>
232
248
  </component>
233
249
  <component name="PropertiesComponent">
234
250
  <property name="WebServerToolWindowFactoryState" value="false" />
251
+ <property name="FullScreen" value="false" />
235
252
  </component>
236
253
  <component name="RunManager">
237
254
  <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
@@ -391,11 +408,23 @@
391
408
  <option name="project" value="LOCAL" />
392
409
  <updated>1481543915924</updated>
393
410
  </task>
394
- <option name="localTasksCounter" value="4" />
411
+ <task id="LOCAL-00004" summary="split version to 4.2 and 5 as rails">
412
+ <created>1483724081540</created>
413
+ <option name="number" value="00004" />
414
+ <option name="project" value="LOCAL" />
415
+ <updated>1483724081540</updated>
416
+ </task>
417
+ <task id="LOCAL-00005" summary="0.5 version for rails 5">
418
+ <created>1483724342632</created>
419
+ <option name="number" value="00005" />
420
+ <option name="project" value="LOCAL" />
421
+ <updated>1483724342632</updated>
422
+ </task>
423
+ <option name="localTasksCounter" value="6" />
395
424
  <servers />
396
425
  </component>
397
426
  <component name="ToolWindowManager">
398
- <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
427
+ <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
399
428
  <editor active="true" />
400
429
  <layout>
401
430
  <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20066334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -404,23 +433,31 @@
404
433
  <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
405
434
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32946378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
406
435
  <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3966597" sideWeight="0.4997236" order="10" side_tool="false" content_ui="tabs" />
436
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38830897" sideWeight="0.4997236" order="3" side_tool="false" content_ui="tabs" />
407
437
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2498618" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
408
438
  <window_info id="Terminal" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3810021" sideWeight="0.4997236" order="11" side_tool="false" content_ui="tabs" />
409
439
  <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
440
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.45093945" sideWeight="0.4997236" order="12" side_tool="false" content_ui="tabs" />
410
441
  <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294979" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
411
442
  <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
412
443
  <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32881" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
413
444
  <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
414
445
  <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
415
446
  <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
416
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38830897" sideWeight="0.4997236" order="3" side_tool="false" content_ui="tabs" />
417
447
  <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294979" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
418
448
  <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2498618" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
419
449
  <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.41336116" sideWeight="0.78275293" order="2" side_tool="false" content_ui="tabs" />
420
450
  <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
421
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.45093945" sideWeight="0.4997236" order="12" side_tool="false" content_ui="tabs" />
422
451
  </layout>
423
452
  </component>
453
+ <component name="Vcs.Log.UiProperties">
454
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
455
+ <collection />
456
+ </option>
457
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
458
+ <collection />
459
+ </option>
460
+ </component>
424
461
  <component name="VcsContentAnnotationSettings">
425
462
  <option name="myLimit" value="2678400000" />
426
463
  </component>
@@ -428,18 +465,68 @@
428
465
  <MESSAGE value="initial commit" />
429
466
  <MESSAGE value="flatten_hash_values errors" />
430
467
  <MESSAGE value="case insensitive as" />
431
- <option name="LAST_COMMIT_MESSAGE" value="case insensitive as" />
468
+ <MESSAGE value="split version to 4.2 and 5 as rails" />
469
+ <MESSAGE value="0.5 version for rails 5" />
470
+ <option name="LAST_COMMIT_MESSAGE" value="0.5 version for rails 5" />
432
471
  </component>
433
472
  <component name="XDebuggerManager">
434
473
  <breakpoint-manager />
435
474
  <watches-manager />
436
475
  </component>
437
476
  <component name="editorHistoryManager">
477
+ <entry file="file://$PROJECT_DIR$/rails_select_on_includes.gemspec">
478
+ <provider selected="true" editor-type-id="text-editor">
479
+ <state vertical-scroll-proportion="0.0">
480
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
481
+ <folding />
482
+ </state>
483
+ </provider>
484
+ </entry>
485
+ <entry file="file://$PROJECT_DIR$/.gitignore">
486
+ <provider selected="true" editor-type-id="text-editor">
487
+ <state vertical-scroll-proportion="0.0">
488
+ <caret line="0" column="6" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
489
+ <folding />
490
+ </state>
491
+ </provider>
492
+ </entry>
493
+ <entry file="file://$PROJECT_DIR$/README.md">
494
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
495
+ <state />
496
+ </provider>
497
+ <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
498
+ <state split_layout="FIRST">
499
+ <first_editor vertical-scroll-proportion="0.0">
500
+ <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
501
+ <folding />
502
+ </first_editor>
503
+ <second_editor />
504
+ </state>
505
+ </provider>
506
+ </entry>
507
+ <entry file="file://$PROJECT_DIR$/bin/console">
508
+ <provider selected="true" editor-type-id="text-editor">
509
+ <state vertical-scroll-proportion="0.0">
510
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
511
+ <folding />
512
+ </state>
513
+ </provider>
514
+ </entry>
515
+ <entry file="file://$PROJECT_DIR$/bin/setup">
516
+ <provider selected="true" editor-type-id="text-editor">
517
+ <state vertical-scroll-proportion="0.0">
518
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
519
+ <folding />
520
+ </state>
521
+ </provider>
522
+ </entry>
438
523
  <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes.rb">
439
524
  <provider selected="true" editor-type-id="text-editor">
440
525
  <state vertical-scroll-proportion="0.0">
441
526
  <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="37" />
442
- <folding />
527
+ <folding>
528
+ <element signature="e#170#2269#0" expanded="false" />
529
+ </folding>
443
530
  </state>
444
531
  </provider>
445
532
  </entry>
@@ -468,6 +555,9 @@
468
555
  </provider>
469
556
  </entry>
470
557
  <entry file="file://$PROJECT_DIR$/README.md">
558
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
559
+ <state />
560
+ </provider>
471
561
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
472
562
  <state split_layout="FIRST">
473
563
  <first_editor vertical-scroll-proportion="0.0">
@@ -477,9 +567,6 @@
477
567
  <second_editor />
478
568
  </state>
479
569
  </provider>
480
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
481
- <state />
482
- </provider>
483
570
  </entry>
484
571
  <entry file="file://$PROJECT_DIR$/bin/console">
485
572
  <provider selected="true" editor-type-id="text-editor">
@@ -501,7 +588,9 @@
501
588
  <provider selected="true" editor-type-id="text-editor">
502
589
  <state vertical-scroll-proportion="0.0">
503
590
  <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
504
- <folding />
591
+ <folding>
592
+ <element signature="e#170#2269#0" expanded="false" />
593
+ </folding>
505
594
  </state>
506
595
  </provider>
507
596
  </entry>
@@ -530,6 +619,9 @@
530
619
  </provider>
531
620
  </entry>
532
621
  <entry file="file://$PROJECT_DIR$/README.md">
622
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
623
+ <state />
624
+ </provider>
533
625
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
534
626
  <state split_layout="FIRST">
535
627
  <first_editor vertical-scroll-proportion="0.0">
@@ -539,9 +631,6 @@
539
631
  <second_editor />
540
632
  </state>
541
633
  </provider>
542
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
543
- <state />
544
- </provider>
545
634
  </entry>
546
635
  <entry file="file://$PROJECT_DIR$/bin/console">
547
636
  <provider selected="true" editor-type-id="text-editor">
@@ -563,7 +652,9 @@
563
652
  <provider selected="true" editor-type-id="text-editor">
564
653
  <state vertical-scroll-proportion="0.0">
565
654
  <caret line="39" column="9" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
566
- <folding />
655
+ <folding>
656
+ <element signature="e#170#2269#0" expanded="false" />
657
+ </folding>
567
658
  </state>
568
659
  </provider>
569
660
  </entry>
@@ -592,6 +683,9 @@
592
683
  </provider>
593
684
  </entry>
594
685
  <entry file="file://$PROJECT_DIR$/README.md">
686
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
687
+ <state />
688
+ </provider>
595
689
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
596
690
  <state split_layout="FIRST">
597
691
  <first_editor vertical-scroll-proportion="0.0">
@@ -601,9 +695,6 @@
601
695
  <second_editor />
602
696
  </state>
603
697
  </provider>
604
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
605
- <state />
606
- </provider>
607
698
  </entry>
608
699
  <entry file="file://$PROJECT_DIR$/bin/console">
609
700
  <provider selected="true" editor-type-id="text-editor">
@@ -625,7 +716,9 @@
625
716
  <provider selected="true" editor-type-id="text-editor">
626
717
  <state vertical-scroll-proportion="0.0">
627
718
  <caret line="25" column="25" selection-start-line="22" selection-start-column="8" selection-end-line="25" selection-end-column="25" />
628
- <folding />
719
+ <folding>
720
+ <element signature="e#170#2269#0" expanded="false" />
721
+ </folding>
629
722
  </state>
630
723
  </provider>
631
724
  </entry>
@@ -646,6 +739,9 @@
646
739
  </provider>
647
740
  </entry>
648
741
  <entry file="file://$PROJECT_DIR$/README.md">
742
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
743
+ <state />
744
+ </provider>
649
745
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
650
746
  <state split_layout="FIRST">
651
747
  <first_editor vertical-scroll-proportion="0.0">
@@ -655,9 +751,6 @@
655
751
  <second_editor />
656
752
  </state>
657
753
  </provider>
658
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
659
- <state />
660
- </provider>
661
754
  </entry>
662
755
  <entry file="file://$PROJECT_DIR$/bin/console">
663
756
  <provider selected="true" editor-type-id="text-editor">
@@ -679,7 +772,9 @@
679
772
  <provider selected="true" editor-type-id="text-editor">
680
773
  <state vertical-scroll-proportion="0.0">
681
774
  <caret line="25" column="25" selection-start-line="22" selection-start-column="8" selection-end-line="25" selection-end-column="25" />
682
- <folding />
775
+ <folding>
776
+ <element signature="e#170#2269#0" expanded="false" />
777
+ </folding>
683
778
  </state>
684
779
  </provider>
685
780
  </entry>
@@ -700,6 +795,9 @@
700
795
  </provider>
701
796
  </entry>
702
797
  <entry file="file://$PROJECT_DIR$/README.md">
798
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
799
+ <state />
800
+ </provider>
703
801
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
704
802
  <state split_layout="FIRST">
705
803
  <first_editor vertical-scroll-proportion="0.0">
@@ -709,9 +807,6 @@
709
807
  <second_editor />
710
808
  </state>
711
809
  </provider>
712
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
713
- <state />
714
- </provider>
715
810
  </entry>
716
811
  <entry file="file://$PROJECT_DIR$/bin/console">
717
812
  <provider selected="true" editor-type-id="text-editor">
@@ -733,7 +828,9 @@
733
828
  <provider selected="true" editor-type-id="text-editor">
734
829
  <state vertical-scroll-proportion="0.0">
735
830
  <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
736
- <folding />
831
+ <folding>
832
+ <element signature="e#170#2269#0" expanded="false" />
833
+ </folding>
737
834
  </state>
738
835
  </provider>
739
836
  </entry>
@@ -746,6 +843,9 @@
746
843
  </provider>
747
844
  </entry>
748
845
  <entry file="file://$PROJECT_DIR$/README.md">
846
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
847
+ <state />
848
+ </provider>
749
849
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
750
850
  <state split_layout="FIRST">
751
851
  <first_editor vertical-scroll-proportion="0.0">
@@ -755,9 +855,6 @@
755
855
  <second_editor />
756
856
  </state>
757
857
  </provider>
758
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
759
- <state />
760
- </provider>
761
858
  </entry>
762
859
  <entry file="file://$PROJECT_DIR$/bin/console">
763
860
  <provider selected="true" editor-type-id="text-editor">
@@ -799,15 +896,10 @@
799
896
  </state>
800
897
  </provider>
801
898
  </entry>
802
- <entry file="file://$PROJECT_DIR$/rails_select_on_includes.gemspec">
803
- <provider selected="true" editor-type-id="text-editor">
804
- <state vertical-scroll-proportion="0.0">
805
- <caret line="19" column="35" selection-start-line="19" selection-start-column="35" selection-end-line="19" selection-end-column="35" />
806
- <folding />
807
- </state>
808
- </provider>
809
- </entry>
810
899
  <entry file="file://$PROJECT_DIR$/README.md">
900
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
901
+ <state />
902
+ </provider>
811
903
  <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">
812
904
  <state split_layout="FIRST">
813
905
  <first_editor vertical-scroll-proportion="0.0">
@@ -817,25 +909,40 @@
817
909
  <second_editor />
818
910
  </state>
819
911
  </provider>
820
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
821
- <state />
822
- </provider>
823
912
  </entry>
824
- <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes.rb">
913
+ <entry file="file://$PROJECT_DIR$/Gemfile">
825
914
  <provider selected="true" editor-type-id="text-editor">
826
915
  <state vertical-scroll-proportion="0.0">
827
- <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="37" />
916
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
917
+ <folding />
918
+ </state>
919
+ </provider>
920
+ </entry>
921
+ <entry file="file://$PROJECT_DIR$/rails_select_on_includes.gemspec">
922
+ <provider selected="true" editor-type-id="text-editor">
923
+ <state vertical-scroll-proportion="-11.793103">
924
+ <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
828
925
  <folding />
829
926
  </state>
830
927
  </provider>
831
928
  </entry>
832
929
  <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes/version.rb">
833
930
  <provider selected="true" editor-type-id="text-editor">
834
- <state vertical-scroll-proportion="0.06006674">
835
- <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
931
+ <state vertical-scroll-proportion="-0.62068963">
932
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
836
933
  <folding />
837
934
  </state>
838
935
  </provider>
839
936
  </entry>
937
+ <entry file="file://$PROJECT_DIR$/lib/rails_select_on_includes.rb">
938
+ <provider selected="true" editor-type-id="text-editor">
939
+ <state vertical-scroll-proportion="0.6618465">
940
+ <caret line="83" column="32" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="32" />
941
+ <folding>
942
+ <element signature="e#170#2269#0" expanded="false" />
943
+ </folding>
944
+ </state>
945
+ </provider>
946
+ </entry>
840
947
  </component>
841
948
  </project>
@@ -1,3 +1,3 @@
1
1
  module RailsSelectOnIncludes
2
- VERSION = "0.4.3"
2
+ VERSION = "0.4.4"
3
3
  end
@@ -51,9 +51,49 @@ module ActiveRecord
51
51
  some_hash.values.map{ |value| value.is_a?(Hash) ? flatten_hash_values( value ) : value }.flatten
52
52
  end
53
53
  end
54
+
55
+ class JoinPart
56
+ def instantiate(row, aliases, column_types = {}, &block)
57
+ base_klass.instantiate(extract_record(row, aliases), column_types, &block)
58
+ end
59
+ end
60
+
61
+ def instantiate(result_set, aliases)
62
+ primary_key = aliases.column_alias(join_root, join_root.primary_key)
63
+
64
+ seen = Hash.new { |i, object_id|
65
+ i[object_id] = Hash.new { |j, child_class|
66
+ j[child_class] = {}
67
+ }
68
+ }
69
+
70
+ model_cache = Hash.new { |h,klass| h[klass] = {} }
71
+ parents = model_cache[join_root]
72
+ column_aliases = aliases.column_aliases join_root
73
+
74
+ message_bus = ActiveSupport::Notifications.instrumenter
75
+
76
+ payload = {
77
+ record_count: result_set.length,
78
+ class_name: join_root.base_klass.name
79
+ }
80
+
81
+ message_bus.instrument('instantiation.active_record', payload) do
82
+ result_set.each { |row_hash|
83
+ parent_key = primary_key ? row_hash[primary_key] : row_hash
84
+ # DISTINCTION PART > join_root.instantiate(row_hash, column_aliases, result_set.column_types )
85
+ # PREVIOUS > join_root.instantiate(row_hash, column_aliases )
86
+ parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, result_set.column_types )
87
+ construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
88
+ }
89
+ end
90
+ parents.values
91
+ end
92
+
54
93
  end
55
94
  end
56
95
  end
96
+
57
97
  module ActiveRecord
58
98
  module FinderMethods
59
99
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_select_on_includes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3
4
+ version: 0.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - alekseyl
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-01-06 00:00:00.000000000 Z
11
+ date: 2017-02-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -71,8 +71,6 @@ files:
71
71
  - LICENSE.txt
72
72
  - README.md
73
73
  - Rakefile
74
- - bin/console
75
- - bin/setup
76
74
  - lib/rails_select_on_includes.rb
77
75
  - lib/rails_select_on_includes/version.rb
78
76
  - rails_select_on_includes.gemspec
data/bin/console DELETED
@@ -1,14 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- require "bundler/setup"
4
- require "rails_select_on_includes"
5
-
6
- # You can add fixtures and/or initialization code here to make experimenting
7
- # with your gem easier. You can also use a different console, if you like.
8
-
9
- # (If you use this, don't forget to add pry to your Gemfile!)
10
- # require "pry"
11
- # Pry.start
12
-
13
- require "irb"
14
- IRB.start
data/bin/setup DELETED
@@ -1,8 +0,0 @@
1
- #!/usr/bin/env bash
2
- set -euo pipefail
3
- IFS=$'\n\t'
4
- set -vx
5
-
6
- bundle install
7
-
8
- # Do any other automated setup that you need to do here