framework 0.1.0 → 0.1.1

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
- SHA1:
3
- metadata.gz: b924ac673b1e9c9e29672278324cde4cff1bbe12
4
- data.tar.gz: cffd250d8d621a60a7e7eb9fc1c3a208aa71054f
2
+ SHA256:
3
+ metadata.gz: 1292045d0694939b8f12f2886ea2c70661d44a2fbe899941e1e773677447efef
4
+ data.tar.gz: 59ff906be745fbad82615507049a88b73979af31ceea39e8a9b603db4292bec0
5
5
  SHA512:
6
- metadata.gz: b1bd3b320516b6235e1d4416c8242374c091404c7e741f1f1eabb31ecc8f94de931e688e1c8002e6c40da0b63398c5556944e46a64b08943fdaf203a525bd61a
7
- data.tar.gz: bb5a3e9e24ad18650e4e895906a232b3323e69f81530acc71aba835eb995420afd5e610c0d1c1ad6620fb22c642827262a022e440e67129cb0e8aed16bc625d2
6
+ metadata.gz: bb7275487125b9e2173fe980e46b60d7839e8a2a9d32e8f4a30ef7f7a244e035804430d8d073af59ffe406318437efcf63202e9ad4b4bce2904df2f193a389c4
7
+ data.tar.gz: 5cef0a92115cfd535d60e83020111a8561efd0fccb8b56a85f46b8dde625d379e4b4b6c05d0a66c6721a670a656e48708410a2045b7e2570e58df7b854cccc10
@@ -88,11 +88,11 @@ module Framework
88
88
  end
89
89
 
90
90
  def migrate_database(version = nil)
91
- ActiveRecord::Migrator.migrate root.join("db/migrate"), version.try(:to_i)
91
+ ActiveRecord::MigrationContext.new(root.join("db/migrate")).migrate(version && version.to_i)
92
92
  end
93
93
 
94
94
  def rollback_database(steps = 1)
95
- ActiveRecord::Migrator.rollback root.join("db/migrate"), steps
95
+ ActiveRecord::MigrationContext.new(root.join("db/migrate")).rollback(steps)
96
96
  end
97
97
 
98
98
  # @return [Hash<String>]
@@ -198,12 +198,17 @@ module Framework
198
198
 
199
199
  # @return [Hash]
200
200
  def load_application_config
201
- @config = Framework::Config.new(YAML.load_file(root.join(CONFIG_PATH))[env])
201
+ @config = Framework::Config.new(YAML.load(erb(CONFIG_PATH).result)[env])
202
202
  end
203
203
 
204
204
  # @return [Hash]
205
205
  def load_database_config
206
- @database_config = YAML.load_file(root.join('config/databases.yml'))
206
+ @database_config = YAML.load(erb('config/databases.yml').result)
207
+ end
208
+
209
+ # @param [String] path
210
+ def erb(path)
211
+ ERB.new(File.read(root.join(path)))
207
212
  end
208
213
 
209
214
  # @param [String] path
@@ -74,25 +74,25 @@ module Framework
74
74
  <<: *common
75
75
  database: #{db_name}_production
76
76
 
77
- second_one:
78
- development: &common
79
- adapter: postgresql
80
- username:
81
- password:
82
- database: second_sample_development
83
- min_messages: WARNING
84
- reconnect: true
85
- pool: 5
86
- encoding: unicode
87
- host: localhost
88
-
89
- test:
90
- <<: *common
91
- database: second_sample_test
92
-
93
- production:
94
- <<: *common
95
- database: second_sample_production
77
+ # second_one:
78
+ # development: &common
79
+ # adapter: postgresql
80
+ # username:
81
+ # password:
82
+ # database: second_sample_development
83
+ # min_messages: WARNING
84
+ # reconnect: true
85
+ # pool: 5
86
+ # encoding: unicode
87
+ # host: localhost
88
+ #
89
+ # test:
90
+ # <<: *common
91
+ # database: second_sample_test
92
+ #
93
+ # production:
94
+ # <<: *common
95
+ # database: second_sample_production
96
96
  CONFIG
97
97
  end
98
98
  end
@@ -1,5 +1,5 @@
1
1
  module Framework
2
- class Migration < ActiveRecord::Migration
2
+ class Migration < ActiveRecord::Migration[6.0]
3
3
 
4
4
  def self.use_database(db_name)
5
5
  define_method :connection do
@@ -1,3 +1,3 @@
1
1
  module Framework
2
- VERSION = '0.1.0'.freeze
2
+ VERSION = '0.1.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: framework
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sergei Nikolaevich Zinin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-16 00:00:00.000000000 Z
11
+ date: 2019-06-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -16,160 +16,136 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '5.0'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 5.0.0.1
19
+ version: 6.0.0.rc1
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '5.0'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 5.0.0.1
26
+ version: 6.0.0.rc1
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: activesupport
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
31
  - - "~>"
38
32
  - !ruby/object:Gem::Version
39
- version: '5.0'
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: 5.0.0.1
33
+ version: 6.0.0.rc1
43
34
  type: :runtime
44
35
  prerelease: false
45
36
  version_requirements: !ruby/object:Gem::Requirement
46
37
  requirements:
47
38
  - - "~>"
48
39
  - !ruby/object:Gem::Version
49
- version: '5.0'
50
- - - ">="
51
- - !ruby/object:Gem::Version
52
- version: 5.0.0.1
40
+ version: 6.0.0.rc1
53
41
  - !ruby/object:Gem::Dependency
54
42
  name: actionpack
55
43
  requirement: !ruby/object:Gem::Requirement
56
44
  requirements:
57
45
  - - "~>"
58
46
  - !ruby/object:Gem::Version
59
- version: '5.0'
60
- - - ">="
61
- - !ruby/object:Gem::Version
62
- version: 5.0.0.1
47
+ version: 6.0.0.rc1
63
48
  type: :runtime
64
49
  prerelease: false
65
50
  version_requirements: !ruby/object:Gem::Requirement
66
51
  requirements:
67
52
  - - "~>"
68
53
  - !ruby/object:Gem::Version
69
- version: '5.0'
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- version: 5.0.0.1
54
+ version: 6.0.0.rc1
73
55
  - !ruby/object:Gem::Dependency
74
56
  name: awesome_print
75
57
  requirement: !ruby/object:Gem::Requirement
76
58
  requirements:
77
59
  - - "~>"
78
60
  - !ruby/object:Gem::Version
79
- version: '1.6'
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: 1.6.1
61
+ version: 2.0.0.pre2
83
62
  type: :runtime
84
63
  prerelease: false
85
64
  version_requirements: !ruby/object:Gem::Requirement
86
65
  requirements:
87
66
  - - "~>"
88
67
  - !ruby/object:Gem::Version
89
- version: '1.6'
90
- - - ">="
91
- - !ruby/object:Gem::Version
92
- version: 1.6.1
68
+ version: 2.0.0.pre2
93
69
  - !ruby/object:Gem::Dependency
94
70
  name: rake
95
71
  requirement: !ruby/object:Gem::Requirement
96
72
  requirements:
97
- - - "~>"
98
- - !ruby/object:Gem::Version
99
- version: '10.5'
100
73
  - - ">="
101
74
  - !ruby/object:Gem::Version
102
- version: 10.5.0
75
+ version: 12.3.0
76
+ - - "~>"
77
+ - !ruby/object:Gem::Version
78
+ version: '12.3'
103
79
  type: :runtime
104
80
  prerelease: false
105
81
  version_requirements: !ruby/object:Gem::Requirement
106
82
  requirements:
107
- - - "~>"
108
- - !ruby/object:Gem::Version
109
- version: '10.5'
110
83
  - - ">="
111
84
  - !ruby/object:Gem::Version
112
- version: 10.5.0
85
+ version: 12.3.0
86
+ - - "~>"
87
+ - !ruby/object:Gem::Version
88
+ version: '12.3'
113
89
  - !ruby/object:Gem::Dependency
114
90
  name: thor
115
91
  requirement: !ruby/object:Gem::Requirement
116
92
  requirements:
117
93
  - - "~>"
118
94
  - !ruby/object:Gem::Version
119
- version: '0.19'
95
+ version: '0.20'
120
96
  - - ">="
121
97
  - !ruby/object:Gem::Version
122
- version: 0.19.1
98
+ version: 0.20.3
123
99
  type: :runtime
124
100
  prerelease: false
125
101
  version_requirements: !ruby/object:Gem::Requirement
126
102
  requirements:
127
103
  - - "~>"
128
104
  - !ruby/object:Gem::Version
129
- version: '0.19'
105
+ version: '0.20'
130
106
  - - ">="
131
107
  - !ruby/object:Gem::Version
132
- version: 0.19.1
108
+ version: 0.20.3
133
109
  - !ruby/object:Gem::Dependency
134
110
  name: bundler
135
111
  requirement: !ruby/object:Gem::Requirement
136
112
  requirements:
137
113
  - - "~>"
138
114
  - !ruby/object:Gem::Version
139
- version: '1.6'
115
+ version: '1.16'
140
116
  - - ">="
141
117
  - !ruby/object:Gem::Version
142
- version: 1.6.2
118
+ version: 1.16.6
143
119
  type: :development
144
120
  prerelease: false
145
121
  version_requirements: !ruby/object:Gem::Requirement
146
122
  requirements:
147
123
  - - "~>"
148
124
  - !ruby/object:Gem::Version
149
- version: '1.6'
125
+ version: '1.16'
150
126
  - - ">="
151
127
  - !ruby/object:Gem::Version
152
- version: 1.6.2
128
+ version: 1.16.6
153
129
  - !ruby/object:Gem::Dependency
154
130
  name: rspec
155
131
  requirement: !ruby/object:Gem::Requirement
156
132
  requirements:
157
- - - "~>"
158
- - !ruby/object:Gem::Version
159
- version: '3.4'
160
133
  - - ">="
161
134
  - !ruby/object:Gem::Version
162
- version: 3.4.0
135
+ version: 3.8.0
136
+ - - "~>"
137
+ - !ruby/object:Gem::Version
138
+ version: '3.8'
163
139
  type: :development
164
140
  prerelease: false
165
141
  version_requirements: !ruby/object:Gem::Requirement
166
142
  requirements:
167
- - - "~>"
168
- - !ruby/object:Gem::Version
169
- version: '3.4'
170
143
  - - ">="
171
144
  - !ruby/object:Gem::Version
172
- version: 3.4.0
145
+ version: 3.8.0
146
+ - - "~>"
147
+ - !ruby/object:Gem::Version
148
+ version: '3.8'
173
149
  description: Allows to quickly build well structured complex Ruby apps.
174
150
  email: zinin@xakep.ru
175
151
  executables:
@@ -213,15 +189,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
213
189
  requirements:
214
190
  - - ">="
215
191
  - !ruby/object:Gem::Version
216
- version: 2.3.1
192
+ version: 2.5.0
217
193
  required_rubygems_version: !ruby/object:Gem::Requirement
218
194
  requirements:
219
195
  - - ">="
220
196
  - !ruby/object:Gem::Version
221
- version: 2.3.1
197
+ version: 2.5.0
222
198
  requirements: []
223
199
  rubyforge_project:
224
- rubygems_version: 2.5.1
200
+ rubygems_version: 2.7.9
225
201
  signing_key:
226
202
  specification_version: 4
227
203
  summary: Ruby Application Framework for all your needs.