Add support for the chain methods every() and some().

Author: javadev

src/main/java/com/github/underscore/$.java

@@ -1664,21 +1664,11 @@ public <F> Chain<F> reduceRight(final FunctionAccum<F, T> func, final F zeroElem
         }
 
         public Chain<Optional<T>> find(final Predicate<T> pred) {
-            for (final T element : list) {
-                if (pred.apply(element)) {
-                    return new Chain<Optional<T>>(Optional.of(element));
-                }
-            }
-            return new Chain<Optional<T>>(Optional.<T>absent());
+            return new Chain<Optional<T>>($.find(list, pred));
         }
 
         public Chain<Optional<T>> findLast(final Predicate<T> pred) {
-            for (int index = list.size() - 1; index >= 0; index--) {
-                if (pred.apply(list.get(index))) {
-                    return new Chain<Optional<T>>(Optional.of(list.get(index)));
-                }
-            }
-            return new Chain<Optional<T>>(Optional.<T>absent());
+            return new Chain<Optional<T>>($.findLast(list, pred));
         }
 
         public Chain<Comparable> max() {
@@ -1738,6 +1728,14 @@ public Chain<T> tap(final Block<T> func) {
             return new Chain<T>(list);
         }
 
+        public Chain<Boolean> every(final Predicate<T> pred) {
+            return new Chain<Boolean>($.every(list, pred));
+        }
+
+        public Chain<Boolean> some(final Predicate<T> pred) {
+            return new Chain<Boolean>($.some(list, pred));
+        }
+
         public Chain<Boolean> contains(final T elem) {
             return new Chain<Boolean>($.contains(list, elem));
         }
@@ -1750,8 +1748,8 @@ public <F> Chain<F> uniq(final Function1<T, F> func) {
             return new Chain<F>($.newArrayList((Iterable<F>) $.uniq(list, func)));
         }
 
-        public <T> Chain<T> concat(final List<T> second) {
-            return new Chain<T>((List<T>) Arrays.asList($.concat(list.toArray(), second.toArray())));
+        public Chain<T> concat(final List<T> second) {
+            return new Chain<T>($.concat(list, second));
         }
 
         public <T> Chain<T> slice(final int start) {

src/test/java/com/github/underscore/CollectionsTest.java

@@ -459,6 +459,13 @@ public Boolean apply(Integer item) {
                 return item % 2 == 0;
             }
         });
+        final boolean result1chain = (Boolean) $.chain(asList(1, 2, 3, 4))
+            .every(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        }).item();
         final boolean result2 = $.every(asList(1, 2, 3, 4),
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
@@ -472,10 +479,19 @@ public Boolean apply(Integer item) {
                 return item < 5;
             }
         });
+        final boolean result2chain = (Boolean) $.chain(asList(1, 2, 3, 4))
+            .every(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item < 5;
+            }
+        }).item();
         assertFalse(result1);
         assertFalse(result1obj);
+        assertFalse(result1chain);
         assertTrue(result2);
         assertTrue(result2obj);
+        assertTrue(result2chain);
     }
 
 /*
@@ -573,6 +589,13 @@ public Boolean apply(Integer item) {
                 return item % 2 == 0;
             }
         });
+        final boolean result1chain = (Boolean) $.chain(asList(1, 2, 3, 4))
+            .some(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item % 2 == 0;
+            }
+        }).item();
         final boolean result2 = $.some(asList(1, 2, 3, 4),
             new Predicate<Integer>() {
             public Boolean apply(Integer item) {
@@ -586,10 +609,19 @@ public Boolean apply(Integer item) {
                 return item == 5;
             }
         });
+        final boolean result2chain = (Boolean) $.chain(asList(1, 2, 3, 4))
+            .some(
+            new Predicate<Integer>() {
+            public Boolean apply(Integer item) {
+                return item == 5;
+            }
+        }).item();
         assertTrue(result1);
         assertTrue(result1obj);
+        assertTrue(result1chain);
         assertFalse(result2);
         assertFalse(result2obj);
+        assertFalse(result2chain);
     }
 
 /*

src/test/java/com/github/underscore/FunctionsTest.java

@@ -113,7 +113,7 @@ public Void apply() {
                 assertEquals("incr was debounced", 1, counter[0]);
                 return null;
             }
-        }, 48);
+        }, 60);
         Thread.sleep(120);
     }