pading 0.1.2 → 0.1.3

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 931182b600baa4340478b7606c6ff840647be877fbffdc285fe2a7a81faf60ee
4
- data.tar.gz: 15d930a08a1fa3d577c88e90f2dbc2fc620a4f0568bd58567af468c1a113c028
3
+ metadata.gz: 0572eb401d0e2e54a60d8eddefb515b6aba246df6d5d38ff9dacb76030b4b5ad
4
+ data.tar.gz: 3e5f174eddab15f4032e6a6726057bea411541682b2a9ec4ef688ad80391dcea
5
5
  SHA512:
6
- metadata.gz: fb921a803126011bf7936b654f8c5a9fafca4c8b5ca581f7e95c66ed90570858940692e52f9b5dc3b2c03f68605e0809f1f2a31bd131faa68d844da7fd4bd1ea
7
- data.tar.gz: 17332f8e5e141f26cb81f422dc6bdba0e069a087aecdc2c8f2b7e9a5f42f1574e400a4d327c8b7274f1bc898d3169f2f695c0360b9cd44ee45b869d854e6f907
6
+ metadata.gz: 390188829658535ca317f8ca29ce3a8c2556efe2cfa53217ba4597ef2f136207a2831fe76bab53822f8199fa5eb8aab9814fbd8923ec157fecd7f63aabaa08c1
7
+ data.tar.gz: d5623f1d2ff381f17d616648e545feaf33d9204625482198ef957af0d6cd8ea3b6b9d26a82ed06ee67c2af2bf983e221ce1b75648b4028eb4f54328710dd3830
@@ -2,15 +2,6 @@
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
4
  <list default="true" id="fb0f6f3c-7fa5-4dbf-94f4-a2e16c806fef" name="Default" comment="">
5
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/generators/pading/views_generator.rb" />
6
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.rakeTasks" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" />
7
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading.rb" afterPath="$PROJECT_DIR$/lib/pading.rb" />
9
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/actionview.rb" afterPath="$PROJECT_DIR$/lib/pading/actionview.rb" />
10
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/activerecord.rb" afterPath="$PROJECT_DIR$/lib/pading/activerecord.rb" />
11
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb" afterPath="$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb" />
12
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb" afterPath="$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb" />
13
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/config.rb" afterPath="$PROJECT_DIR$/lib/pading/config.rb" />
14
5
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pading/version.rb" afterPath="$PROJECT_DIR$/lib/pading/version.rb" />
15
6
  </list>
16
7
  <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -22,17 +13,27 @@
22
13
  </component>
23
14
  <component name="FileEditorManager">
24
15
  <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
25
- <file leaf-file-name="tags.rb" pinned="false" current-in-tab="false">
26
- <entry file="file://$PROJECT_DIR$/lib/pading/actionview/tags.rb">
16
+ <file leaf-file-name="active_record_extension.rb" pinned="false" current-in-tab="false">
17
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb">
27
18
  <provider selected="true" editor-type-id="text-editor">
28
- <state relative-caret-position="345">
29
- <caret line="66" column="20" lean-forward="false" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
19
+ <state relative-caret-position="575">
20
+ <caret line="25" column="0" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
21
+ <folding />
22
+ </state>
23
+ </provider>
24
+ </entry>
25
+ </file>
26
+ <file leaf-file-name="config.rb" pinned="false" current-in-tab="false">
27
+ <entry file="file://$PROJECT_DIR$/lib/pading/config.rb">
28
+ <provider selected="true" editor-type-id="text-editor">
29
+ <state relative-caret-position="506">
30
+ <caret line="22" column="30" lean-forward="false" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="30" />
30
31
  <folding />
31
32
  </state>
32
33
  </provider>
33
34
  </entry>
34
35
  </file>
35
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
36
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
36
37
  <entry file="file://$PROJECT_DIR$/lib/pading/version.rb">
37
38
  <provider selected="true" editor-type-id="text-editor">
38
39
  <state relative-caret-position="69">
@@ -42,11 +43,61 @@
42
43
  </provider>
43
44
  </entry>
44
45
  </file>
45
- <file leaf-file-name="pading.rb" pinned="false" current-in-tab="true">
46
- <entry file="file://$PROJECT_DIR$/lib/pading.rb">
46
+ <file leaf-file-name="config_generator.rb" pinned="false" current-in-tab="false">
47
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/config_generator.rb">
48
+ <provider selected="true" editor-type-id="text-editor">
49
+ <state relative-caret-position="276">
50
+ <caret line="12" column="75" lean-forward="true" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="75" />
51
+ <folding />
52
+ </state>
53
+ </provider>
54
+ </entry>
55
+ </file>
56
+ <file leaf-file-name="active_record_model_extension.rb" pinned="false" current-in-tab="false">
57
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb">
58
+ <provider selected="true" editor-type-id="text-editor">
59
+ <state relative-caret-position="345">
60
+ <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
61
+ <folding />
62
+ </state>
63
+ </provider>
64
+ </entry>
65
+ </file>
66
+ <file leaf-file-name="views_generator.rb" pinned="false" current-in-tab="false">
67
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/views_generator.rb">
68
+ <provider selected="true" editor-type-id="text-editor">
69
+ <state relative-caret-position="299">
70
+ <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
71
+ <folding />
72
+ </state>
73
+ </provider>
74
+ </entry>
75
+ </file>
76
+ <file leaf-file-name="pading_config.rb" pinned="false" current-in-tab="false">
77
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/templates/pading_config.rb">
47
78
  <provider selected="true" editor-type-id="text-editor">
