Initial ruff check --fix

Author: Sven Groot

inertia/__init__.py

@@ -1,3 +1,3 @@
-from .http import inertia, render, location, InertiaResponse
-from .utils import lazy, optional, defer, merge
+from .http import InertiaResponse, inertia, location, render
 from .share import share
+from .utils import defer, lazy, merge, optional

inertia/helpers.py

@@ -1,7 +1,7 @@
 def deep_transform_callables(prop):
   if not isinstance(prop, dict):
     return prop() if callable(prop) else prop
-  
+
   for key in list(prop.keys()):
     prop[key] = deep_transform_callables(prop[key])
 
@@ -10,5 +10,5 @@ def deep_transform_callables(prop):
 def validate_type(value, name, expected_type):
   if not isinstance(value, expected_type):
     raise TypeError(f"Expected {expected_type.__name__} for {name}, got {type(value).__name__}")
-  
+
   return value

inertia/http.py

@@ -1,12 +1,14 @@
+from functools import wraps
 from http import HTTPStatus
-from django.template.loader import render_to_string
-from django.http import HttpResponse
-from .settings import settings
 from json import dumps as json_encode
-from functools import wraps
+
 import requests
-from .prop_classes import IgnoreOnFirstLoadProp, DeferredProp, MergeableProp
+from django.http import HttpResponse
+from django.template.loader import render_to_string
+
 from .helpers import deep_transform_callables, validate_type
+from .prop_classes import DeferredProp, IgnoreOnFirstLoadProp, MergeableProp
+from .settings import settings
 
 INERTIA_REQUEST_ENCRYPT_HISTORY = "_inertia_encrypt_history"
 INERTIA_SESSION_CLEAR_HISTORY = "_inertia_clear_history"
@@ -17,27 +19,27 @@
 class InertiaRequest:
   def __init__(self, request):
     self.request = request
-  
+
   def __getattr__(self, name):
     return getattr(self.request, name)
-  
+
   @property
   def headers(self):
     return self.request.headers
-  
+
   @property
   def inertia(self):
     return self.request.inertia.all() if hasattr(self.request, 'inertia') else {}
-  
+
   def is_a_partial_render(self, component):
     return 'X-Inertia-Partial-Data' in self.headers and self.headers.get('X-Inertia-Partial-Component', '') == component
 
   def partial_keys(self):
     return self.headers.get('X-Inertia-Partial-Data', '').split(',')
-  
+
   def reset_keys(self):
     return self.headers.get('X-Inertia-Reset', '').split(',')
-  
+
   def is_inertia(self):
     return 'X-Inertia' in self.headers
 
@@ -55,7 +57,7 @@ def page_data(self):
       expected_type=bool,
       name="clear_history"
     )
-      
+
     _page = {
       'component': self.component,
       'props': self.build_props(),
@@ -68,11 +70,11 @@ def page_data(self):
     _deferred_props = self.build_deferred_props()
     if _deferred_props:
       _page['deferredProps'] = _deferred_props
-    
+
     _merge_props = self.build_merge_props()
     if _merge_props:
       _page['mergeProps'] = _merge_props
-    
+
     return _page
 
   def build_props(self):
@@ -104,15 +106,15 @@ def build_deferred_props(self):
 
   def build_merge_props(self):
     return [
-      key 
+      key
       for key, prop in self.props.items()
       if (
         isinstance(prop, MergeableProp)
         and prop.should_merge()
         and key not in self.request.reset_keys()
       )
     ]
-  
+
   def build_first_load(self, data):
     context, template = self.build_first_load_context_and_template(data)
 
@@ -126,10 +128,10 @@ def build_first_load(self, data):
       using=None,
     )
 
-  
+
   def build_first_load_context_and_template(self, data):
     if settings.INERTIA_SSR_ENABLED:
-      try: 
+      try:
         response = requests.post(
           f"{settings.INERTIA_SSR_URL}/render",
           data=data,
@@ -142,7 +144,7 @@ def build_first_load_context_and_template(self, data):
         }, INERTIA_SSR_TEMPLATE
       except Exception:
         pass
