Merge pull request #6 from thoov/codeCleanup

[Enhancement] Minor cleanup / refactoring

Author: stefanpenner

addon/helpers.js

@@ -0,0 +1,18 @@
+var hasOwnProp = Object.prototype.hasOwnProperty;
+
+function aliasMethod(methodName) {
+  return function() {
+    return this[methodName].apply(this, arguments);
+  };
+}
+
+function empty(obj) {
+  var key;
+  for (key in obj) {
+    if (!hasOwnProp.call(obj, key)) { continue; }
+    return false;
+  }
+  return true;
+}
+
+export { aliasMethod, empty };

addon/mixin.js

@@ -1,35 +1,23 @@
 import Ember from 'ember';
+import {aliasMethod, empty} from './helpers';
 
-var hasOwnProp = Object.prototype.hasOwnProperty;
-var get = Ember.get;
-var set = Ember.set;
-var keys = Ember.keys;
-var isArray = Ember.isArray;
-var computed = Ember.computed;
-
-function aliasMethod(methodName) {
-  return function() {
-    return this[methodName].apply(this, arguments);
-  };
-}
-
-function empty(obj) {
-  var key;
-  for (key in obj) {
-    if (!hasOwnProp.call(obj, key)) { continue; }
-    return false;
-  }
-  return true;
-}
+var get        = Ember.get;
+var set        = Ember.set;
+var keys       = Ember.keys;
+var isArray    = Ember.isArray;
+var computed   = Ember.computed;
 
 export default Ember.Mixin.create({
+
+  hasChanges     : computed.readOnly('hasBufferedChanges'),
+  applyChanges   : aliasMethod('applyBufferedChanges'),
+  discardChanges : aliasMethod('discardBufferedChanges'),
+
   init: function() {
     this.initializeBuffer();
     this.hasBufferedChanges = false;
   },
 
-  hasChanges: computed.readOnly('hasBufferedChanges'),
-
   initializeBuffer: function(onlyTheseKeys) {
     if(isArray(onlyTheseKeys) && !empty(onlyTheseKeys)) {
       onlyTheseKeys.forEach(function(key) {
@@ -52,15 +40,16 @@ export default Ember.Mixin.create({
   },
 
   setUnknownProperty: function(key, value) {
-    var buffer = this.buffer;
+    var buffer  = this.buffer;
     var content = this.get('content');
     var current;
+    var previous;
 
     if (content != null) {
       current = get(content, key);
     }
 
-    var previous = buffer.hasOwnProperty(key) ? buffer[key] : current;
+    previous = buffer.hasOwnProperty(key) ? buffer[key] : current;
 
     if (previous === value) {
       return;
@@ -84,7 +73,7 @@ export default Ember.Mixin.create({
   },
 
   applyBufferedChanges: function(onlyTheseKeys) {
-    var buffer = this.buffer;
+    var buffer  = this.buffer;
     var content = this.get('content');
 
     keys(buffer).forEach(function(key) {
@@ -102,8 +91,6 @@ export default Ember.Mixin.create({
     }
   },
 
-  applyChanges: aliasMethod('applyBufferedChanges'),
-
   discardBufferedChanges: function(onlyTheseKeys) {
     var buffer = this.buffer;
 
@@ -121,7 +108,5 @@ export default Ember.Mixin.create({
     if (empty(this.buffer)) {
       this.set('hasBufferedChanges', false);
     }
-  },
-
-  discardChanges: aliasMethod('discardBufferedChanges'),
+  }
 });

tests/unit/mixin-test.js

@@ -1,13 +1,13 @@
-import Mixin from 'ember-buffered-proxy/mixin';
 import Ember from 'ember';
+import Mixin from 'ember-buffered-proxy/mixin';
 
-module("ember-buffered-proxy/mixin");
+module('ember-buffered-proxy/mixin');
 
-test("exists", function() {
+test('exists', function() {
   ok(Mixin);
 });
 
-test("that it works", function() {
+test('that it works', function() {
   var BufferedPorxy = Ember.ObjectProxy.extend(Mixin);
 
   var content = {
@@ -61,7 +61,7 @@ test("that it works", function() {
   equal(content.baz, 1);
 });
 
-test("that apply/discard only these keys works", function() {
+test('that apply/discard only these keys works', function() {
   var BufferedPorxy = Ember.ObjectProxy.extend(Mixin);
 
   var content = {
@@ -157,22 +157,22 @@ test("that apply/discard only these keys works", function() {
   equal(content.baz, 1);
 });
 
-test("aliased methods work", function() {
+test('aliased methods work', function() {
   var BufferedProxy = Ember.ObjectProxy.extend(Mixin);
 
   var proxy = BufferedProxy.create({
     content: { property: 1 }
   });
 
   proxy.set('property', 2);
-  ok(proxy.get('hasChanges'), "Modified proxy has changes");
+  ok(proxy.get('hasChanges'), 'Modified proxy has changes');
 
   proxy.applyChanges();
-  equal(proxy.get('content.property'), 2, "Applying changes sets the content's property");
-  ok(!(proxy.get('hasChanges')), "Proxy has no changes after changes are applied");
+  equal(proxy.get('content.property'), 2, 'Applying changes sets the content\'s property');
+  ok(!(proxy.get('hasChanges')), 'Proxy has no changes after changes are applied');
 
   proxy.set('baz', 3);
   proxy.discardChanges();
-  equal(proxy.get('property'), 2, "Discarding changes resets the proxy's property");
-  ok(!(proxy.get('hasChanges')), "Proxy has no changes after changes are discarded");
+  equal(proxy.get('property'), 2, 'Discarding changes resets the proxy\'s property');
+  ok(!(proxy.get('hasChanges')), 'Proxy has no changes after changes are discarded');
 });

tests/unit/proxy-test.js

@@ -2,12 +2,12 @@ import Ember from 'ember';
 import BufferedProxy from 'ember-buffered-proxy/proxy';
 import BufferedMixin from 'ember-buffered-proxy/mixin';
 
-module("ember-buffered-proxy/mixin");
+module('ember-buffered-proxy/mixin');
 
-test("exists", function() { 
+test('exists', function() {
   ok(BufferedProxy);
 });
 
-test("that appears correct", function() {
-  ok(BufferedMixin.detect( BufferedProxy.create()));
+test('that appears correct', function() {
+  ok(BufferedMixin.detect(BufferedProxy.create()));
 });