Merge pull request #35 from melbourne2991/master

Fixed  _.min and _.max behavior

2 files changed, 12 insertions, 7 deletions

diff --git a/moses.lua b/moses.lua
index f3d484a..9254c92 100644
--- a/moses.lua
+++ b/moses.lua
@@ -36,13 +36,18 @@ local function count(t)  -- raw count of items in an map-table
 end
 
 local function extract(list,comp,transform,...) -- extracts value from a list
-  local _ans
+  local _ans, prev, curr
   local transform = transform or _.identity
-  for index,value in pairs(list) do
-    if not _ans then _ans = transform(value,...)
+  for index, value in pairs(list) do
+    if not _ans then 
+      _ans = value
+      prev = transform(value,...)
     else
-      local value = transform(value,...)
-      _ans = comp(_ans,value) and _ans or value
+      curr = transform(value,...)
+      if comp(curr, prev) then
+        _ans = value
+        prev = curr
+      end
     end
   end
   return _ans
diff --git a/spec/table_spec.lua b/spec/table_spec.lua
index 209969a..8224387 100644
--- a/spec/table_spec.lua
+++ b/spec/table_spec.lua
@@ -442,7 +442,7 @@ context('Table functions specs', function()
         {name = 'John', age = 23},{name = 'Peter', age = 17},
         {name = 'Steve', age = 15},{age = 33}}        
       assert_equal(_.max(_.pluck(peoples,'age')),33)
-      assert_equal(_.max(peoples,function(people) return people.age end),33)        
+      assert_equal(_.max(peoples,function(people) return people.age end),peoples[4])        
     end)
     
     test('directly compares items when given no iterator', function()
@@ -458,7 +458,7 @@ context('Table functions specs', function()
         {name = 'John', age = 23},{name = 'Peter', age = 17},
         {name = 'Steve', age = 15},{age = 33}}        
       assert_equal(_.min(_.pluck(peoples,'age')),15)
-      assert_equal(_.min(peoples,function(people) return people.age end),15)        
+      assert_equal(_.min(peoples,function(people) return people.age end),peoples[3])        
     end)
     
     test('directly compares items when given no iterator', function()