Merge branch 'wardi-2581-fix-lazyjson'

ckan/lib/lazyjson.py

@@ -28,7 +28,7 @@ def method(self, *args, **kwargs):
         return getattr(self._loads(), name)(*args, **kwargs)
     return method
 
-for fn in ['__cmp__', '__contains__', '__delitem__', '__eq__', '__ge__',
+for fn in ['__contains__', '__delitem__', '__eq__', '__ge__',
            '__getitem__', '__gt__', '__iter__', '__le__', '__len__', '__lt__',
            '__ne__', '__setitem__', 'clear', 'copy', 'fromkeys', 'get',
            'has_key', 'items', 'iteritems', 'iterkeys', 'itervalues', 'keys',
@@ -47,9 +47,13 @@ class JSONString(int):
     subclassing JSONEncoder and modifying its internal workings, or
     monkeypatching the simplejson library.
     '''
-    def __init__(self, s):
-        self.s = s
-        super(JSONString, self).__init__(-1)
+    def __new__(cls, s):
+        obj = super(JSONString, cls).__new__(cls, -1)
+        obj.s = s
+        return obj
 
     def __str__(self):
-        return s
+        return self.s
+
+    def __repr__(self):
+        return "JSONString(%r)" % self.s

ckan/logic/action/get.py

@@ -1080,9 +1080,9 @@ def package_show(context, data_dict):
     for item in plugins.PluginImplementations(plugins.IPackageController):
         item.read(pkg)
 
-    for resource_dict in package_dict['resources']:
-        for item in plugins.PluginImplementations(plugins.IResourceController):
-            resource_dict = item.before_show(resource_dict)
+    for item in plugins.PluginImplementations(plugins.IResourceController):
+        for resource_dict in package_dict['resources']:
+            item.before_show(resource_dict)
 
     if not package_dict_validated:
         package_plugin = lib_plugins.lookup_package_plugin(

ckan/tests/logic/action/test_get.py

@@ -36,6 +36,17 @@ def foo(key, data, errors, context):
 
         eq(dataset2['new_field'], 'foo')
 
+    def test_package_show_is_lazy(self):
+        dataset1 = factories.Dataset()
+
+        dataset2 = helpers.call_action(
+            'package_show',
+            id=dataset1['id'],
+            context=dict(return_type='LazyJSONObject'))
+
+        # LazyJSONObject passed through without being expanded
+        assert dataset2._json_dict is None
+
 
 class TestGroupList(helpers.FunctionalTestBase):