Merge branch 'master' into opds_facets

core/facets.py

@@ -4,12 +4,10 @@ from regluit.core import cc
   
 class BaseFacet(object):
     facet_name = 'all'
-    outer_facet = None
-    model = get_model('core', 'Work')
     
     def __init__(self, outer_facet):
-        if outer_facet:
-            self.outer_facet = outer_facet
+        self.outer_facet = outer_facet if outer_facet else None
+        self.model = get_model('core', 'Work')
     
     def _get_query_set(self):
         if self.outer_facet:
@@ -87,8 +85,12 @@ class NamedFacet(BaseFacet):
         self.set_name() 
     
 class FormatFacetGroup(FacetGroup):
-    title = 'Format'
-    facets = ['pdf', 'epub', 'mobi']
+    
+    def __init__(self):
+        super(FacetGroup,self).__init__()
+        self.title = 'Format'
+        self.facets = ['pdf', 'epub', 'mobi']
+        
     
     def get_facet_class(self, facet_name):
         class FormatFacet(NamedFacet):
@@ -108,9 +110,13 @@ class FormatFacetGroup(FacetGroup):
         
         
 class LicenseFacetGroup(FacetGroup):
-    title = 'License'
-    licenses = cc.LICENSE_LIST_ALL
-    facets = cc.FACET_LIST    
+
+    def __init__(self):
+        super(FacetGroup,self).__init__()
+        self.title = 'License'
+        self.licenses = cc.LICENSE_LIST_ALL
+        self.facets = cc.FACET_LIST
+        
         
     def get_facet_class(self, facet_name):
         class LicenseFacet(NamedFacet):

core/tests.py

@@ -426,7 +426,7 @@ class SearchTests(TestCase):
         self.assertTrue(r.has_key('author'))
         self.assertTrue(r.has_key('description'))
         self.assertTrue(r.has_key('cover_image_thumbnail'))
-        self.assertTrue(r['cover_image_thumbnail'].startswith('https'))
+        self.assertTrue(r['cover_image_thumbnail'].startswith('https') or r['cover_image_thumbnail'].startswith('http'))
         self.assertTrue(r.has_key('publisher'))
         self.assertTrue(r.has_key('isbn_13'))
         self.assertTrue(r.has_key('googlebooks_id'))