runtilities 3.0.0.dev1__tar.gz → 3.0.0.dev2__tar.gz

{runtilities-3.0.0.dev1 → runtilities-3.0.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtilities
-Version: 3.0.0.dev1
+Version: 3.0.0.dev2
 Summary: running related scripts
 Home-page: http://github.com/louking/running
 Author: Lou King

{runtilities-3.0.0.dev1 → runtilities-3.0.0.dev2}/running/runsignup.py

@@ -15,7 +15,6 @@ from tempfile import NamedTemporaryFile
 # pypi
 from flask import current_app
 import requests
-from universalclient import Client as UniversalClient
 
 # github
 
@@ -48,9 +47,9 @@ class parameterError(Exception): pass
 thislogger = logging.getLogger("running.runsignup")
 
 ########################################################################
-class RunSignUp():
+class RunSignupBase():
     '''
-    access methods for RunSignUp.com
+    common session / authentication / low-level request handling for RunSignUp.com REST API clients
 
     key and secret should be supplied for authenticated access
 
@@ -133,6 +132,62 @@ class RunSignUp():
         self.client_credentials = {}
         self.session.close()
 
+    def _rsugetcsv(self, methodurl, **payload):
+        """
+        get method for runsignup access (csv format response)
+
+        :param methodurl: runsignup method url to call
+        :param contentfield: content field to retrieve from response
+        :param **payload: parameters for the method
+        """
+
+        thispayload = self.client_credentials.copy()
+        thispayload.update(payload)
+        thispayload.update({'format':'csv'})
+
+        resp = self.session.get(methodurl, params=thispayload)
+        if resp.status_code != 200:
+            raise accessError('HTTP response code={}, url={}'.format(resp.status_code,resp.url))
+
+        data = resp.text
+
+        # if 'error' in data:
+        #     raise accessError('RSU response code={}-{}, url={}'.format(data['error']['error_code'],data['error']['error_msg'],resp.url))
+
+        return data
+
+    def _rsuget(self, methodurl, **payload):
+        """
+        get method for runsignup access (json format response)
+
+        :param methodurl: runsignup method url to call
+        :param contentfield: content field to retrieve from response
+        :param **payload: parameters for the method
+        """
+
+        thispayload = self.client_credentials.copy()
+        thispayload.update(payload)
+        thispayload.update({'format':'json'})
+
+        resp = self.session.get(methodurl, params=thispayload)
+        if resp.status_code != 200:
+            raise accessError('HTTP response code={}, url={}'.format(resp.status_code,resp.url))
+
+        data = resp.json()
+
+        if 'error' in data:
+            raise accessError('RSU response code={}-{}, url={}'.format(data['error']['error_code'],data['error']['error_msg'],resp.url))
+
+        return data
+
+########################################################################
+class RunSignUp(RunSignupBase):
+    '''
+    access methods for RunSignUp.com
+
+    see :class:`RunSignupBase` for authentication / session parameters
+    '''
+
     def members(self, club_id, **kwargs):
         '''
         return members accessible to this application
@@ -336,54 +391,6 @@ class RunSignUp():
 
         return '\n'.join([header] + results)
 
-    def _rsugetcsv(self, methodurl, **payload):
-        """
-        get method for runsignup access (csv format response)
-        
-        :param methodurl: runsignup method url to call
-        :param contentfield: content field to retrieve from response
-        :param **payload: parameters for the method
-        """
-        
-        thispayload = self.client_credentials.copy()
-        thispayload.update(payload)
-        thispayload.update({'format':'csv'})
-
-        resp = self.session.get(methodurl, params=thispayload)
-        if resp.status_code != 200:
-            raise accessError('HTTP response code={}, url={}'.format(resp.status_code,resp.url))
-
-        data = resp.text
-
-        # if 'error' in data:
-        #     raise accessError('RSU response code={}-{}, url={}'.format(data['error']['error_code'],data['error']['error_msg'],resp.url))
-    
-        return data 
-
-    def _rsuget(self, methodurl, **payload):
-        """
-        get method for runsignup access (json format response)
-        
-        :param methodurl: runsignup method url to call
-        :param contentfield: content field to retrieve from response
-        :param **payload: parameters for the method
-        """
-        
-        thispayload = self.client_credentials.copy()
-        thispayload.update(payload)
-        thispayload.update({'format':'json'})
-
-        resp = self.session.get(methodurl, params=thispayload)
-        if resp.status_code != 200:
-            raise accessError('HTTP response code={}, url={}'.format(resp.status_code,resp.url))
-
-        data = resp.json()
-
-        if 'error' in data:
-            raise accessError('RSU response code={}-{}, url={}'.format(data['error']['error_code'],data['error']['error_msg'],resp.url))
-    
-        return data 
-        
 #----------------------------------------------------------------------
 def updatemembercache(club_id, membercachefilename, key=None, secret=None,
                        api_reg_token=None, api_reg_secret=None, debug=False):
@@ -843,40 +850,3 @@ class ClubMemberships():
             for member in self.userid2mem
         )
 
