opal-haml 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33b7eaf522a6cecf841934bcef00144f3cd5594
-  data.tar.gz: acc6c1d3be312df2dd0224685ac09d9084762017
+  metadata.gz: 9a51df8f11890733b25009b477cd1858d435d23c
+  data.tar.gz: 9d1269a086e15e682d2ea661ffe5e780066ba77b
 SHA512:
-  metadata.gz: de66f0e58bdddfadc3423c8259abc289a08630e8084a5af14c27d38e27a9b7b9060e34fe15888e52bc03ab2b9a10545eb996c3394fd72f083866a411906ae941
-  data.tar.gz: 91d0745a2c2202cc4b113bf9059fc70bdf355b551463b272fb5efe0ef5d13b6e98ebef205f04b02e7a1c83c1828f8bd4476a2392c467ba9c74a37368fe652aaf
+  metadata.gz: 82c5a14a140dc07be2be3afbd300e339b67fa69ec293fc3c92178bad911b981c0e7421450a5423eeb32ba2d0b13bf1edf89216c94ad11873a1aa90fdff01ecfc
+  data.tar.gz: 794c500356aeb83d467ac1eff35aa79127f0996929ebe292443e72f1c99030e9663c4404a6908822984a463adf0cdedc50293e0e6e37e25f28654d5f563b907c

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.3.0 2015-08-07
+## 0.4.1 2015-11-02
+
+*   Add support for nested attribute hashes: `%div{ data: { foo: 123 } }` now becomes `<div data-foo="123"></div>`.
+
+*   Attribute values are now properly escaped.
+
+## 0.4.0 2015-08-07
 
 *   Add support for Opal 0.8.
 

data/lib/opal/haml/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Haml
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/opal/opal-haml.rb

@@ -9,20 +9,36 @@ class Template
       attributes = class_id
 
       attributes_hashes.each do |hash|
-        attributes.update hash
+        attributes.update hash do |_, oldval, newval|
+          Array(oldval) + Array(newval)
+        end
       end
 
-      result = attributes.collect do |attr, value|
-        if value == true
-          next " #{attr}"
-        elsif value == false
-          next
+      result = []
+      _render_attributes attributes, result, ''
+
+      result.join
+    end
+
+    private
+
+    def _render_attributes(attributes, out, prefix)
+      attributes.each do |attr, value|
+        attr_name = prefix + attr
+
+        case value
+        when true then out << " #{attr_name}"
+        when false, nil then next
+        when Hash then _render_attributes(value, out, attr_name + '-')
         else
-          " #{attr}='#{value}'"
+          value = value.compact.join ' ' if value.is_a? Array
+          out << " #{attr_name}='#{_attribute_escape value}'"
         end
       end
+    end
 
-      result.join
+    def _attribute_escape(value)
+      value.to_s.gsub /['"&<>]/, '"' => '&quot;', "'" => '&apos;', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;'
     end
   end
 end

data/spec/output_buffer_spec.rb

@@ -12,11 +12,38 @@ describe Template::OutputBuffer do
       expect(result).to include("name='foo'", "height='100'")
     end
 
+    it "can compile nested attributes" do
+      result = attributes(data: { foo: { bar: 'baz' }, another: 'one' })
+      expect(result).to include("data-foo-bar='baz'")
+      expect(result).to include("data-another='one'")
+    end
+
+    it "combines input hashes" do
+      result = subject.attributes({ 'class' => 'foo' }, nil, { class: 'bar', data: 'baz' })
+      expect(result).to include("class='foo bar'")
+      expect(result).to include("data='baz'")
+    end
+
+    it "removes nil from arrays" do
+      result = attributes(foo: [ 'bar', nil, 'baz' ])
+      expect(result).to include("foo='bar baz'")
+    end
+
+    it "escapes attribute values" do
+      result = attributes(foo: 'a<>&"\'b')
+      expect(result).to include("foo='a&lt;&gt;&amp;&quot;&apos;b'")
+    end
+
     it "skips the attribute for false values" do
       result = attributes(name: false)
       expect(result).to_not include('name')
     end
 
+    it "skips the attribute for nil values" do
+      result = attributes(name: nil)
+      expect(result).to_not include('name')
+    end
+
     it "generates a simple named attribute for true values" do
       result = attributes(closable: true)
       expect(result).to include('closable')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-haml
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Run Haml templates client-side with Opal