48
- <state relative-caret-position="207">
49
- <caret line="9" column="16" lean-forward="true" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
79
+ <state relative-caret-position="92">
80
+ <caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
81
+ <folding />
82
+ </state>
83
+ </provider>
84
+ </entry>
85
+ </file>
86
+ <file leaf-file-name="helper_menthods.rb" pinned="false" current-in-tab="false">
87
+ <entry file="file://$PROJECT_DIR$/lib/pading/actionview/helper_menthods.rb">
88
+ <provider selected="true" editor-type-id="text-editor">
89
+ <state relative-caret-position="345">
90
+ <caret line="15" column="36" lean-forward="true" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
91
+ <folding />
92
+ </state>
93
+ </provider>
94
+ </entry>
95
+ </file>
96
+ <file leaf-file-name="paginator.rb" pinned="false" current-in-tab="false">
97
+ <entry file="file://$PROJECT_DIR$/lib/pading/actionview/paginator.rb">
98
+ <provider selected="true" editor-type-id="text-editor">
99
+ <state relative-caret-position="-1477">
100
+ <caret line="22" column="7" lean-forward="true" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
50
101
  <folding />
51
102
  </state>
52
103
  </provider>
@@ -63,40 +114,42 @@
63
114
  </component>
64
115
  <component name="FindInProjectRecents">
65
116
  <findStrings>
66
- <find>active_record_model_extension</find>
67
- <find>ctiveSupport</find>
68
- <find>kami</find>
69
- <find>Pading::ActiveRecordExtension</find>
70
- <find>Delete this and the text above, and describe your gem</find>
71
- <find>authors</find>
72
- <find>test_page</find>
73
- <find>PageScopeMethods</find>
74
- <find>ActiveRecord</find>
75
- <find>ActiveRecordModelExtension</find>
76
- <find>Pading::Actionview</find>
77
- <find>Helpers</find>
78
- <find>Pading::Tag</find>
79
- <find>Pading::Actionview::Tag</find>
80
- <find>merge</find>
81
- <find>locals</find>
82
- <find>param_name</find>
83
- <find>PageProxy</find>
84
- <find>relevant_pages</find>
85
- <find>first_page</find>
86
- <find>def render</find>
87
- <find>FirstPage</find>
88
- <find>paginator</find>
89
- <find>eval</find>
90
- <find>-</find>
91
- <find>current</find>
92
- <find>relevant</find>
93
- <find>@windo</find>
94
117
  <find>display_tag</find>
95
118
  <find>partial_path</find>
119
+ <find>test_</find>
120
+ <find>@output_buffer</find>
121
+ <find>limit_value</find>
122
+ <find>render</find>
123
+ <find>first</find>
124
+ <find>current_page_num</find>
125
+ <find>each_page</find>
126
+ <find>current_page</find>
127
+ <find>def las</find>
128
+ <find>next_page</find>
129
+ <find>FirstPage</find>
130
+ <find>@options[:current_page]</find>
131
+ <find>def last?</find>
132
+ <find>def page_tag(page)</find>
133
+ <find>options[:current_page]</find>
134
+ <find>PageProxy</find>
135
+ <find>window</find>
136
+ <find>@options[:page]</find>
137
+ <find>.to_s</find>
138
+ <find>8 -</find>
139
+ <find>def per</find>
140
+ <find>def page</find>
141
+ <find>::Actio</find>
142
+ <find>Paginator.</find>
143
+ <find>to_s</find>
144
+ <find>pp</find>
145
+ <find>page:</find>
146
+ <find>test_page</find>
96
147
  </findStrings>
97
148
  <dirStrings>
98
149
  <dir>E:\lym_project\gem\pading\lib\pading\actionview</dir>
150
+ <dir>E:\lym_project\gem\pading\app</dir>
99
151
  <dir>E:\lym_project\gem\pading</dir>
152
+ <dir>E:\lym_project\gem\pading\lib</dir>
100
153
  </dirStrings>
101
154
  </component>
102
155
  <component name="Git.Settings">
@@ -111,7 +164,6 @@
111
164
  <option value="$PROJECT_DIR$/lib/pading/activerecord/config.rb" />
112
165
  <option value="$PROJECT_DIR$/lib/generators/pading/templates/pading_config.rb" />
113
166
  <option value="$PROJECT_DIR$/lib/generators/pading/config_generator.rb" />
114
- <option value="$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb" />
115
167
  <option value="$PROJECT_DIR$/pading.gemspec" />
116
168
  <option value="$PROJECT_DIR$/lib/pading.rb" />
117
169
  <option value="$PROJECT_DIR$/lib/generators/pading/view_generator.rb" />
@@ -120,17 +172,18 @@
120
172
  <option value="$PROJECT_DIR$/app/views/pading/_next_page.html.erb" />
