dom-rb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cae4bc31b6b58eba444410662c49f6fc38956b8
-  data.tar.gz: 7d6094522646022477e1e18822ec3dbf01ec37f2
+  metadata.gz: 506d56aaaa6c084470621a2b06ede1564a619014
+  data.tar.gz: 41005f31a9cda1c1106ce501307f3bbab5a47735
 SHA512:
-  metadata.gz: 4a6e6c87150dd87203d089ddb08357ecc6a72bf46f26f1f7395198b77a9986985d49aa2c5a210e18caf08a227d84ad980bce334c20a767afdc99dedd567be8bc
-  data.tar.gz: bd12f013b96489a59961d0cebb0f8c6a312ed93e8f2a3eeb4e832dff06f83e26b692e81b28ef2c88d1239e97608db154c845d94c5b6cacb6119dbc144087dcb1
+  metadata.gz: 63ec0c8fe718cc6e45a8acea70f090b334cd442f2d8e58ae17eec03dbe7ee4fc256c05ed2e016fb5d7c8c0fd5090ef8fcadb84297d318439d76cd6a9bc622348
+  data.tar.gz: 9eea6f3341e0a9421748e0a2b7c995930b5595be4071b77db2572e41cdb2eeff52d9ae2da86fd63aa7f465bf4ce5be4aaaeff6c103935dc5ac817acd220016ef

data/csr/dom/builder/helpers.rb

@@ -51,7 +51,7 @@ module CSR
       def icon_with_anchor(icon_name, href, icon_attributes: nil, anchor_attributes: nil, tooltip: nil, popover: nil)
         attributes = { href: href }
         if anchor_attributes
-          attributes = anchor_attributes.merge(attributes)
+          attributes = merge_attributes(anchor_attributes, attributes)
         end
         tag(
           :a,
@@ -68,7 +68,7 @@ module CSR
         }
         if icon_attributes
           # argument takes precedence
-          _icon_attributes = _icon_attributes.merge(icon_attributes)
+          _icon_attributes = merge_attributes(_icon_attributes, icon_attributes)
         end
         icon_with_anchor(
           :plus_sign,
@@ -132,7 +132,7 @@ module CSR
             class: "dropdown-menu#{menu_right ? ' dropdown-menu-right' : nil}"
         }
         if menu_attributes
-          _menu_attributes  = _menu_attributes.merge(menu_attributes)
+          _menu_attributes  = merge_attributes(_menu_attributes, menu_attributes)
         end
         tag(
           :div,
@@ -191,7 +191,9 @@ module CSR
         }
         if icon_attributes
           # argument attributes take precedence
-          _icon_attributes = _icon_attributes.merge(icon_attributes)
+          debug 0, ->{[__FILE__, __LINE__, __method__, "_icon_attributes=#{_icon_attributes} icon_attributes=#{icon_attributes}"]}
+          _icon_attributes = merge_attributes(_icon_attributes,  icon_attributes)
+          debug 0, ->{[__FILE__, __LINE__, __method__, "_icon_attributes=#{_icon_attributes}"]}
         end
         drop_down_icon(
            icon: 'plus-sign',
@@ -242,9 +244,10 @@ module CSR
         end
         tag(
           :div,
-          attributes: {
-            style: { cursor: 'pointer' }
-          }.merge(attributes || {}),
+          attributes: merge_attributes(
+            { style: { cursor: 'pointer' } },
+            attributes
+          ),
           content: arrify(content, icon)
         )
       end

data/csr/dom/table/base.rb

@@ -203,6 +203,7 @@ module CSR
       def update
         debug 2, ->{[ __FILE__, __LINE__,  __method__ ]}
         init_sorting
+        @caption = @sections = nil
         update_root
       end
 

data/csr/dom/util.rb

@@ -49,6 +49,25 @@ module CSR
         result
       end
 
+      # args are hashes, lowest to highest precedence
+      # TODO: only handles two levels deep (style, onclick, ...)
+      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)
+              else
+                result[k] = v
+              end
+            end
+          end
+        end
+        result
+      end
+
       # make a single array from args
       # args may be mix of non-enumerables and enumerables
       # nils will not be included

data/lib/dom/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dom-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Colin Gunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal-browser