modded combox.file.node_path function.

It has a third argument (boolean) which tells whether `cb_path' (the
first argument) is a file or not.

Updated the test for node_path function + code wherever node_path was used.

	modified:   combox/events.py
	modified:   combox/file.py
	modified:   tests/file_test.py

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/file_test.py b/tests/file_test.py
index 0e19e60..8065ff7 100644
--- a/tests/file_test.py
+++ b/tests/file_test.py
@@ -145,14 +145,16 @@ class TestFile(object):
                                               test_file_shard_0)
 
         assert test_file_shard_0_abspath == node_path(self.TEST_FILE,
-                                                      self.config)
+                                                      self.config,
+                                                      isfile=True)
 
 
         foo_dir = path.join(self.config['combox_dir'], 'foo')
         foo_nodedir = path.join(get_nodedirs(self.config)[0],
                                 'foo')
 
-        assert foo_nodedir == node_path(foo_dir, self.config)
+        assert foo_nodedir == node_path(foo_dir, self.config,
+                                        isfile=False)
 
 
     def test_rmpath(self):