drop lodash

Darmody · Apr 1, 2016 · 64d6e91 · 64d6e91
1 parent 01107f8
commit 64d6e91
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 47 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -123,7 +123,6 @@
     "electron-cookies": "^1.1.0",
     "electron-json-storage": "^2.0.0",
     "humps": "^1.0.0",
-    "lodash": "^4.6.1",
     "lodash.sample": "^4.1.1",
     "material-design-icons-iconfont": "^2.0.4",
     "moment": "^2.12.0",

diff --git a/src/middlewares/apiMiddlewareHook.js b/src/middlewares/apiMiddlewareHook.js
@@ -1,10 +1,7 @@
 import { compose } from 'redux';
 import { CALL_API, isValidRSAA } from 'redux-api-middleware';
 import { decamelizeKeys } from 'humps';
-import _transform from 'lodash/transform';
-import _join from 'lodash/join';
-import _isPlainObject from 'lodash/isPlainObject';
-import _includes from 'lodash/includes';
+import _ from 'ramda';
 import {
   FETCH_REQUEST as CHANNEL_FETCH_REQUEST,
   BAN_REQUEST as CHANNEL_BAN_REQUEST,
@@ -31,24 +28,20 @@ const decamelizeBody = (action) => {
 };
 
 const serializeFormBody = (action) => {
-
   const callAPI = action[CALL_API];
   const { body, headers } = callAPI;
 
-  if (!body || headers['Content-Type'] !== 'application/x-www-form-urlencoded') {
-    return action;
-  }
-
-  /* eslint no-param-reassign: 0*/
-  const fieldsArray = _transform(body, (result, value, key) => {
-    result.push(`${key}=${encodeURIComponent(value)}`);
-  }, []);
+  if (!body || headers['Content-Type'] !== 'application/x-www-form-urlencoded') return action;
 
+  const parsedBody = _.compose(
+    _.join('&'), _.map(_.join('=')), _.toPairs,
+    _.mapObjIndexed((value) => encodeURIComponent(value))
+  )(body);
   return {
     ...action,
     [CALL_API]: {
       ...callAPI,
-      body: _join(fieldsArray, '&'),
+      body: parsedBody,
     }
   };
 };
@@ -57,7 +50,7 @@ const stringifyJsonBody = (action) => {
   const callAPI = action[CALL_API];
   const { body } = callAPI;
 
-  if (!body || !_isPlainObject(body)) return action;
+  if (!body || !_.is(Object, body)) return action;
 
   return {
     ...action,
@@ -72,7 +65,7 @@ const pendingRefuse = (action, store) => {
   if (!store) return action;
 
   const callAPI = action[CALL_API];
-  if (_includes([CHANNEL_FETCH_REQUEST, CHANNEL_BAN_REQUEST], callAPI.types[0])) {
+  if (_.contains(callAPI.types[0], [CHANNEL_FETCH_REQUEST, CHANNEL_BAN_REQUEST])) {
     if (store.getState().channel.loading) return { type: CHANNEL_REFUSE };
   }
   if (FAVORITE_BAN_REQUEST === callAPI.types[0]) {

diff --git a/src/reducers/__tests__/auth.spec.js b/src/reducers/__tests__/auth.spec.js
@@ -3,10 +3,9 @@ import { expect } from 'chai';
 import nock from 'nock';
 import { apiMiddleware } from 'redux-api-middleware';
 import thunk from 'redux-thunk';
+import _ from 'ramda';
 import apiMiddlewareHook from '../../middlewares/apiMiddlewareHook';
 import camelizeState from '../../middlewares/camelizeState';
-import _last from 'lodash/last';
-import _join from 'lodash/join';
 import {
   LOGIN_SUCCESS, LOGIN_FAILURE, LOGOUT, VERIFY_SUCCESS, VERIFY_FAILURE,
 } from '../../actionTypes/auth';
@@ -35,7 +34,7 @@ describe('Auth Actions', function actions() {
       'captcha_id=captchaId'
     ];
     nock('http://douban.fm/')
-      .post('/j/login', _join(params, '&'))
+      .post('/j/login', _.join('&', params))
       .reply(200, {
         user_info: {
           uid: 1,
@@ -49,9 +48,9 @@ describe('Auth Actions', function actions() {
       captchaSolution: 'captcha', captchaId: 'captchaId'
     }));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(LOGIN_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(LOGIN_SUCCESS);
       done();
-    }, 50);
+    }, 20);
   });
 
   it('LOGIN_FAILURE', function loginFailure(done) {
@@ -64,7 +63,7 @@ describe('Auth Actions', function actions() {
       'captcha_id=captchaId'
     ];
     nock('http://douban.fm/')
-      .post('/j/login', _join(params, '&'))
+      .post('/j/login', _.join('&', params))
       .reply(200, { err_msg: 'wrong_password' });
 
     const store = mockStore({ user: { id: 0 } });
@@ -88,7 +87,7 @@ describe('Auth Actions', function actions() {
     const store = mockStore({ user: { id: 0 } });
     store.dispatch(verify());
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(VERIFY_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(VERIFY_SUCCESS);
       done();
     }, 20);
   });

diff --git a/src/reducers/__tests__/captcha.spec.js b/src/reducers/__tests__/captcha.spec.js
@@ -3,9 +3,9 @@ import { expect } from 'chai';
 import nock from 'nock';
 import { apiMiddleware } from 'redux-api-middleware';
 import thunk from 'redux-thunk';
+import _ from 'ramda';
 import apiMiddlewareHook from '../../middlewares/apiMiddlewareHook';
 import camelizeState from '../../middlewares/camelizeState';
-import _last from 'lodash/last';
 import { FETCH_SUCCESS } from '../../actionTypes/captcha';
 import captcha, { fetch } from '../captcha';
 
@@ -27,7 +27,7 @@ describe('Captcha Actions', function actions() {
     const store = mockStore({ code: '' });
     store.dispatch(fetch());
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(FETCH_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(FETCH_SUCCESS);
       done();
     }, 20);
   });

diff --git a/src/reducers/__tests__/channel.spec.js b/src/reducers/__tests__/channel.spec.js
@@ -4,9 +4,9 @@ import nock from 'nock';
 import Immutable from 'seamless-immutable';
 import { apiMiddleware } from 'redux-api-middleware';
 import thunk from 'redux-thunk';
+import _ from 'ramda';
 import apiMiddlewareHook from '../../middlewares/apiMiddlewareHook';
 import camelizeState from '../../middlewares/camelizeState';
-import _last from 'lodash/last';
 import {
   FETCH_SUCCESS, FETCH_FAILURE, LIKE_SUCCESS, DISLIKE_SUCCESS,
   BAN_SUCCESS, BAN_FAILURE, PLAY, PAUSE, JUMP, REFUSE,
@@ -57,7 +57,7 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(fetch(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(FETCH_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(FETCH_SUCCESS);
       done();
     }, 20);
   });
@@ -90,7 +90,8 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(fetch(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(REFUSE);
+      console.log(store.getActions());
+      expect(_.last(store.getActions()).type).to.equal(REFUSE);
       done();
     }, 20);
   });
@@ -120,7 +121,7 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(like(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(LIKE_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(LIKE_SUCCESS);
       done();
     }, 20);
   });
@@ -150,7 +151,7 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(dislike(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(DISLIKE_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(DISLIKE_SUCCESS);
       done();
     }, 20);
   });
@@ -182,7 +183,7 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(ban(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(BAN_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(BAN_SUCCESS);
       done();
     }, 20);
   });
