Merge pull request #3 from real-easypy/collection-methods

Collection methods

Author: koreno

.travis.yml

@@ -4,6 +4,7 @@ python:
 - '3.7'
 - '3.6'
 - '3.5'
+- 3.9-dev
 - 3.8-dev
 - 3.7-dev
 - 3.6-dev
@@ -23,10 +24,12 @@ notifications:
   email:
     on_success: change
     on_failure: change
+if: branch != master
 jobs:
   include:
     - stage: deploy
       python: 3.8
+      if: branch = master
       deploy:
         provider: pypi
         user: __token__

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.3] - 2020-04-28
+
+### Added
+- collections: make `separate`, `grouped`, `chunkify` and `takesome` methods of the ObjectCollection classes
+
+### Fixed
+- support for gevent 1.5
+
 ## [0.4.2] - 2020-04-28
 
 ### Added

easypy/collections.py

@@ -444,6 +444,11 @@ def __add__(self, collection):
         return AggregateCollection([self, collection])
 
 
+def ObjectCollectionBaseMethod(func):
+    setattr(ObjectCollectionBase, func.__name__, func)
+    return func
+
+
 class AggregateCollection(ObjectCollectionBase):
     """
     Dynamically aggregate other collections into one chained collection
@@ -790,6 +795,7 @@ def iter_filtered(self, *preds, **filters):
         return filtered(objects, preds, filters)
 
 
+@ObjectCollectionBaseMethod
 def grouped(sequence, key=None, transform=None):
     """
     Parse the sequence into groups, according to key:
@@ -812,6 +818,7 @@ def grouped(sequence, key=None, transform=None):
     return groups
 
 
+@ObjectCollectionBaseMethod
 def separate(sequence, key=None):
     """
     Partition the sequence into items that match and items that don't:
@@ -860,6 +867,7 @@ def listify(obj):
     return list(ilistify(obj))
 
 
+@ObjectCollectionBaseMethod
 def chunkify(sequence, size):
     """
     Chunk a sequence into equal-size chunks (except for the last chunk):
@@ -984,6 +992,7 @@ def inner(*args, **kwargs):
     return inner
 
 
+@ObjectCollectionBaseMethod
 def takesome(generator, max=None, min=0):
     """
     Take between ``min`` and ``max`` items from the generator.
@@ -1007,19 +1016,22 @@ def takesome(generator, max=None, min=0):
     if max is not None and max < min:
         raise ValueError("'max' must be great than 'min'")
 
-    items = [p for p, _ in zip(generator, range(min))]
+    generator = iter(generator)  # just in case it ain't a generator
+
+    min_items = [p for _, p in zip(range(min), generator)]
 
-    if len(items) < min:
-        raise ValueError("Not enough items in sequence (wanted {}, got {})".format(min, len(items)))
+    if len(min_items) < min:
+        raise ValueError("Not enough items in sequence (wanted {}, got {})".format(min, len(min_items)))
 
-    yield from items
+    yield from min_items
 
     if max is None:
+        # yield the rest
         yield from generator
         return
 
     remain = max - min
-    for p, _ in zip(generator, range(remain)):
+    for _, p in zip(range(remain), generator):
         yield p