Deserialize dash-case to camelCase

src/features/micro/attributes.html

@@ -7,6 +7,9 @@
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+
+<link rel="import" href="../../lib/annotations/annotations.html">
+
 <script>
 
   /**
@@ -52,7 +55,7 @@
    * @class base feature: attributes
    */
 
-  using('Base', function(Base) {
+  using(['Base', 'Annotations'], function(Base, Annotations) {
 
     Base.addFeature({
 
@@ -78,40 +81,37 @@
       },
 
       _takeAttributesToModel: function(model) {
-        for (var name in this.properties) {
-          var type = this.getPropertyType(name);
-          if (type && this.hasAttribute(name)) {
-            this.setAttributeToProperty(model, name, type);
+        for (var propName in this.properties) {
+          var type = this.getPropertyType(propName);
+          var attrName = Annotations.camelToDashCase(propName);
+          if (type && this.hasAttribute(attrName)) {
+            var val = this.getAttribute(attrName);
+            model[propName] = this.deserialize(val, type);
           }
         }
       },
 
-      setAttributeToProperty: function(model, name, type) {
-        if (this._serializing) {
-          // Don't deserialize back to property if currently reflecting
-          return;
-        }
-        type = type || this.getPropertyType(name);
-        if (type) {
-          model[name] = this.deserialize(name, this.getAttribute(name), type);
+      setAttributeToProperty: function(model, attrName) {
+        // Don't deserialize back to property if currently reflecting
+        if (!this._serializing) {
+          var propName = Annotations.dashToCamelCase(attrName);
+          var type = this.getPropertyType(propName);
+          if (type) {
+            var val = this.getAttribute(attrName);
+            model[propName] = this.deserialize(val, type);
+          }
         }
       },
 
-      deserialize: function(name, value, type) {
-        //
-        var hasAttribute = this.hasAttribute(name);
-        if (!hasAttribute && (type != Boolean) && (this[name] == null)) {
-          return;
-        }
-        //
+      deserialize: function(value, type) {
         switch (type) {
 
           case Number:
             value = Number(value);
             break;
 
           case Boolean:
-            value = hasAttribute;
+            value = (value !== null);
             break;
 
           case Object:

test/unit/attributes-elements.html

@@ -29,6 +29,10 @@
       date: {
         type: Date,
         value: function() { return new Date(0); }
+      },
+      dashCase: {
+        type: String,
+        value: 'none'
       }
     }
   });
@@ -72,6 +76,11 @@
         type: Date,
         reflect: true,
         value: function() { return new Date(0); }
+      },
+      dashCase: {
+        type: String,
+        reflect: true,
+        value: 'none'
       }
     }
   });

test/unit/attributes.html

@@ -27,6 +27,7 @@
   string="The quick brown fox"
   bool
   date="Wed Mar 04 2015 10:46:05 GMT-0800 (PST)"
+  dash-case="The quick brown fox"
   >
 </x-basic>
 
@@ -39,6 +40,7 @@
   string="The quick brown fox"
   bool
   date="Wed Mar 04 2015 10:46:05 GMT-0800 (PST)"
+  dash-case="The quick brown fox"
   >
 </x-basic>
 
@@ -60,6 +62,7 @@
     assert.strictEqual(basicDefault.bool, true);
     assert.strictEqual(basicDefault.negBool, false);
     assert.strictEqual(basicDefault.date.getTime(), 0);
+    assert.strictEqual(basicDefault.dashCase, 'none');
   });
 
   test('basic deserialize attributes', function() {
@@ -70,6 +73,7 @@
     assert.strictEqual(basicConfigured.bool, true);
     assert.strictEqual(basicConfigured.negBool, false);
     assert.strictEqual(basicConfigured.date.getTime(), configuredTime);
+    assert.strictEqual(basicConfigured.dashCase, configuredString);
   });
 
   test('reflected default values', function() {
@@ -80,6 +84,7 @@
     assert.strictEqual(reflectDefault.bool, true);
     assert.strictEqual(reflectDefault.negBool, false);
     assert.strictEqual(reflectDefault.date.getTime(), 0);
+    assert.strictEqual(reflectDefault.dashCase, 'none');
   });
 
   test('reflected deserialize attributes', function() {
@@ -90,6 +95,7 @@
     assert.strictEqual(reflectConfigured.bool, true);
     assert.strictEqual(reflectConfigured.negBool, false);
     assert.strictEqual(reflectConfigured.date.getTime(), configuredTime);
+    assert.strictEqual(reflectConfigured.dashCase, configuredString);
   });
 
 });