-class RunSignupFluent(UniversalClient):
-    from rauth import OAuth2Service
-    
-    '''
-    Fluent interface to RunSignUp API -- see https://universal-client.readthedocs.io
-    '''
-    def __init__(self, key=None, secret=None, api_reg_token=None, api_reg_secret=None, debug=False):
-        '''
-        initialize RunSignUp Fluent client
-
-        :param key: api key for RunSignUp
-        :param secret: api secret for RunSignUp
-        :param api_reg_token: API caller registration token, sent as rsu_api_reg GET parameter -- see
-            https://info.runsignup.com/2026/07/17/new-api-registration-requirements/
-        :param api_reg_secret: API caller registration secret, sent as X-RSU-API-REG-SECRET header
-        :param debug: debug flag
-        '''
-        # rsuservice = Oauth2Service(
-        #     name='runsignup',
-        #     authorize_url='https://www.runsignup.com/oauth2/authorize',
-        #     access_token_url='https://api.runsignup.com/oauth2/token',
-        #     client_id=key,
-        #     client_secret=secret,
-        # )
-
-        self._params = params = {'api_key'    : key,
-                                 'api_secret' : secret,
-                                 'format'     : 'json' }
-        if api_reg_token:
-            params['rsu_api_reg'] = api_reg_token
-
-        client_kwargs = {'url': 'https://api.runsignup.com/rest', 'params': params}
-        if api_reg_secret:
-            client_kwargs['headers'] = {'X-RSU-API-REG-SECRET': api_reg_secret}
-
-        super().__init__(**client_kwargs)
-    

runtilities-3.0.0.dev2/running/runsignup_fluent.py

@@ -0,0 +1,36 @@
+'''
+runsignup_fluent - fluent access to runsignup.com
+===================================================
+'''
+
+# pypi
+from universalclient import Client as UniversalClient
+
+class RunSignupFluent(UniversalClient):
+
+    '''
+    Fluent interface to RunSignUp API -- see https://universal-client.readthedocs.io
+    '''
+    def __init__(self, key=None, secret=None, api_reg_token=None, api_reg_secret=None, debug=False):
+        '''
+        initialize RunSignUp Fluent client
+
+        :param key: api key for RunSignUp
+        :param secret: api secret for RunSignUp
+        :param api_reg_token: API caller registration token, sent as rsu_api_reg GET parameter -- see
+            https://info.runsignup.com/2026/07/17/new-api-registration-requirements/
+        :param api_reg_secret: API caller registration secret, sent as X-RSU-API-REG-SECRET header
+        :param debug: debug flag
+        '''
+
+        self._params = params = {'api_key'    : key,
+                                 'api_secret' : secret,
+                                 'format'     : 'json' }
+        if api_reg_token:
+            params['rsu_api_reg'] = api_reg_token
+
+        client_kwargs = {'url': 'https://api.runsignup.com/rest', 'params': params}
+        if api_reg_secret:
+            client_kwargs['headers'] = {'X-RSU-API-REG-SECRET': api_reg_secret}
+
+        super().__init__(**client_kwargs)

{runtilities-3.0.0.dev1 → runtilities-3.0.0.dev2}/running/version.py

@@ -1,2 +1,2 @@
 # this string is used for the version string in the documentation, as well as the egg
-__version__ = '3.0.0.dev1'
+__version__ = '3.0.0.dev2'

{runtilities-3.0.0.dev1 → runtilities-3.0.0.dev2}/runtilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtilities
-Version: 3.0.0.dev1
+Version: 3.0.0.dev2
 Summary: running related scripts
 Home-page: http://github.com/louking/running
 Author: Lou King

{runtilities-3.0.0.dev1 → runtilities-3.0.0.dev2}/runtilities.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ running/runningaheadmembers.py
 running/runningaheadparticipants.py
 running/runningaheadresults.py
 running/runsignup.py
+running/runsignup_fluent.py
 running/strava.py
 running/textnormalize.py
 running/ultrasignup.py