Merge branch 'efficiency'

.travis.yml

@@ -11,8 +11,9 @@ install:
   - pip install pandas==0.23.4
   - pip install requests==2.21.0
   - pip install beautifulsoup4==4.7.1
-  - pip install investpy==0.4
+  - pip install investpy_test==1.4
   - pip install pytest==4.1.1
+  - pip install lxml==4.3.2
 
 script:
   - pytest

investpy/Data.py

@@ -17,9 +17,13 @@ class Data(object):
     Methods
     -------
     equity_to_dict()
-        converts the equity object into a dictionary (JSON format)
+        converts the equity object into a dictionary
+    equity_as_json()
+        converts the equity object into a JSON object
     fund_to_dict()
-        converts the fund object into a dictionary (JSON format)
+        converts the fund object into a dictionary
+    fund_as_json()
+        converts the fund object into a JSON object
     """
 
     def __init__(self, date_, close_, open_, max_, min_, volume_):
@@ -40,11 +44,28 @@ def equity_to_dict(self):
             'Volume': self.volume,
         }
 
+    def equity_as_json(self):
+        return {self.date.strftime('%d/%m/%Y'): {
+            'Close': self.close,
+            'Open': self.open,
+            'Max': self.max,
+            'Min': self.min,
+            'Volume': self.volume,
+        }}
+
     def fund_to_dict(self):
         return {
             'Date': self.date,
             'Close': self.close,
             'Open': self.open,
             'Max': self.max,
             'Min': self.min,
-        }
+        }
+
+    def fund_as_json(self):
+        return {self.date.strftime('%d/%m/%Y'): {
+            'Close': self.close,
+            'Open': self.open,
+            'Max': self.max,
+            'Min': self.min,
+        }}