-    
+
     return {
       'page': data,
       **(self.template_data),
@@ -169,9 +171,9 @@ def __init__(self, request, component, props=None, template_data=None, headers=N
         'Content-Type': 'application/json',
       }
       content = data
-    else:    
+    else:
       content = self.build_first_load(data)
-    
+
     super().__init__(
       content=content,
       headers=_headers,
@@ -209,7 +211,7 @@ def inner(request, *args, **kwargs):
         return props
 
       return render(request, component, props)
-    
+
     return inner
-  
+
   return decorator

inertia/middleware.py

@@ -1,13 +1,14 @@
-from .settings import settings
 from django.contrib import messages
-from django.http import HttpResponse
 from django.middleware.csrf import get_token
+
 from .http import location
+from .settings import settings
+
 
 class InertiaMiddleware:
   def __init__(self, get_response):
     self.get_response = get_response
-  
+
   def __call__(self, request):
     response = self.get_response(request)
 

inertia/prop_classes.py

@@ -1,10 +1,10 @@
 from abc import ABC, abstractmethod
-import warnings
+
 
 class CallableProp(ABC):
   def __init__(self, prop):
     self.prop = prop
-  
+
   def __call__(self):
     return self.prop() if callable(self.prop) else self.prop
 
@@ -24,7 +24,7 @@ def __init__(self, prop, group, merge=False):
     super().__init__(prop)
     self.group = group
     self.merge = merge
-  
+
   def should_merge(self):
     return self.merge
 

inertia/settings.py

@@ -1,4 +1,5 @@
 from django.conf import settings as django_settings
+
 from .utils import InertiaJsonEncoder
 
 __all__ = ['settings']
@@ -9,7 +10,7 @@ class InertiaSettings:
   INERTIA_SSR_URL = 'http://localhost:13714'
   INERTIA_SSR_ENABLED = False
   INERTIA_ENCRYPT_HISTORY = False
-  
+
   def __getattribute__(self, name):
     try:
       return getattr(django_settings, name)

inertia/test.py

@@ -1,27 +1,30 @@
-from django.test import TestCase, Client
+from json import dumps, loads
 from unittest.mock import patch
+
 from django.template.loader import render_to_string as base_render_to_string
-from inertia.settings import settings
-from json import dumps, loads
+from django.test import Client, TestCase
 from django.utils.html import escape
 
+from inertia.settings import settings
+
+
 class ClientWithLastResponse:
   def __init__(self, client):
     self.client = client
     self.last_response = None
-  
+
   def get(self, *args, **kwargs):
     self.last_response = self.client.get(*args, **kwargs)
     return self.last_response
-  
+
   def __getattr__(self, name):
     return getattr(self.client, name)
 
 class BaseInertiaTestCase:
   def setUp(self):
     self.inertia = ClientWithLastResponse(Client(HTTP_X_INERTIA=True))
     self.client = ClientWithLastResponse(Client())
-  
+
   def last_response(self):
     return self.inertia.last_response or self.client.last_response
 
@@ -41,15 +44,15 @@ def tearDown(self):
 
   def page(self):
     page_data = self.mock_render.call_args[0][1]['page'] if self.mock_render.call_args else self.last_response().content
-    
+
     return loads(page_data)
 
   def props(self):
     return self.page()['props']
-  
+
   def merge_props(self):
     return self.page()['mergeProps']
-  
+
   def deferred_props(self):
     return self.page()['deferredProps']
 
@@ -87,10 +90,10 @@ def inertia_page(url, component='TestComponent', props={}, template_data={}, def
 
   if deferred_props:
     _page['deferredProps'] = deferred_props
-  
+
   if merge_props:
     _page['mergeProps'] = merge_props
-    
+
   return _page
 
 def inertia_div(*args, **kwargs):

inertia/tests/test_encoder.py

@@ -1,8 +1,11 @@
-from inertia.tests.testapp.models import User
+from datetime import date, datetime
+from json import dumps
+
 from django.test import TestCase
+
+from inertia.tests.testapp.models import User
 from inertia.utils import InertiaJsonEncoder
-from json import dumps
-from datetime import date, datetime
+
 
 class InertiaJsonEncoderTestCase(TestCase):
   def setUp(self):
@@ -32,4 +35,4 @@ def test_it_handles_querysets(self):
     self.assertEqual(
       dumps([{'id': 1, 'name': 'Brandon', 'birthdate': '1987-02-15', 'registered_at': '2022-10-31T10:13:01'}]),
       self.encode(User.objects.all())
-    )
+    )

inertia/tests/test_history.py

@@ -1,8 +1,7 @@
-from inertia.http import encrypt_history
-from inertia.test import InertiaTestCase
 from django.test import override_settings
-from django.test.client import RequestFactory
-from inertia.tests.testapp.views import empty_test
+
+from inertia.test import InertiaTestCase
+
 
 class HistoryTestCase(InertiaTestCase):
   def test_encrypt_history_setting(self):

inertia/tests/test_middleware.py

@@ -1,6 +1,6 @@
-from django.test import TestCase, Client, override_settings
 from inertia.test import InertiaTestCase
 
+
 class MiddlewareTestCase(InertiaTestCase):
   def test_anything(self):
     response = self.client.get('/test/')