121
173
  <option value="$PROJECT_DIR$/app/views/pading/_prev_page.html.erb" />
122
174
  <option value="$PROJECT_DIR$/app/views/pading/_gap.html.erb" />
123
- <option value="$PROJECT_DIR$/lib/generators/pading/views_generator.rb" />
124
- <option value="$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb" />
125
175
  <option value="$PROJECT_DIR$/lib/pading/activerecord.rb" />
126
- <option value="$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb" />
127
176
  <option value="$PROJECT_DIR$/lib/pading/helpers/paginator.rb" />
128
177
  <option value="$PROJECT_DIR$/lib/pading/actionview.rb" />
129
178
  <option value="$PROJECT_DIR$/lib/pading/config.rb" />
130
- <option value="$PROJECT_DIR$/lib/pading/actionview/paginator.rb" />
179
+ <option value="$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb" />
131
180
  <option value="$PROJECT_DIR$/lib/pading/actionview/tags.rb" />
132
181
  <option value="$PROJECT_DIR$/lib/pading/actionview/helper_menthods.rb" />
133
182
  <option value="$PROJECT_DIR$/app/views/pading/_paginator.html.erb" />
183
+ <option value="$PROJECT_DIR$/lib/generators/pading/views_generator.rb" />
184
+ <option value="$PROJECT_DIR$/lib/pading/actionview/paginator.rb" />
185
+ <option value="$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb" />
186
+ <option value="$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb" />
134
187
  <option value="$PROJECT_DIR$/lib/pading/version.rb" />
135
188
  </list>
136
189
  </option>
@@ -141,7 +194,7 @@
141
194
  <detection-done>true</detection-done>
142
195
  <sorting>DEFINITION_ORDER</sorting>
143
196
  </component>
144
- <component name="ProjectFrameBounds" extendedState="6">
197
+ <component name="ProjectFrameBounds" extendedState="7">
145
198
  <option name="x" value="1912" />
146
199
  <option name="y" value="-8" />
147
200
  <option name="width" value="1936" />
@@ -162,7 +215,6 @@
162
215
  <foldersAlwaysOnTop value="true" />
163
216
  </navigator>
164
217
  <panes>
165
- <pane id="Scratches" />
166
218
  <pane id="Scope" />
167
219
  <pane id="ProjectPane">
168
220
  <subPane>
@@ -179,20 +231,28 @@
179
231
  <path>
180
232
  <item name="pading" type="b2602c69:ProjectViewProjectNode" />
181
233
  <item name="pading" type="462c0819:PsiDirectoryNode" />
182
- <item name="app" type="462c0819:PsiDirectoryNode" />
183
- <item name="views" type="462c0819:PsiDirectoryNode" />
234
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
184
235
  </path>
185
236
  <path>
186
237
  <item name="pading" type="b2602c69:ProjectViewProjectNode" />
187
238
  <item name="pading" type="462c0819:PsiDirectoryNode" />
188
- <item name="app" type="462c0819:PsiDirectoryNode" />
189
- <item name="views" type="462c0819:PsiDirectoryNode" />
239
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
240
+ <item name="generators" type="462c0819:PsiDirectoryNode" />
241
+ </path>
242
+ <path>
243
+ <item name="pading" type="b2602c69:ProjectViewProjectNode" />
244
+ <item name="pading" type="462c0819:PsiDirectoryNode" />
245
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
246
+ <item name="generators" type="462c0819:PsiDirectoryNode" />
190
247
  <item name="pading" type="462c0819:PsiDirectoryNode" />
191
248
  </path>
192
249
  <path>
193
250
  <item name="pading" type="b2602c69:ProjectViewProjectNode" />
194
251
  <item name="pading" type="462c0819:PsiDirectoryNode" />
195
252
  <item name="lib" type="462c0819:PsiDirectoryNode" />
253
+ <item name="generators" type="462c0819:PsiDirectoryNode" />
254
+ <item name="pading" type="462c0819:PsiDirectoryNode" />
255
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
196
256
  </path>
197
257
  <path>
198
258
  <item name="pading" type="b2602c69:ProjectViewProjectNode" />
@@ -207,16 +267,24 @@
207
267
  <item name="pading" type="462c0819:PsiDirectoryNode" />
208
268
  <item name="actionview" type="462c0819:PsiDirectoryNode" />
209
269
  </path>
270
+ <path>
271
+ <item name="pading" type="b2602c69:ProjectViewProjectNode" />
272
+ <item name="pading" type="462c0819:PsiDirectoryNode" />
273
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
274
+ <item name="pading" type="462c0819:PsiDirectoryNode" />
275
+ <item name="activerecord" type="462c0819:PsiDirectoryNode" />
276
+ </path>
210
277
  </expand>
211
278
  <select />
212
279
  </subPane>
213
280
  </pane>
281
+ <pane id="Scratches" />
214
282
  </panes>
215
283
  </component>
216
284
  <component name="PropertiesComponent">
217
285
  <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
218
286
  <property name="WebServerToolWindowFactoryState" value="false" />
219
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../k" />
287
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../kaminari-master" />
220
288
  </component>
221
289
  <component name="RecentsManager">
222
290
  <key name="MoveFile.RECENT_KEYS">
@@ -255,28 +323,29 @@
255
323
  <option name="presentableId" value="Default" />
256
324
  <updated>1599697704909</updated>
257
325
  <workItem from="1599697706302" duration="24349000" />
258
- <workItem from="1599782125726" duration="21959000" />
326
+ <workItem from="1599782125726" duration="24806000" />
327
+ <workItem from="1600042697617" duration="22946000" />
259
328
  </task>
260
329
  <servers />
261
330
  </component>
262
331
  <component name="TimeTrackingManager">
263
- <option name="totallyTimeSpent" value="46308000" />
332
+ <option name="totallyTimeSpent" value="72101000" />
264
333
  </component>
265
334
  <component name="ToolWindowManager">
266
- <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
335
+ <frame x="1912" y="-8" width="1936" height="1056" extended-state="7" />
267
336
  <editor active="true" />
268
337
  <layout>
269
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25266525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
338
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2553305" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
270
339
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
271
340
  <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
272
341
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
273
342
  <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
274
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
275
343
  <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
344
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
276
345
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
277
346
  <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
278
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
279
347
  <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
348
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
280
349
  <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
281
350
  <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
282
351
  <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -293,11 +362,43 @@
293
362
  </component>
294
363
  <component name="XDebuggerManager">
295
364
  <breakpoint-manager>
296
- <option name="time" value="1" />
365
+ <option name="time" value="2" />
297
366
  </breakpoint-manager>
298
367
  <watches-manager />
299
368
  </component>
300
369
  <component name="editorHistoryManager">
370
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb">
371
+ <provider selected="true" editor-type-id="text-editor">
372
+ <state relative-caret-position="552">
373
+ <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
374
+ <folding />
375
+ </state>
376
+ </provider>
377
+ </entry>
378
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb">
379
+ <provider selected="true" editor-type-id="text-editor">
380
+ <state relative-caret-position="161">
381
+ <caret line="7" column="30" lean-forward="true" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
382
+ <folding />
383
+ </state>
384
+ </provider>
385
+ </entry>
386
+ <entry file="file://$PROJECT_DIR$/lib/pading/actionview/helper_menthods.rb">
387
+ <provider selected="true" editor-type-id="text-editor">
388
+ <state relative-caret-position="0">
389
+ <caret line="0" column="34" lean-forward="true" selection-start-line="0" selection-start-column="34" selection-end-line="0" selection-end-column="34" />
390
+ <folding />
391
+ </state>
392
+ </provider>
393
+ </entry>
394
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/views_generator.rb">
395
+ <provider selected="true" editor-type-id="text-editor">
396
+ <state relative-caret-position="115">
397
+ <caret line="5" column="76" lean-forward="true" selection-start-line="5" selection-start-column="76" selection-end-line="5" selection-end-column="76" />
398
+ <folding />
399
+ </state>
400
+ </provider>
401
+ </entry>
301
402
  <entry file="file://$PROJECT_DIR$/lib/pading/config.rb">
302
403
  <provider selected="true" editor-type-id="text-editor">
303
404
  <state relative-caret-position="230">
@@ -418,14 +519,6 @@
418
519
  </state>
419
520
  </provider>
420
521
  </entry>
421
- <entry file="file://$PROJECT_DIR$/lib/generators/pading/templates/pading_config.rb">
422
- <provider selected="true" editor-type-id="text-editor">
423
- <state relative-caret-position="92">
424
- <caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
425
- <folding />
426
- </state>
427
- </provider>
428
- </entry>
429
522
  <entry file="file://$PROJECT_DIR$/lib/pading/drawing.rb" />
430
523
  <entry file="file://$PROJECT_DIR$/pading-0.1.0.gem">
431
524
  <provider selected="true" editor-type-id="text-editor">
@@ -443,18 +536,19 @@
443
536
  </state>
444
537
  </provider>
445
538
  </entry>
446
- <entry file="file://$PROJECT_DIR$/lib/generators/pading/view_generator.rb">
539
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/view_generator.rb" />
540
+ <entry file="file://D:/utils/ruby/ruby/Ruby23-x64/lib/ruby/site_ruby/2.3.0/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb">
447
541
  <provider selected="true" editor-type-id="text-editor">
448
- <state relative-caret-position="115">
449
- <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
450
- <folding />
542
+ <state relative-caret-position="161">
543
+ <caret line="7" column="10" lean-forward="false" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
451
544
  </state>
452
545
  </provider>
453
546
  </entry>
454
- <entry file="file://$PROJECT_DIR$/app/views/pading/_first_page.html.erb">
547
+ <entry file="file://$PROJECT_DIR$/lib/pading/helpers/paginator.rb" />
548
+ <entry file="file://$PROJECT_DIR$/app/views/pading/_gap.html.erb">
455
549
  <provider selected="true" editor-type-id="text-editor">
456
550
  <state relative-caret-position="46">
457
- <caret line="9" column="45" lean-forward="false" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
551
+ <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
458
552
  <folding />
459
553
  </state>
460
554
  </provider>
@@ -475,58 +569,58 @@
475
569
  </state>
476
570
  </provider>
477
571
  </entry>
478
- <entry file="file://$PROJECT_DIR$/app/views/pading/_prev_page.html.erb">
572
+ <entry file="file://$PROJECT_DIR$/app/views/pading/_page.html.erb">
479
573
  <provider selected="true" editor-type-id="text-editor">
480
- <state relative-caret-position="46">
481
- <caret line="9" column="46" lean-forward="false" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
574
+ <state relative-caret-position="92">
575
+ <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
482
576
  <folding />
483
577
  </state>
484
578
  </provider>
485
579
  </entry>
486
- <entry file="file://D:/utils/ruby/ruby/Ruby23-x64/lib/ruby/site_ruby/2.3.0/bundler/vendor/thor/lib/thor/actions.rb">
580
+ <entry file="file://$PROJECT_DIR$/app/views/pading/_prev_page.html.erb">
487
581
  <provider selected="true" editor-type-id="text-editor">
488
- <state relative-caret-position="196">
489
- <caret line="26" column="10" lean-forward="false" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" />
582
+ <state relative-caret-position="92">
583
+ <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
490
584
  <folding />
491
585
  </state>
492
586
  </provider>
493
587
  </entry>
494
- <entry file="file://$PROJECT_DIR$/lib/generators/pading/config_generator.rb">
588
+ <entry file="file://$PROJECT_DIR$/app/views/pading/_first_page.html.erb">
495
589
  <provider selected="true" editor-type-id="text-editor">
496
- <state relative-caret-position="69">
497
- <caret line="3" column="19" lean-forward="true" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
590
+ <state relative-caret-position="46">
591
+ <caret line="9" column="45" lean-forward="false" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
498
592
  <folding />
499
593
  </state>
500
594
  </provider>
501
595
  </entry>
502
- <entry file="file://$PROJECT_DIR$/lib/generators/pading/views_generator.rb">
596
+ <entry file="file://$APPLICATION_HOME_DIR$/rubystubs23/file.rb">
503
597
  <provider selected="true" editor-type-id="text-editor">
504
- <state relative-caret-position="437">
505
- <caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
598
+ <state relative-caret-position="987">
599
+ <caret line="504" column="13" lean-forward="false" selection-start-line="504" selection-start-column="13" selection-end-line="504" selection-end-column="13" />
506
600
  <folding />
507
601
  </state>
508
602
  </provider>
509
603
  </entry>
510
- <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb">
604
+ <entry file="file://D:/utils/ruby/ruby/Ruby23-x64/lib/ruby/site_ruby/2.3.0/bundler/vendor/thor/lib/thor/actions.rb">
511
605
  <provider selected="true" editor-type-id="text-editor">
512
- <state relative-caret-position="414">
513
- <caret line="18" column="7" lean-forward="true" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
606
+ <state relative-caret-position="297">
607
+ <caret line="26" column="10" lean-forward="false" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" />
514
608
  <folding />
515
609
  </state>
516
610
  </provider>
517
611
  </entry>
518
- <entry file="file://D:/utils/ruby/ruby/Ruby23-x64/lib/ruby/site_ruby/2.3.0/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb">
612
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord.rb">
519
613
  <provider selected="true" editor-type-id="text-editor">
520
- <state relative-caret-position="161">
521
- <caret line="7" column="10" lean-forward="false" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
614
+ <state relative-caret-position="69">
615
+ <caret line="3" column="46" lean-forward="true" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
522
616
  <folding />
523
617
  </state>
524
618
  </provider>
525
619
  </entry>
526
- <entry file="file://$PROJECT_DIR$/lib/pading/helpers/paginator.rb">
620
+ <entry file="file://$PROJECT_DIR$/lib/pading.rb">
527
621
  <provider selected="true" editor-type-id="text-editor">
528
- <state relative-caret-position="23">
529
- <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
622
+ <state relative-caret-position="276">
623
+ <caret line="12" column="22" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
530
624
  <folding />
531
625
  </state>
532
626
  </provider>
@@ -539,106 +633,108 @@
539
633
  </state>
540
634
  </provider>
541
635
  </entry>
542
- <entry file="file://$PROJECT_DIR$/app/views/pading/_gap.html.erb">
636
+ <entry file="file://$PROJECT_DIR$/lib/pading/actionview/tags.rb">
543
637
  <provider selected="true" editor-type-id="text-editor">
544
- <state relative-caret-position="46">
545
- <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
638
+ <state relative-caret-position="-644">
639
+ <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
546
640
  <folding />
547
641
  </state>
548
642
  </provider>
549
643
  </entry>
550
- <entry file="file://$PROJECT_DIR$/app/views/pading/_page.html.erb">
644
+ <entry file="file://$PROJECT_DIR$/app/views/pading/_paginator.html.erb">
551
645
  <provider selected="true" editor-type-id="text-editor">
552
- <state relative-caret-position="92">
553
- <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
554
- <folding />
646
+ <state relative-caret-position="161">
647
+ <caret line="7" column="3" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
648
+ <folding>
649
+ <element signature="e#0#319#0#RHTML" expanded="true" />
650
+ </folding>
555
651
  </state>
556
652
  </provider>
557
653
  </entry>