@@ -215,7 +216,7 @@ describe('Channel Actions', function actions() {
     });
     store.dispatch(ban(0, 0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(REFUSE);
+      expect(_.last(store.getActions()).type).to.equal(REFUSE);
       done();
     }, 20);
   });

diff --git a/src/reducers/__tests__/favorite.spec.js b/src/reducers/__tests__/favorite.spec.js
@@ -4,10 +4,9 @@ import nock from 'nock';
 import Immutable from 'seamless-immutable';
 import { apiMiddleware } from 'redux-api-middleware';
 import thunk from 'redux-thunk';
+import _ from 'ramda';
 import apiMiddlewareHook from '../../middlewares/apiMiddlewareHook';
 import camelizeState from '../../middlewares/camelizeState';
-import _last from 'lodash/last';
-import _join from 'lodash/join';
 import {
   FETCH_ALL_SUCCESS, LIKE_SUCCESS, DISLIKE_SUCCESS, BAN_SUCCESS, BAN_FAILURE, REFUSE,
   PLAY, PAUSE, NEXT, JUMP,
@@ -46,7 +45,7 @@ describe('Favorite Actions', function actions() {
         }]
       });
     nock('http://douban.fm')
-      .post('/j/v2/redheart/songs', _join(['bps=192', 'sids=1', 'ck='], '&'))
+      .post('/j/v2/redheart/songs', _.join('&', ['bps=192', 'sids=1', 'ck=']))
       .reply(200, [{
         sid: 1,
         title: '浮夸',
@@ -66,7 +65,7 @@ describe('Favorite Actions', function actions() {
     });
     store.dispatch(fetchAll());
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(FETCH_ALL_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(FETCH_ALL_SUCCESS);
       done();
     }, 20);
   });
@@ -96,7 +95,7 @@ describe('Favorite Actions', function actions() {
     });
     store.dispatch(like(0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(LIKE_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(LIKE_SUCCESS);
       done();
     }, 20);
   });
@@ -126,7 +125,7 @@ describe('Favorite Actions', function actions() {
     });
     store.dispatch(dislike(0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(DISLIKE_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(DISLIKE_SUCCESS);
       done();
     }, 20);
   });
@@ -158,7 +157,7 @@ describe('Favorite Actions', function actions() {
     });
     store.dispatch(ban(0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(BAN_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(BAN_SUCCESS);
       done();
     }, 20);
   });
@@ -191,7 +190,7 @@ describe('Favorite Actions', function actions() {
     });
     store.dispatch(ban(0));
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(REFUSE);
+      expect(_.last(store.getActions()).type).to.equal(REFUSE);
       done();
     }, 20);
   });

diff --git a/src/reducers/__tests__/updater.spec.js b/src/reducers/__tests__/updater.spec.js
@@ -4,9 +4,9 @@ import nock from 'nock';
 import Immutable from 'seamless-immutable';
 import { apiMiddleware } from 'redux-api-middleware';
 import thunk from 'redux-thunk';
+import _ from 'ramda';
 import apiMiddlewareHook from '../../middlewares/apiMiddlewareHook';
 import camelizeState from '../../middlewares/camelizeState';
-import _last from 'lodash/last';
 import { FETCH_SUCCESS } from '../../actionTypes/updater';
 import updater, { check } from '../updater';
 
@@ -32,7 +32,7 @@ describe('Updater Actions', function actions() {
     });
     store.dispatch(check());
     setTimeout(() => {
-      expect(_last(store.getActions()).type).to.equal(FETCH_SUCCESS);
+      expect(_.last(store.getActions()).type).to.equal(FETCH_SUCCESS);
       done();
     }, 20);
   });

diff --git a/src/utils/apiMiddleware.js b/src/utils/apiMiddleware.js
@@ -16,7 +16,10 @@ function fetch(actionTypes, channel, lastSongId = 0, type = 's') {
     sid: lastSongId,
     type,
   };
-  const queryString = _.compose(_.join('&'), _.map(_.join('=')), _.toPairs)(params);
+  const queryString = _.compose(
+    _.join('&'), _.map(_.join('=')), _.toPairs,
+    _.mapObjIndexed((value) => encodeURIComponent(value))
+  )(params);
 
   return dispatch => {
     dispatch({