release: 0.6.1

Fix issue #168: intervals greater than one day were incorrect.

AUTHORS.rst

@@ -24,3 +24,5 @@ In chronological order:
 - Evan Mattiza <emattiza@gmail.com> (`@emattiza <https://github.com/emattiza>`_)
 - Dima Spivak <dima@spivak.ch> (`@dimaspivak <https://github.com/dimaspivak>`_)
 - Tom Barron <tusculum@gmail.com> (`@dtbarron <https://github.com/tbarron>`_)
+- Alex Ward <alxwrd@gmail.com> (`@alxwrd <https://github.com/alxwrd>`_)
+- Frank Tobia <frank.tobia@gmail.com> (`@ftobia <https://github.com/ftobia>`_)

Pipfile

@@ -1,3 +1,8 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
 [dev-packages]
 freezegun = "*"
 pytest = "*"

README.rst

@@ -26,6 +26,7 @@ Art by `Sam Flores
 <https://www.instagram.com/samagram12/>`_ (Photo by `Kenneth Reitz
 <https://www.instagram.com/kennethreitz/>`_). 
 
+If you're interested in financially supporting Kenneth Reitz open source, consider `visiting this link <https://cash.me/$KennethReitz>`_. Your support helps tremendously with sustainability of motivation, as Open Source is no longer part of my day job.
 
 ☤ Basic Usage of Maya
 ---------------------
@@ -77,6 +78,10 @@ Behold, datetimes for humans!
     >>> m = maya.MayaDT.from_struct(time.gmtime())
     >>> print(m)
     Wed, 20 Sep 2017 17:24:32 GMT
+    
+    >>> m = maya.MayaDT(time.time())
+    >>> print(m)
+    Wed, 20 Sep 2017 17:24:32 GMT
 
     >>> rand_day.day
     7
@@ -133,7 +138,7 @@ From here, there are a number of methods available to you, which you can use to
 ☤ What about Delorean, Arrow, & Pendulum?
 -----------------------------------------
 
-All these project complement each other, and are friends. Pendulum, for example, helps power Maya's parsing.
+All these projects complement each other, and are friends. Pendulum, for example, helps power Maya's parsing.
 
 Arrow, for example, is a fantastic library, but isn't what I wanted in a datetime library. In many ways, it's better than Maya for certain things. In some ways, in my opinion, it's not.
 

maya/__version__.py

@@ -1 +1 @@
-__version__ = '0.4.2'
+__version__ = '0.6.1'

maya/core.py

@@ -14,6 +14,7 @@ import pendulum
 import snaptime
 from tzlocal import get_localzone
 from dateutil.relativedelta import relativedelta
+from dateparser.languages.loader import default_loader
 
 from .compat import cmp, comparable
 
@@ -277,7 +278,7 @@ class MayaDT(object):
 
     def rfc3339(self):
         """Returns an RFC 3339 representation of the MayaDT."""
-        return self.datetime().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-4] + "Z"
+        return self.datetime().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-5] + "Z"
 
     # Properties
     # ----------
@@ -331,15 +332,38 @@ class MayaDT(object):
 
     # Human Slang Extras
     # ------------------
-    def slang_date(self):
-        """"Returns human slang representation of date."""
-        dt = self.datetime(naive=True, to_timezone=self.local_timezone)
-        return humanize.naturaldate(dt)
+    def slang_date(self, locale="en"):
+        """"Returns human slang representation of date.
 
-    def slang_time(self):
-        """"Returns human slang representation of time."""
-        dt = self.datetime(naive=True, to_timezone=self.local_timezone)
-        return humanize.naturaltime(dt)
+        Keyword Arguments:
+            locale -- locale to translate to, e.g. 'fr' for french.
+                       (default: 'en' - English)
+        """
+        dt = pendulum.instance(self.datetime())
+
+        try:
+            return _translate(dt, locale)
+        except KeyError:
+            pass
+
+        delta = humanize.time.abs_timedelta(
+            timedelta(seconds=(self.epoch - now().epoch)))
+
+        format_string = "DD MMM"
+        if delta.days >= 365:
+            format_string += " YYYY"
+
+        return dt.format(format_string, locale=locale).title()
+
+    def slang_time(self, locale="en"):
+        """"Returns human slang representation of time.
+
+        Keyword Arguments:
+            locale -- locale to translate to, e.g. 'fr' for french.
+                       (default: 'en' - English)
+        """
+        dt = self.datetime()
+        return pendulum.instance(dt).diff_for_humans(locale=locale)
 
 
 def utc_offset(time_struct=None):
@@ -472,7 +496,7 @@ class MayaInterval(object):
 
         try:
             end = parse(end)
-        except pendulum.parsing.exceptions.ParserError as e:
+        except (pendulum.parsing.exceptions.ParserError, TypeError) as e:
             end = cls.parse_iso8601_duration(end, start=start)
 
         return cls(start=start, end=end)
@@ -715,7 +739,7 @@ def when(string, timezone='UTC', prefer_dates_from='current_period'):
     return MayaDT.from_datetime(dt)
 
 
-def parse(string, timezone='UTC', day_first=False, year_first=True):
+def parse(string, timezone='UTC', day_first=False, year_first=True, strict=False):
     """"Returns a MayaDT instance for the machine-produced moment specified.
 
     Powered by pendulum.
@@ -730,11 +754,14 @@ def parse(string, timezone='UTC', day_first=False, year_first=True):
                      between YDM and YMD. (default: False)
         year_first -- if true, the first value (e.g. 2016/05/01)
                       is parsed as year (default: True)
