activeadmin-reform 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +3 -0
  3. data/.gitignore +1 -0
  4. data/.rubocop.yml +3 -2
  5. data/.travis.yml +10 -17
  6. data/Appraisals +38 -0
  7. data/CHANGELOG.md +4 -0
  8. data/CONTRIBUTING.md +13 -14
  9. data/Gemfile +0 -17
  10. data/activeadmin-reform.gemspec +14 -4
  11. data/gemfiles/rails_3.2.22.5_activeadmin_1.0.0.pre5_reform_2.2.4_reform_rails_0.1.7.gemfile +10 -0
  12. data/gemfiles/rails_3.2.22.5_activeadmin_1.0.0.pre5_reform_2.2.4_reform_rails_0.1.7.gemfile.lock +294 -0
  13. data/gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.2.4_reform_rails_0.1.7.gemfile +10 -0
  14. data/gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.2.4_reform_rails_0.1.7.gemfile.lock +305 -0
  15. data/gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.3.0.rc1_reform_rails_0.2.0.rc2.gemfile +10 -0
  16. data/gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.3.0.rc1_reform_rails_0.2.0.rc2.gemfile.lock +306 -0
  17. data/lib/active_admin/reform/active_record.rb +10 -7
  18. metadata +174 -13
data/lib/active_admin/reform/active_record.rb CHANGED
@@ -13,9 +13,7 @@ module ActiveAdmin
13
13
  # @return [Boolean]
14
14
  # Used here - https://github.com/activeadmin/activeadmin/blob/487f976/lib/active_admin/resource_controller/data_access.rb#L160
15
15
  def save
16
- validate({}) && super.tap do
17
- errors.merge!(model.errors, [])
18
- end
16
+ validate({}) && (super || validate({}))
19
17
  end
20
18
 
21
19
  # @param attributes [Hash]
@@ -28,10 +26,15 @@ module ActiveAdmin
28
26
  include ::Reform::Form::ModelReflections
29
27
  include ::Reform::Form::ActiveRecord
30
28
 
31
- def self.reflect_on_association(name)
32
- reflection = model_class.reflect_on_association(name) || return
33
- property = definitions[name.to_s]
34
- (@reflections ||= {})[name] ||= Reflection.new(reflection, (property[:nested] if property))
29
+ validate { model.errors.each { |key, error| errors.add key, error } }
30
+
31
+ class << self
32
+ def reflect_on_association(name)
33
+ reflection = model_class.reflect_on_association(name) || return
34
+ property = definitions[name.to_s]
35
+ @reflections ||= {}
36
+ @reflections[name] ||= Reflection.new(reflection, (property[:nested] if property))
37
+ end
35
38
  end
36
39
  end
37
40
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeadmin-reform
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom Bolshakov
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-12-28 00:00:00.000000000 Z
11
+ date: 2018-06-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,14 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '3.2'
19
+ version: 3.2.22.5
20
+ - - "<="
21
+ - !ruby/object:Gem::Version
22
+ version: 4.2.10
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - ">="
25
28
  - !ruby/object:Gem::Version
26
- version: '3.2'
29
+ version: 3.2.22.5
30
+ - - "<="
31
+ - !ruby/object:Gem::Version
32
+ version: 4.2.10
33
+ - !ruby/object:Gem::Dependency
34
+ name: activeadmin
35
+ requirement: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: 1.0.0.pre5
40
+ - - "<="
41
+ - !ruby/object:Gem::Version
42
+ version: 1.2.1
43
+ type: :runtime
44
+ prerelease: false
45
+ version_requirements: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: 1.0.0.pre5
50
+ - - "<="
51
+ - !ruby/object:Gem::Version
52
+ version: 1.2.1
27
53
  - !ruby/object:Gem::Dependency
28
54
  name: disposable
29
55
  requirement: !ruby/object:Gem::Requirement
@@ -42,30 +68,44 @@ dependencies:
42
68
  name: reform
43
69
  requirement: !ruby/object:Gem::Requirement
44
70
  requirements:
45
- - - "~>"
71
+ - - "<="
46
72
  - !ruby/object:Gem::Version
47
- version: 2.2.1
73
+ version: 2.3.0.rc1
48
74
  type: :runtime
49
75
  prerelease: false
50
76
  version_requirements: !ruby/object:Gem::Requirement
51
77
  requirements:
52
- - - "~>"
78
+ - - "<="
53
79
  - !ruby/object:Gem::Version
54
- version: 2.2.1
80
+ version: 2.3.0.rc1
55
81
  - !ruby/object:Gem::Dependency
56
82
  name: reform-rails
57
83
  requirement: !ruby/object:Gem::Requirement
58
84
  requirements:
59
- - - "~>"
85
+ - - "<="
60
86
  - !ruby/object:Gem::Version
61
- version: 0.1.7
87
+ version: 0.2.0.rc2
62
88
  type: :runtime
63
89
  prerelease: false
64
90
  version_requirements: !ruby/object:Gem::Requirement
65
91
  requirements:
66
- - - "~>"
92
+ - - "<="
93
+ - !ruby/object:Gem::Version
94
+ version: 0.2.0.rc2
95
+ - !ruby/object:Gem::Dependency
96
+ name: appraisal
97
+ requirement: !ruby/object:Gem::Requirement
98
+ requirements:
99
+ - - '='
67
100
  - !ruby/object:Gem::Version
68
- version: 0.1.7
101
+ version: 2.2.0
102
+ type: :development
103
+ prerelease: false
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ requirements:
106
+ - - '='
107
+ - !ruby/object:Gem::Version
108
+ version: 2.2.0
69
109
  - !ruby/object:Gem::Dependency
70
110
  name: bundler
71
111
  requirement: !ruby/object:Gem::Requirement
@@ -80,6 +120,76 @@ dependencies:
80
120
  - - "~>"
81
121
  - !ruby/object:Gem::Version
82
122
  version: '1.10'
123
+ - !ruby/object:Gem::Dependency
124
+ name: capybara
125
+ requirement: !ruby/object:Gem::Requirement
126
+ requirements:
127
+ - - '='
128
+ - !ruby/object:Gem::Version
129
+ version: 2.17.0
130
+ type: :development
131
+ prerelease: false
132
+ version_requirements: !ruby/object:Gem::Requirement
133
+ requirements:
134
+ - - '='
135
+ - !ruby/object:Gem::Version
136
+ version: 2.17.0
137
+ - !ruby/object:Gem::Dependency
138
+ name: codeclimate-test-reporter
139
+ requirement: !ruby/object:Gem::Requirement
140
+ requirements:
141
+ - - "~>"
142
+ - !ruby/object:Gem::Version
143
+ version: 0.4.8
144
+ type: :development
145
+ prerelease: false
146
+ version_requirements: !ruby/object:Gem::Requirement
147
+ requirements:
148
+ - - "~>"
149
+ - !ruby/object:Gem::Version
150
+ version: 0.4.8
151
+ - !ruby/object:Gem::Dependency
152
+ name: database_cleaner
153
+ requirement: !ruby/object:Gem::Requirement
154
+ requirements:
155
+ - - "~>"
156
+ - !ruby/object:Gem::Version
157
+ version: 1.5.1
158
+ type: :development
159
+ prerelease: false
160
+ version_requirements: !ruby/object:Gem::Requirement
161
+ requirements:
162
+ - - "~>"
163
+ - !ruby/object:Gem::Version
164
+ version: 1.5.1
165
+ - !ruby/object:Gem::Dependency
166
+ name: launchy
167
+ requirement: !ruby/object:Gem::Requirement
168
+ requirements:
169
+ - - "~>"
170
+ - !ruby/object:Gem::Version
171
+ version: 2.4.3
172
+ type: :development
173
+ prerelease: false
174
+ version_requirements: !ruby/object:Gem::Requirement
175
+ requirements:
176
+ - - "~>"
177
+ - !ruby/object:Gem::Version
178
+ version: 2.4.3
179
+ - !ruby/object:Gem::Dependency
180
+ name: poltergeist
181
+ requirement: !ruby/object:Gem::Requirement
182
+ requirements:
183
+ - - ">="
184
+ - !ruby/object:Gem::Version
185
+ version: '0'
186
+ type: :development
187
+ prerelease: false
188
+ version_requirements: !ruby/object:Gem::Requirement
189
+ requirements:
190
+ - - ">="
191
+ - !ruby/object:Gem::Version
192
+ version: '0'
83
193
  - !ruby/object:Gem::Dependency
84
194
  name: rake
85
195
  requirement: !ruby/object:Gem::Requirement
@@ -108,6 +218,20 @@ dependencies:
108
218
  - - "~>"
109
219
  - !ruby/object:Gem::Version
110
220
  version: '3.4'
221
+ - !ruby/object:Gem::Dependency
222
+ name: rspec-rails
223
+ requirement: !ruby/object:Gem::Requirement
224
+ requirements:
225
+ - - ">="
226
+ - !ruby/object:Gem::Version
227
+ version: '0'
228
+ type: :development
229
+ prerelease: false
230
+ version_requirements: !ruby/object:Gem::Requirement
231
+ requirements:
232
+ - - ">="
233
+ - !ruby/object:Gem::Version
234
+ version: '0'
111
235
  - !ruby/object:Gem::Dependency
112
236
  name: spbtv_code_style
113
237
  requirement: !ruby/object:Gem::Requirement
@@ -122,6 +246,34 @@ dependencies:
122
246
  - - "~>"
123
247
  - !ruby/object:Gem::Version
124
248
  version: 1.4.1
249
+ - !ruby/object:Gem::Dependency
250
+ name: sqlite3
251
+ requirement: !ruby/object:Gem::Requirement
252
+ requirements:
253
+ - - "~>"
254
+ - !ruby/object:Gem::Version
255
+ version: 1.3.11
256
+ type: :development
257
+ prerelease: false
258
+ version_requirements: !ruby/object:Gem::Requirement
259
+ requirements:
260
+ - - "~>"
261
+ - !ruby/object:Gem::Version
262
+ version: 1.3.11
263
+ - !ruby/object:Gem::Dependency
264
+ name: test-unit
265
+ requirement: !ruby/object:Gem::Requirement
266
+ requirements:
267
+ - - "~>"
268
+ - !ruby/object:Gem::Version
269
+ version: '3.0'
270
+ type: :development
271
+ prerelease: false
272
+ version_requirements: !ruby/object:Gem::Requirement
273
+ requirements:
274
+ - - "~>"
275
+ - !ruby/object:Gem::Version
276
+ version: '3.0'
125
277
  description: Provides ability to use form object in your ActiveAdmin application
126
278
  email:
127
279
  - abolshakov@spbtv.com
@@ -129,6 +281,7 @@ executables: []
129
281
  extensions: []
130
282
  extra_rdoc_files: []
131
283
  files:
284
+ - ".codeclimate.yml"
132
285
  - ".github/ISSUE_TEMPLATE.md"
133
286
  - ".github/PULL_REQUEST_TEMPLATE.md"
134
287
  - ".gitignore"
@@ -136,6 +289,7 @@ files:
136
289
  - ".rspec"
137
290
  - ".rubocop.yml"
138
291
  - ".travis.yml"
292
+ - Appraisals
139
293
  - CHANGELOG.md
140
294
  - CODE_OF_CONDUCT.md
141
295
  - CONTRIBUTING.md
@@ -146,6 +300,12 @@ files:
146
300
  - activeadmin-reform.gemspec
147
301
  - bin/console
148
302
  - bin/setup
303
+ - gemfiles/rails_3.2.22.5_activeadmin_1.0.0.pre5_reform_2.2.4_reform_rails_0.1.7.gemfile
304
+ - gemfiles/rails_3.2.22.5_activeadmin_1.0.0.pre5_reform_2.2.4_reform_rails_0.1.7.gemfile.lock
305
+ - gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.2.4_reform_rails_0.1.7.gemfile
306
+ - gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.2.4_reform_rails_0.1.7.gemfile.lock
307
+ - gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.3.0.rc1_reform_rails_0.2.0.rc2.gemfile
308
+ - gemfiles/rails_4.2.10_activeadmin_1.2.1_reform_2.3.0.rc1_reform_rails_0.2.0.rc2.gemfile.lock
149
309
  - lib/active_admin/reform.rb
150
310
  - lib/active_admin/reform/active_record.rb
151
311
  - lib/active_admin/reform/dsl.rb
@@ -175,8 +335,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
175
335
  version: '0'
176
336
  requirements: []
177
337
  rubyforge_project:
178
- rubygems_version: 2.5.2.1
338
+ rubygems_version: 2.6.11
179
339
  signing_key:
180
340
  specification_version: 4
181
341
  summary: Integrates ActiveAdmin with Reform
182
342
  test_files: []
343
+ has_rdoc: