wip: starts upgrading lodash to v3

common/script/count.js

@@ -11,7 +11,7 @@ function beastMasterProgress(pets) {
   _(DROP_ANIMALS).each(function(animal) {
     if(pets[animal] > 0 || pets[animal] == -1)
       count++
-  });
+  }).value();
 
   return count;
 }
@@ -22,7 +22,7 @@ function dropPetsCurrentlyOwned(pets) {
   _(DROP_ANIMALS).each(function(animal) {
     if(pets[animal] > 0)
       count++
-  });
+  }).value();
 
   return count;
 }
@@ -32,7 +32,7 @@ function mountMasterProgress(mounts) {
   _(DROP_ANIMALS).each(function(animal) {
     if (mounts[animal])
       count++
-  });
+  }).value();
 
   return count;
 }

common/script/src/content/helpers.js

@@ -1,6 +1,4 @@
-import {each, defaults, assign} from 'lodash';
+import {each, defaults, assign, capitalize, camelCase} from 'lodash';
-import capitalize from 'lodash.capitalize';
-import camelCase from 'lodash.camelcase';
 
 import i18n from '../i18n';
 

package.json

@@ -51,9 +51,7 @@
     "in-app-purchase": "^0.2.0",
     "jade": "~1.11.0",
     "js2xmlparser": "~0.1.2",
-    "lodash": "~2.4.1",
+    "lodash": "^3.10.1",
-    "lodash.camelcase": "^3.0.1",
-    "lodash.capitalize": "^3.0.0",
     "loggly": "~1.0.8",
     "marked": "^0.3.5",
     "merge-stream": "^1.0.0",

tasks/gulp-transifex-test.js

@@ -89,7 +89,7 @@ gulp.task('transifex:malformedStrings', () => {
         }
       });
     });
-  });
+  }).value();
 
   if (!_.isEmpty(stringsWithMalformedInterpolations)) {
     let message = 'The following strings have malformed or missing interpolations';
@@ -128,7 +128,7 @@ function eachTranslationFile(languages, cb) {
 
       cb(null, lang, filename, parsedEnglishFile, parsedTranslationFile)
     });
-  });
+  }).value();
 }
 
 function eachTranslationString(languages, cb) {
@@ -162,7 +162,7 @@ function getStringsWith(json, interpolationRegex) {
       var match = value.match(interpolationRegex);
       if(match) strings[file_name][key] = match;
     });
-  });
+  }).value();
 
   return strings;
 }

test/api-legacy/coupons.coffee

@@ -41,6 +41,7 @@ describe "Coupons", ->
               expect(coupons.length).to.equal 10
               _(coupons).each (c)->
                 expect(c.event).to.equal 'wondercon'
+              .value()
               done()
 
     context "while regular user", ->
@@ -73,7 +74,9 @@ describe "Coupons", ->
             codes = res.text
             expect(codes).to.contain('code')
             # Expect each coupon code _id to exist in response
-            _(coupons).each (c) -> expect(codes).to.contain(c._id)
+            _(coupons).each (c) -> 
+              expect(codes).to.contain(c._id)
+            .value()
 
             done()
 
@@ -89,9 +92,13 @@ describe "Coupons", ->
             secondHalf = sortedCoupons[5..9]
 
             # First five coupons should be present in codes
-            _(firstHalf).each (c) -> expect(codes).to.contain(c._id)
+            _(firstHalf).each (c) -> 
+              expect(codes).to.contain(c._id)
+            .value()
             # Second five coupons should not be present in codes
-            _(secondHalf).each (c) -> expect(codes).to.not.contain(c._id)
+            _(secondHalf).each (c) -> 
+              expect(codes).to.not.contain(c._id)
+            .value()
             done()
 
       it "gets last 5 coupons out of 10 when a limit of 5 is set", (done) ->
@@ -106,9 +113,13 @@ describe "Coupons", ->
             secondHalf = sortedCoupons[5..9]
 
             # First five coupons should not be present in codes
-            _(firstHalf).each (c) -> expect(codes).to.not.contain(c._id)
+            _(firstHalf).each (c) -> 
+              expect(codes).to.not.contain(c._id)
+            .value()
             # Second five coupons should be present in codes
-            _(secondHalf).each (c) -> expect(codes).to.contain(c._id)
+            _(secondHalf).each (c) -> 
+              expect(codes).to.contain(c._id)
+            .value()
             done()
 
     context "while regular user", ->
@@ -142,6 +153,7 @@ describe "Coupons", ->
           expect(gear[i]).to.exist
         else
           expect(gear[i]).to.not.exist
+      .value()
 
     beforeEach (done) ->
       registerNewUser ->

test/common/user.fns.buy.test.js

@@ -134,8 +134,8 @@ describe('user.fns.buy', function() {
       _(shared.content.gear.tree[type].armoire).each(function(gearObject, gearName) {
         var armoireKey = gearObject.key;
         fullArmoire[armoireKey] = true;
-      });
+      }).value();
-    });
+    }).value();
 
     beforeEach(function() {
       user.achievements.ultimateGearSets = { rogue: true };

website/public/js/controllers/challengesCtrl.js

@@ -81,7 +81,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
 
       _(clonedTasks).each(function(val, type) {
         challenge[type + 's'].forEach(_cloneTaskAndPush);
-      });
+      }).value();
 
       $scope.obj = $scope.newChallenge = new Challenges.Challenge({
         name: challenge.name,

website/public/js/services/guideServices.js

@@ -209,7 +209,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
         }
         User.set(ups);
       }
-    })
+    }).value();
   });
 
   var tour = {};

website/public/js/services/statServices.js

@@ -48,7 +48,7 @@
 
           total += equipmentStat;
         }
-      });
+      }).value();
 
       return total;
     }

website/public/js/services/taskServices.js

@@ -36,7 +36,7 @@
       _(cleansedTask.checklist).forEach(function(item) {
         item.completed = false;
         item.id = Shared.uuid();
-      });
+      }).value();
 
       if (cleansedTask.type !== 'reward') {
         delete cleansedTask.value;

website/src/controllers/payments/index.js

@@ -60,7 +60,7 @@ exports.createSubscription = function(data, cb) {
     }).defaults({ // allow non-override if a plan was previously used
       dateCreated: new Date(),
       mysteryItems: []
-    });
+    }).value();
   }
 
   // Block sub perks

website/src/libs/analytics.js

@@ -60,7 +60,7 @@ function _generateLabelForGoogleAnalytics(data) {
       label = data[key];
       return false; // exit _.each early
     }
-  });
+  }).value();
 
   return label;
 }
@@ -74,7 +74,7 @@ function _generateValueForGoogleAnalytics(data) {
       value = data[key];
       return false; // exit _.each early
     }
-  });
+  }).value();
 
   return value;
 }

website/views/options/profile.jade

@@ -4,7 +4,7 @@ mixin gemCost(cost)
     = ' ' + env.t('locked')
     block
 
--var gearGroup = function(grouping) { return env._(env.Content.gear.flat).where({gearSet:grouping}).pluck('key') }
+-var gearGroup = function(grouping) { return env._(env.Content.gear.flat).where({gearSet:grouping}).pluck('key').value() }
 -var showPath = function(path, items, joiner) { return path+'["'+items.join('"] '+joiner+' '+path+'["')+'"]'; }
 -var unlockPath = function(path, items) { return 'unlock("'+path+'.'+items.join(','+path+'.')+'")'; }