zadok 0.6.0 → 0.6.1

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.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +19 -14
  3. data/app/views/zadok/form/fields/_date.html.slim +1 -1
  4. data/app/views/zadok/form/fields/_decimal.html.slim +1 -2
  5. data/app/views/zadok/form/fields/_email_field.html.slim +1 -2
  6. data/app/views/zadok/form/fields/_file_field.html.slim +2 -3
  7. data/app/views/zadok/form/fields/_float.html.slim +1 -2
  8. data/app/views/zadok/form/fields/_hex_field.html.slim +1 -2
  9. data/app/views/zadok/form/fields/_inet.html.slim +1 -2
  10. data/app/views/zadok/form/fields/_integer.html.slim +1 -2
  11. data/app/views/zadok/form/fields/_number_field.html.slim +1 -2
  12. data/app/views/zadok/form/fields/_select.html.slim +2 -2
  13. data/app/views/zadok/form/fields/_serialized.html.slim +1 -2
  14. data/app/views/zadok/form/fields/_string.html.slim +1 -2
  15. data/app/views/zadok/form/fields/_text.html.slim +3 -3
  16. data/app/views/zadok/form/fields/_text_area.html.slim +3 -3
  17. data/app/views/zadok/form/fields/_text_field.html.slim +1 -2
  18. data/app/views/zadok/form/fields/_time_zone_converter.html.slim +1 -2
  19. data/app/views/zadok/form/fields/_url_field.html.slim +1 -2
  20. data/app/views/zadok/form/fields/_uuid.html.slim +1 -2
  21. data/lib/zadok/version.rb +1 -1
  22. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5e871ace491d0759a93cbc85ee9780a85ada83158da361c1a257dbd01f04faaa
4
- data.tar.gz: a76997f427d0d71e121efed20dc9346250400715b74c08119654860f3af23137
3
+ metadata.gz: 56070814066473c389ffdefda5573b316a350b2b05315c0095c383d67a5336e5
4
+ data.tar.gz: 4b9d72d63e7e5dd31e33411f203a0e695b4878cc5cfb5d40b1d1a08f7a027fdf
5
5
  SHA512:
6
- metadata.gz: 3ead225eab048cfc2113fdf95dd55a8e55bd774c0d7c25d8355b6c226cbf9d49e686e9e1f3261c3927feb44a68affe047db48e0b588938b7367d77f9c161870d
7
- data.tar.gz: 03ca0ddbdd17424f68a44c2d0db72a77af2b4ac410f7c5d882afddc82cf2791f46bda602d5b489e31bc33284106ba0050e4a5c4afb5a9e66da3d2f07ee9f834b
6
+ metadata.gz: ca26e0c25bb8d11b824cf2264239ba72cae3a53402718ad123324c1f78a978cafc61b7c72e44fe906b99b5355c68f1ee6aae1ca573ad4a855991e621878039e6
7
+ data.tar.gz: 265256bf6b5ec6082b44ad949aab0e6ade0efac4e9fa4b75c42614686b5d11d0a25cff0768cd800ce8c08315bb6748452be87d4ec9942b07c65bfc7a70a07fd9
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- zadok (0.5.11)
4
+ zadok (0.6.1)
5
5
  bootstrap (~> 4.0)
6
6
  bundler-audit (~> 0.6)
7
7
  cancancan (~> 2.1)
@@ -73,10 +73,11 @@ GEM
73
73
  tzinfo (~> 1.1)
74
74
  arel (9.0.0)
75
75
  ast (2.4.0)
76
- autoprefixer-rails (8.3.0)
76
+ autoprefixer-rails (8.5.2)
77
77
  execjs
78
- bcrypt (3.1.11)
79
- bootstrap (4.0.0)
78
+ bcrypt (3.1.12)
79
+ bcrypt (3.1.12-x64-mingw32)
80
+ bootstrap (4.1.1)
80
81
  autoprefixer-rails (>= 6.0.3)
81
82
  popper_js (>= 1.12.9, < 2)
82
83
  sass (>= 3.5.2)
@@ -98,19 +99,20 @@ GEM
98
99
  devise_invitable (1.7.4)
99
100
  actionmailer (>= 4.1.0)
100
101
  devise (>= 4.0.0)
101
- dotenv (2.2.2)
102
+ dotenv (2.4.0)
102
103
  dry-initializer (2.3.0)
103
104
  erubi (1.7.1)
104
105
  execjs (2.7.0)
105
106
  ffi (1.9.23)
107
+ ffi (1.9.23-x64-mingw32)
106
108
  font-awesome-rails (4.7.0.4)
107
109
  railties (>= 3.2, < 6.0)
108
110
  globalid (0.4.1)
109
111
  activesupport (>= 4.2.0)
110
112
  highline (1.7.10)
111
- i18n (1.0.0)
113
+ i18n (1.0.1)
112
114
  concurrent-ruby (~> 1.0)
113
- jquery-rails (4.3.1)
115
+ jquery-rails (4.3.3)
114
116
  rails-dom-testing (>= 1, < 3)
115
117
  railties (>= 4.2.0)
116
118
  thor (>= 0.14, < 2.0)
@@ -134,21 +136,24 @@ GEM
134
136
  mini_mime (1.0.0)
135
137
  mini_portile2 (2.3.0)
136
138
  minitest (5.11.3)
137
- newrelic_rpm (5.0.0.342)
138
- nio4r (2.3.0)
139
+ newrelic_rpm (5.1.0.344)
140
+ nio4r (2.3.1)
139
141
  nokogiri (1.8.2)
140
142
  mini_portile2 (~> 2.3.0)
143
+ nokogiri (1.8.2-x64-mingw32)
144
+ mini_portile2 (~> 2.3.0)
141
145
  orm_adapter (0.5.0)
142
146
  parallel (1.12.1)
143
147
  parser (2.5.1.0)
144
148
  ast (~> 2.4.0)
145
149
  pg (1.0.0)
150
+ pg (1.0.0-x64-mingw32)
146
151
  polyamorous (1.3.3)
147
152
  activerecord (>= 3.0)
148
153
  popper_js (1.12.9)
149
154
  powerpack (0.1.1)
150
155
  puma (3.11.4)
151
- rack (2.0.4)
156
+ rack (2.0.5)
152
157
  rack-test (1.0.0)
153
158
  rack (>= 1.0, < 3)
154
159
  rails (5.2.0)
@@ -192,7 +197,7 @@ GEM
192
197
  responders (2.4.0)
193
198
  actionpack (>= 4.2.0, < 5.3)
194
199
  railties (>= 4.2.0, < 5.3)
195
- rubocop (0.55.0)
200
+ rubocop (0.56.0)
196
201
  parallel (~> 1.10)
197
202
  parser (>= 2.5)
198
203
  powerpack (~> 0.1)
@@ -241,9 +246,9 @@ GEM
241
246
  turbolinks-source (5.1.0)
242
247
  tzinfo (1.2.5)
243
248
  thread_safe (~> 0.1)
244
- uglifier (4.1.9)
249
+ uglifier (4.1.10)
245
250
  execjs (>= 0.3.0, < 3)
246
- unicode-display_width (1.3.0)
251
+ unicode-display_width (1.3.3)
247
252
  warden (1.2.7)
248
253
  rack (>= 1.0)
249
254
  websocket-driver (0.7.0)
@@ -260,4 +265,4 @@ DEPENDENCIES
260
265
  zadok!
261
266
 
262
267
  BUNDLED WITH
263
- 1.16.1
268
+ 1.16.2
data/app/views/zadok/form/fields/_date.html.slim CHANGED
@@ -1,4 +1,4 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
3
  = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
4
+ options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_decimal.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_email_field.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.email_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.email_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_file_field.html.slim CHANGED
@@ -1,8 +1,7 @@
1
1
  .form-group
2
2
  .custom-file
3
- = form.file_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "custom-file-input"))
3
+ = form.file_field(attr, options.fetch(:html, {}).merge(class: "custom-file-input"))
5
4
  = form.label(attr, class: "custom-file-label")
6
5
 
7
- - if options[:preview]
6
+ - if options[:preview] && resource.send(attr).image?
8
7
  = image_tag(resource.send(attr), class: "logo img-fluid")
data/app/views/zadok/form/fields/_float.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_hex_field.html.slim CHANGED
@@ -4,5 +4,4 @@
4
4
  .input-group-prepend
5
5
  .input-group-text
6
6
  | #
7
- = form.text_field(attr,
8
- options.fetch(:html) { {} }.merge(class: "form-control", maxlength: 6))
7
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control", maxlength: 6))
data/app/views/zadok/form/fields/_inet.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_integer.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.number_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.number_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_number_field.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.number_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.number_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_select.html.slim CHANGED
@@ -4,5 +4,5 @@
4
4
  = form.select(attr,
5
5
  options_for_select(options[:choices],
6
6
  resource.send(attr)),
7
- options.fetch(:options) { {} },
8
- options.fetch(:html) { {} }.merge(class: "custom-select"))
7
+ options.fetch(:options, {}),
8
+ options.fetch(:html, {}).merge(class: "custom-select"))
data/app/views/zadok/form/fields/_serialized.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_string.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_text.html.slim CHANGED
@@ -1,6 +1,6 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
3
  = form.text_area(attr,
4
- options.fetch(:html) { {} }.merge(rows: 5,
5
- cols: nil,
6
- class: "form-control"))
4
+ options.fetch(:html, {}).merge(rows: 5,
5
+ cols: nil,
6
+ class: "form-control"))
data/app/views/zadok/form/fields/_text_area.html.slim CHANGED
@@ -1,6 +1,6 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
3
  = form.text_area(attr,
4
- options.fetch(:html) { {} }.merge(rows: options[:rows],
5
- cols: options[:cols],
6
- class: "form-control"))
4
+ options.fetch(:html, {}).merge(rows: options[:rows],
5
+ cols: options[:cols],
6
+ class: "form-control"))
data/app/views/zadok/form/fields/_text_field.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_time_zone_converter.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_url_field.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.url_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.url_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/app/views/zadok/form/fields/_uuid.html.slim CHANGED
@@ -1,4 +1,3 @@
1
1
  .form-group
2
2
  = form.label(attr)
3
- = form.text_field(attr,
4
- options.fetch(:html) { {} }.merge(class: "form-control"))
3
+ = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))
data/lib/zadok/version.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module Zadok
4
4
  VERSION_MAJOR = 0
5
5
  VERSION_MINOR = 6
6
- VERSION_TINY = 0
6
+ VERSION_TINY = 1
7
7
  VERSION_PRE = nil
8
8
 
9
9
  VERSION = [
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zadok
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Leon Hooijer
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-05-30 00:00:00.000000000 Z
11
+ date: 2018-05-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap