myg 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659173bf49a85aa8f6809b99ee21ce2bb02d38f40ee3e8b5fd5adf99bd076c4e
-  data.tar.gz: 5bdd0f771f0e3971dee5e85b618b4cdd4172f73d27e44b9a17a6f074f1766206
+  metadata.gz: 60c2ee718112a659c71183889dc1add9a38e37cf6b30643a1b7581e3806b1337
+  data.tar.gz: 10bdcb9da1ad4cdb1f7e1da91b0a8f819dd39662a47af0b2d91bdcc036c9bb54
 SHA512:
-  metadata.gz: 289a5ca1fbfc822cbfd0e1dbe2c3fcb55c9a56c077ea281e61485587a00613abb7a45d08876c9e63e98878a3ee8501d911e27e9a7ed530afefd16cd6d7976c7d
-  data.tar.gz: 14d4d2c69cd6df82a8bbde5590ced7e720bc4754309f9408660229478c386b2e771240669af122a44a0d0f5e34f8ab41fd61173380e05a341e69c2d3409fb1a7
+  metadata.gz: 3886130fdf1589a419576d59a6002f825d0f74650e4273961b0835295b739c62d38b5c9ec984251082b045f0214a768433c8db74662aca2be6b2a965e15a5ef3
+  data.tar.gz: 365d9649da06f8d35df608fb67dc0d5fc8c620b45a65d6ded5df7b007a5ed9b48efeb9a3d526c4801dbee22d5736fe8ab39ce42371b3a42a63ccac3dd3f673b0

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 * nothing yet
 
+### 2.3.3 - 2018/02/25
+
+* bugfixes
+    * fixed `undefined method 'merge' for nil:NilClass`
+
 ### 2.3.2 - 2018/02/25
 
 * bugfixes

data/app/views/mozaic/myg/_checkbox.html.erb

@@ -13,9 +13,9 @@
     id: id
 } %>
 
-<%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
+<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
     <input value="0" type="hidden" name="<%= name %>" />
-    <%= tag 'input', options[:input_html].merge(input_html) %>
+    <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
     <div class="mdc-checkbox__background">
         <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
             <path class="mdc-checkbox__checkmark__path" fill="none" stroke="white" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>

data/app/views/mozaic/myg/_form-field.html.erb

@@ -17,29 +17,29 @@
     class: ['myg-label--wrapper', options.dig(:label_wrapper_html, :class)].join(' ')
 } %>
 
-<%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
+<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
     <% if options[:label] %>
         <% unless options[:label].is_a? Array %>
-            <%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:label].html_safe %><% end %>
+            <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:label].html_safe %><% end %>
         <% else %>
-            <%= content_tag 'div', options[:label_wrapper_html].merge(label_wrapper_html) do %>
+            <%= content_tag 'div', (options[:label_wrapper_html] || {}).merge(label_wrapper_html) do %>
                 <% options[:label].each_with_index do |label, index| %>
-                    <%= component 'myg/label', options[:label_html].merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
+                    <%= component 'myg/label', (options[:label_html] || {}).merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
                 <% end %>
             <% end %>
         <% end %>
     <% end %>
-    <%= component "myg/#{options[:as]}", options[:input_html].merge(input_html) %>
+    <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
     <% if options[:inline_label] %>
         <% unless options[:inline_label].is_a? Array %>
-            <%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:inline_label] %><% end %>
+            <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:inline_label] %><% end %>
         <% else %>
-            <%= content_tag 'div', options[:label_wrapper_html].merge(label_wrapper_html) do %>
+            <%= content_tag 'div', (options[:label_wrapper_html] || {}).merge(label_wrapper_html) do %>
                 <% options[:inline_label].each_with_index do |label, index| %>
-                    <%= component 'myg/label', options[:label_html].merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
+                    <%= component 'myg/label', (options[:label_html] || {}).merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
                 <% end %>
             <% end %>
         <% end %>
     <% end %>
-    <% if options[:floating_label] %><%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:floating_label] %><% end %><% end %>
+    <% if options[:floating_label] %><%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:floating_label] %><% end %><% end %>
 <% end %>

data/app/views/mozaic/myg/_radio.html.erb

@@ -14,8 +14,8 @@
     id: id
 } %>
 
-<%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
-    <%= tag 'input', options[:input_html].merge(input_html) %>
+<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
+    <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
     <div class="mdc-radio__background">
         <div class="mdc-radio__outer-circle"></div>
         <div class="mdc-radio__inner-circle"></div>

data/app/views/mozaic/myg/_switch.html.erb

@@ -12,8 +12,8 @@
     id: id
 } %>
 
-<%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
-    <%= tag 'input', options[:input_html].merge(input_html) %>
+<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
+    <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
     <div class="mdc-switch__background">
         <div class="mdc-switch__knob"></div>
     </div>

data/lib/myg/version.rb

@@ -1,5 +1,5 @@
 module Myg
 
-    VERSION = '2.3.2'
+    VERSION = '2.3.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myg
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Jonas Hübotter