Refactor utility library

Author: Amir Tocker

src/Util/Util.js

@@ -0,0 +1,7 @@
+import debounce from './debounce';
+import firstDefined from './firstDefined';
+import closestAbove from './closestAbove';
+
+module.exports = {
+  debounce, firstDefined, closestAbove
+};

src/Util/closestAbove.js

@@ -0,0 +1,9 @@
+/**
+ * Returns the first item in list that is greater or equal to the given value.
+ * @param {Array} list a sorted array of items
+ * @param {*} value
+ * @returns {*}
+ */
+export default function closestAbove(list, value) {
+  return list.reduce((last, next) => value <= last ? last : next, undefined);
+}

src/util/debounce.js src/Util/debounce.jssrc/util/debounce.js renamed to src/Util/debounce.js

@@ -1,10 +1,17 @@
+/**
+ * Delay execution of func until wait miliseconds have passed since the last invocation of the returned debounced function.
+ * @param {function} func the function to execute
+ * @param {number} wait waiting time in miliseconds
+ * @param {boolean=false} immediate if true execute func at the beginning of the wait period
+ * @returns {function()} debounced function
+ */
 export default function debounce(func, wait, immediate) {
   let timeout = null;
-  let debounced =  () => {
+  let debounced = () => {
     const context = this;
     const args = arguments;
     const callNow = immediate && !timeout;
-    if(timeout){
+    if (timeout) {
       clearTimeout(timeout);
     }
     const later = () => {
@@ -20,10 +27,9 @@ export default function debounce(func, wait, immediate) {
     }
   };
 
-  debounced.cancel = ()=>{
+  debounced.cancel = ()=> {
     clearTimeout(timeout);
     timeout = null;
   };
   return debounced;
-
 }

src/util/firstDefined.js src/Util/firstDefined.jssrc/util/firstDefined.js renamed to src/Util/firstDefined.js

@@ -1,3 +1,8 @@
+/**
+ * Returns the first argument that is not undefined
+ * @param {...*} values a list of arguments of any type
+ * @returns {*}
+ */
 export default function firstDefined(...values){
   for(let value of values) {
     if(value !== undefined) return value;

src/Util/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "util",
+  "version": "1.0.0",
+  "main": "./Util.js",
+  "private": true
+}

src/components/Image/Image.js

@@ -1,8 +1,7 @@
 import React, {Component, PropTypes} from 'react';
 import cloudinary, {Util} from 'cloudinary-core';
 import CloudinaryComponent from '../CloudinaryComponent';
-import debounce from '../../util/debounce';
-import firstDefined from '../../util/firstDefined';
+import {debounce, firstDefined, closestAbove} from '../../Util';
 
 export default class Image extends CloudinaryComponent {
   constructor(props, context) {
@@ -37,7 +36,7 @@ export default class Image extends CloudinaryComponent {
     }
 
     let currentState = this.state || {};
-    if (/* FIXME probably not needed */ Util.isEmpty(currentState.url) || url !== currentState.url) {
+    if (!Util.isEmpty(url) && url !== currentState.url) {
       state.url = url;
     }
     return state;
@@ -66,7 +65,6 @@ export default class Image extends CloudinaryComponent {
   }
 
   componentWillUpdate(nextProps, nextState, nextContext) {
-    // TODO check responsive. also check for responsive state change.
     if (nextState.responsive) {
       const wait = firstDefined(nextProps.responsiveDebounce, nextContext.responsiveDebounce, 100);
       if (this.listener) {
@@ -105,7 +103,7 @@ export default class Image extends CloudinaryComponent {
     );
   }
 
-  // methods from cloudinary_js
+  // Methods from cloudinary_js
 
   findContainerWidth() {
     var containerWidth, style;
@@ -213,16 +211,7 @@ Image.defaultProps = {};
 Image.contextTypes = CloudinaryComponent.contextTypes;
 Image.propTypes = CloudinaryComponent.propTypes;
 
-
 function defaultBreakpoints(width, steps = 100) {
   return steps * Math.ceil(width / steps);
 }
 
-function closestAbove(list, value) {
-  var i;
-  i = list.length - 2;
-  while (i >= 0 && list[i] >= value) {
-    i--;
-  }
-  return list[i + 1];
-}