kallithea Changeset - 54a439edaf99

Changeset - 54a439edaf99

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-01-29 23:51:53
marcin@python-works.com

fixed AGE funtion for future dates, testa are now cleaner with dateutil usage

2 files changed with 26 insertions and 25 deletions:

rhodecode/lib/utils2.py

rhodecode/tests/test_libs.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -336,65 +336,69 @@ def engine_from_config(configuration, pr @@
                 context._query_start_time = time.time()
                 log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
             def after_cursor_execute(conn, cursor, statement,
                                     parameters, context, executemany):
                 total = time.time() - context._query_start_time
                 log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total))
             event.listen(engine, "before_cursor_execute",
                          before_cursor_execute)
             event.listen(engine, "after_cursor_execute",
                          after_cursor_execute)
     return engine
 def age(prevdate):
     """
     turns a datetime into an age string.
     :param prevdate: datetime object
     :rtype: unicode
     :returns: unicode words describing age
     """
     now = datetime.datetime.now()
     now = now.replace(microsecond=0)
     order = ['year', 'month', 'day', 'hour', 'minute', 'second']
     deltas = {}
     future = False
     # Get date parts deltas
     now = datetime.datetime.now()
     if prevdate > now:
         now, prevdate = prevdate, now
         future = True
     # Get date parts deltas
     for part in order:
         deltas[part] = getattr(now, part) - getattr(prevdate, part)
         if future:
             import dateutil
             d = dateutil.relativedelta.relativedelta(now, prevdate)
             deltas[part] = getattr(d, part + 's')
         else:
             deltas[part] = getattr(now, part) - getattr(prevdate, part)
     # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
     # not 1 hour, -59 minutes and -59 seconds)
     for num, length in [(5, 60), (4, 60), (3, 24)]:  # seconds, minutes, hours
         part = order[num]
         carry_part = order[num - 1]
         if deltas[part] < 0:
             deltas[part] += length
             deltas[carry_part] -= 1
     # Same thing for days except that the increment depends on the (variable)
     # number of days in the month
     month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     if deltas['day'] < 0:
         if prevdate.month == 2 and (prevdate.year % 4 == 0 and
             (prevdate.year % 100 != 0 or prevdate.year % 400 == 0)):
             deltas['day'] += 29
         else:
             deltas['day'] += month_lengths[prevdate.month - 1]
         deltas['month'] -= 1
     if deltas['month'] < 0:
         deltas['month'] += 12
         deltas['year'] -= 1

rhodecode/tests/test_libs.py

➞

Show inline comments

