Change the priority of spider-enabling settings (#84)

Author: Verz1Lka

scrapy_crawlera/middleware.py

@@ -139,10 +139,8 @@ def is_enabled(self, spider):
                           'use CRAWLERA_ENABLED instead.',
                           category=ScrapyDeprecationWarning, stacklevel=1)
         return (
-            getattr(spider, 'crawlera_enabled', False) or
-            getattr(spider, 'use_hubproxy', False) or
-            self.crawler.settings.getbool("CRAWLERA_ENABLED") or
-            self.crawler.settings.getbool("HUBPROXY_ENABLED")
+            getattr(spider, 'crawlera_enabled', self.crawler.settings.getbool('CRAWLERA_ENABLED')) or
+            getattr(spider, 'use_hubproxy', self.crawler.settings.getbool("HUBPROXY_ENABLED"))
         )
 
     def get_proxyauth(self, spider):

tests/test_crawlera.py

@@ -140,6 +140,23 @@ def test_enabled(self):
         self.settings['CRAWLERA_ENABLED'] = True
         self._assert_enabled(self.spider, self.settings)
 
+    def test_spider_crawlera_enabled_priority(self):
+        self.spider.crawlera_enabled = False
+        self.settings['CRAWLERA_ENABLED'] = True
+        self._assert_disabled(self.spider, self.settings)
+
+        self.spider.crawlera_enabled = True
+        self.settings['CRAWLERA_ENABLED'] = False
+        self._assert_enabled(self.spider, self.settings)
+
+        self.spider.crawlera_enabled = True
+        self.settings['CRAWLERA_ENABLED'] = True
+        self._assert_enabled(self.spider, self.settings)
+
+        self.spider.crawlera_enabled = False
+        self.settings['CRAWLERA_ENABLED'] = False
+        self._assert_disabled(self.spider, self.settings)
+
     def test_apikey(self):
         self.spider.crawlera_enabled = True
         self.settings['CRAWLERA_APIKEY'] = apikey = 'apikey'