From 033f8a5467434d11e9a52c579f4f6aba509439bb Mon Sep 17 00:00:00 2001
From: Marco Solazzi <msolazzi@aquest.it>
Date: Thu, 10 Dec 2015 18:52:44 +0100
Subject: [PATCH] a bunch of stuff

---
 .babelrc                                      |  11 ++
 .eslintrc                                     |   6 +-
 application/assets/javascripts/actions.js     |   8 +-
 application/assets/javascripts/application.js |  45 +++++-
 .../javascripts/components/attendee-list.js   |  36 +++++
 .../assets/javascripts/components/attendee.js |  15 ++
 .../javascripts/components/edit-form.js       |  75 +++++++++
 application/assets/javascripts/constants.js   |   4 +-
 application/assets/javascripts/reducers.js    |  10 +-
 application/fixtures/api-test.json            |   3 +
 application/test/actions.spec.js              |  18 +--
 .../test/components/attendee-list.spec.js     |  37 +++++
 application/test/components/attendee.spec.js  |  30 ++++
 application/test/components/edit-form.spec.js |  68 ++++++++
 application/test/reducers.spec.js             |  11 +-
 application/test/setup.js                     |  10 +-
 build/gulp-config/modernizr.conf.json         | 153 ++++++++++++++++++
 build/gulp-config/webpack.conf.js             |  57 ++++---
 build/gulp-tasks/lib/middlewares.js           |  29 +++-
 build/gulp-tasks/modernizr.js                 |   2 +-
 build/gulp-tasks/scripts.js                   |  38 ++---
 build/gulp-tasks/test.js                      |   3 +-
 package.json                                  |  22 +--
 23 files changed, 591 insertions(+), 100 deletions(-)
 create mode 100644 .babelrc
 create mode 100644 application/assets/javascripts/components/attendee-list.js
 create mode 100644 application/assets/javascripts/components/attendee.js
 create mode 100644 application/assets/javascripts/components/edit-form.js
 create mode 100644 application/fixtures/api-test.json
 create mode 100644 application/test/components/attendee-list.spec.js
 create mode 100644 application/test/components/attendee.spec.js
 create mode 100644 application/test/components/edit-form.spec.js
 create mode 100644 build/gulp-config/modernizr.conf.json

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..e5a0962
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,11 @@
+{
+    "presets": [
+        "es2015-loose",
+        "react"
+    ],
+    "env": {
+        "production": {
+            "plugins": ["external-helpers-2"]
+        }
+    }
+}
diff --git a/.eslintrc b/.eslintrc
index c72ccdc..4f34d22 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -35,7 +35,7 @@
         /**
          * React
          */
-        "react/display-name": 1,
+        "react/display-name": 0,
         "react/forbid-prop-types": 1,
         "react/jsx-boolean-value": 1,
         "react/jsx-closing-bracket-location": 1,
@@ -43,7 +43,7 @@
         "react/jsx-handler-names": 1,
         "react/jsx-indent-props": 1,
         "react/jsx-key": 1,
-        "react/jsx-max-props-per-line": 1,
+        "react/jsx-max-props-per-line": 0,
         "react/jsx-no-bind": 1,
         "react/jsx-no-duplicate-props": 1,
         "react/jsx-no-literals": 1,
@@ -51,7 +51,7 @@
         "react/jsx-pascal-case": 1,
         "react/jsx-quotes": 1,
         "react/jsx-sort-prop-types": 1,
-        "react/jsx-sort-props": 1,
+        "react/jsx-sort-props": 0,
         "react/jsx-uses-react": 1,
         "react/jsx-uses-vars": 1,
         "react/no-danger": 1,
diff --git a/application/assets/javascripts/actions.js b/application/assets/javascripts/actions.js
index b37bbce..3dbe1fa 100644
--- a/application/assets/javascripts/actions.js
+++ b/application/assets/javascripts/actions.js
@@ -6,12 +6,12 @@
  * @module actions
  */
 
-import {ACTION_NAMES_CHANGE, ACTION_SELECTED_ADD} from './constants';
+import {ACTION_ATTENDEES_CHANGE, ACTION_SELECTED_ADD} from './constants';
 
