subj_sub_models 0.0.3.7 → 0.0.3.8

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
  SHA1:
3
- metadata.gz: de97ee5d6d51cfaee0a63dc6a86588845e8ee43b
4
- data.tar.gz: 02ebbb49bcfe651f02392f2feb0e476efa913a99
3
+ metadata.gz: 14e9f6ce6d174979dfc893101295e929f4146883
4
+ data.tar.gz: 47ba2975508e5b47672566d75cb457ba6af691ff
5
5
  SHA512:
6
- metadata.gz: b2cd7f3e4fd53d9e3863133e76dd7ae95873585403306e917ea3e944ce014b103e4e60b3ac1c7a351274d6792b4a12f577e6aa400111f1c8f0eb243f07d30a8c
7
- data.tar.gz: 7cd1380ce2441cebbd60507f545aa5979560cc0f45e95b33bc676fc67ea8043230f23824ba54092823d06b2550f39b7e6c21f5edb31159825b8401b4e5869c11
6
+ metadata.gz: 4ecdc718e29f14808b741aec3b1b0e3777ce7041e0f1394538b2e52e1e491b3ab273b0a407a55adee61cd31cb5a684f3541e387718fd3db4440bc920d81f07d8
7
+ data.tar.gz: ae2d34a8b1fb6a899c7667586335f5fb4198303473d26b7bff2f3fbafe85dc6a0237142b4b2d9f9eaf42b66c2d4c1b0c52594bd68c00b607a3be3f90cd68da02
data/.gitignore CHANGED
@@ -9,3 +9,4 @@
9
9
  /tmp/
10
10
  /lib/subj_models/.DS_Store
11
11
  lib/.DS_Store
12
+ .idea
data/.idea/misc.xml CHANGED
@@ -7,19 +7,7 @@
7
7
  </MavenGeneralSettings>
8
8
  </option>
9
9
  </component>
10
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
11
- <OptionsSetting value="true" id="Add" />
12
- <OptionsSetting value="true" id="Remove" />
13
- <OptionsSetting value="true" id="Checkout" />
14
- <OptionsSetting value="true" id="Update" />
15
- <OptionsSetting value="true" id="Status" />
16
- <OptionsSetting value="true" id="Edit" />
17
- <ConfirmationsSetting value="0" id="Add" />
18
- <ConfirmationsSetting value="0" id="Remove" />
19
- </component>
20
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" assert-keyword="false" jdk-15="false" project-jdk-name="ruby-2.0.0-p648" project-jdk-type="RUBY_SDK">
21
- <output url="file://$PROJECT_DIR$/out" />
22
- </component>
10
+ <component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.0.0-p648" project-jdk-type="RUBY_SDK" />
23
11
  <component name="masterDetails">
24
12
  <states>
25
13
  <state key="ProjectJDKs.UI">
data/.idea/workspace.xml CHANGED
@@ -19,6 +19,9 @@
19
19
  <component name="FavoritesManager">
20
20
  <favorites_list name="subj_models" />
21
21
  </component>
22
+ <component name="Git.Settings">
23
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
24
+ </component>
22
25
  <component name="GradleLocalSettings">
23
26
  <option name="externalProjectsViewState">
24
27
  <projects_view />
@@ -31,18 +34,8 @@
31
34
  <sorting>DEFINITION_ORDER</sorting>
32
35
  </component>
33
36
  <component name="ProjectFrameBounds">
34
- <option name="width" value="1280" />
35
- <option name="height" value="800" />
36
- </component>
37
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
38
- <OptionsSetting value="true" id="Add" />
39
- <OptionsSetting value="true" id="Remove" />
40
- <OptionsSetting value="true" id="Checkout" />
41
- <OptionsSetting value="true" id="Update" />
42
- <OptionsSetting value="true" id="Status" />
43
- <OptionsSetting value="true" id="Edit" />
44
- <ConfirmationsSetting value="0" id="Add" />
45
- <ConfirmationsSetting value="0" id="Remove" />
37
+ <option name="width" value="1440" />
38
+ <option name="height" value="900" />
46
39
  </component>
47
40
  <component name="ProjectView">
48
41
  <navigator currentView="ProjectPane" proportions="" version="1">
@@ -59,29 +52,23 @@
59
52
  <foldersAlwaysOnTop value="true" />
60
53
  </navigator>
61
54
  <panes>
62
- <pane id="PackagesPane" />
63
- <pane id="Scratches" />
55
+ <pane id="Scope" />
64
56
  <pane id="ProjectPane">