+        strict -- if False, allow pendulum to fall back on datetime parsing
+                  if pendulum's own parsing fails
     """
     options = {}
     options['tz'] = timezone
     options['day_first'] = day_first
     options['year_first'] = year_first
+    options['strict'] = strict
 
     dt = pendulum.parse(str(string), **options)
     return MayaDT.from_datetime(dt)
@@ -759,6 +786,16 @@ def _seconds_or_timedelta(duration):
     return dt_timedelta
 
 
+def _translate(dt, target_locale):
+    en = default_loader.get_locale("en")
+    target = default_loader.get_locale(target_locale)
+    naturaldate = humanize.naturaldate(dt)
+
+    base = en.translate(naturaldate, settings=dateparser.conf.settings)
+
+    return target.info["relative-type"][base][-1]
+
+
 def intervals(start, end, interval):
     """
     Yields MayaDT objects between the start and end MayaDTs given,
@@ -769,4 +806,6 @@ def intervals(start, end, interval):
     while current_timestamp.epoch < end.epoch:
         yield current_timestamp
 
-        current_timestamp = current_timestamp.add(seconds=interval.seconds)
+        current_timestamp = current_timestamp.add(
+            seconds=interval.total_seconds()
+        )

setup.py

@@ -25,7 +25,7 @@ required = [
     'pytz',
     'dateparser>=0.7.0',
     'tzlocal',
-    'pendulum>=1.0, <=1.5.1',
+    'pendulum>=2.0.2',
     'snaptime'
 ]
 

tests/test_maya.py

@@ -158,9 +158,19 @@ def test_slang_date():
     assert d.slang_date() == 'tomorrow'
 
 
+def test_slang_date_locale():
+    d = maya.when('tomorrow')
+    assert d.slang_date(locale='fr') == 'demain'
+
+
 def test_slang_time():
     d = maya.when('1 hour ago')
-    assert d.slang_time() == 'an hour ago'
+    assert d.slang_time() == '1 hour ago'
+
+
+def test_slang_time_locale():
+    d = maya.when('1 hour ago')
+    assert d.slang_time(locale='de') == 'vor 1 Stunde'
 
 
 @pytest.mark.parametrize("string,kwds,expected", [
@@ -239,13 +249,20 @@ def test_datetime_to_timezone():
     assert dt.tzinfo.zone == 'US/Eastern'
 
 
-def test_rfc3339():
+def test_rfc3339_epoch():
     mdt = maya.when('2016-01-01')
     out = mdt.rfc3339()
     mdt2 = maya.MayaDT.from_rfc3339(out)
     assert mdt.epoch == mdt2.epoch
 
 
+def test_rfc3339_format():
+    rfc3339 = maya.MayaDT.rfc3339(maya.when('2016-01-01T12:03:03Z'))
+    # it's important that the string has got a "max 1-digit millis" fragment
+    # as per https://tools.ietf.org/html/rfc3339#section-5.6
+    assert rfc3339 == '2016-01-01T12:03:03.0Z'
+
+
 @pytest.mark.usefixtures("frozen_now")
 def test_comparison_operations():
     now = maya.now()

tests/test_maya_interval.py

@@ -570,3 +570,60 @@ def test_interval_from_iso8601_duration():
 
     assert interval.start == s
     assert interval.end == e
+
+
+@pytest.mark.parametrize(
+    "start_string,end_string,interval,expected_count",
+    [
+        ("2019-01-03 11:40:00Z", "2019-01-03 11:40:20Z", 2, 10),
+        (
+            "2019-01-03 11:40:00Z",
+            "2019-01-03 11:40:30Z",
+            timedelta(seconds=2),
+            15,
+        ),
+        ("2019-01-03 11:40:00Z", "2019-01-03 11:45:00Z", 2 * 60, 3),
+        (
+            "2019-01-03 11:40:00Z",
+            "2019-01-03 11:51:00Z",
+            timedelta(minutes=1),
+            11,
+        ),
+        ("2019-01-03 11:40:00Z", "2019-01-03 21:40:00Z", 3 * 60 * 60, 4),
+        (
+            "2019-01-03 11:40:00Z",
+            "2019-01-03 13:41:00Z",
+            timedelta(hours=1),
+            3,
+        ),
+        ("2019-01-03 11:40:00Z", "2019-01-09 11:40:00Z", 3 * 60 * 60 * 24, 2),
+        ("2019-01-03 11:40:00Z", "2019-01-05 12:00:00Z", timedelta(days=2), 2),
+    ],
+    ids=(
+        "seconds",
+        "seconds-timedelta",
+        "minutes",
+        "minutes-timedelta",
+        "hours",
+        "hours-timedelta",
+        "days",
+        "days-timedelta",
+    ),
+)
+def test_intervals(start_string, end_string, interval, expected_count):
+    start = maya.parse(start_string)
+    end = maya.parse(end_string)
+    assert len(list(maya.intervals(start, end, interval))) == expected_count
+
+
+def test_issue_168_regression():
+    start = maya.now()
+    end = start.add(weeks=1)
+    gen = maya.intervals(start=start, end=end, interval=60 * 60 * 24)
+    # Since the bug causes the generator to never end, first sanity
+    # check that two results are not the same.
+    assert next(gen) != next(gen)
+    assert (
+        len(list(maya.intervals(start=start, end=end, interval=60 * 60 * 24)))
+        == 7
+    )