Merge pull request #46 from launchdarkly/pk/features-stream-uri

fixed uri building to get features stream

Author: pkaeding

ldclient/client.py

@@ -130,7 +130,8 @@ def upsert(self, key, feature):
             self._lock.lock()
             f = self._features.get(key)
             if f is None or f['version'] < feature['version']:
-                self._features[key] = f
+                self._features[key] = feature
+                log.debug("Updated feature {} to version {}".format(key, feature['version']))
         finally:
             self._lock.unlock()
 

ldclient/requests.py

@@ -67,7 +67,7 @@ def run(self):
         log.debug("Starting stream processor")
         self._running = True
         hdrs = _stream_headers(self._api_key)
-        uri = self._config.stream_uri + "/"
+        uri = self._config.stream_uri + "/features"
         messages = SSEClient(uri, verify=self._config.verify, headers=hdrs)
         for msg in messages:
             if not self._running:
@@ -80,11 +80,13 @@ def stop(self):
     @staticmethod
     def process_message(store, msg):
         payload = json.loads(msg.data)
+        log.debug("Recieved stream event {}".format(msg.event))
         if msg.event == 'put':
             store.init(payload)
         elif msg.event == 'patch':
             key = payload['path'][1:]
             feature = payload['data']
+            log.debug("Updating feature {}".format(key))
             store.upsert(key, feature)
         elif msg.event == 'delete':
             key = payload['path'][1:]

ldclient/version.py

@@ -1 +1 @@
-VERSION = "0.20.2"
+VERSION = "0.20.3"

setup.py

@@ -40,7 +40,7 @@ def run(self):
 
 setup(
     name='ldclient-py',
-    version='0.20.2',
+    version='0.20.3',
     author='Catamorphic Co.',
     author_email='[email protected]',
     packages=['ldclient'],

testing/test_inmemoryfeaturestore.py

@@ -0,0 +1,82 @@
+from ldclient.client import InMemoryFeatureStore
+import pytest
+
+def make_feature(key, ver):
+  return {
+      u'key': key,
+      u'version': ver,
+      u'salt': u'abc',
+      u'on': True,
+      u'variations': [
+          {
+              u'value': True,
+              u'weight': 100,
+              u'targets': []
+          },
+          {
+              u'value': False,
+              u'weight': 0,
+              u'targets': []
+          }
+      ]
+  }
+
+def base_initialized_store():
+  store = InMemoryFeatureStore()
+  store.init({
+    'foo': make_feature('foo', 10),
+    'bar': make_feature('bar', 10),
+    })
+  return store
+
+def test_not_initially_initialized():
+  store = InMemoryFeatureStore()
+  assert store.initialized == False
+
+def test_initialized():
+  store = base_initialized_store()
+  assert store.initialized == True
+
+def test_get_existing_feature():
+  store = base_initialized_store()
+  expected = make_feature('foo', 10)
+  assert store.get('foo') == expected
+
+def test_get_nonexisting_feature():
+  store = base_initialized_store()
+  assert store.get('biz') is None
+
+def test_upsert_with_newer_version():
+  store = base_initialized_store()
+  new_ver = make_feature('foo', 11)
+  store.upsert('foo', new_ver)
+  assert store.get('foo') == new_ver
+
+def test_upsert_with_older_version():
+  store = base_initialized_store()
+  new_ver = make_feature('foo', 9)
+  expected = make_feature('foo', 10)
+  store.upsert('foo', new_ver)
+  assert store.get('foo') == expected
+
+def test_upsert_with_new_feature():
+  store = base_initialized_store()
+  new_ver = make_feature('biz', 1)
+  store.upsert('biz', new_ver)
+  assert store.get('biz') == new_ver
+
+def test_delete_with_newer_version():
+  store = base_initialized_store()
+  store.delete('foo', 11)
+  assert store.get('foo') is None
+
+def test_delete_unknown_feature():
+  store = base_initialized_store()
+  store.delete('biz', 11)
+  assert store.get('biz') is None
+
+def test_delete_with_older_version():
+  store = base_initialized_store()
+  store.delete('foo', 9)
+  expected = make_feature('foo', 10)
+  assert store.get('foo') == expected