Merge pull request #4158 from gratipay/npm-sync-bugs

Fix npm sync bug with empty descriptions

.travis.yml

@@ -9,15 +9,13 @@ before_install:
  - pwd
 
  # Sometimes ya just halfta ...
- - test -d yajl || git clone https://github.com/lloyd/yajl.git && cd yajl && git checkout 2.1.0
- - test -f Makefile || ./configure && sudo make install && cd ..
+ - git clone https://github.com/lloyd/yajl.git && cd yajl && git checkout 2.1.0 && ./configure && sudo make install && cd ..
 
  - npm install -g marky-markdown
 cache:
   directories:
     - env/bin
     - env/lib/python2.7/site-packages
-    - yajl
 install:
  - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rf env; fi
  - touch requirements.txt package.json

gratipay/package_managers/sync.py

@@ -6,11 +6,13 @@
 import csv
 import sys
 import time
+import uuid
 
 import ijson.backends.yajl2_cffi as ijson
 
 
 log = lambda *a: print(*a, file=sys.stderr)
+NULL = uuid.uuid4().hex
 
 
 def arrayize(seq):
@@ -98,7 +100,7 @@ def upsert(args):
         # http://tapoueh.org/blog/2013/03/15-batch-update.html
         cursor.run("CREATE TEMP TABLE updates (LIKE packages INCLUDING ALL) ON COMMIT DROP")
         cursor.copy_expert('COPY updates (package_manager, name, description, emails) '
-                           'FROM STDIN WITH (FORMAT csv)', fp)
+                           "FROM STDIN WITH (FORMAT csv, NULL '%s')" % NULL, fp)
         cursor.run("""
 
             WITH updated AS (

tests/py/test_npm_sync.py

@@ -1,4 +1,4 @@
-"""Tests for syncing npm. Requires a `pip install ijson`, which requires yajl.
+"""Tests for syncing npm. Requires a `pip install ijson`, which requires yajl. Good luck! :^)
 """
 from __future__ import absolute_import, division, print_function, unicode_literals
 
@@ -21,6 +21,7 @@ class Tests(Harness):
     def test_packages_starts_empty(self):
         assert self.db.all('select * from packages') == []
 
+
     # sn - sync-npm
 
     def test_sn_inserts_packages(self):
@@ -61,3 +62,21 @@ def test_sn_handles_quoting(self):
         assert package.name == r'testi\"ng-pa\"ckage'
         assert package.description == 'A package for "testing"'
         assert package.emails == ['alice@"example".com', r'\\"bob\\"@example.com']
+
+
+    def test_sn_handles_empty_description_and_emails(self):
+        load(br'''
+        { "_updated": 1234567890
+        , "empty-description":
+            { "name":"empty-description"
+            , "description":""
+            , "time":{"modified":"2015-09-12T03:03:03.135Z"}
+             }
+         }
+        ''')
+
+        package = self.db.one('select * from packages')
+        assert package.package_manager == 'npm'
+        assert package.name == 'empty-description'
+        assert package.description == ''
+        assert package.emails == []