dom-rb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 506d56aaaa6c084470621a2b06ede1564a619014
-  data.tar.gz: 41005f31a9cda1c1106ce501307f3bbab5a47735
+  metadata.gz: 2a1e4262174591a71793ff83f613266799532cef
+  data.tar.gz: e3446a6022ed4daef1a4d0baa819bdfc5d502d52
 SHA512:
-  metadata.gz: 63ec0c8fe718cc6e45a8acea70f090b334cd442f2d8e58ae17eec03dbe7ee4fc256c05ed2e016fb5d7c8c0fd5090ef8fcadb84297d318439d76cd6a9bc622348
-  data.tar.gz: 9eea6f3341e0a9421748e0a2b7c995930b5595be4071b77db2572e41cdb2eeff52d9ae2da86fd63aa7f465bf4ce5be4aaaeff6c103935dc5ac817acd220016ef
+  metadata.gz: 849d13f0b39045e93dac4887de8e254ed34e3e5076abd21a806ac9a8c74140b882fa2000bd9c06cbc51d39513b8810e72c0b174cf94a9bf6a8761c5d5c702212
+  data.tar.gz: 6dc0612437026220e2015338cf050de46a0df7d7dcd9b690f8c164c68650d626c4a02e839343426e49f1488289d870d3f2718f7717cb02b1fc6437099476c44b

data/csr/dom/builder/helpers.rb

@@ -80,41 +80,41 @@ module CSR
         )
       end
 
-      def remove_sign_icon(callback: nil, tooltip: nil, popover: nil)
+      def remove_sign_icon(callback: nil, attributes: nil, tooltip: nil, popover: nil)
         icon(
           :remove_sign,
           callback: callback,
-          attributes: { style: {color: 'red'} },
+          attributes: merge_attributes({ style: {color: 'red'} }, attributes),
           tooltip: tooltip,
           popover: popover
         )
       end
 
-      def refresh_icon(callback: nil, tooltip: nil, popover: nil)
+      def refresh_icon(callback: nil, attributes: nil, tooltip: nil, popover: nil)
         icon(
           :refresh,
           callback: callback,
-          attributes: { style: {color: 'inherit'} },
+          attributes: merge_attributes({ style: { color: 'inherit' } }, attributes),
           tooltip: tooltip,
           popover: popover
         )
       end
 
-      def save_icon(callback: nil, tooltip: nil, popover: nil)
+      def save_icon(callback: nil, attributes: nil, tooltip: nil, popover: nil)
         icon(
           :save,
           callback: callback,
-          attributes: { style: {color: 'inherit'} },
+          attributes: merge_attributes({ style: { color: 'inherit' } }, attributes),
           tooltip: tooltip,
           popover: popover
         )
       end
 
-      def hamburger_icon(callback: nil, tooltip: nil, popover: nil)
+      def hamburger_icon(callback: nil, attributes: nil, tooltip: nil, popover: nil)
         icon(
           :menu_hamburger,
           callback: callback,
-          attributes: { style: {color: 'inherit'} },
+          attributes: merge_attributes({ style: { color: 'inherit' } }, attributes),
           tooltip: tooltip,
           popover: popover
         )
@@ -134,17 +134,15 @@ module CSR
         if menu_attributes
           _menu_attributes  = merge_attributes(_menu_attributes, menu_attributes)
         end
-        tag(
-          :div,
+        div(
           attributes: {
             class: 'dropdown',
           },
           content: [
-            tag(
-              :div,
+            div(
               attributes: {
                 class: 'dropdown-toggle',
-                data_toggle: 'dropdown'
+                data_toggle: 'dropdown',
               },
               content: icon(
                 icon,
@@ -228,7 +226,7 @@ module CSR
                font_size: 'smaller',
                margin_left: '0.5em',
                margin_right: '0.5em',
-               vertical_align: 'middle',
+               margin_top: '0.3em',
                color: 'inherit',
                background_color: 'inherit',
             }.merge(

data/csr/dom/util.rb

@@ -49,18 +49,19 @@ module CSR
         result
       end
 
-      # args are hashes, lowest to highest precedence
-      # TODO: only handles two levels deep (style, onclick, ...)
+      # args are hashes, lowest to highest precedence,
+      # i.e. later args override earlier args
+      # goes deep recursively
       def merge_attributes(*args)
         result = args[0] || {}
         args.each do |arg|
           if arg
-            arg.each_pair do |k,v|
-              prev = result[k]
-              if Hash == v && Hash === prev
-                result[k] = v.merge(prev)
+            arg.each_pair do |key, next_value|
+              current_value = result[key]
+              if Hash === current_value && Hash === next_value
+                result[key] = merge_attributes(current_value, next_value)
               else
-                result[k] = v
+                result[key] = next_value
               end
             end
           end

data/lib/dom/version.rb

@@ -1,5 +1,5 @@
 module CSR
   module DOM
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dom-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Colin Gunn