65
57
  <subPane>
66
58
  <PATH>
67
59
  <PATH_ELEMENT>
68
- <option name="myItemId" value="subj_models" />
60
+ <option name="myItemId" value="subj_sub_modules" />
69
61
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
70
62
  </PATH_ELEMENT>
71
- </PATH>
72
- <PATH>
73
63
  <PATH_ELEMENT>
74
- <option name="myItemId" value="subj_models" />
75
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
76
- </PATH_ELEMENT>
77
- <PATH_ELEMENT>
78
- <option name="myItemId" value="subj_models" />
64
+ <option name="myItemId" value="subj_sub_modules" />
79
65
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
80
66
  </PATH_ELEMENT>
81
67
  </PATH>
82
68
  </subPane>
83
69
  </pane>
84
- <pane id="Scope" />
70
+ <pane id="Scratches" />
71
+ <pane id="PackagesPane" />
85
72
  </panes>
86
73
  </component>
87
74
  <component name="PropertiesComponent">
@@ -89,94 +76,6 @@
89
76
  <property name="WebServerToolWindowFactoryState" value="false" />
90
77
  <property name="FullScreen" value="true" />
91
78
  </component>
92
- <component name="RunManager">
93
- <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
94
- <module name="" />
95
- <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
96
- <option name="PROGRAM_PARAMETERS" />
97
- <method />
98
- </configuration>
99
- <configuration default="true" type="Applet" factoryName="Applet">
100
- <option name="HTML_USED" value="false" />
101
- <option name="WIDTH" value="400" />
102
- <option name="HEIGHT" value="300" />
103
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
104
- <module />
105
- <method />
106
- </configuration>
107
- <configuration default="true" type="Application" factoryName="Application">
108
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
109
- <option name="MAIN_CLASS_NAME" />
110
- <option name="VM_PARAMETERS" />
111
- <option name="PROGRAM_PARAMETERS" />
112
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
113
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
114
- <option name="ALTERNATIVE_JRE_PATH" />
115
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
116
- <option name="ENV_VARIABLES" />
117
- <option name="PASS_PARENT_ENVS" value="true" />
118
- <module name="" />
119
- <envs />
120
- <method />
121
- </configuration>
122
- <configuration default="true" type="JUnit" factoryName="JUnit">
123
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
124
- <module name="" />
125
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
126
- <option name="ALTERNATIVE_JRE_PATH" />
127
- <option name="PACKAGE_NAME" />
128
- <option name="MAIN_CLASS_NAME" />
129
- <option name="METHOD_NAME" />
130
- <option name="TEST_OBJECT" value="class" />
131
- <option name="VM_PARAMETERS" value="-ea" />
132
- <option name="PARAMETERS" />
133
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
134
- <option name="ENV_VARIABLES" />
135
- <option name="PASS_PARENT_ENVS" value="true" />
136
- <option name="TEST_SEARCH_SCOPE">
137
- <value defaultName="singleModule" />
138
- </option>
139
- <envs />
140
- <patterns />
141
- <method />
142
- </configuration>
143
- <configuration default="true" type="Remote" factoryName="Remote">
144
- <option name="USE_SOCKET_TRANSPORT" value="true" />
145
- <option name="SERVER_MODE" value="false" />
146
- <option name="SHMEM_ADDRESS" value="javadebug" />
147
- <option name="HOST" value="localhost" />
148
- <option name="PORT" value="5005" />
149
- <method />
150
- </configuration>
151
- <configuration default="true" type="TestNG" factoryName="TestNG">
152
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
153
- <module name="" />
154
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
155
- <option name="ALTERNATIVE_JRE_PATH" />
156
- <option name="SUITE_NAME" />
157
- <option name="PACKAGE_NAME" />
158
- <option name="MAIN_CLASS_NAME" />
159
- <option name="METHOD_NAME" />
160
- <option name="GROUP_NAME" />
161
- <option name="TEST_OBJECT" value="CLASS" />
162
- <option name="VM_PARAMETERS" value="-ea" />
163
- <option name="PARAMETERS" />
164
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
165
- <option name="OUTPUT_DIRECTORY" />
166
- <option name="ANNOTATION_TYPE" />
167
- <option name="ENV_VARIABLES" />
168
- <option name="PASS_PARENT_ENVS" value="true" />
169
- <option name="TEST_SEARCH_SCOPE">
170
- <value defaultName="singleModule" />
171
- </option>
172
- <option name="USE_DEFAULT_REPORTERS" value="false" />
173
- <option name="PROPERTIES_FILE" />
174
- <envs />
175
- <properties />
176
- <listeners />
177
- <method />
178
- </configuration>
179
- </component>
180
79
  <component name="ShelveChangesManager" show_recycled="false">
181
80
  <option name="remove_strategy" value="false" />
182
81
  </component>
@@ -188,42 +87,46 @@
188
87
  <option name="presentableId" value="Default" />
189
88
  <updated>1474965845268</updated>
190
89
  <workItem from="1474965862769" duration="101000" />
90
+ <workItem from="1504779092113" duration="13000" />
191
91
  </task>
192
92
  <servers />
193
93
  </component>
194
94
  <component name="TimeTrackingManager">
195
- <option name="totallyTimeSpent" value="101000" />
95
+ <option name="totallyTimeSpent" value="114000" />
196
96
  </component>
197
97
  <component name="ToolWindowManager">
198
- <frame x="0" y="0" width="1280" height="800" extended-state="0" />
98
+ <frame x="0" y="0" width="1440" height="900" extended-state="0" />
199
99
  <editor active="false" />
200
100
  <layout>
201
- <window_info id="Designer" 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" />
202
- <window_info id="Palette" 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" />
203
- <window_info id="Palette&#9;" 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="false" content_ui="tabs" />
204
- <window_info id="Capture Analysis" 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" />
205
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934928" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
206
- <window_info id="UI Designer" 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="false" content_ui="tabs" />
207
- <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" />
208
- <window_info id="Capture Tool" 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="false" content_ui="tabs" />
209
- <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" />
101
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2532189" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
210
102
  <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" />
103
+ <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" />
104
+ <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" />
105
+ <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" />
106
+ <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" />
107
+ <window_info id="Terminal" 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" />
108
+ <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" />
109
+ <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" />
110
+ <window_info id="Palette" 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" />
211
111
  <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" />
212
112
  <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" />
213
- <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" />
113
+ <window_info id="Palette&#9;" 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="false" content_ui="tabs" />
114
+ <window_info id="Capture Analysis" 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" />
214
115
  <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
215
116
  <window_info id="Maven Projects" 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" />
216
- <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" />
217
- <window_info id="Terminal" 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" />
218
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
117
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934928" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
118
+ <window_info id="Capture Tool" 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="false" content_ui="tabs" />
219
119
  <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
120
+ <window_info id="Designer" 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" />
220
121
  <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" />
221
- <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" />
222
- <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" />
223
122
  <window_info id="Ant Build" active="false" anchor="right" 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" />
224
- <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" />
123
+ <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" />
124
+ <window_info id="UI Designer" 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="false" content_ui="tabs" />
225
125
  </layout>
226
126
  </component>
127
+ <component name="TypeScriptGeneratedFilesManager">
128
+ <option name="processedProjectFiles" value="true" />
129
+ </component>
227
130
  <component name="Vcs.Log.UiProperties">
228
131
  <option name="RECENTLY_FILTERED_USER_GROUPS">
229
132
  <collection />
@@ -118,8 +118,9 @@ module SubjModels
118
118
  scope :order_by_price, -> (ordering) do
119
119
  ordering = ordering.second.try(:to_sym)
120
120
  if [:asc, :desc].include? ordering
121
- nomenclature_prices_join.
122
- order("nomenclature_prices.current_price #{ordering}")
121
+ most_recent_prices_ids = NomenclaturePrice.all.group(:nomenclature_id).maximum(:id).values
122
+ nomenclature_prices_join.where('nomenclature_prices.id in (?)', most_recent_prices_ids).
123
+ order("nomenclature_prices.current_price #{ordering}")
123
124
  end
124
125
  end
125
126
 
@@ -1,3 +1,3 @@
1
1
  module SubjModels
2
- VERSION = "0.0.3.7"
2
+ VERSION = '0.0.3.8'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: subj_sub_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3.7
4
+ version: 0.0.3.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - A.Nasa
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-08-23 00:00:00.000000000 Z
11
+ date: 2017-09-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
137
137
  version: '0'
138
138
  requirements: []
139
139
  rubyforge_project:
140
- rubygems_version: 2.2.2
140
+ rubygems_version: 2.6.8
141
141
  signing_key:
142
142
  specification_version: 4
143
143
  summary: Move models from some project to gem.