More tests and fixes for Slice

kennknowles · kennknowles · commit f5e6e398104f · 2013-03-22T13:41:19.000-04:00
diff --git a/jsonpath_rw/jsonpath.py b/jsonpath_rw/jsonpath.py
@@ -458,20 +458,20 @@ def __init__(self, start=None, end=None, step=None):
         self.end = end
         self.step = step
     
-    def find(self, data):
+    def find(self, datum):
+        datum = DatumInContext.wrap(datum)
+        
         # Here's the hack. If it is a dictionary or some kind of constant,
         # put it in a single-element list
-        if (isinstance(data, dict) or isinstance(data, six.integer_types) 
-                                   or isinstance(data, six.string_types)):
-
-            return self.find([data])
+        if (isinstance(datum.value, dict) or isinstance(datum.value, six.integer_types) or isinstance(datum.value, six.string_types)):
+            return self.find(DatumInContext([datum.value], path=datum.path, context=datum.context))
 
         # Some iterators do not support slicing but we can still
         # at least work for '*'
         if self.start == None and self.end == None and self.step == None:
-            return [DatumInContext(data[i], Index(i)) for i in xrange(0, len(data))]
+            return [DatumInContext(datum.value[i], path=Index(i), context=datum) for i in xrange(0, len(datum.value))]
         else:
-            return [DatumInContext(data[i], Index(i)) for i in range(0, len(data))[self.start:self.end:self.step]]
+            return [DatumInContext(datum.value[i], path=Index(i), context=datum) for i in range(0, len(datum.value))[self.start:self.end:self.step]]
 
     def __str__(self):
         if self.start == None and self.end == None and self.step == None:
@@ -481,5 +481,8 @@ def __str__(self):
                                    ':%d'%self.end if self.end else '',
                                    ':%d'%self.step if self.step else '')
 
+    def __repr__(self):
+        return '%s(start=%r,end=%r,step=%r)' % (self.__class__.__name__, self.start, self.end, self.step)
+
     def __eq__(self, other):
         return isinstance(other, Slice) and other.start == self.start and self.end == other.end and other.step == self.step
diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py
@@ -118,6 +118,14 @@ def test_slice_value(self):
                           ('[1:]', [1, 2, 3, 4], [2, 3, 4]),
                           ('[:2]', [1, 2, 3, 4], [1, 2])])
 
+        # Funky slice hacks
+        self.check_cases([
+            ('[*]', 1, [1]), # This is a funky hack
+            ('[0:]', 1, [1]), # This is a funky hack
+            ('[*]', {'foo':1}, [{'foo': 1}]), # This is a funky hack
+            ('[*].foo', {'foo':1}, [1]), # This is a funky hack
+        ])
+
     def test_child_value(self):
         self.check_cases([('foo.baz', {'foo': {'baz': 3}}, [3]),
                           ('foo.baz', {'foo': {'baz': [3]}}, [[3]]),
