@@ -1,58 +1,58 @@

 {

-    "name": "routedux",

-    "contributors": [

-	{

-	    "name": "Maximilian Summe",

-	    "email": "msumme@gmail.com"

-	},

-	{

-	    "name": "Edward Langley",

-	    "email": "el-os@elangley.org"

-	}

-    ],

-    "main": "dist/index.js",

-    "version": "0.1.5",

-    "license": "MIT",

-    "dependencies": {

-	"ramda": "^0.24.1",

-	"redux": "^3.6.0"

-    },

-    "devDependencies": {

-	"babel-cli": "^6.24.1",

-	"babel-preset-flow": "^6.23.0",

-	"babel-preset-stage-3": "^6.24.1",

-	"enzyme": "^2.8.2",

-	"enzyme-to-json": "^1.5.1",

-	"flow": "^0.2.3",

-	"flow-bin": "^0.48.0",

-	"flow-typed": "^2.1.2",

-	"react": "^15.6.0",

-	"react-dom": "^15.6.0",

-	"react-scripts": "1.0.7",

-	"react-test-renderer": "^15.5.4"

-    },

-    "scripts": {

-	"start": "react-scripts start",

-	"build": "babel src -d dist",

-	"test": "react-scripts test --env=jsdom",

-	"eject": "react-scripts eject",

-	"flow": "flow"

+  "name": "routedux",

+  "contributors": [

+    {

+      "name": "Maximilian Summe",

+      "email": "msumme@gmail.com"

     },

-    "npmFileMap": [

-	{

-	    "basePath": "/dist/",

-	    "files": [

-		"*.js"

-	    ]

-	}

+    {

+      "name": "Edward Langley",

+      "email": "el-os@elangley.org"

+    }

+  ],

+  "main": "dist/index.js",

+  "version": "0.1.5",

+  "license": "MIT",

+  "dependencies": {

+    "ramda": "^0.24.1",

+    "redux": "^3.6.0"

+  },

+  "devDependencies": {

+    "babel-cli": "^6.24.1",

+    "babel-preset-flow": "^6.23.0",

+    "babel-preset-stage-3": "^6.24.1",

+    "enzyme": "^2.8.2",

+    "enzyme-to-json": "^1.5.1",

+    "flow": "^0.2.3",

+    "flow-bin": "^0.48.0",

+    "flow-typed": "^2.1.2",

+    "react": "^15.6.0",

+    "react-dom": "^15.6.0",

+    "react-scripts": "1.0.7",

+    "react-test-renderer": "^15.5.4"

+  },

+  "scripts": {

+    "start": "react-scripts start",

+    "build": "babel src -d dist",

+    "test": "react-scripts test --env=jsdom",

+    "eject": "react-scripts eject",

+    "flow": "flow"

+  },

+  "npmFileMap": [

+    {

+      "basePath": "/dist/",

+      "files": [

+        "*.js"

+      ]

+    }

+  ],

+  "babel": {

+    "plugins": [

+      "transform-react-jsx"

     ],

-    "babel": {

-	"plugins": [

-	    "transform-react-jsx"

-	],

-	"presets": [

-	    "env",

+    "presets": [

+      "env",

 	    "stage-3"

-	]

-    }

+	  ]

+  }

 }

@@ -12,7 +12,7 @@ function mostSpecificRouteMatch(match1, match2) {

   const paramLength1 = match1.routeParams.length;

   const paramLength2 = match2.routeParams.length;

-  let findWildcard = R.compose(R.findIndex.bind(R, isWildcard), pathSplit)

+  let findWildcard = R.compose(R.findIndex.bind(R, isWildcard), pathSplit);

   let result = (paramLength1 > paramLength2) ? match2 : match1;

@@ -44,10 +44,10 @@ function matchRoute(loc, matchers) {

     if (matchedParams) {

       if (matcherType === 'exact') {

-         return buildMatch(matchedParams, route)

-       } else {

-         return mostSpecificRouteMatch(match, buildMatch(matchedParams, route));

-       }

+        return buildMatch(matchedParams, route);

+      } else {

+        return mostSpecificRouteMatch(match, buildMatch(matchedParams, route));

+      }

     } else {

       return match;

     }

@@ -143,7 +143,7 @@ function makeRoute(path, action, extraParams) {

   const updateWildcard = (wildcards, match, input) => {

     const wildcardName = match.replace(':', '');

     return Object.assign(wildcards, {[wildcardName]: input});

-  }

+  };

   const routeMatcher = function (inputPath) {

     let result = null;

@@ -166,14 +166,14 @@ function makeRoute(path, action, extraParams) {

         }

         if(match === input) {

-          return acc

+          return acc;

         } else if (match[0] === ":") {

           return updateWildcard(acc, match, input);

         } else {

           return null;

         }

       };

-      result = R.zip(normMatchPath, normInputPath).reduce(f, {})

+      result = R.zip(normMatchPath, normInputPath).reduce(f, {});

     }

     return result;

@@ -191,7 +191,7 @@ function makeRoute(path, action, extraParams) {

       routeParams,

       extraParams

     }

-  }

+  };

 }

 function getRouteByPath(pattern, matchers) {

@@ -202,7 +202,7 @@ function normalizeWildcards(path) {

   let curIdx = 0;

   return path.map((el) => {

     if (isWildcard(el)) {

-      return `:wildcard${curIdx}`

+      return `:wildcard${curIdx}`;

     } else {

       return el;

     }

@@ -210,7 +210,7 @@ function normalizeWildcards(path) {

 }

 function routeAlreadyExists(compiledRouteMatchers, path) {

-  let result = compiledRouteMatchers.hasOwnProperty(path)

+  let result = compiledRouteMatchers.hasOwnProperty(path);

   if (!result) {

     const normalizingSplit = R.compose(normalizeWildcards, pathSplit);

@@ -219,7 +219,7 @@ function routeAlreadyExists(compiledRouteMatchers, path) {

     for (const otherPath of Object.keys(compiledRouteMatchers)) {

       const otherPathParts = normalizingSplit(otherPath);

       if (R.equals(pathParts, otherPathParts)) {

-        throw new Error(`invalid routing configuration — route ${path} overlaps with route ${otherPath}`)

+        throw new Error(`invalid routing configuration — route ${path} overlaps with route ${otherPath}`);

       }

     }

   }

@@ -252,8 +252,8 @@ function compileRoutes(routesConfig) {

   }

   return {

     compiledActionMatchers, // { ACTION: [Route] }

-    compiledRouteMatchers,  // { PATH: Route }

-  }

+    compiledRouteMatchers  // { PATH: Route }

+  };

 }

 ///////

@@ -270,7 +270,7 @@ function constructPath(match) {

     if (part[0] === ":") {

       const name = part.slice(1);

       const val = match.extractedParams.hasOwnProperty(name)

-        ? match.extractedParams[name] : match.extraParams[name];

+            ? match.extractedParams[name] : match.extraParams[name];

       resultParts.push(val);

     } else {

       resultParts.push(part);

@@ -294,7 +294,7 @@ function createActionDispatcher(routesConfig, window) {

         this.activateDispatcher(theStore);

         this.receiveLocation(window.location);

         return theStore;

-      }

+      };

     },

     handleEvent(ev) {

@@ -333,7 +333,7 @@ function createActionDispatcher(routesConfig, window) {

 function buildMiddleware(actionDispatcher) {

   return store => next => action => {

     if (actionDispatcher.handlesAction(action)) {

-        actionDispatcher.receiveAction(action, store);

+      actionDispatcher.receiveAction(action, store);

     }

     return next(action);

   };

@@ -32,7 +32,7 @@ export default function addChangeUrlEvent(window) {

       }

     };

-// / make sure we fire urlchanged for these

+    // / make sure we fire urlchanged for these

     wrapEvent(window, 'popstate', changeUrlEventCreator);

     wrapEvent(window, 'pushstate', changeUrlEventCreator);

     wrapEvent(window, 'replacestate', changeUrlEventCreator);

@@ -76,7 +76,7 @@ it("given event handler should generate a urlchange event only when url changes"

 });

 it("should only add url events 1x when addChangeUrlEvent is called on window more than 1x", () => {

-// given

+  // given

   const window = {

     location: {

       hash: '#hash',

@@ -120,4 +120,4 @@ it("should only add url events 1x when addChangeUrlEvent is called on window mor

     expect(map[event].length).toEqual(1);

   }

-});

\ No newline at end of file

+});

@@ -1,13 +1,11 @@

-

-

 export default function Fragment({state, filterOn, children}) {

-    let parts = filterOn.split('.');

-    let cur = parts.reduce((cur, next) => cur ? cur[next] : cur, state);

+  let parts = filterOn.split('.');

+  let cur = parts.reduce((cur, next) => cur ? cur[next] : cur, state);

-    if(cur) {

-        return children;

-    } else {

-        return null;

-    }

-}

\ No newline at end of file

+  if(cur) {

+    return children;

+  } else {

+    return null;

+  }

+}

@@ -5,14 +5,15 @@ import {shallow} from 'enzyme';

 it("should display when state is truthy", () => {

-

   // given

   const state = {property : true};

   // when

-  const wrapper = shallow(<Fragment state={state} filterOn="property">

+  const wrapper = shallow(

+    <Fragment state={state} filterOn="property">

       <div>Hello</div>

-  </Fragment>);

+    </Fragment>

+  );

   // then

   expect(ezJson(wrapper)).toMatchSnapshot();

@@ -23,9 +24,11 @@ it("should not display when state is falsy", () => {

   const state = {property : undefined};

   // when

-  const wrapper = shallow(<Fragment state={state} filterOn="property">

-    <div>Hello</div>

-  </Fragment>);

+  const wrapper = shallow(

+    <Fragment state={state} filterOn="property">

+      <div>Hello</div>

+    </Fragment>

+  );

   // then

   expect(ezJson(wrapper)).toEqual(null);

@@ -36,9 +39,11 @@ it("should handle paths in the state tree", () => {

   const state = {property : {subproperty: true}};

   // when

-  const wrapper = shallow(<Fragment state={state} filterOn="property.subproperty">

-    <div>Hello</div>

-  </Fragment>);

+  const wrapper = shallow(

+    <Fragment state={state} filterOn="property.subproperty">

+      <div>Hello</div>

+    </Fragment>

+  );

   // then

   expect(ezJson(wrapper)).toMatchSnapshot();

@@ -49,9 +54,11 @@ it("should handle arrays in the state tree", () => {

   const state = {property : [{bar: {}}]};

   // when

-  const wrapper = shallow(<Fragment state={state} filterOn="property.0.bar">

-    <div>Hello</div>

-  </Fragment>);

+  const wrapper = shallow(

+    <Fragment state={state} filterOn="property.0.bar">

+      <div>Hello</div>

+    </Fragment>

+  );

   // then

   expect(ezJson(wrapper)).toMatchSnapshot();

@@ -61,9 +68,11 @@ it("should be falsy if missing state tree", () => {

   // given

   const state = {property : {subproperty: true}};

-  const wrapper = shallow(<Fragment state={state} filterOn="property.missingproperty.something">

-    <div>Hello</div>

-  </Fragment>);

+  const wrapper = shallow(

+    <Fragment state={state} filterOn="property.missingproperty.something">

+      <div>Hello</div>

+    </Fragment>

+  );

   expect(ezJson(wrapper)).toEqual(null);