558
- <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb">
654
+ <entry file="file://$PROJECT_DIR$/lib/pading/actionview.rb">
559
655
  <provider selected="true" editor-type-id="text-editor">
560
- <state relative-caret-position="23">
561
- <caret line="1" column="39" lean-forward="true" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
656
+ <state relative-caret-position="92">
657
+ <caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
562
658
  <folding />
563
659
  </state>
564
660
  </provider>
565
661
  </entry>
566
- <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb">
662
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/page_scope_menthods.rb">
567
663
  <provider selected="true" editor-type-id="text-editor">
568
- <state relative-caret-position="161">
569
- <caret line="7" column="30" lean-forward="true" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
664
+ <state relative-caret-position="-51">
665
+ <caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
570
666
  <folding />
571
667
  </state>
572
668
  </provider>
573
669
  </entry>
574
- <entry file="file://$PROJECT_DIR$/lib/pading/activerecord.rb">
670
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/config_generator.rb">
575
671
  <provider selected="true" editor-type-id="text-editor">
576
- <state relative-caret-position="69">
577
- <caret line="3" column="44" lean-forward="false" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
672
+ <state relative-caret-position="276">
673
+ <caret line="12" column="75" lean-forward="true" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="75" />
578
674
  <folding />
579
675
  </state>
580
676
  </provider>
581
677
  </entry>
582
- <entry file="file://$PROJECT_DIR$/lib/pading/actionview.rb">
678
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/views_generator.rb">
583
679
  <provider selected="true" editor-type-id="text-editor">
584
- <state relative-caret-position="92">
585
- <caret line="4" column="37" lean-forward="false" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
680
+ <state relative-caret-position="299">
681
+ <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
586
682
  <folding />
587
683
  </state>
588
684
  </provider>
589
685
  </entry>
590
- <entry file="file://$PROJECT_DIR$/lib/pading/config.rb">
686
+ <entry file="file://$PROJECT_DIR$/lib/generators/pading/templates/pading_config.rb">
591
687
  <provider selected="true" editor-type-id="text-editor">
592
- <state relative-caret-position="501">
593
- <caret line="22" column="30" lean-forward="false" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="30" />
688
+ <state relative-caret-position="92">
689
+ <caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
594
690
  <folding />
595
691
  </state>
596
692
  </provider>
597
693
  </entry>
598
694
  <entry file="file://$PROJECT_DIR$/lib/pading/actionview/helper_menthods.rb">
599
695
  <provider selected="true" editor-type-id="text-editor">
600
- <state relative-caret-position="69">
601
- <caret line="3" column="22" lean-forward="false" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
696
+ <state relative-caret-position="345">
697
+ <caret line="15" column="36" lean-forward="true" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
602
698
  <folding />
603
699
  </state>
604
700
  </provider>
605
701
  </entry>
606
702
  <entry file="file://$PROJECT_DIR$/lib/pading/actionview/paginator.rb">
607
703
  <provider selected="true" editor-type-id="text-editor">
608
- <state relative-caret-position="-795">
609
- <caret line="19" column="7" lean-forward="false" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
704
+ <state relative-caret-position="-1477">
705
+ <caret line="22" column="7" lean-forward="true" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
610
706
  <folding />
611
707
  </state>
612
708
  </provider>
613
709
  </entry>
614
- <entry file="file://$PROJECT_DIR$/app/views/pading/_paginator.html.erb">
710
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_model_extension.rb">
615
711
  <provider selected="true" editor-type-id="text-editor">
616
- <state relative-caret-position="161">
617
- <caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
712
+ <state relative-caret-position="345">
713
+ <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
618
714
  <folding />
619
715
  </state>
620
716
  </provider>
621
717
  </entry>
622
- <entry file="file://$PROJECT_DIR$/lib/pading/actionview/tags.rb">
718
+ <entry file="file://$PROJECT_DIR$/lib/pading/activerecord/active_record_extension.rb">
623
719
  <provider selected="true" editor-type-id="text-editor">
624
- <state relative-caret-position="345">
625
- <caret line="66" column="20" lean-forward="false" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
720
+ <state relative-caret-position="575">
721
+ <caret line="25" column="0" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
626
722
  <folding />
627
723
  </state>
628
724
  </provider>
629
725
  </entry>
630
- <entry file="file://$PROJECT_DIR$/lib/pading/version.rb">
726
+ <entry file="file://$PROJECT_DIR$/lib/pading/config.rb">
631
727
  <provider selected="true" editor-type-id="text-editor">
632
- <state relative-caret-position="69">
633
- <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
728
+ <state relative-caret-position="506">
729
+ <caret line="22" column="30" lean-forward="false" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="30" />
634
730
  <folding />
635
731
  </state>
636
732
  </provider>
637
733
  </entry>
638
- <entry file="file://$PROJECT_DIR$/lib/pading.rb">
734
+ <entry file="file://$PROJECT_DIR$/lib/pading/version.rb">
639
735
  <provider selected="true" editor-type-id="text-editor">
640
- <state relative-caret-position="207">
641
- <caret line="9" column="16" lean-forward="true" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
736
+ <state relative-caret-position="69">
737
+ <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
642
738
  <folding />
643
739
  </state>