-export function namesChangeAction(names = []) {
+export function attendeeListChangeAction(attendeeList = []) {
     return {
-        type: ACTION_NAMES_CHANGE,
-        names
+        type: ACTION_ATTENDEES_CHANGE,
+        attendeeList
     };
 }
 
diff --git a/application/assets/javascripts/application.js b/application/assets/javascripts/application.js
index 9e99c28..531b430 100644
--- a/application/assets/javascripts/application.js
+++ b/application/assets/javascripts/application.js
@@ -6,11 +6,48 @@
  *
  */
 
-import React from 'react';
+import { applyMiddleware, createStore } from 'redux';
+import createLogger from 'redux-logger';
+
+import React, {Component} from 'react';
 import ReactDOM from 'react-dom';
-import Provider from 'react-redux';
+import {Provider} from 'react-redux';
+
+//redux stuff
+import reducers from './reducers';
+
+//container Components
+import AttendeeListContainer from './components/attendee-list';
+import EditForm from './components/edit-form';
+
+const middlewares = [];
+if (PRODUCTION === false) {
+    middlewares.push(createLogger({
+        collapsed: true
+    }));
+}
+
+const createStoreWithMiddleware = applyMiddleware(...middlewares)(createStore);
+const store = createStoreWithMiddleware(reducers);
+
+class App extends Component {
+
+    componentDidMount() {
+    }
+
+    render() {
+        return (
+            <section>
+                <EditForm />
+                <AttendeeListContainer />
+            </section>
+        );
+    }
+}
 
 ReactDOM.render(
-    <div>{'test'}</div>,
-    document.querySelector('#root')
+    <Provider store={store}>
+        <App />
+    </Provider>,
+    document.getElementById('root')
 );
\ No newline at end of file
diff --git a/application/assets/javascripts/components/attendee-list.js b/application/assets/javascripts/components/attendee-list.js
new file mode 100644
index 0000000..dcd522f
--- /dev/null
+++ b/application/assets/javascripts/components/attendee-list.js
@@ -0,0 +1,36 @@
+/**
+ * Applicatino Container: List of attendees
+ *
+ * @author Marco Solazzi
+ * @copyright (c) Marco solazzi
+ * @module components/attendees-list
+ */
+
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import Attendee from './attendee';
+
+function mapStateToProps(state) {
+    return {
+        attendees: state.attendeeList
+    };
+}
+
+export class AttendeeList extends Component {
+
+    render() {
+        let items = this.props.attendees.map((attendee) => (
+            <Attendee details={attendee} key={attendee.id} />
+        ));
+        return <ul>{items}</ul>;
+    }
+}
+
+AttendeeList.propTypes = {
+    attendees: React.PropTypes.array
+};
+
+export default connect(
+    mapStateToProps
+)(AttendeeList);
\ No newline at end of file
diff --git a/application/assets/javascripts/components/attendee.js b/application/assets/javascripts/components/attendee.js
new file mode 100644
index 0000000..0773a6c
--- /dev/null
+++ b/application/assets/javascripts/components/attendee.js
@@ -0,0 +1,15 @@
+/**
+ * Attendee diplayer
+ *
+ * @author Marco Solazzi
+ * @copyright (c) Marco Solazzi
+ * @module components/attendee
+ */
+
+import React from 'react';
+
+export default ({
+    details
+}) => (
+    <li className="c-attendee" id={'attendee-' + details.id}>{details.name}</li>
+);
diff --git a/application/assets/javascripts/components/edit-form.js b/application/assets/javascripts/components/edit-form.js
new file mode 100644
index 0000000..7424f6b
--- /dev/null
+++ b/application/assets/javascripts/components/edit-form.js
@@ -0,0 +1,75 @@
+/**
+ * Attendee edit form
+ *
+ * @author Marco Solazzi
+ * @copyright (c) AQuest
+ * @module components/edit-form
+ */
+
+import React, {Component} from 'react';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import {attendeeListChangeAction} from '../actions';
+
+
+function mapStateToProps(state) {
+    return {
+        attendees: state.attendeeList
+    };
+}
+
+function mapDispatchToProps(dispatch) {
+    return {
+        updateAttendees: bindActionCreators(attendeeListChangeAction, dispatch)
+    };
+}
+
+export class EditForm extends Component {
+
+    handleSubmit(e) {
+        e.preventDefault();
+        const value = (this.refs.attendeeInput.value || '').trim();
+        const attendees = EditForm.filterAttendees(value)
+            .map((name, id) => {
+                return {id, name};
+            });
+
+        this.props.updateAttendees(attendees);
+
+    }
+
+    static filterAttendees(value = '') {
+        return value.split("\n")
+            .map((line) => line.replace(/[\s]+/g, ' ').trim())
+            .filter((line) => !!line.length);
+    }
+
+    getAttendees() {
+        return this.props.attendees.map((attendee) => attendee.name).join("\n").trim();
+    }
+
+    render() {
+
+        let attendees = this.getAttendees();
+
+        return (
+            <form action="" onSubmit={this.handleSubmit.bind(this)}>
+                <textarea cols="30" ref="attendeeInput" id="edit-form" name="edit-form" rows="10" defaultValue={attendees} />
+                <p>
+                    <button type="submit">{'Save'}</button>
+                    <button type="reset">{'Reset'}</button>
+                </p>
+            </form>
+        );
+    }
+}
+
+EditForm.propTypes = {
+    attendees: React.PropTypes.array,
+    updateAttendees: React.PropTypes.func.isRequired
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(EditForm);
\ No newline at end of file
diff --git a/application/assets/javascripts/constants.js b/application/assets/javascripts/constants.js
index df7dac7..bc49552 100644
--- a/application/assets/javascripts/constants.js
+++ b/application/assets/javascripts/constants.js
@@ -1,5 +1,5 @@
 /**
- * Contants
+ * Constants
  *
  * @author Marco Solazzi
  * @copyright (c) Marco Solazzi
@@ -7,6 +7,6 @@
  */
 
 //ACTIONS
-export const ACTION_NAMES_CHANGE = 'ACTION_NAMES_CHANGE';
+export const ACTION_ATTENDEES_CHANGE = 'ACTION_ATTENDEES_CHANGE';
 
 export const ACTION_SELECTED_ADD = 'ACTION_SELECTED_ADD';
diff --git a/application/assets/javascripts/reducers.js b/application/assets/javascripts/reducers.js
index 1379564..922f9bd 100644
--- a/application/assets/javascripts/reducers.js
+++ b/application/assets/javascripts/reducers.js
@@ -7,13 +7,13 @@
  */
 
 import { combineReducers } from 'redux';
-import {ACTION_NAMES_CHANGE, ACTION_SELECTED_ADD} from './constants';
+import {ACTION_ATTENDEES_CHANGE, ACTION_SELECTED_ADD} from './constants';
 
-export function namesReducer(state = [], action = {}) {
+export function attendeeListReducer(state = [], action = {}) {
 
     switch (action.type) {
-    case ACTION_NAMES_CHANGE:
-        return [...action.names];
+    case ACTION_ATTENDEES_CHANGE:
+        return [...action.attendeeList];
     default:
         return state;
     }
@@ -32,7 +32,7 @@ export function selectedReducer(state = [], action = {}) {
 
 
 export default combineReducers({
-    names: namesReducer,
+    attendeeList: attendeeListReducer,
     selected: selectedReducer
 });
 
diff --git a/application/fixtures/api-test.json b/application/fixtures/api-test.json
new file mode 100644
index 0000000..69fbf10
--- /dev/null
+++ b/application/fixtures/api-test.json
@@ -0,0 +1,3 @@
+{
+    "test": true
+}
\ No newline at end of file
diff --git a/application/test/actions.spec.js b/application/test/actions.spec.js
index 31fcec9..e70e111 100644
--- a/application/test/actions.spec.js
+++ b/application/test/actions.spec.js
@@ -1,18 +1,18 @@
 import expect from 'expect';
 
-import {ACTION_NAMES_CHANGE, ACTION_SELECTED_ADD} from '../assets/javascripts/constants';
-import {namesChangeAction, selectedAddAction} from '../assets/javascripts/actions';
+import {ACTION_ATTENDEES_CHANGE, ACTION_SELECTED_ADD} from '../assets/javascripts/constants';
+import {attendeeListChangeAction, selectedAddAction} from '../assets/javascripts/actions';
 
 describe('Test Actions', () => {
 
 
     describe('Action name action', () => {
 
-        const names = ['John'];
+        const attendeeList = ['John'];
         let action;
 
         beforeEach(() => {
-            action = namesChangeAction(names);
+            action = attendeeListChangeAction(attendeeList);
         });
 
         it('should return an object', () => {
@@ -20,17 +20,17 @@ describe('Test Actions', () => {
         });
 
         it('should match the change action action type', () => {
-            expect(action.type).toBe(ACTION_NAMES_CHANGE);
+            expect(action.type).toBe(ACTION_ATTENDEES_CHANGE);
         });
 
         it('should pass new names', () => {
-            expect(action.names).toEqual(names);
+            expect(action.attendeeList).toEqual(attendeeList);
         });
 
         it('should return an empty array by default', () => {
-            let defaultAction = namesChangeAction();
-            expect(defaultAction.names).toBeA(Array);
-            expect(defaultAction.names.length).toBe(0);
+            let defaultAction = attendeeListChangeAction();
+            expect(defaultAction.attendeeList).toBeA(Array);
+            expect(defaultAction.attendeeList.length).toBe(0);
         });
 
     });
diff --git a/application/test/components/attendee-list.spec.js b/application/test/components/attendee-list.spec.js
new file mode 100644
index 0000000..e8ce899
--- /dev/null
+++ b/application/test/components/attendee-list.spec.js
@@ -0,0 +1,37 @@
+import expect, { spyOn } from 'expect';
+import React from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import {AttendeeList} from '../../assets/javascripts/components/attendee-list';
+
+describe('Name Item Component Actions', () => {
+
+    let shallowRenderer, output;
+
+    const data = {
+        attendees: [{
+            id: 0,
+            name: 'John'
+        }, {
+            id: 1,
+            name: 'Jane'
+        }]
+    };
+
+    beforeEach(() => {
+        shallowRenderer = TestUtils.createRenderer();
+        shallowRenderer.render(<AttendeeList {...data} />);
+        output = shallowRenderer.getRenderOutput();
+    });
+
+    it('should render an unordered list', () => {
+        expect(output.type).toBe('ul');
+    });
+
+    it('should render <Attendee> components', () => {
+        output.props.children.forEach((prop, i) => {
+            expect(prop.props.details).toEqual(data.attendees[i]);
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/application/test/components/attendee.spec.js b/application/test/components/attendee.spec.js
new file mode 100644
index 0000000..f9df2b1
--- /dev/null
+++ b/application/test/components/attendee.spec.js
@@ -0,0 +1,30 @@
+import expect from 'expect';
+import React from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import Attendee from '../../assets/javascripts/components/attendee';
+
+describe('Name Item Component Actions', () => {
+
+    let shallowRenderer, output;
+
+    const data = {
+        id: 0,
+        name: 'John'
+    };
+
+    beforeEach(() => {
+        shallowRenderer = TestUtils.createRenderer();
+        shallowRenderer.render(<Attendee details={data} />);
+        output = shallowRenderer.getRenderOutput();
+    });
+
+    it('should render a list item', () => {
+        expect(output.type).toBe('li');
+    });
+
+    it('should have the name as its unique child', () => {
+        expect(output.props.children).toBe(data.name);
+    });
+
+});
\ No newline at end of file
diff --git a/application/test/components/edit-form.spec.js b/application/test/components/edit-form.spec.js
new file mode 100644
index 0000000..46660aa
--- /dev/null
+++ b/application/test/components/edit-form.spec.js
@@ -0,0 +1,68 @@
+import expect, { createSpy } from 'expect'
+import React from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import {EditForm} from '../../assets/javascripts/components/edit-form';
+
+describe('Edit Form Component Actions', () => {
+
+    let editFormInstance, textarea, button;
+    const props = {
+        attendees: [{
+            id: 0,
+            name: 'John'
+        }, {
+            id: 1,
+            name: 'Jane'
+        }],
+        updateAttendees: createSpy()
+    };
+
+    beforeEach(() => {
+        editFormInstance = TestUtils.renderIntoDocument(<EditForm {...props} />);
+        textarea = TestUtils.scryRenderedDOMComponentsWithTag(editFormInstance, 'textarea');
+        ///button = TestUtils.findRenderedDOMComponentWithTag(editFormInstance, 'button');
+    });
+
+
+
+    describe('Instance Methods', () => {
+
+        it('should return a multi-line string of names', () => {
+            const expected = "John\nJane";
+            expect(editFormInstance.getAttendees()).toBe(expected);
+        });
+
+        //it('should clean up empty lines and exceeeding whitespaces', () => {
+        //    const expected = "John\nJane Doe";
+        //    let newProps = Object.assign({}, props);
+        //    newProps.attendees = [
+        //        {
+        //            id: 0,
+        //            name: 'John'
+        //        },
+        //        {
+        //            id: 1,
+        //            name: '   '
+        //        },
+        //        {
+        //            id: 2,
+        //            name: 'Jane Doe'
+        //        }
+        //    ];
+        //    editFormInstance = TestUtils.renderIntoDocument(<EditForm {...newProps} />);
+        //    expect(editFormInstance.getAttendees()).toBe(expected);
+        //});
+        it('should clean up empty lines and exceeeding whitespaces', () => {
+            const expected = ['John', 'Jane Doe'];
+            const input = "John\n    \nJane Doe\n\n";
+            expect(EditForm.filterAttendees(input)).toEqual(expected);
+        });
+    });
+
+    //it('should render a list of names into the textarea', () => {
+    //    const expected = props.
+    //});
+
+
+});
\ No newline at end of file
diff --git a/application/test/reducers.spec.js b/application/test/reducers.spec.js
index 9b7d319..9bdfeeb 100644
--- a/application/test/reducers.spec.js
+++ b/application/test/reducers.spec.js
@@ -1,16 +1,16 @@
 import expect from 'expect';
 
-import {ACTION_NAMES_CHANGE, ACTION_SELECTED_ADD} from '../assets/javascripts/constants';
-import {namesReducer, selectedReducer} from '../assets/javascripts/reducers';
+import {ACTION_ATTENDEES_CHANGE, ACTION_SELECTED_ADD} from '../assets/javascripts/constants';
+import {attendeeListReducer, selectedReducer} from '../assets/javascripts/reducers';
 
 describe('Test Reducers', () => {
 
 
-    describe('Name reducer', () => {
+    describe('Attendee List reducer', () => {
 
         it('should return an empty array by default', () => {
 
-            const state = namesReducer();
+            const state = attendeeListReducer();
 
             expect(state).toBeA(Array);
             expect(state.length).toBe(0);
@@ -21,7 +21,7 @@ describe('Test Reducers', () => {
 
             const prevState = ['Jane'];
 
-            const state = namesReducer(prevState, {type: ACTION_NAMES_CHANGE, names: ['John']});
+            const state = attendeeListReducer(prevState, {type: ACTION_ATTENDEES_CHANGE, attendeeList: ['John']});
 
             expect(state.length).toBe(1);
             expect(state[0]).toBe('John');
@@ -30,7 +30,6 @@ describe('Test Reducers', () => {
 
     });
 
-
     describe('Selected reducer', () => {
 
         it('should return an empty array by default', () => {
diff --git a/application/test/setup.js b/application/test/setup.js
index fcf9b00..50699bb 100644
--- a/application/test/setup.js
+++ b/application/test/setup.js
@@ -1,5 +1,5 @@
-//import { jsdom } from 'jsdom';
-//
-//global.document = jsdom('<!doctype html><html><body></body></html>');
-//global.window = document.defaultView;
-//global.navigator = global.window.navigator;
\ No newline at end of file
+var jsdom = require('jsdom').jsdom;
+
+global.document = jsdom('<!doctype html><html><body></body></html>');
+global.window = document.defaultView;
+global.navigator = global.window.navigator;
\ No newline at end of file
diff --git a/build/gulp-config/modernizr.conf.json b/build/gulp-config/modernizr.conf.json
new file mode 100644
index 0000000..8167163
--- /dev/null
+++ b/build/gulp-config/modernizr.conf.json
@@ -0,0 +1,153 @@
+{
+    "classPrefix": "",
+    "options": [
+        "addTest",
+        "atRule",
+        "domPrefixes",
+        "hasEvent",
+        "html5shiv",
+        "html5printshiv",
+        "load",
+        "mq",
+        "prefixed",
+        "prefixes",
+        "prefixedCSS",
+        "setClasses",
+        "testAllProps",
+        "testProp",
+        "testStyles"
+    ],
+    "feature-detects": [
+        "applicationcache",
+        "audio",
+        "audio/loop",
+        "audio/preload",
+        "audio/webaudio",
+        "canvas",
+        "canvas/blending",
+        "canvas/todataurl",
+        "canvas/winding",
+        "canvastext",
+        "contenteditable",
+        "contextmenu",
+        "cookies",
+        "crypto",
+        "crypto/getrandomvalues",
+        "css/all",
+        "css/animations",
+        "css/appearance",
+        "css/backdropfilter",
+        "css/backgroundblendmode",
+        "css/backgroundcliptext",
+        "css/backgroundposition-shorthand",
+        "css/backgroundposition-xy",
+        "css/backgroundrepeat",
+        "css/backgroundsize",
+        "css/backgroundsizecover",
+        "css/borderimage",
+        "css/borderradius",
+        "css/boxshadow",
+        "css/boxsizing",
+        "css/calc",
+        "css/checked",
+        "css/chunit",
+        "css/columns",
+        "css/cubicbezierrange",
+        "css/displayrunin",
+        "css/displaytable",
+        "css/ellipsis",
+        "css/escape",
+        "css/exunit",
+        "css/filters",
+        "css/flexbox",
+        "css/flexboxlegacy",
+        "css/flexboxtweener",
+        "css/flexwrap",
+        "css/fontface",
+        "css/generatedcontent",
+        "css/gradients",
+        "css/hsla",
+        "css/hyphens",
+        "css/invalid",
+        "css/mask",
+        "css/mediaqueries",
+        "css/multiplebgs",
+        "css/nthchild",
+        "css/opacity",
+        "css/overflow-scrolling",
+        "css/pointerevents",
+        "css/positionsticky",
+        "css/pseudoanimations",
+        "css/pseudotransitions",
+        "css/reflections",
+        "css/regions",
+        "css/remunit",
+        "css/resize",
+        "css/rgba",
+        "css/scrollbars",
+        "css/shapes",
+        "css/siblinggeneral",
+        "css/subpixelfont",
+        "css/supports",
+        "css/target",
+        "css/textalignlast",
+        "css/textshadow",
+        "css/transforms",
+        "css/transforms3d",
+        "css/transformstylepreserve3d",
+        "css/transitions",
+        "css/userselect",
+        "css/valid",
+        "css/vhunit",
+        "css/vmaxunit",
+        "css/vminunit",
+        "css/vwunit",
+        "css/will-change",
+        "css/wrapflow",
+        "custom-protocol-handler",
+        "customevent",
+        "dataview-api",
+        "forms/fileinput",
+        "forms/fileinputdirectory",
+        "forms/formattribute",
+        "forms/inputnumber-l10n",
+        "forms/placeholder",
+        "forms/validation",
+        "fullscreen-api",
+        "geolocation",
+        "hashchange",
+        "history",
+        "img/apng",
+        "img/jpeg2000",
+        "img/jpegxr",
+        "img/sizes",
+        "img/srcset",
+        "img/webp",
+        "img/webp-alpha",
+        "img/webp-animation",
+        "img/webp-lossless",
+        "inputtypes",
+        "notification",
+        "pagevisibility-api",
+        "pointerevents",
+        "postmessage",
+        "storage/localstorage",
+        "storage/sessionstorage",
+        "storage/websqldatabase",
+        "svg",
+        "svg/asimg",
+        "svg/clippaths",
+        "svg/filters",
+        "svg/foreignobject",
+        "svg/inline",
+        "svg/smil",
+        "touchevents",
+        "vibration",
+        "video",
+        "video/autoplay",
+        "video/loop",
+        "video/preload",
+        "webgl",
+        "webgl/extensions"
+    ]
+}
\ No newline at end of file
diff --git a/build/gulp-config/webpack.conf.js b/build/gulp-config/webpack.conf.js
index aac3ab4..e63dc54 100644
--- a/build/gulp-config/webpack.conf.js
+++ b/build/gulp-config/webpack.conf.js
@@ -1,13 +1,43 @@
 module.exports = function (options) {
 
     var path = require('path'),
+        _ = require('lodash'),
         webpack = require('webpack');
 
-    var cwd = path.join(process.cwd(), options.assetsPath('src.js')),
-        destPath = path.join(options.assetsPath('dist.js'));
+    var srcPath = path.join(process.cwd(), options.assetsPath('src.js')),
+        destPath = path.join(options.assetsPath('dist.js')),
+        plugins = [];
+
+    plugins.push(
+        new webpack.NoErrorsPlugin(),
+        new webpack.DefinePlugin({
+            'PRODUCTION': options.production,
+            'process.env': {
+                'NODE_ENV': JSON.stringify(options.production ? 'production' : 'development')
+            }
+        })
+    );
+
+    if (options.production) {
+        plugins.push(
+            new webpack.optimize.OccurenceOrderPlugin(),
+            new webpack.optimize.DedupePlugin(),
+            new webpack.optimize.UglifyJsPlugin({
+                sourceMap: false,
+                compressor: {
+                    screw_ie8: true,
+                    warnings: false
+                }
+            }),
+            new webpack.BannerPlugin(
+                _.template(options.banners.application)(options),
+                {entryOnly: true, raw: true}
+            )
+        );
+    }
 
     return {
-        context: cwd,
+        context: srcPath,
         entry: {
             application: ['babel-polyfill', './application.js']
         },
@@ -16,14 +46,10 @@ module.exports = function (options) {
             publicPath: destPath.replace(options.paths.dist.root, '').replace(/\\/g, '/') + '/',
             filename: '[name].js'
         },
-        plugins: [
-            new webpack.DefinePlugin({
-                'PRODUCTION': options.production,
-                'process.env': {
-                    'NODE_ENV': JSON.stringify(options.production ? 'production' : 'development')
-                }
-            })
-        ],
+        watch: !!options.isWatching,
+        devtool: (options.production ? null : '#source-map'),
+        debug: (options.production === false),
+        plugins: plugins,
         module: {
             loaders: [
                 {
@@ -35,14 +61,7 @@ module.exports = function (options) {
                     exclude: /(node_modules|assets\/vendors)/,
                     loader: 'babel-loader',
                     query: {
-                        cacheDirectory: true,
-                        presets: [
-                            'es2015',
-                            'react'
-                        ],
-                        plugins: [
-                            'transform-runtime'
-                        ]
+                        cacheDirectory: true
                     }
                 }
             ]
diff --git a/build/gulp-tasks/lib/middlewares.js b/build/gulp-tasks/lib/middlewares.js
index d3c40a7..819ddc4 100644
--- a/build/gulp-tasks/lib/middlewares.js
+++ b/build/gulp-tasks/lib/middlewares.js
@@ -1,3 +1,28 @@
-module.exports = function  (/*options*/) {
-    return [];
+module.exports = function  (options) {
+
+    var url = require('url'),
+        path = require('path'),
+        fs = require('fs'),
+        fixturePath = path.join(process.cwd(), options.paths.src.fixtures),
+        fixturePathRegEx = /\/api\/(.+)/;
+
+    var fixtures = function (req, res, next) {
+
+
+        var parserUrl = url.parse(req.url, false);
+
+        var match = parserUrl.path.match(fixturePathRegEx),
+            filepath = match !== null ? path.join(fixturePath, 'api-' + match[1]) + '.json' : null;
+
+        if (filepath) {
+            fs.readFile(filepath, 'utf8', function (err, data) {
+                res.end(data);
+            });
+            return;
+        }
+        next();
+
+    };
+
+    return [fixtures];
 };
\ No newline at end of file
diff --git a/build/gulp-tasks/modernizr.js b/build/gulp-tasks/modernizr.js
index 8cc7523..a2af5b5 100644
--- a/build/gulp-tasks/modernizr.js
+++ b/build/gulp-tasks/modernizr.js
@@ -61,7 +61,7 @@ module.exports = function (gulp, $, options) {
         var fs = require('fs'),
             modernizr = require('modernizr'),
             customizr = require('customizr'),
-            fullConfig = require('modernizr/lib/config-all.json'),
+            fullConfig = require('../gulp-config/modernizr.conf.json'),
             filePath = options.assetsPath('dist.vendors',  '/modernizr');
 
 
diff --git a/build/gulp-tasks/scripts.js b/build/gulp-tasks/scripts.js
index 03f173c..5b9303b 100644
--- a/build/gulp-tasks/scripts.js
+++ b/build/gulp-tasks/scripts.js
@@ -16,33 +16,6 @@ function compilerTask(gulp, $, options) {
         var callingDone = false,
             config = _.defaults(opts || {}, webpackConfig);
 
-
-        if (options.isWatching) {
-            config.watch = true;
-        }
-
-        if (!options.production) {
-            if (config.debug === undefined) {
-                config.devtool = '#source-map';
-                config.debug = true;
-            }
-        } else {
-            config.plugins.push(
-                new webpack.optimize.DedupePlugin(),
-                new webpack.optimize.UglifyJsPlugin({
-                    sourceMap: false,
-                    compressor: {
-                        screw_ie8: true,
-                        warnings: false
-                    }
-                }),
-                new webpack.BannerPlugin(
-                    _.template(options.banners.application)(options),
-                    {entryOnly: true, raw: true}
-                )
-            );
-        }
-
         webpack(config, function (err, stats) {
 
             if (callingDone) {
@@ -80,7 +53,12 @@ function compilerTask(gulp, $, options) {
                 if (stats && stats.hasErrors()) {
                     callback(true);
                 } else {
-                    callback();
+                    var assets = stats.toJson().assets.filter(function (asset) {
+                        return asset.emitted === true;
+                    }).map(function (asset) {
+                        return asset.name;
+                    });
+                    callback(null, assets);
                 }
             }
         });
@@ -109,7 +87,7 @@ module.exports = function (gulp, $, options) {
             options.isWatching = true;
         }
 
-        webpackCompiler(function (err) {
+        webpackCompiler(function (err/*, assets*/) {
             if (err) {
                 notifier.emit('error', new Error('Compilation error!'));
             } else {
@@ -117,6 +95,8 @@ module.exports = function (gulp, $, options) {
                 browserSync.reload();
             }
 
+        }, {
+            watch: true
         });
     });
 };
diff --git a/build/gulp-tasks/test.js b/build/gulp-tasks/test.js
index 8f3c839..245c18d 100644
--- a/build/gulp-tasks/test.js
+++ b/build/gulp-tasks/test.js
@@ -28,9 +28,11 @@ module.exports = function (gulp, $, options) {
         }
 
         mocha.addFile(require.resolve('babel-polyfill'));
+        mocha.addFile(srcTestPath + '/setup.js');
 
         webpackConf = {
             debug: false,
+            devtool: false,
             context: srcTestPath,
             entry: {},
             output: {
@@ -71,7 +73,6 @@ module.exports = function (gulp, $, options) {
             }
             // Run the tests.
             runner = mocha.run(function (mochaErr) {
-                console.log(options.isWatching);
                 if (!options.isWatching) {
                     if (mochaErr) {
                         done(true);
diff --git a/package.json b/package.json
index b76a4fd..8f046e6 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "node": "~0.12.0"
   },
   "dependencies": {
-    "babel-polyfill": "6.2.0",
-    "babel-runtime": "6.2.0",
+    "babel-plugin-external-helpers-2": "6.3.13",
+    "babel-polyfill": "6.3.14",
     "modernizr": "3.2.0",
     "react": "0.14.3",
     "react-dom": "0.14.3",
@@ -27,17 +27,16 @@
   },
   "devDependencies": {
     "autoprefixer": "6.1.2",
-    "babel-core": "6.2.1",
+    "babel-core": "6.3.15",
     "babel-loader": "6.2.0",
-    "babel-plugin-transform-runtime": "6.1.18",
-    "babel-preset-es2015": "6.1.18",
-    "babel-preset-react": "6.1.18",
-    "browser-sync": "2.9.2",
+    "babel-preset-es2015-loose": "6.1.3",
+    "babel-preset-react": "6.3.13",
+    "browser-sync": "2.10.0",
     "customizr": "https://github.com/doctyper/customizr/tarball/develop",
     "datauri": "0.8.0",
-    "del": "2.1.0",
+    "del": "2.2.0",
     "expect": "1.13.0",
-    "ftps": "0.3.2",
+    "ftps": "0.4.0",
     "glob": "6.0.1",
     "gulp": "3.9.0",
     "gulp-bump": "1.0.0",
@@ -66,6 +65,7 @@
     "image-size": "0.4.0",
     "imports-loader": "0.6.5",
     "inquirer": "0.11.0",
+    "jsdom": "7.2.0",
     "lazypipe": "1.0.1",
     "lodash": "3.10.1",
     "lorem-ipsum": "1.0.3",
@@ -77,12 +77,14 @@
     "nunjucks-markdown": "1.1.0",
     "postcss-color-rgba-fallback": "2.0.0",
     "postcss-pseudoelements": "3.0.0",
+    "react-addons-test-utils": "0.14.3",
+    "redux-logger": "2.1.4",
     "rsyncwrapper": "0.4.3",
     "run-sequence": "1.1.5",
     "semver": "5.1.0",
     "ssh2": "0.4.12",
     "through2": "2.0.0",
     "webpack": "1.12.9",
-    "yargs": "3.30.0"
+    "yargs": "3.31.0"
   }
 }