Renamed "in-page" stuff to "action"

Author: ncadou

scrapy_webdriver/download.py

@@ -2,7 +2,7 @@
 from scrapy.utils.decorator import inthread
 from scrapy.utils.misc import load_object
 
-from .http import WebdriverInPageRequest, WebdriverRequest, WebdriverResponse
+from .http import WebdriverActionRequest, WebdriverRequest, WebdriverResponse
 
 FALLBACK_HANDLER = 'scrapy.core.downloader.handlers.http.HttpDownloadHandler'
 
@@ -20,8 +20,8 @@ def __init__(self, settings):
     def download_request(self, request, spider):
         """Return the result of the right download method for the request."""
         if self._enabled and isinstance(request, WebdriverRequest):
-            if isinstance(request, WebdriverInPageRequest):
-                download = self._do_inpage_request
+            if isinstance(request, WebdriverActionRequest):
+                download = self._do_action_request
             else:
                 download = self._download_request
         else:
@@ -36,7 +36,7 @@ def _download_request(self, request, spider):
         return WebdriverResponse(request.url, request.manager.webdriver)
 
     @inthread
-    def _do_inpage_request(self, request, spider):
+    def _do_action_request(self, request, spider):
         """Perform an action on a previously webdriver-loaded page."""
         log.msg('Running webdriver actions %s' % request.url, level=log.DEBUG)
         request.actions.perform()

scrapy_webdriver/http.py

@@ -15,20 +15,20 @@ def replace(self, *args, **kwargs):
         return super(WebdriverRequest, self).replace(*args, **kwargs)
 
 
-class WebdriverInPageRequest(WebdriverRequest):
+class WebdriverActionRequest(WebdriverRequest):
     """A Request that handles in-page webdriver actions (action chains)."""
     def __init__(self, response, actions=None, **kwargs):
         kwargs.setdefault('manager', response.request.manager)
         url = kwargs.pop('url', response.request.url)
-        super(WebdriverInPageRequest, self).__init__(url, **kwargs)
+        super(WebdriverActionRequest, self).__init__(url, **kwargs)
         self._response = response
         self.actions = actions or response.actions
         self.parent = response.request
 
     def replace(self, *args, **kwargs):
         kwargs.setdefault('response', self._response)
         kwargs.setdefault('actions', self.actions)
-        return super(WebdriverInPageRequest, self).replace(*args, **kwargs)
+        return super(WebdriverActionRequest, self).replace(*args, **kwargs)
 
 
 class WebdriverResponse(TextResponse):
@@ -40,7 +40,7 @@ def __init__(self, url, webdriver, **kwargs):
         self.actions = ActionChains(webdriver)
         self.webdriver = webdriver
 
-    def inpage_request(self, **kwargs):
+    def action_request(self, **kwargs):
         """Return a Request object to perform the recorded actions."""
         kwargs.setdefault('meta', self.meta)
-        return WebdriverInPageRequest(self, **kwargs)
+        return WebdriverActionRequest(self, **kwargs)

scrapy_webdriver/manager.py

@@ -3,7 +3,7 @@
 
 from scrapy.signals import engine_stopped
 from selenium import webdriver
-from scrapy_webdriver.http import WebdriverRequest, WebdriverInPageRequest
+from scrapy_webdriver.http import WebdriverRequest, WebdriverActionRequest
 
 
 class WebdriverManager(object):
@@ -55,7 +55,7 @@ def acquire(self, request):
             request.manager = self
             return request
         else:
-            if isinstance(request, WebdriverInPageRequest):
+            if isinstance(request, WebdriverActionRequest):
                 queue = self._wait_inpage_queue
             else:
                 queue = self._wait_queue

scrapy_webdriver/middlewares.py

@@ -1,6 +1,6 @@
 from scrapy.exceptions import IgnoreRequest, NotConfigured
 
-from .http import WebdriverInPageRequest, WebdriverRequest
+from .http import WebdriverActionRequest, WebdriverRequest
 from .manager import WebdriverManager
 
 
@@ -50,7 +50,7 @@ def _process_requests(self, items_or_requests, start=False):
         error_msg = "WebdriverRequests from start_requests can't be in-page."
         for request in iter(items_or_requests):
             if isinstance(request, WebdriverRequest):
-                if start and isinstance(request, WebdriverInPageRequest):
+                if start and isinstance(request, WebdriverActionRequest):
                     raise IgnoreRequest(error_msg)
                 request = self.manager.acquire(request)
                 if request is WebdriverRequest.WAITING:

scrapy_webdriver/tests/test_request_queue.py

@@ -78,15 +78,15 @@ def get(url):
 
             for i in xrange(2):
                 fake_url = '%s&wa=%d' % (response.url, i)
-                request = response.inpage_request(url=fake_url,
-                                                  callback=self.parse_inpage)
+                request = response.action_request(url=fake_url,
+                                                  callback=self.parse_action)
                 # Leave a trace in the webdriver instance mock so we can look
                 # at the request processing order.
                 request.actions = Mock()
                 request.actions.perform.side_effect = partial(get, fake_url)
                 yield request
 
-        def parse_inpage(self, response):
+        def parse_action(self, response):
             yield WebdriverRequest('%s&wr=%d' % (response.url, 0),
                                    callback=self.parse_nothing)