Merge branch 'master' of https://github.com/graphql-python/graphene-mongo

� Conflicts:
�	examples/flask_mongoengine/app.py
�	graphene_mongo/converter.py
�	graphene_mongo/fields.py
�	graphene_mongo/tests/models.py
�	graphene_mongo/tests/nodes.py
�	graphene_mongo/tests/test_converter.py
�	graphene_mongo/tests/test_relay_query.py

Author: Arun S Kumar

.gitignore

@@ -6,6 +6,7 @@ _build/
 build/
 dist/
 graphene_mongo.egg-info/
+htmlcov/
 *.pyc
 *.swo
 *.swp

.travis.yml

@@ -4,6 +4,7 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
+    - "3.8"
 install:
     pip install -r requirements.txt
 script: make test

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018-Present Abaw Chen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

MANIFEST.in

@@ -0,0 +1,4 @@
+global-exclude *.py[cod]
+recursive-exclude examples *
+recursive-exclude graphene-mongo/tests *
+include README.md LICENSE

Makefile

@@ -14,7 +14,7 @@ lint:
 	@flake8 graphene_mongo
 
 test: clean lint
-	py.test --cov=graphene_mongo
+	py.test graphene_mongo/tests --cov=graphene_mongo --cov-report=html --cov-report=term
 
 register-pypitest:
 	python setup.py register -r pypitest

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/graphql-python/graphene-mongo.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-mongo) [![Coverage Status](https://coveralls.io/repos/github/graphql-python/graphene-mongo/badge.svg?branch=master)](https://coveralls.io/github/graphql-python/graphene-mongo?branch=master) [![Documentation Status](https://readthedocs.org/projects/graphene-mongo/badge/?version=latest)](http://graphene-mongo.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/graphene-mongo.svg)](https://badge.fury.io/py/graphene-mongo) [![PyPI pyversions](https://img.shields.io/pypi/pyversions/graphene-mongo.svg)](https://pypi.python.org/pypi/graphene-mongo/)
+[![Build Status](https://travis-ci.org/graphql-python/graphene-mongo.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-mongo) [![Coverage Status](https://coveralls.io/repos/github/graphql-python/graphene-mongo/badge.svg?branch=master)](https://coveralls.io/github/graphql-python/graphene-mongo?branch=master) [![Documentation Status](https://readthedocs.org/projects/graphene-mongo/badge/?version=latest)](http://graphene-mongo.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/graphene-mongo.svg)](https://badge.fury.io/py/graphene-mongo) [![PyPI pyversions](https://img.shields.io/pypi/pyversions/graphene-mongo.svg)](https://pypi.python.org/pypi/graphene-mongo/) [![Downloads](https://pepy.tech/badge/graphene-mongo)](https://pepy.tech/project/graphene-mongo)
 
 # Graphene-Mongo
 
@@ -7,7 +7,7 @@ A [Mongoengine](https://mongoengine-odm.readthedocs.io/) integration for [Graphe
 
 ## Installation
 
-For instaling graphene-mongo, just run this command in your shell
+For installing graphene-mongo, just run this command in your shell
 
 ```
 pip install graphene-mongo
@@ -65,20 +65,10 @@ result = schema.execute(query)
 
 To learn more check out the following [examples](examples/):
 
-* **Full example**: [Flask MongoEngine example](examples/flask_mongoengine)
+* [Flask MongoEngine example](examples/flask_mongoengine)
+* [Django MongoEngine example](examples/django_mongoengine)
+* [Falcon MongoEngine example](examples/falcon_mongoengine)
 
-## TODOs
-
-- [ ] Examples
-    - [x] Flask example
-    - [ ] Django example
-- [x] Filtering & Paging
-    - [x] Default filtering enabled with all model's attributes by equal comparison (requester: [git-albertomarin](https://github.com/git-albertomarin))
-    - [x] Take first, or last n items (credit: [alexpantyukhin](https://github.com/alexpantyukhin))
-    - [x] Filter by global id (requester: [bwalsh](https://github.com/bwalsh))
-    - [x] Filter by reference model id (requester: [msholty-fd](https://github.com/msholty-fd))
-- [ ] Support more types ([Currently supported](http://graphene-mongo.readthedocs.io/en/latest/fields.html#))
-    - [x] Self-reference and list-of-self-reference relationship (requester: [mehdiym](https://github.com/mehdiym))
 
 ## Contributing
 

README.rst

@@ -15,7 +15,7 @@ A `Mongoengine <https://mongoengine-odm.readthedocs.io/>`__ integration for `Gra
 Installation
 ------------
 
-For instaling graphene-mongo, just run this command in your shell
+For installing graphene-mongo, just run this command in your shell
 
 .. code:: bash
 

docs/conf.py

@@ -1,6 +1,6 @@
 import os
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 # -*- coding: utf-8 -*-
 #
@@ -34,46 +34,44 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
 ]
 if not on_rtd:
-    extensions += [
-        'sphinx.ext.githubpages',
-    ]
+    extensions += ["sphinx.ext.githubpages"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 #
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'Graphene Mongo'
-copyright = u'Graphene 2018'
-author = u'Abaw Chen'
+project = u"Graphene Mongo"
+copyright = u"Graphene 2018"
+author = u"Abaw Chen"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1'
+version = u"0.1"
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.2'
+release = u"0.1.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -94,7 +92,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -116,7 +114,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -175,7 +173,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -255,34 +253,30 @@
 # html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Graphenedoc'
+htmlhelp_basename = "Graphenedoc"
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
-
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
-
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
-
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'Graphene.tex', u'Graphene Documentation',
-     u'Syrus Akbary', 'manual'),
+    (master_doc, "Graphene.tex", u"Graphene Documentation", u"Syrus Akbary", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -323,8 +317,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'graphene_django', u'Graphene Django Documentation',
-     [author], 1)
+    (master_doc, "graphene_django", u"Graphene Django Documentation", [author], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -338,9 +331,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Graphene-Django', u'Graphene Django Documentation',
-     author, 'Graphene Django', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "Graphene-Django",
+        u"Graphene Django Documentation",
+        author,
+        "Graphene Django",
+        "One line description of project.",
+        "Miscellaneous",
+    )
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -414,7 +413,7 @@
 # epub_post_files = []
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 # The depth of the table of contents in toc.ncx.
 #
@@ -446,5 +445,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
-
+intersphinx_mapping = {"https://docs.python.org/": None}

docs/fields.rst

@@ -11,11 +11,20 @@ Mongoengine Fields
 - EmailField
 - EmbeddedDocumentField
 - EmbeddedDocumentListField
+- FileField
 - FloatField
-- IntegerField
+- GenericReferenceField
+- IntField
+- LazyReferenceField
 - ListField
+- LongField
+- MapField
+- MultiPolygonField
 - ObjectIdField
 - ReferenceField
+- PointField
+- PolygonField
+- SequenceField
 - StringField
 - URLField
 - UUIDField

docs/tutorial.rst

@@ -64,7 +64,7 @@ Let's get start with following models:
 Schema
 ------
 
-Here I assume you guys have the basic knowledage of how schema works in GraphQL, that I define the *root type*  as the `Query` class below with the ability to list all employees.
+Here I assume you guys have the basic knowledge of how schema works in GraphQL, that I define the *root type*  as the `Query` class below with the ability to list all employees.
 
 .. code:: python