git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ae1605
)
RSpec: added a ttl parameter, this duration will set the expires tag in request rspec...
author
Loic Baron
<loic.baron@lip6.fr>
Wed, 23 Jul 2014 12:53:58 +0000
(14:53 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Wed, 23 Jul 2014 12:53:58 +0000
(14:53 +0200)
sfa/rspecs/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
a17b7d6
..
7d7d007
100755
(executable)
--- a/
sfa/rspecs/rspec.py
+++ b/
sfa/rspecs/rspec.py
@@
-9,13
+9,14
@@
from sfa.rspecs.version_manager import VersionManager
class RSpec:
class RSpec:
- def __init__(self, rspec="", version=None, user_options={}):
+ def __init__(self, rspec="", version=None, user_options={}
, ttl=60
):
self.header = '<?xml version="1.0"?>\n'
self.template = """<RSpec></RSpec>"""
self.version = None
self.xml = XML()
self.version_manager = VersionManager()
self.user_options = user_options
self.header = '<?xml version="1.0"?>\n'
self.template = """<RSpec></RSpec>"""
self.version = None
self.xml = XML()
self.version_manager = VersionManager()
self.user_options = user_options
+ self.ttl = ttl
self.elements = {}
if rspec:
if version:
self.elements = {}
if rspec:
if version:
@@
-28,9
+29,10
@@
class RSpec:
else:
raise InvalidRSpec("No RSpec or version specified. Must specify a valid rspec string or a valid version")
else:
raise InvalidRSpec("No RSpec or version specified. Must specify a valid rspec string or a valid version")
- def create(self, version=None):
+ def create(self, version=None
, ttl=60
):
"""
Create root element
"""
Create root element
+ ttl: time to live in minutes, this will determine the expires tag of the RSpec
"""
self.version = self.version_manager.get_version(version)
self.namespaces = self.version.namespaces
"""
self.version = self.version_manager.get_version(version)
self.namespaces = self.version.namespaces
@@
-39,7
+41,7
@@
class RSpec:
date_format = '%Y-%m-%dT%H:%M:%SZ'
now = datetime.utcnow()
generated_ts = now.strftime(date_format)
date_format = '%Y-%m-%dT%H:%M:%SZ'
now = datetime.utcnow()
generated_ts = now.strftime(date_format)
- expires_ts = (now + timedelta(
hours=1
)).strftime(date_format)
+ expires_ts = (now + timedelta(
minutes=self.ttl
)).strftime(date_format)
self.xml.set('expires', expires_ts)
self.xml.set('generated', generated_ts)
self.xml.set('expires', expires_ts)
self.xml.set('generated', generated_ts)