keynote 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb2837127985cda52b837475d149b7a0445de3d
-  data.tar.gz: 1c76f12e8ab9ac25fbcd18183d3e5687a560faed
+  metadata.gz: bbd02a5e8d588001102132e7864b294e34290700
+  data.tar.gz: d8db8a485b076d070774031959cecbc2f0b9fb68
 SHA512:
-  metadata.gz: a95130c4b619eefa804e6bb2df56eb1f07271a7163e63f7b635aaa518485e7dc252ef41102325b8f09f5a0c7dd21aeb62045ed579a43262843b403d188e23258
-  data.tar.gz: 713dd5c6bbb3d69dc74e5e15360706ab61b92b81cfef00169279ddfb30dde8577ce2d7e680566d88a549d9908d65539ad57a8d1ddfff2207ae27cae37bfbe0e9
+  metadata.gz: 2033a7f5c59e895ac0d8f31202591f02f8d4f5f750203b940696f029968a14c0f59d0d8bba990f7f3ef95bb39358605b961326b869b074366210411ef7b80c9a
+  data.tar.gz: d683f2f2259fbff0ad2ab280ce5300093f25ed4e6bc68a13a5901a7d422fe0764a61dd50f6fb74de5babe3ed582772d47c224d16262218d9000f40a9506797e9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.0
+* Rumble: Fix bug in v1.0.0 that caused an exception if the user passed a `nil`
+  value for an attribute.
+* Rumble: Add support for `aria` attr hashes, behaving the same way as `data`.
+
 ## v1.0.0
 * Add support for Rails 5.1.
 * Fix all Ruby warnings generated by Keynote itself.

data/lib/keynote/rumble.rb

@@ -267,14 +267,8 @@ module Keynote
           content = nil
         end
 
-        # Flatten `data` hash into individual attributes if necessary
-        if attrs && attrs[:data].is_a?(Hash)
-          attrs = attrs.dup
-          attrs.delete(:data).each do |key, value|
-            attrs[:"data-#{key}"] = value.to_s
-          end
-        end
-
+        attrs = flatten_attr_hash(attrs, :aria)
+        attrs = flatten_attr_hash(attrs, :data)
         merge_attributes(attrs) if attrs
 
         if block_given?
@@ -321,9 +315,25 @@ module Keynote
 
       def inspect; to_s.inspect end
 
+      private
+
+      # If the given attrs contain an `aria` or `data` hash, flatten its
+      # contents into hyphenated attribute names.
+      def flatten_attr_hash(attrs, name)
+        if attrs && attrs[name].is_a?(Hash)
+          attrs = attrs.dup
+          attrs.delete(name).each do |key, value|
+            next if value.nil?
+            attrs[:"#{name}-#{key}"] = value.to_s
+          end
+        end
+
+        attrs
+      end
+
       def attrs_to_s
         attributes.inject("") do |res, (name, value)|
-          next unless value
+          next res unless value
 
           value =
             if value.is_a?(Array)

data/lib/keynote/version.rb

@@ -2,5 +2,5 @@
 
 module Keynote
   # @private
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/rumble_spec.rb

@@ -72,7 +72,34 @@ class TestRumble < klass
     HTML
 
     assert_rumble str do
-      div data: { modal: true, safe: '"&quot;"'.html_safe, unsafe: '"&quot;"' }
+      div data: {
+        modal: true,
+        safe: '"&quot;"'.html_safe,
+        absent: nil,
+        unsafe: '"&quot;"'
+      }
+    end
+  end
+
+  def test_string_aria
+    assert_rumble '<div aria="whatever"></div>' do
+      div aria: "whatever"
+    end
+  end
+
+  def test_hash_aria
+    str = <<-HTML
+      <div aria-modal="true" aria-safe="&quot;&quot;&quot;" aria-unsafe="&quot;&amp;quot;&quot;">
+      </div>
+    HTML
+
+    assert_rumble str do
+      div aria: {
+        modal: true,
+        safe: '"&quot;"'.html_safe,
+        absent: nil,
+        unsafe: '"&quot;"'
+      }
     end
   end
 
@@ -87,6 +114,16 @@ class TestRumble < klass
     end
   end
 
+  def test_nil_attr
+    str = <<-HTML
+      <div id="id" class="class"></div>
+    HTML
+
+    assert_rumble str do
+      div id: "id", title: nil, class: "class"
+    end
+  end
+
   def test_several
     str = <<-HTML
       <p>Hello</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keynote
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Fitzgerald