rfc 3339, v0.1.7

Update AUTHORS

.gitignore

@@ -0,0 +1,94 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# PyCharm
+.idea/

.travis.yml

@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
+# command to install dependencies
+install: pip install -r requirements.txt
+# command to run tests
+script: make

AUTHORS.rst

@@ -0,0 +1,22 @@
+Contributions to the maya project
+=================================
+
+Creator & Maintainer
+--------------------
+
+- Kenneth Reitz <me@kennethreitz.org> `@kennethreitz <https://github.com/kennethreitz>`_
+
+
+Contributors
+------------
+
+In chronological order:
+
+- Adam Nelson <adam@varud.com> (`@adamn <https://github.com/adamn>`_)
+- Timo Furrer <tuxtimo@gmail.com> (`@timofurrer <https://github.com/timofurrer>`_)
+- Moinuddin Quadri <moin18@gmail.com> (`@moin18 <https://github.com/moin18>`_)
+- Grigouze <grigouze@yahoo.fr> (`@grigouze <https://github.com/grigouze>`_)
+- Tzu-ping Chung <uranusjr@gmail.com> (`@uranusjr <https://github.com/uranusjr>`_)
+- aaronjeline (`@aaronjeline <https://github.com/aaronjeline>`_)
+- jerry2yu (`@jerry2yu <https://github.com/jerry2yu>`_)
+- Joshua Li <joshua.r.li.98@gmail.com> (`@JoshuaRLi <https://github.com/JoshuaRLi>`_)

Pipfile

@@ -0,0 +1,11 @@
+[packages]
+humanize = "*"
+pytz = "*"
+dateparser = "*"
+iso8601 = "*"
+python-dateutil = "*"
+"ruamel.yaml" = "*"
+tzlocal = "*"
+
+[dev-packages]
+pytest = "*"

README.rst

@@ -1,6 +1,16 @@
 Maya: Datetime for Humans™
 ==========================
 
+.. image:: https://img.shields.io/pypi/v/maya.svg
+    :target: https://pypi.python.org/pypi/maya
+
+.. image:: https://travis-ci.org/kennethreitz/maya.svg?branch=master
+    :target: https://travis-ci.org/kennethreitz/maya
+
+.. image:: https://img.shields.io/badge/SayThanks.io-☼-1EAEDB.svg
+    :target: https://saythanks.io/to/kennethreitz
+
+
 Datetimes are very frustrating to work with in Python, especially when dealing
 with different locales on different systems. This library exists to make the
 simple things **much** easier, while admitting that time is an illusion
@@ -8,6 +18,9 @@ simple things **much** easier, while admitting that time is an illusion
 
 Datetimes should be interacted with via an API written for humans.
 
+Maya is mostly built around the headaches and use-cases around parsing datetime data from websites.
+
+
 ☤ Basic Usage of Maya
 ---------------------
 
@@ -30,7 +43,7 @@ Behold, datetimes for humans!
     >>> tomorrow.iso8601()
     '2016-12-16T15:11:30.263350Z'
 
-    >>> tomorrrow.rfc2822()
+    >>> tomorrow.rfc2822()
     'Fri, 16 Dec 2016 20:11:30 -0000'
 
     >>> tomorrow.datetime()
@@ -52,8 +65,6 @@ Behold, datetimes for humans!
     >>> rand_day.timezone
     UTC
 
-
-
 ☤ Why is this useful?
 ---------------------
 
@@ -61,9 +72,20 @@ Behold, datetimes for humans!
 - Complete symmetric import and export of both ISO 8601 and RFC 2822 datetime stamps.
 - Fantastic parsing of both dates written for/by humans and machines (``maya.when()`` vs ``maya.parse()``).
 - Support for human slang, both import and export (e.g. `an hour ago`).
-- Datetimes can very easily be generated, with our without tzinfo attached.
+- Datetimes can very easily be generated, with or without tzinfo attached.
 - This library is based around epoch time, but dates before Jan 1 1970 are indeed supported, via negative integers.
-- Maya never panics, and always carrys a towel.
+- Maya never panics, and always carries a towel.
+
+
+☤ What about Delorean, Arrow, & Pendulum?
+-----------------------------------------
+
+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.
+
+I simply desire a sane API for datetimes that made sense to me for all the things I'd ever want to do—especially when dealing with timezone algebra. Arrow doesn't do all of the things I need (but it does a lot more!). Maya does do exactly what I need.
+
+I think these projects complement each-other, personally. Maya is great for parsing websites. For example- Arrow supports floors and ceilings and spans of dates, which Maya does not at all.
+
 
 ☤ Installing Maya
 -----------------
@@ -73,3 +95,20 @@ Installation is easy, with pip::
     $ pip install maya
 
 ✨🍰✨
+
+☤ Like it?
+----------
+
+`Say Thanks <https://saythanks.io/to/kennethreitz>`_!
+
+
+How to Contribute
+-----------------
+
+#. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug.
+#. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
+#. Write a test which shows that the bug was fixed or that the feature works as expected.
+#. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
+
+.. _`the repository`: http://github.com/kennethreitz/maya
+.. _AUTHORS: https://github.com/kennethreitz/maya/blob/master/AUTHORS.rst

maya.py

@@ -20,7 +20,28 @@ import iso8601
 import dateutil.parser
 from tzlocal import get_localzone
 
-EPOCH_START = (1970, 1, 1)
+_EPOCH_START = (1970, 1, 1)
+
+
+def validate_class_type_arguments(operator):
+    """
+    Decorator to validate all the arguments to function
+    are of the type of calling class
+    """
+
+    def inner(function):
+        def wrapper(self, *args, **kwargs):
+            for arg in args + tuple(kwargs.values()):
+                if not isinstance(arg, self.__class__):
+                    raise TypeError('unorderable types: {}() {} {}()'.format(
+                        type(self).__name__, operator, type(arg).__name__))
+            return function(self, *args, **kwargs)
+
+        return wrapper
+
+    return inner
+
+
 
 class MayaDT(object):
     """The Maya Datetime object."""
@@ -32,9 +53,38 @@ class MayaDT(object):
     def __repr__(self):
         return '<MayaDT epoch={}>'.format(self._epoch)
 
+    def __str__(self):
+        return self.rfc2822()
+
     def __format__(self, *args, **kwargs):
         """Return's the datetime's format"""
-        return self.datetime(*args, **kwargs)
+        return format(self.datetime(), *args, **kwargs)
+
+
+    @validate_class_type_arguments('==')
+    def __eq__(self, maya_dt):
+        return self._epoch == maya_dt._epoch
+
+    @validate_class_type_arguments('!=')
+    def __ne__(self, maya_dt):
+        return self._epoch != maya_dt._epoch
+
+    @validate_class_type_arguments('<')
+    def __lt__(self, maya_dt):
+        return self._epoch < maya_dt._epoch
+
+    @validate_class_type_arguments('<=')
+    def __le__(self, maya_dt):
+        return self._epoch <= maya_dt._epoch
+
+    @validate_class_type_arguments('>')
+    def __gt__(self, maya_dt):
+        return self._epoch > maya_dt._epoch
+
+    @validate_class_type_arguments('>=')
+    def __ge__(self, maya_dt):
+        return self._epoch >= maya_dt._epoch
+
 
     # Timezone Crap
     # -------------
@@ -67,7 +117,7 @@ class MayaDT(object):
         if dt.tzinfo is None:
             dt = dt.replace(tzinfo=pytz.utc)
 
-        epoch_start = Datetime(*EPOCH_START, tzinfo=pytz.timezone('UTC'))
+        epoch_start = Datetime(*_EPOCH_START, tzinfo=pytz.timezone('UTC'))
         return (dt - epoch_start).total_seconds()
 
     # Importers
@@ -89,6 +139,11 @@ class MayaDT(object):
         """Returns MayaDT instance from rfc2822 string."""
         return parse(string)
 
+    @staticmethod
+    def from_rfc3339(string):
+        """Returns MayaDT instance from rfc3339 string."""
+        return parse(string)
+
     # Exporters
     # ---------
 
@@ -104,12 +159,16 @@ class MayaDT(object):
             dt = self.datetime().astimezone(pytz.timezone(to_timezone))
         else:
             dt = Datetime.utcfromtimestamp(self._epoch)
+            dt.replace(tzinfo=self._tz)
 
         # Strip the timezone info if requested to do so.
         if naive:
             return dt.replace(tzinfo=None)
+        else:
+            if dt.tzinfo is None:
+                dt = dt.replace(tzinfo=self._tz)
 
-        return dt.replace(tzinfo=self._tz)
+        return dt
 
     def iso8601(self):
         """Returns an ISO 8601 representation of the MayaDT."""
@@ -121,6 +180,10 @@ class MayaDT(object):
         """Returns an RFC 2822 representation of the MayaDT."""
         return email.utils.formatdate(self.epoch, usegmt=True)
 
+    def rfc3339(self):
+        """Returns an RFC 3339 representation of the MayaDT."""
+        return self.datetime().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-4]+"Z"
+
     # Properties
     # ----------
 
@@ -136,6 +199,15 @@ class MayaDT(object):
     def day(self):
         return self.datetime().day
 
+    @property
+    def week(self):
+        return self.datetime().isocalendar()[1]
+
+    @property
+    def weekday(self):
+        """Return the day of the week as an integer. Monday is 1 and Sunday is 7"""
+        return self.datetime().isoweekday()
+
     @property
     def hour(self):
         return self.datetime().hour
@@ -161,7 +233,8 @@ class MayaDT(object):
 
     def slang_date(self):
         """"Returns human slang representation of date."""
-        return humanize.naturaldate(self.datetime())
+        dt = self.datetime(naive=True, to_timezone=self.local_timezone)
+        return humanize.naturaldate(dt)
 
     def slang_time(self):
         """"Returns human slang representation of time."""
@@ -196,13 +269,14 @@ def when(string, timezone='UTC'):
 
     return MayaDT.from_datetime(dt)
 
-def parse(string):
+def parse(string, day_first=False):
     """"Returns a MayaDT instance for the machine-produced moment specified.
 
     Powered by dateutil. Accepts most known formats. Useful for working with data.
 
     Keyword Arguments:
         string -- string to be parsed
+        day_first -- if true, the first value (e.g. 01/05/2016) is parsed as day (default: False)
     """
-    dt = dateutil.parser.parse(string)
-    return MayaDT.from_datetime(dt)
+    dt = dateutil.parser.parse(string, dayfirst=day_first)
+    return MayaDT.from_datetime(dt)

requirements.txt

@@ -1,15 +0,0 @@
-dateparser==0.5.0
-humanize==0.5.1
-iso8601==0.1.11
-jdatetime==1.8.1
-py==1.4.32
-pytest==3.0.5
-python-dateutil==2.6.0
-pytz==2016.10
-regex==2016.11.21
-ruamel.ordereddict==0.4.9
-ruamel.yaml==0.13.4
-six==1.10.0
-typing==3.5.2.2
-tzlocal==1.3
-umalqurra==0.2

setup.py

@@ -3,9 +3,22 @@
 
 import os
 import sys
+import codecs
 
 from setuptools import setup
 
+try:
+    # Python 3
+    from os import dirname
+except ImportError:
+    # Python 2
+    from os.path import dirname
+
+here = os.path.abspath(dirname(__file__))
+
+with codecs.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = '\n' + f.read()
+
 
 if sys.argv[-1] == "publish":
     os.system("python setup.py sdist bdist_wheel upload")