@@ @@ -98,81 +98,78 @@ class TestLibs(unittest.TestCase): @@
             ('0', False),
             ('-1', False),
             ('', False), ]
         for case in test_cases:
             self.assertEqual(str2bool(case[0]), case[1])
     def test_mention_extractor(self):
         from rhodecode.lib.utils2 import extract_mentioned_users
         sample = (
             "@first hi there @marcink here's my email marcin@email.com "
             "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three "
             "@MARCIN    @maRCiN @2one_more22 @john please see this http://org.pl "
             "@marian.user just do it @marco-polo and next extract @marco_polo "
             "user.dot  hej ! not-needed maril@domain.org"
+        )
         s = sorted([
         'first', 'marcink', 'lukaszb', 'one_more22', 'MARCIN', 'maRCiN', 'john',
         'marian.user', 'marco-polo', 'marco_polo'
         ], key=lambda k: k.lower())
         self.assertEqual(s, extract_mentioned_users(sample))
     def test_age(self):
         import calendar
         from rhodecode.lib.utils2 import age
         from dateutil import relativedelta
         n = datetime.datetime.now()
         delt = lambda *args, **kwargs: datetime.timedelta(*args, **kwargs)
         prev_month = n.month - 1 if n.month != 1 else n.month - 2
         delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
         self.assertEqual(age(n), u'just now')
         self.assertEqual(age(n - delt(seconds=1)), u'1 second ago')
         self.assertEqual(age(n - delt(seconds=60 * 2)), u'2 minutes ago')
         self.assertEqual(age(n - delt(hours=1)), u'1 hour ago')
         self.assertEqual(age(n - delt(hours=24)), u'1 day ago')
         self.assertEqual(age(n - delt(hours=24 * 5)), u'5 days ago')
         self.assertEqual(age(n - delt(hours=24 * (calendar.mdays[prev_month]))),
                          u'1 month ago')
         self.assertEqual(age(n - delt(hours=24 * (calendar.mdays[prev_month] + 2))),
                          u'1 month and 2 days ago')
         self.assertEqual(age(n - delt(hours=24 * 400)), u'1 year and 1 month ago')
         self.assertEqual(age(n + delt(seconds=-1)), u'1 second ago')
         self.assertEqual(age(n + delt(seconds=-60 * 2)), u'2 minutes ago')
         self.assertEqual(age(n + delt(hours=-1)), u'1 hour ago')
         self.assertEqual(age(n + delt(hours=-24)), u'1 day ago')
         self.assertEqual(age(n + delt(hours=-24 * 5)), u'5 days ago')
         self.assertEqual(age(n + delt(months=-1)), u'1 month ago')
         self.assertEqual(age(n + delt(months=-1, days=-2)), u'1 month and 2 days ago')
         self.assertEqual(age(n + delt(years=-1, months=-1)), u'1 year and 1 month ago')
     def test_age_in_future(self):
         import calendar
         from rhodecode.lib.utils2 import age
         from dateutil import relativedelta
         n = datetime.datetime.now()
         delt = lambda *args, **kwargs: datetime.timedelta(*args, **kwargs)
         delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
         self.assertEqual(age(n), u'just now')
         self.assertEqual(age(n + delt(seconds=1)), u'in 1 second')
         self.assertEqual(age(n + delt(seconds=60 * 2)), u'in 2 minutes')
         self.assertEqual(age(n + delt(hours=1)), u'in 1 hour')
         self.assertEqual(age(n + delt(hours=24)), u'in 1 day')
         self.assertEqual(age(n + delt(hours=24 * 5)), u'in 5 days')
         self.assertEqual(age(n + delt(hours=24 * (calendar.mdays[n.month]))),
                          u'in 1 month')
         self.assertEqual(age(n + delt(hours=24 * (calendar.mdays[n.month] + 1))),
                          u'in 1 month and 1 day')
         self.assertEqual(age(n + delt(hours=24 * 400)), u'in 1 year and 1 month')
         self.assertEqual(age(n + delt(months=1)), u'in 1 month')
         self.assertEqual(age(n + delt(months=1, days=1)), u'in 1 month and 1 day')
         self.assertEqual(age(n + delt(years=1, months=1)), u'in 1 year and 1 month')
     def test_tag_exctrator(self):
         sample = (
             "hello pta[tag] gog [[]] [[] sda ero[or]d [me =>>< sa]"
             "[requires] [stale] [see<>=>] [see => http://url.com]"
             "[requires => url] [lang => python] [just a tag]"
             "[,d] [ => ULR ] [obsolete] [desc]]"
+        )
         from rhodecode.lib.helpers import desc_stylize
         res = desc_stylize(sample)
         self.assertTrue('<div class="metatag" tag="tag">tag</div>' in res)
         self.assertTrue('<div class="metatag" tag="obsolete">obsolete</div>' in res)
         self.assertTrue('<div class="metatag" tag="stale">stale</div>' in res)
         self.assertTrue('<div class="metatag" tag="lang">python</div>' in res)
         self.assertTrue('<div class="metatag" tag="requires">requires =&gt; <a href="/url">url</a></div>' in res)
         self.assertTrue('<div class="metatag" tag="tag">tag</div>' in res)
     def test_alternative_gravatar(self):
         from rhodecode.lib.helpers import gravatar_url
         _md5 = lambda s: hashlib.md5(s).hexdigest()
         def fake_conf(**kwargs):
             from pylons import config
             config['app_conf'] = {}

0 comments (0 inline, 0 general)