rc/0.14.0

.travis.yml

@@ -24,6 +24,7 @@ deploy:
     secure: CGv5mHV8SFnFkdwpRl2EGRU5kvnl7xfxZPgl5DvqJHZ6xBreDpGFQOyQDVVqRAt7s9Dq/JD8qMCvm15rVRdXN9rKMDFV9ilPiR2dTBPs5rzE+upA/W2N2+pkQrnXEP+80EF3Wy3ODUAUb4aUlCwG1NqZCWnn4NzuZNCtAYEqwuk=
   app:
     master: lore-ci
+    demo: lore-demo
     release-candidate: lore-rc
     release: lore-release
   run:

RELEASE.rst

@@ -1,6 +1,28 @@
 Release Notes
 -------------
 
+Version 0.14.0
+==============
+
+- Moved spinner into separate React class.
+- Fixed double resource import bug.
+- Fixed preview link to use parent resource link if child has none.
+- Fixed Elasticsearch in docker-compose.
+- Implemented tracking import tasks.
+- Added parsing for ``display_name`` so we can use it if ``url_name`` isn't present.
+- Removed ``django-compressor-requirejs`` requirement.
+- Moved taxonomy React components to separate files.
+- Moved manage taxonomy tests into separate files.
+- Moved React components to separate files in new directories.
+- Moved tests into separate files.
+- Added tests to verify index on course delete.
+- Fixed intermittent test failures.
+- Added compressor cache.
+- Bound demo branch to lore-demo app deployment.
+- Sorted terms in taxonomy panel.
+- Renamed ``listing.js`` to JSX.
+- Added tasks API.
+
 Version 0.13.0
 ==============
 
@@ -9,7 +31,7 @@ Version 0.13.0
 - Added custom slugify function to allow any name for Repo, Vocab, Term.
 - Fixed index mapping of terms and vocabularies.
 - Set Elasticsearch log level higher during testing.
-- Set Spinner `zIndex` to 0 to not have it float above everything else.
+- Set Spinner ``zIndex`` to 0 to not have it float above everything else.
 - Added loader on save.
 - Removed unused functions.
 - Fixed link click behavior for term edit and delete.
@@ -78,8 +100,8 @@ Version 0.11.0
 Version 0.10.1
 ==============
 
-- Fixed exact repository search bug
-- Fixed clear export bug
+- Fixed exact repository search bug.
+- Fixed clear export bug.
 
 Version 0.10.0
 ==============

apiary.apib

@@ -89,6 +89,86 @@ Page numbering is 1-based. Omitting the `?page` parameter will return the first
             ]
         }
 
+## Group Tasks
+
+## Tasks Collection [/tasks/]
+
+### List All Tasks [GET]
+
+List all recent tasks for a user.
+
++ Response 200 (application/json)
+
+        {
+            "count": 1,
+            "next": null,
+            "previous": null,
+            "results": [
+                {
+                    "id": "45e3c830-0ff8-4d84-85b4-c0a6e3ce81b3",
+                    "status": "processing",
+                    "result": {
+                        "url": "/media/resource_exports/sarah_exports.tar.gz",
+                        "collision": false
+                    },
+                    "task_type": "resource_export",
+                    "task_info": {
+                        "repo_slug": "repo",
+                        "ids": [
+                            23517,
+                            23518
+                        ]
+                    }
+                }
+            ]
+        }
+
+### Create a New Task [POST]
+
+Queue a new task.
+
++ Request (application/json)
+
+        {
+            "task_info": {
+                "repo_slug": "repo",
+                "ids": [1]
+            },
+            "task_type": "resource_export"
+        }
+
++ Response 200 (application/json)
+
+        {
+            "id": "45e3c830-0ff8-4d84-85b4-c0a6e3ce81b3"
+        }
+
+## Task [/tasks/{task_id}/]
+
++ Parameters
+    + task_id: `45e3c830-0ff8-4d84-85b4-c0a6e3ce81b3` (string, required) - task identifier
+
+### Retrieve a Task [GET]
+
++ Response 200 (application/json)
+
+        {
+            "id": "45e3c830-0ff8-4d84-85b4-c0a6e3ce81b3",
+            "status": "processing",
+            "result": {
+                "url": "/media/resource_exports/sarah_exports.tar.gz",
+                "collision": false
+            },
+            "task_type": "resource_export",
+            "task_info": {
+                "repo_slug": "repo",
+                "ids": [
+                    23517,
+                    23518
+                ]
+            }
+        }
+
 ## Group Repositories
 
 ## Repository Collection [/repositories/]
@@ -477,6 +557,8 @@ Clears the export list for this repository.
 
 ## LearningResourceExportTasks Collection [/repositories/{repo_slug}/learning_resource_export_tasks/]
 
+Deprecated. Use /api/v1/tasks/ instead.
+
 + Parameters
     + repo_slug: `physics-1` (string, required) - slug for the repository
 
@@ -515,7 +597,9 @@ Queue a new LearningResourceExportTask task for the given LearningResource ids.
             "id": "45e3c830-0ff8-4d84-85b4-c0a6e3ce81b3"
         }
 
-## LearningResourceExportTask [/repositories/{repo_slug}/learning_resource_export_tasks/{task_id}/
+## LearningResourceExportTask [/repositories/{repo_slug}/learning_resource_export_tasks/{task_id}/]
+
+Deprecated. Use /api/v1/tasks/ instead.
 
 + Parameters
     + repo_slug: `physics-1` (string, required) - slug for the repository

docker-compose.yml

@@ -8,6 +8,7 @@ redis:
     - "6379"
 elastic:
   image: elasticsearch
+  command: elasticsearch -Des.network.host=0.0.0.0
   ports:
     - "9200"
 stats:

exporter/tasks.py

@@ -4,6 +4,8 @@
 
 from __future__ import unicode_literals
 
+from django.core.files.storage import default_storage
+
 from lore.celery import async
 from exporter.api import export_resources_to_tarball
 
@@ -18,8 +20,14 @@ def export_resources(learning_resources, username):
             LearningResources to export in tarball
         username (unicode): Name of user
     Returns:
-        (unicode, bool):
-            First item is newly created temp directory with files inside of it.
-            Second item is True if a static asset collision was detected.
+        dict:
+            name is path of tarball.
+            url is URL of tarball using django-storage.
+            collision is True if a static asset collision was detected.
     """
-    return export_resources_to_tarball(learning_resources, username)
+    name, collision = export_resources_to_tarball(learning_resources, username)
+    return {
+        "name": name,
+        "url": default_storage.url(name),
+        "collision": collision
+    }

exporter/tests/test_export.py

@@ -175,8 +175,10 @@ def test_export_task(self):
         """Test exporting resources task."""
         resources = LearningResource.objects.all()
 
-        path, collision = export_resources.delay(
+        result = export_resources.delay(
             resources, self.user.username).get()
+        path = result['name']
+        collision = result['collision']
         tempdir = mkdtemp()
 
         self.assertTrue(collision)

importer/api/__init__.py

@@ -144,6 +144,19 @@ def import_course(bundle, repo_id, user_id, static_dir):
     return course
 
 
+def is_leaf_tag(tag):
+    """
+    Should we look for resources within elements with this tag?
+
+    Args:
+        tag (unicode): Element tag
+    Returns:
+        bool: Whether tag is leaf tag
+    """
+    return tag in {'video', 'html', 'problem', 'discussion'}
+
+
+# pylint: disable=too-many-branches
 def import_children(course, element, parent, parent_dpath):
     """
     Create LearningResource instances for each element
@@ -166,12 +179,16 @@ def import_children(course, element, parent, parent_dpath):
         desc_path = MissingTitle.for_desc_path_field
     mpath = etree.ElementTree(element).getpath(element)
     dpath = join_description_paths(parent_dpath, desc_path)
+    url_name = element.attrib.get(
+        "url_name",
+        element.attrib.get("display_name", None)
+    )
     resource = create_resource(
         course=course, parent=parent, resource_type=element.tag,
         title=title,
         content_xml=etree.tostring(element),
         mpath=mpath,
-        url_name=element.attrib.get("url_name", None),
+        url_name=url_name,
         dpath=dpath,
     )
     # temp variable to store static assets for bulk insert
@@ -226,6 +243,10 @@ def import_children(course, element, parent, parent_dpath):
         ]
     )
 
-    for child in element.getchildren():
-        if child.tag in DESCRIPTOR_TAGS:
-            import_children(course, child, resource, dpath)
+    # Try to protect against bad data, specifically <problem><problem>...
+    # imports. The two tags will still appear in content_xml but there will
+    # be only one resource for the outer one.
+    if not is_leaf_tag(element.tag):
+        for child in element.getchildren():
+            if child.tag in DESCRIPTOR_TAGS:
+                import_children(course, child, resource, dpath)

importer/tests/test_forms.py

@@ -36,7 +36,7 @@ def test_init(self):
             {"course_file": self.get_upload_file(".zip")},
         )
         self.assertTrue(form.is_valid())
-        form.save(self.user.id, self.repo.id)
+        form.save(self.user.id, self.repo.id, self.client.session)
 
     def test_extensions(self):
         """Only certain extensions are valid."""