644
740
  </provider>
@@ -6,14 +6,17 @@
6
6
  remote: data-remote
7
7
  paginator: the paginator that renders the pagination tags inside
8
8
  -%>
9
- <% pp paginator %>
10
9
  <%= paginator.render do -%>
11
- <nav class="pagination" role="navigation" aria-label="pager">
12
- <%= first_page_tag unless current_page.first? %>
13
- <%= prev_page_tag unless current_page.first? %>
10
+ <nav class="pagination" role="navigation" aria-label="pager">
11
+ <%= first_page_tag unless current_page.first? %>
12
+ <%= prev_page_tag unless current_page.first? %>
14
13
 
14
+ <!-- 页码 -->
15
+ <% each_page do |page| %>
16
+ <%= page.display_tag? ? (page_tag page) : (gap_tag) %>
17
+ <% end %>
15
18
 
16
19
  <%= next_page_tag unless current_page.last? %>
17
20
  <%= last_page_tag unless current_page.last? %>
18
- </nav>
21
+ </nav>
19
22
  <% end -%>
@@ -2,33 +2,19 @@
2
2
  require 'pp'
3
3
  module Pading
4
4
  module Generators
5
- class ViewsGenerator < Rails::Generators::NamedBase
5
+ class ViewsGenerator < Rails::Generators::Base
6
+ # source_root 存储并返回定义这个类所在的位置
7
+ # __FILE__ -> E:/lym_project/gem/pading/lib/generators/pading/views_generator.rb"
8
+ # File.expand_path('../../../../app/views/pading', __FILE__) ->E:/lym_project/gem/pading/app/views/pading
9
+ # E:/lym_project/gem/pading/app/views/pading
6
10
  source_root File.expand_path('../../../../app/views/pading', __FILE__)
7
11
 
8
12
  def copy_or_fetch
9
- return copy_default_views if file_name == 'default'
10
- end
11
-
12
- private
13
- def copy_default_views
14
13
  # self.class.source_root 它将返回其路径名 -> E:/lym_project/gem/pading/app/views/pading/*.html.erb"
15
- file = File.join self.class.source_root, "*.html.erb"
16
-
17
- # 遍历目录下的全部文件 取出name. 拷贝
18
- Dir.glob(file).map{|f| File.basename f}.each do |f|
19
- copy_file f, view_path_for(f)
20
- end
14
+ # 复制文件到指定文件夹
15
+ FileUtils.cp_r "#{self.class.source_root}/.", 'app/views/pading'
21
16
  end
22
17
 
23
-
24
- # 拷贝到的文件路径
25
- def view_path_for file
26
- ['app','views',views_prefix,'pading', File.basename(file)].compact.join("/")
27
- end
28
-
29
- def views_prefix
30
- options[:views_prefix].try(:to_s)
31
- end
32
18
  end
33
19
  end
34
20
  end
@@ -1,3 +1,5 @@
1
+ # 变形器将单词从单数转换为复数,将类名转换为表名,将模块化类名转换为不带名,将类名转换为外键。
2
+ # 复数形式,单数形式和不可数单词的默认变形会保留在inflections.rb中
1
3
  require 'active_support/inflector'
2
4
  require 'pading/actionview/paginator'
3
5
  module Pading
@@ -8,10 +10,11 @@ module Pading
8
10
  # 所以能调用 PageScopeMenthods 下面的方法
9
11
 
10
12
  options[:total_pages] ||= scope.total_pages
11
- options.reverse_merge! current_page: scope.current_page, per_page: scope.limit_value, remote: false
13
+ options.reverse_merge! current_page_number: scope.current_page, per_page: scope.limit_value, remote: false
12
14
 
13
15
  # 最后返回的 其实是一个渲染好的模板。
14
16
  paginator = paginator_class.new (template || self), options
17
+
15
18
  paginator.to_s
16
19
 
17
20
  end
@@ -8,11 +8,14 @@ module Pading
8
8
  def initialize(template, **options)
9
9
  @template = template
10
10
  @options = options
11
- @options[:current_page] = PageProxy.new(@options, options[:current_page_num])
12
-
11
+ @options[:current_page] = PageProxy.new(@options, options[:current_page_number])
12
+ #
13
+ # undefined method `safe_append='
14
+ # 允许写 多个 <% %>
13
15
  @output_buffer = if defined?(::ActionView::OutputBuffer)
14
16
  ::ActionView::OutputBuffer.new
15
17
  elsif template.instance_variable_get(:@output_buffer)
18
+ # instance_variable_get 获取并返回对象的实例变量的值。 如果未定义实例变量,则返回nil
16
19
  template.instance_variable_get(:@output_buffer).class.new
17
20
  else
18
21
  ActiveSupport::SafeBuffer.new
@@ -44,12 +47,22 @@ module Pading
44
47
 
45
48
 
46
49
  def each_page
50
+ # Kaminari.config.window = 1
51
+ window = 1
52
+ each_start = @options[:current_page_number] - 1 - window
53
+ each_end = @options[:current_page_number] + 1 + window
54
+ each_start = 1 if each_start < window
55
+ each_end = @options[:total_pages] if each_end > @options[:total_pages]
56
+
57
+ (each_start..each_end).each do |page|
58
+ yield PageProxy.new(@options,page)
59
+ end
47
60
 
