Fix for to_dict and to_json methods

.gitignore

@@ -1,45 +1,16 @@
+*.pyc
 
-.komodotools/python.komodotool
-
-.komodotools/python2_6_-m_test_ru.komodotool
-
-Tiger.komodoproject
-
-Tiger.kpf
-
-.DS_Store
-
-X12/*.pyc
-
-X12/map/*.pyc
-
-X12/message/*.pyc
-
-claims/*.pyc
-
-doc/build/.*
-
-doc/build/html/.*
-
-extras/*.pyc
-
+doc/build
 doc/*.zargo~
 
-test/*.pyc
-
-
 testserver.err
-
 testserver.log
 
 tiger.db
 
-tools/*.pyc
-
-web/*.pyc
-
-web/claims/*.pyc
-
-web/claims_837/*.pyc
-
-build/*
+build
+dist
+MANIFEST
+.cache
+.tox
+*.egg-info

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+python:
+  - "2.7"
+  - "3.5"
+install:
+  - pip install tox tox-travis
+script:
+  - tox

AUTHORS

@@ -0,0 +1,7 @@
+Steven <steven.buss@gmail.com>
+Dave Peticolas <dave@krondo.com>
+Thomas Kho <tom@hioscar.com>
+Wojciech Zając <wojciech.zajac@tirasu.com>
+Lucas Wiman <lucas.wiman@gmail.com>
+S.Lott <slott56@gmail.com>
+Cloud Cray <cloudcray@gmail.com>

README.md

@@ -1,8 +1,106 @@
 TigerShark is an X12 EDI message parser that can be tailored to
 a specific partner in the health care payment ecosystem.
 
-State of the Project
-====================
+
+Version 0.3.5
+-------------
+
+Minor patch for converting zero-length strings to python values in `D8` elements (dates).
+Previous behavior raised a `ValueError` trying to convert `''` to a `datetime.date` - now returns `None`. 
+This now matches the existing functionality for `DR` elements (datetime values)
+
+
+Version 0.3.4
+-------------
+
+This patch cleans up the X12 271 Service Type Codes to bring them in line with current use. This patch also includes 
+parsers for the 5010 versions of Professional (X222A1) and Institutional (X223A1) 837 transactions.
+* Updates `enums.eligibility.service_type_codes` to include new and missing Service Type Codes
+* Adds `enums.eligibility.deprecated_service_type_codes`, a tuple of service type codes that have been deprecated by 
+  X12
+* Adds `X12_5010_X222A1` and `X12_5010_X223A1` parsers for 837 5010 messages
+* This does NOT add or update any facades related to 837 transactions (existing 837 facades only function for 4010 
+  messages)
+
+The `service_type_codes` dict was last updated in June 2012. Since then, 21 Service Type Codes have been added, 
+7 of which have already been deprecated.
+
+13 Service Type Codes have been deprecated by X12 (including 7 added in this patch). All 13 have been 
+preserved in `service_type_codes`, as this module may be used to parse existing/old 271 responses. The 
+`deprecated_service_type_codes` tuple has been added as a helper to identify which codes are considered inactive.
+
+Note: the code `EO` ("ECHO-OSCAR") appears to have been added in error temporarily as a duplicate of `E0` 
+("ECHO-ZERO") for a 4-month span in 2017. The code has been added back in on the chance it made its way into 
+any production systems.
+
+New Service Type Codes:
+
+| Code | Label | Date Added | Date Deprecated |
+| ---  | ---   | ---        | --- |
+| E29 | Technical Cardiac Rehabilitation Services Component | 09/30/2012 | 07/01/2016 |
+| E30 | Professional Cardiac Rehabilitation Services Component | 09/30/2012 | 07/01/2016 |
+| E31 | Professional Intensive Cardiac Rehabilitation Services Component | 09/30/2012 | 07/01/2016 |
+| E32 | Intensive Cardiac Rehabilitation - Technical Component | 06/02/2013 | 05/01/2017 |
+| E33 | Intensive Cardiac Rehabilitation | 06/02/2013 |  |
+| E34 | Pulmonary Rehabilitation - Technical Component | 06/02/2013 | 05/01/2017 |
+| E35 | Pulmonary Rehabilitation - Professional Component | 06/02/2013 | 05/01/2017 |
+| E36 | Convenience Care | 06/02/2013 |  |
+| E37 | Telemedicine | 07/01/2015 |  |
+| E38 | Pharmacist Services | 07/01/2015 |  |
+| E39 | Diabetic Education | 03/01/2016 |  |
+| E40 | Early Intervention | 11/01/2016 |  |
+| EO | Applied Behavioral Analysis Therapy | 03/01/2017 | 07/01/2017 |
+| F1 | Medical Coverage | 11/01/2015 |  |
+| F2 | Social Work Coverage | 11/01/2015 |  |
+| F3 | Dental Coverage | 11/01/2015 |  |
+| F4 | Hearing Coverage | 11/01/2015 |  |
+| F5 | Prescription Drug Coverage | 11/01/2015 |  |
+| F6 | Vision Coverage | 11/01/2015 |  |
+| F7 | Orthodontia Coverage | 11/01/2015 |  |
+| F8 | Mental Health Coverage | 11/01/2015 |  |
+
+More on service type codes on the [official X12 website](https://x12.org/codes/service-type-codes).
+* _Note: Use the 
+"Show All" filter to view current and deprecated codes (page only displays current codes by default.)_
+
+
+Version 0.3.3
+-------------
+
+* Adds `in_plan_network_type` to `EligibilityOrBenefitInformation` for explicit values
+* Adds `out_of_plan_network` for completion's sake
+* Note that `in_plan_network`, `out_of_plan_network`, and `both_in_out_network` all return `False` when no value is set, although `None` would probably be more appropriate
+* It may be more intuitive if `in_plan_network` and `out_of_plan_network` returned `True` when `both_in_out_network` is `True`, but the behavior is preserved for backwards compatibility
+
+Version 0.3.2
+-------------
+
+* Support for EligibilityOrBenefitAdditionalInformation - `additional_information` property added to EligibilityOrBenefit to handle `III*ZZ*` segments
+* Adds `place_of_service` enum for corresponding `additional_information` property
+* Cleans up unittest warnings (`assertEquals` replaced with `assertEqual`)
+* More descriptive and reliable `.to_dict` and `.to_json` methods.
+
+Version 0.3.1
+-------------
+
+* `to_dict` and `to_json` helper methods. Thanks CloudCray.
+
+Version 0.3.0
+-------------
+
+* Python 3 support, thanks Lucas Wiman!
+
+Version 0.2.9
+-------------
+
+* Bugfix for parsing the LS loop in 5010 271.
+
+Version 0.2.8
+-------------
+
+* Support for parsing 5010 270, 271, and 835 files.
+* Support for parsing any X12 file to get version and transaction set information.
+* Utility APIs for parsing any X12 file.
 
 Version 0.2.5
 -------------
@@ -229,5 +327,12 @@ the tests that currently exist, run the following in the current directory.
 python -m unittest discover
 ```
 
+To limit tests to the `tests` directory (ignoring all tests in the `web` directory), run the following:
+
+
+```sh
+python -m unittest discover -s 'tests'
+```
+
 Note that if you first `cd tests` and then run the unit tests, they will fail
 because the tests expect certain files to be in certain paths.

setup.py

@@ -7,20 +7,25 @@
     name='TigerShark',
     version=__version__,
     description='TigerShark: An X12 file parser.',
-    long_description='TigerShark is an X12 EDI message parser that can be '\
-            'tailored to a specific partner in the health care payment '\
-            'ecosystem.',
-    author='Steven Buss & Steven Lott',
-    author_email='steven.buss@gmail.com',
-    download_url='https://github.com/sbuss/TigerShark/tarball/v%s' % \
-            __version__,
+    long_description=(
+        'TigerShark is an X12 EDI message parser that can be '
+        'tailored to a specific partner in the health care payment '
+        'ecosystem.'),
+    author='Steven Buss & Steven Lott & Dave Peticolas',
+    author_email='dave.peticolas@gmail.com',
+    download_url=(
+        'https://github.com/jdavisp3/TigerShark/tarball/v%s' % __version__),
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Intended Audience :: Healthcare Industry",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Topic :: Text Processing",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
     ],
     packages=[
         'tigershark',

tests/271-example-3.txt

@@ -0,0 +1,78 @@
+ISA|00|          |00|          |ZZ|ZIRMED         |ZZ|10864          |160405|1354|}|00501|000184077|1|P|^~
+GS|HB|ZIRMED|10864|20160301|1354|184065|X|005010X279A1~
+ST|271|0001|005010X279A1~
+BHT|0022|11|94309|20160301|134403~
+HL|1||20|1~
+NM1|PR|2|MEDICA COM|||||PI|123456789~
+HL|2|1|21|1~
+NM1|1P|1|James|Barraret|J.|||XX|1234567894~
+HL|3|2|22|0~
+TRN|2|434343434|9ZIRMEDCOM|ELR ID~
+TRN|1|422422424|9ZIRMEDCOM|ELI ID~
+NM1|IL|1|SMITH|JOHN||||MI|1234567899~
+REF|18|0404044~
+REF|6P|030030001000120|NEVADA EXCHANGE~
+N3|4040 VILLAGE AB~
+N4|KANSAS CITY|MO|64108~
+DMG|D8|19430813|M~
+INS|Y|18|001|25~
+DTP|346|D8|20160201~
+DTP|472|D8|20160601~
+DTP|356|D8|20141208~
+EB|L|EMP|30|EP~
+MSG|PCP SELECTION NOT REQUIRED~
+EB|W~
+LS|2120~
+NM1|PR|2|Mala Compania~
+N3|PO Box 983322~
+N4|El Fixato|TX|68887~
+LE|2120~
+EB|1|EMP|30|EP|Open Access Elect Choice~
+EB|G|IND|30||||2100|||||Y~
+MSG|MAXIMUM SAVINGS,QUALIFIED HEALTH PLAN DESIGNATED PROVIDERS~
+MSG|INT MED AND RX~
+EB|G|IND|30|||29|2100|||||Y~
+EB|F|EMP|30|||||||||Y~
+MSG|PLAN REQUIRES PRECERT~
+EB|F|EMP|30~
+MSG|COMMERCIAL~
+EB|F|EMP|30|||32~
+MSG|UNLIMITED LIFETIME BENEFITS~
+EB|1|EMP|1}33}47}48}50}86}98}UC}AL}MH}88||Open Access Elect Choice~
+EB|A|EMP|33|||||0||||Y~
+MSG|MAXIMUM SAVINGS,QUALIFIED HEALTH PLAN DESIGNATED PROVIDERS~
+MSG|CHIROPRACTOR VISIT OR EVALUATION IN OFFICE~
+MSG|LAB PERFORMED BY CHIROPRACTOR IN OFFICE~
+MSG|XRAY BY CHIROPRACTOR IN OFFICE~
+EB|A|EMP|86|||||0||||Y~
+MSG|MAXIMUM SAVINGS,QUALIFIED HEALTH PLAN DESIGNATED PROVIDERS~
+MSG|EMERGENCY ROOM PHYSICIAN~
+MSG|EMERGENCY USE OF EMERGENCY ROOM~
+MSG|URGENT CARE~
+EB|A|EMP|98|||||.1||||Y~
+MSG|MAXIMUM SAVINGS,QUALIFIED HEALTH PLAN DESIGNATED PROVIDERS~
+MSG|GYN VISIT,COINS APPLIES TO OUT OF POCKET~
+MSG|SPECIALIST VISIT OR EVALUATION,COINS APPLIES TO OUT OF POCKET~
+MSG|PRIMARY CARE VISIT OR EVALUATION,COINS APPLIES TO OUT OF POCKET~
+III|ZZ|11~
+EB|B|EMP|33||||20|||||Y~
+MSG|MAXIMUM SAVINGS,QUALIFIED HEALTH PLAN DESIGNATED PROVIDERS~
+MSG|CHIROPRACTOR VISIT OR EVALUATION IN OFFICE,COPAY INCLUDED IN OOP~
+MSG|LAB PERFORMED BY CHIROPRACTOR IN OFFICE,COPAY INCLUDED IN OOP~
+MSG|XRAY BY CHIROPRACTOR IN OFFICE,COPAY INCLUDED IN OOP~
+EB|F|IND|33|||||||||Y~
+HSD|VS|35|||21|1~
+MSG|SHT TRM RHB OP,MANIPULATION BY CHIROPRACTOR,OCCUPATIONAL THERAPY BY CHIROPRACTOR,PHYSICAL THERAPY BY CHIROPRACTOR~
+EB|F|IND|33|||||||||Y~
+HSD|VS|35|||29~
+MSG|SHT TRM RHB OP~
+EB|I|EMP|86|||||||||Y~
+MSG|NON EMERGENCY USE OF EMERGENCY ROOM/EXCLUSION~
+EB|I|EMP|86}UC|||||||||Y~
+MSG|NON URGENT SERVICES AT AN URGENT CARE FACILITY/EXCLUSION~
+EB|F|EMP|1}33}48}50}86}98}UC~
+MSG|PLAN INCLUDES NAP~
+EB|I|EMP|1}33}48}50}86}98}UC|||||||||N~
+SE|74|0001~
+GE|1|184065~
+IEA|1|000184077~

tests/271-example-in-out-network.txt

@@ -0,0 +1,50 @@
+ISA|00|          |00|          |ZZ|ZIRMED         |ZZ|10864          |160405|1354|}|00501|000184077|1|P|^~
+GS|HB|ZIRMED|10864|20160301|1354|184065|X|005010X279A1~
+ST|271|0001|005010X279A1~
+BHT|0022|11|94309|20160301|134403~
+HL|1||20|1~
+NM1|PR|2|MEDICA COM|||||PI|123456789~
+HL|2|1|21|1~
+NM1|1P|1|James|Barraret|J.|||XX|1234567894~
+HL|3|2|22|0~
+TRN|2|434343434|9ZIRMEDCOM|ELR ID~
+TRN|1|422422424|9ZIRMEDCOM|ELI ID~
+NM1|IL|1|SMITH|JOHN||||MI|1234567899~
+REF|18|0404044~
+REF|6P|030030001000120|NEVADA EXCHANGE~
+N3|4040 VILLAGE AB~
+N4|KANSAS CITY|MO|64108~
+DMG|D8|19430813|M~
+INS|Y|18|001|25~
+DTP|346|D8|20160201~
+DTP|472|D8|20160601~
+DTP|356|D8|20141208~
+EB|L|EMP|30|EP~
+MSG|PCP SELECTION NOT REQUIRED~
+EB|W~
+LS|2120~
+NM1|PR|2|Mala Compania~
+N3|PO Box 983322~
+N4|El Fixato|TX|68887~
+LE|2120~
+EB|1|EMP|30|EP|Open Access Elect Choice~
+EB|G|IND|30|C1|||1500|||||Y~
+EB|G|IND|30|C1||24|1500|||||Y~
+EB|G|IND|30|C1||29|0|||||Y~
+EB|C|IND|30||||118|||||Y~
+EB|C|IND|30|||24|118|||||Y~
+EB|C|IND|30|||29|0|||||Y~
+EB|G|IND|30|C1|||0|||||N~
+EB|G|IND|30|C1||24|0|||||N~
+EB|G|IND|30|C1||29|0|||||N~
+EB|C|IND|30||||0|||||N~
+EB|C|IND|30|||24|0|||||N~
+EB|C|IND|30|||29|0|||||N~
+EB|B|EMP|98||||50|||||Y~
+EB|B|EMP|98||||100|||||N~
+EB|A|IND|50|||27||0.1||||W~
+EB|A|IND|52|||||0.1
+EB|I|EMP|1}33}48}50}86}98}UC|||||||||N~
+SE|74|0001~
+GE|1|184065~
+IEA|1|000184077~

tests/278-sample.txt

@@ -0,0 +1,26 @@
+from tigershark.X12.parse import Message, Loop, Segment, Composite, Element, Properties
+parse_278 = Message( '278', Properties(desc='HIPAA Health Care Services Review: Request X094A1-278'),
+  Loop( 'ISA', Properties(desc='ISA',repeat='1',req_sit='R'),
+    Segment( 'ISA', Properties(),
+    ),
+    Loop( 'GS', Properties(desc='GS',repeat='1',req_sit='R'),
+      Segment( 'GS', Properties(),
+      ),
+      Loop( 'ST', Properties(desc='ST',repeat='1',req_sit='R'),
+        Segment( 'ST', Properties(desc='Transaction Set Header',qual=(1, '278'),repeat='1',req_sit='R'),
+          Element( 'ST01', Properties(desc=None, req_sit=None, data_type=(None,None,None), position=1,
+            codes=['278'] ) ),
+        ),
+        Segment( 'BHT', Properties(desc='Beginning of Hierarchical Transaction',repeat='1',req_sit='R'),
+        ),
+        Loop( '2000A', Properties(desc='2000A',repeat='1',req_sit='R'),
+          Segment( 'HL', Properties(desc='Utilization Management Organization (UMO) Level',qual=(3, '20'),repeat='1',req_sit='R'),
+            Element( 'HL03', Properties(desc=None, req_sit=None, data_type=(None,None,None), position=3,
+              codes=['20'] ) ),
+          ),
+          Loop( '2010A', Properties(desc='2010A',repeat='>1',req_sit='R'),
+            Segment( 'NM1', Properties(desc='Utilization Management Organization (UMO) Name',qual=(1, 'X3'),repeat='1',req_sit='R'),
+              Element( 'NM101', Properties(desc=None, req_sit=None, data_type=(None,None,None), position=1,
+                codes=['X3'] ) ),
+            ),
+          ),