@@ -16,18 +29,20 @@ required = [
     'pytz',
     'dateparser',
     'iso8601',
-    'python-dateutil'
+    'python-dateutil',
+    'ruamel.yaml',
+    'tzlocal'
 ]
 
 setup(
     name='maya',
-    version='0.1.0',
+    version='0.1.7',
     description='Datetimes for Humans.',
-    long_description=open('README.rst').read(),
+    long_description=long_description,
     author='Kenneth Reitz',
     author_email='me@kennethreitz.com',
     url='https://github.com/kennethreitz/maya',
-    my_modules=['maya'],
+    py_modules=['maya'],
     install_requires=required,
     license='MIT',
     classifiers=(

test_maya.py

@@ -1,15 +1,20 @@
+import pytest
+import copy
+
 import maya
 
 
 def test_rfc2822():
-    r = maya.now().rfc2822()
+    r = maya.parse('February 21, 1994').rfc2822()
     d = maya.MayaDT.from_rfc2822(r)
+    assert r == 'Mon, 21 Feb 1994 00:00:00 GMT'
     assert r == d.rfc2822()
 
 
 def test_iso8601():
-    r = maya.now().iso8601()
+    r = maya.parse('February 21, 1994').iso8601()
     d = maya.MayaDT.from_iso8601(r)
+    assert r == '1994-02-21T00:00:00Z'
     assert r == d.iso8601()
 
 
@@ -17,7 +22,8 @@ def test_human_when():
     r1 = maya.when('yesterday')
     r2 = maya.when('today')
 
-    assert r2.day - r1.day == 1
+    assert (r2.day - r1.day) in (1, -30, -29, -28, -27)
+
 
 def test_machine_parse():
     r1 = maya.parse('August 14, 2015')
@@ -30,7 +36,7 @@ def test_machine_parse():
 def test_dt_tz_translation():
     d1 = maya.now().datetime()
     d2 = maya.now().datetime(to_timezone='US/Eastern')
-    assert d1.hour - d2.hour == 5
+    assert (d1.hour - d2.hour) % 24 == 5
 
 
 def test_dt_tz_naive():
@@ -39,14 +45,49 @@ def test_dt_tz_naive():
 
     d2 = maya.now().datetime(to_timezone='US/Eastern', naive=True)
     assert d2.tzinfo is None
-    assert d1.hour - d2.hour == 5
+    assert (d1.hour - d2.hour) % 24 == 5
 
 
 def test_random_date():
+
+    # Test properties for maya.when()
+    d1 = maya.when('11-17-11 08:09:10')
+    assert d1.year == 2011
+    assert d1.month == 11
+    assert d1.day == 17
+    assert d1.week == 46
+    assert d1.weekday == 4
+    assert d1.hour == 8
+    assert d1.minute == 9
+    assert d1.second == 10
+    assert d1.microsecond == 0
+
+    # Test properties for maya.parse()
+    d2 = maya.parse('February 29, 1992 13:12:34')
+    assert d2.year == 1992
+    assert d2.month == 2
+    assert d2.day == 29
+    assert d2.week == 9
+    assert d2.weekday == 6
+    assert d2.hour == 13
+    assert d2.minute == 12
+    assert d2.second == 34
+    assert d2.microsecond == 0
+
+
+def test_print_date(capsys):
     d = maya.when('11-17-11')
-    assert d.year == 2011
-    assert d.month == 11
-    assert d.day == 17
+
+    print(d)
+    out, err = capsys.readouterr()
+
+    assert out == 'Thu, 17 Nov 2011 00:00:00 GMT\n'
+    assert repr(d) == '<MayaDT epoch=1321488000.0>'
+
+
+def test_invalid_date():
+    with pytest.raises(ValueError):
+        maya.when('another day')
 
 
 def test_slang_date():
@@ -58,4 +99,62 @@ def test_slang_time():
     d = maya.when('one hour ago')
     assert d.slang_time() == 'an hour ago'
 
-# rand_day = maya.when('2011-02-07', timezone='US/Eastern')
+
+def test_parse():
+    d = maya.parse('February 21, 1994')
+    assert format(d) == '1994-02-21 00:00:00+00:00'
+
+    d = maya.parse('01/05/2016')
+    assert format(d) == '2016-01-05 00:00:00+00:00'
+
+    d = maya.parse('01/05/2016', day_first=True)
+    assert format(d) == '2016-05-01 00:00:00+00:00'
+
+
+def test_datetime_to_timezone():
+    dt = maya.when('2016-01-01').datetime(to_timezone='US/Eastern')
+    assert dt.tzinfo.zone == 'US/Eastern'
+
+def test_rfc3339():
+    mdt =  maya.when('2016-01-01')
+    out = mdt.rfc3339()
+    mdt2 = maya.MayaDT.from_rfc3339(out)
+    assert mdt.epoch == mdt2.epoch
+
+
+def test_comparison_operations():
+    now = maya.now()
+    now_copy = copy.deepcopy(now)
+    tomorrow = maya.when('tomorrow')
+
+    assert (now == now_copy) is True
+    assert (now == tomorrow) is False
+
+    assert (now != now_copy) is False
+    assert (now != tomorrow) is True
+
+    assert (now < now_copy) is False
+    assert (now < tomorrow) is True
+
+    assert (now <= now_copy) is True
+    assert (now <= tomorrow) is True
+
+    assert (now > now_copy) is False
+    assert (now > tomorrow) is False
+
+    assert (now >= now_copy) is True
+    assert (now >= tomorrow) is False
+
+    # Check Exceptions
+    with pytest.raises(TypeError):
+        now == 1
+    with pytest.raises(TypeError):
+        now != 1
+    with pytest.raises(TypeError):
+        now < 1
+    with pytest.raises(TypeError):
+        now <= 1
+    with pytest.raises(TypeError):
+        now > 1
+    with pytest.raises(TypeError):
+        now >= 1