48
61
  end
49
62
 
50
63
 
51
64
  def page_tag(page)
52
- @last = Page.new @template, @options.merge(page: page)
65
+ Page.new @template, @options.merge(page: page)
53
66
  end
54
67
 
55
68
  class PageProxy
@@ -68,14 +81,35 @@ module Pading
68
81
  end
69
82
 
70
83
  def prev?
71
- @page == @options[:current_page] - 1
84
+ @page == @options[:current_page_number] - 1
72
85
  end
73
86
 
74
87
  def next?
75
- @page == @options[:current_page] + 1
88
+ @page == @options[:current_page_number] + 1
89
+ end
90
+
91
+ def display_tag?
92
+ (@options[:current_page_number] - @page ).abs <= 1
76
93
  end
77
94
 
78
95
 
96
+ def current?
97
+ @options[:current_page_number] == @page
98
+ end
99
+
100
+ def rel
101
+ if next?
102
+ '下一页'
103
+ elsif prev?
104
+ '上一页'
105
+ end
106
+ end
107
+
108
+
109
+ def to_s #:nodoc:
110
+ @page.to_s
111
+ end
112
+
79
113
  end
80
114
  end
81
115
 
@@ -64,21 +64,22 @@ module Pading
64
64
  class LastPage < Tag
65
65
  include Link
66
66
  def page
67
- 1
67
+ @options[:total_pages]
68
68
  end
69
69
  end
70
70
 
71
71
  class PrevPage < Tag
72
72
  include Link
73
73
  def page
74
- 1
74
+
75
+ @options[:current_page_number] - 1
75
76
  end
76
77
  end
77
78
 
78
79
  class NextPage < Tag
79
80
  include Link
80
81
  def page
81
- 1
82
+ @options[:current_page_number] + 1
82
83
  end
83
84
  end
84
85
 
@@ -10,6 +10,7 @@ module Pading
10
10
  def inherited(kls) #:nodoc:
11
11
  # inherited 当前类定义子类时,就会触发此回调
12
12
  super
13
+ pp "===1111111111111111111"
13
14
  kls.send(:include, Pading::ActiveRecordModelExtension) if kls.superclass == ::ActiveRecord::Base
14
15
  end
15
16
  end
@@ -13,7 +13,7 @@ module Pading
13
13
  eval <<-RUBY, nil, __FILE__, __LINE__ + 1
14
14
  def self.#{Pading.config.page_method_name}(num=nil)
15
15
  per_page = Pading.config.default_per_page
16
- num = (num.to_i - 1) < 0 ? 0 : num - 1
16
+ num = (num.to_i - 1) < 0 ? 0 : num.to_i - 1
17
17
  # extending 给一个 scope 增加方法,返回的仍然是 scope.
18
18
  # 如果传递的是 block, 则可以直接调用 block 里面的方法, 如
19
19
  # 果传递的是 module, 则可以调用 module 里面的方法。
@@ -22,6 +22,7 @@ module Pading
22
22
  limit(per_page).offset(per_page * num).extending do
23
23
  include Pading::PageScopeMethods
24
24
  end
25
+
25
26
  end
26
27
  RUBY
27
28
 
@@ -2,7 +2,6 @@ module Pading
2
2
  module PageScopeMethods
3
3
 
4
4
  def per(num, max_per_page: nil)
5
- # offset_value limit_value 元编程自动生成的查询
6
5
  if (n = num.to_i ) < 0 || !(/^\d/ =~ num.to_s)
7
6
  self
8
7
  elsif n.zero? # zero 是否为0
@@ -15,13 +14,17 @@ module Pading
15
14
 
16
15
  # 获取当前page
17
16
  def current_page
18
- (offset_value / limit_value) + 1
17
+ # offset_value limit_value 元编程自动生成的查询
18
+ # limit_value 每一页多少个
19
+ # offset_value 从第几个开始查询
20
+ (offset_value / limit_value) + 1
19
21
  end
20
22
 
21
23
 
22
24
  def total_count(column_name = :all, _options = nil)
23
25
  return @total_count if defined?(@total_count) && @total_count
24
26
  c = except(:offset, :limit, :order)
27
+ # TODO references_eager_loaded_tables? API 没有这个方法的描述
25
28
  c = c.except(:includes) unless references_eager_loaded_tables?
26
29
  c = c.count(column_name)
27
30
  @total_count = if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
@@ -1,3 +1,3 @@
1
1
  module Pading
2
- VERSION = "0.1.2"
2
+ VERSION = "0.1.3"
3
3
  end
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pading
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - liym0723
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-09-11 00:00:00.000000000 Z
11
+ date: 2020-09-14 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: 参照 kaminari 所写的分页
14
14
  email: 15079447645@163.com
@@ -56,6 +56,7 @@ files:
56
56
  - lib/pading/version.rb
57
57
  - pading-0.1.0.gem
58
58
  - pading-0.1.1.gem
59
+ - pading-0.1.2.gem
59
60
  - pading.gemspec
60
61
  homepage: https://github.com/liym0723/pading
61
62
  licenses: