zadok 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e871ace491d0759a93cbc85ee9780a85ada83158da361c1a257dbd01f04faaa
-  data.tar.gz: a76997f427d0d71e121efed20dc9346250400715b74c08119654860f3af23137
+  metadata.gz: 56070814066473c389ffdefda5573b316a350b2b05315c0095c383d67a5336e5
+  data.tar.gz: 4b9d72d63e7e5dd31e33411f203a0e695b4878cc5cfb5d40b1d1a08f7a027fdf
 SHA512:
-  metadata.gz: 3ead225eab048cfc2113fdf95dd55a8e55bd774c0d7c25d8355b6c226cbf9d49e686e9e1f3261c3927feb44a68affe047db48e0b588938b7367d77f9c161870d
-  data.tar.gz: 03ca0ddbdd17424f68a44c2d0db72a77af2b4ac410f7c5d882afddc82cf2791f46bda602d5b489e31bc33284106ba0050e4a5c4afb5a9e66da3d2f07ee9f834b
+  metadata.gz: ca26e0c25bb8d11b824cf2264239ba72cae3a53402718ad123324c1f78a978cafc61b7c72e44fe906b99b5355c68f1ee6aae1ca573ad4a855991e621878039e6
+  data.tar.gz: 265256bf6b5ec6082b44ad949aab0e6ade0efac4e9fa4b75c42614686b5d11d0a25cff0768cd800ce8c08315bb6748452be87d4ec9942b07c65bfc7a70a07fd9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zadok (0.5.11)
+    zadok (0.6.1)
       bootstrap (~> 4.0)
       bundler-audit (~> 0.6)
       cancancan (~> 2.1)
@@ -73,10 +73,11 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (8.3.0)
+    autoprefixer-rails (8.5.2)
       execjs
-    bcrypt (3.1.11)
-    bootstrap (4.0.0)
+    bcrypt (3.1.12)
+    bcrypt (3.1.12-x64-mingw32)
+    bootstrap (4.1.1)
       autoprefixer-rails (>= 6.0.3)
       popper_js (>= 1.12.9, < 2)
       sass (>= 3.5.2)
@@ -98,19 +99,20 @@ GEM
     devise_invitable (1.7.4)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
-    dotenv (2.2.2)
+    dotenv (2.4.0)
     dry-initializer (2.3.0)
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
     font-awesome-rails (4.7.0.4)
       railties (>= 3.2, < 6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     highline (1.7.10)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -134,21 +136,24 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    newrelic_rpm (5.0.0.342)
-    nio4r (2.3.0)
+    newrelic_rpm (5.1.0.344)
+    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.2-x64-mingw32)
+      mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
     pg (1.0.0)
+    pg (1.0.0-x64-mingw32)
     polyamorous (1.3.3)
       activerecord (>= 3.0)
     popper_js (1.12.9)
     powerpack (0.1.1)
     puma (3.11.4)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
@@ -192,7 +197,7 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rubocop (0.55.0)
+    rubocop (0.56.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -241,9 +246,9 @@ GEM
     turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.9)
+    uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.3.3)
     warden (1.2.7)
       rack (>= 1.0)
     websocket-driver (0.7.0)
@@ -260,4 +265,4 @@ DEPENDENCIES
   zadok!
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/app/views/zadok/form/fields/_date.html.slim

@@ -1,4 +1,4 @@
 .form-group
   = form.label(attr)
   = form.text_field(attr,
-          options.fetch(:html) { {} }.merge(class: "form-control"))
+          options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_decimal.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-                    options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_email_field.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.email_field(attr,
-                     options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.email_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_file_field.html.slim

@@ -1,8 +1,7 @@
 .form-group
   .custom-file
-    = form.file_field(attr,
-                      options.fetch(:html) { {} }.merge(class: "custom-file-input"))
+    = form.file_field(attr, options.fetch(:html, {}).merge(class: "custom-file-input"))
     = form.label(attr, class: "custom-file-label")
 
-  - if options[:preview]
+  - if options[:preview] && resource.send(attr).image?
     = image_tag(resource.send(attr), class: "logo img-fluid")

data/app/views/zadok/form/fields/_float.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-                    options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_hex_field.html.slim

@@ -4,5 +4,4 @@
     .input-group-prepend
       .input-group-text
         | #
-    = form.text_field(attr,
-                      options.fetch(:html) { {} }.merge(class: "form-control", maxlength: 6))
+    = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control", maxlength: 6))

data/app/views/zadok/form/fields/_inet.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-                    options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_integer.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.number_field(attr,
-                      options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.number_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_number_field.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.number_field(attr,
-                      options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.number_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_select.html.slim

@@ -4,5 +4,5 @@
   = form.select(attr,
                 options_for_select(options[:choices],
                 resource.send(attr)),
-                options.fetch(:options) { {} },
-                options.fetch(:html) { {} }.merge(class: "custom-select"))
+                options.fetch(:options, {}),
+                options.fetch(:html, {}).merge(class: "custom-select"))

data/app/views/zadok/form/fields/_serialized.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-                    options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_string.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-          options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_text.html.slim

@@ -1,6 +1,6 @@
 .form-group
   = form.label(attr)
   = form.text_area(attr,
-                   options.fetch(:html) { {} }.merge(rows: 5,
-                                                     cols: nil,
-                                                     class: "form-control"))
+                   options.fetch(:html, {}).merge(rows: 5,
+                                                  cols: nil,
+                                                  class: "form-control"))

data/app/views/zadok/form/fields/_text_area.html.slim

@@ -1,6 +1,6 @@
 .form-group
   = form.label(attr)
   = form.text_area(attr,
-                   options.fetch(:html) { {} }.merge(rows: options[:rows],
-                                                     cols: options[:cols],
-                                                     class: "form-control"))
+                   options.fetch(:html, {}).merge(rows: options[:rows],
+                                                  cols: options[:cols],
+                                                  class: "form-control"))

data/app/views/zadok/form/fields/_text_field.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-                    options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_time_zone_converter.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-          options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_url_field.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.url_field(attr,
-                   options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.url_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/app/views/zadok/form/fields/_uuid.html.slim

@@ -1,4 +1,3 @@
 .form-group
   = form.label(attr)
-  = form.text_field(attr,
-          options.fetch(:html) { {} }.merge(class: "form-control"))
+  = form.text_field(attr, options.fetch(:html, {}).merge(class: "form-control"))

data/lib/zadok/version.rb

@@ -3,7 +3,7 @@
 module Zadok
   VERSION_MAJOR = 0
   VERSION_MINOR = 6
-  VERSION_TINY = 0
+  VERSION_TINY = 1
   VERSION_PRE = nil
 
   VERSION = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zadok
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Leon Hooijer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap