Merge branch 'master' into requires-io-master

.coveragerc

@@ -0,0 +1,5 @@
+[run]
+source =
+    iati_datastore
+omit =
+    */test/*

iati_datastore/iatilib/crawler.py

@@ -16,8 +16,8 @@
 
 log = logging.getLogger("crawler")
 
-CKAN_WEB_BASE = 'https://www.iatiregistry.org/dataset/%s'
-CKAN_API = 'https://www.iatiregistry.org'
+CKAN_WEB_BASE = 'https://iatiregistry.org/dataset/%s'
+CKAN_API = 'https://iatiregistry.org'
 
 registry = ckanapi.RemoteCKAN(CKAN_API)
 

iati_datastore/iatilib/frontend/api1.py

@@ -250,7 +250,7 @@ def get(self, format):
 
 
 class DataStoreCSVView(DataStoreView):
-    def get(self, format=".csv"):
+    def get(self, format):
         if format != ".csv":
             abort(404)
         return self.get_response()

iati_datastore/iatilib/frontend/dsfilter.py

@@ -80,9 +80,13 @@ def participating_org_role(role):
         )
 
     def sector(sector_code):
-        return Activity.sector_percentages.any(
+        return or_(Activity.sector_percentages.any(
             SectorPercentage.sector == sector_code
-        )
+        ), Activity.transactions.any(
+            Transaction.sector_percentages.any(
+                SectorPercentage.sector == sector_code
+            )
+        ))
 
     def sector_text(sector):
         return Activity.sector_percentages.any(

iati_datastore/iatilib/test/test_api.py

@@ -258,6 +258,15 @@ def test_invalid_format(self):
         resp = self.client.get(self.base_url + ".zzz")
         self.assertEquals(404, resp.status_code)
 
+    def test_junk_before_format(self):
+        url = self.base_url[:-4] + '-bad.csv'
+        resp = self.client.get(url)
+        self.assertEquals(404, resp.status_code)
+
+    def test_junk_in_format(self):
+        url = self.base_url[:-4] + '.bad-csv'
+        resp = self.client.get(url)
+        self.assertEquals(404, resp.status_code)
 
 class TestActivityView(ClientTestCase, ApiViewMixin):
     base_url = '/api/1/access/activity.csv'

iati_datastore/iatilib/test/test_filter.py

@@ -166,6 +166,29 @@ def test_by_sector(self):
         self.assertIn(act_in, activities.all())
         self.assertNotIn(act_not, activities.all())
 
+    def test_by_transaction_sector(self):
+        act_in = fac.ActivityFactory.create()
+        act_not = fac.ActivityFactory.create()
+        fac.TransactionFactory.create(
+            activity=act_in,
+            ref="12345",
+            sector_percentages=[
+                fac.SectorPercentageFactory.build(
+                    sector=cl.Sector.primary_education),
+            ])
+        fac.TransactionFactory.create(
+            activity=act_not,
+            ref="12345",
+            sector_percentages=[
+                fac.SectorPercentageFactory.build(
+                    sector=cl.Sector.secondary_education),
+            ])
+        activities = dsfilter.activities({
+            "sector": cl.Sector.from_string(u"11220")
+        })
+        self.assertIn(act_in, activities.all())
+        self.assertNotIn(act_not, activities.all())
+
     def test_by_sector_name(self):
         act_in = fac.ActivityFactory.create(
             sector_percentages=[