Merge branch 'develop' of https://github.com/explosion/spaCy into develop

spacy/language.py

@@ -600,7 +600,7 @@ class Language(object):
         deserializers = OrderedDict((
             ('vocab', lambda p: self.vocab.from_disk(p)),
             ('tokenizer', lambda p: self.tokenizer.from_disk(p, vocab=False)),
-            ('meta.json', lambda p: p.open('w').write(json_dumps(self.meta)))
+            ('meta.json', lambda p: self.meta.update(ujson.load(p.open('r'))))
         ))
         for name, proc in self.pipeline:
             if name in disable:

website/api/_data.json

@@ -31,8 +31,7 @@
             "StringStore": "stringstore",
             "Vectors": "vectors",
             "GoldParse": "goldparse",
-            "GoldCorpus": "goldcorpus",
+            "GoldCorpus": "goldcorpus"
-            "Binder": "binder"
         }
     },
 
@@ -193,13 +192,6 @@
         "source": "spacy/gold.pyx"
     },
 
-    "binder": {
-        "title": "Binder",
-        "tag": "class",
-        "tag_new": 2,
-        "source": "spacy/tokens/binder.pyx"
-    },
-
     "vectors": {
         "title": "Vectors",
         "teaser": "Store, save and load word vectors.",

website/api/binder.jade

@@ -1,7 +0,0 @@
-//- 💫 DOCS > API > BINDER
-
-include ../_includes/_mixins
-
-p A container class for serializing collections of #[code Doc] objects.
-
-+under-construction

website/usage/_spacy-101/_architecture.jade

@@ -138,7 +138,3 @@ p
         +cell
             |  An annotated corpus, using the JSON file format. Manages
             |  annotations for tagging, dependency parsing and NER.
-
-    +row
-        +cell #[+api("binder") #[code Binder]]
-        +cell Container class for serializing collections of #[code Doc] objects.

website/usage/v2.jade

@@ -206,7 +206,7 @@ p
         |  e.g. #[code from spacy.lang.en import English].
 
     +infobox
-        |  #[+label-inline API:] #[+api("spacy#load") #[code spacy.load]], #[+api("binder") #[code Binder]]
+        |  #[+label-inline API:] #[+api("spacy#load") #[code spacy.load]]
         |  #[+label-inline Usage:] #[+a("/usage/saving-loading") Saving and loading]
 
     +h(3, "features-displacy") displaCy visualizer with Jupyter support
@@ -387,7 +387,11 @@ p
 
         +row
             +cell #[code Doc.read_bytes]
-            +cell #[+api("binder") #[code Binder]]
+            +cell
+                |  #[+api("doc#to_bytes") #[code Doc.to_bytes]]
+                |  #[+api("doc#from_bytes") #[code Doc.from_bytes]]
+                |  #[+api("doc#to_disk") #[code Doc.to_disk]]
+                |  #[+api("doc#from_disk") #[code Doc.from_disk]]
 
         +row
             +cell #[code Token.is_ancestor_of]