Merge pull request #62 from agiliq/remove_homepage_mongo_dependency

Removed mongo dependency from homepage.

Author: akshar-raaj

README.md

@@ -93,16 +93,16 @@ Graphos is a Django app to normalize data to create beautiful charts. It provide
 
 	python manage.py migrate
 
-* Make sure mongo server is running(You should have mongodb properly setup for this)
-
-	mongod --dbpath ~/data/db
-
 * Run server
 
 	python manage.py runserver
 
 The installed demo app shows the various suported chart types.
 
+In case you want to use mongo data while charting, you must have mongodb properly setup and **pymongo** installed. Make sure mongo server is running.
+
+	mongod --dbpath ~/data/db
+
 
 ### Overview of Plot generation
 

demo_project/demo/templates/demo/home.html

@@ -29,9 +29,6 @@ <h2>Google charts<h2>
 {{ g_chart.as_html }}
 
 
-<h2>Mongo Data with LineChart</h2>
-{{ m_chart.as_html }}
-
 <br />
 </div>
 {% endblock %}

demo_project/demo/utils.py

@@ -1,5 +1,3 @@
-import pymongo
-
 from .models import Account
 
 
@@ -8,13 +6,15 @@
 
 
 def get_db(db_name):
+    import pymongo
     DB_HOST = ["localhost"]
     DB_PORT = 27017
     db = pymongo.Connection(DB_HOST, DB_PORT)[db_name]
     return db
 
 
 def get_mongo_cursor(db_name, collection_name, max_docs=100):
+    import pymongo
     db = pymongo.Connection(host=DB_HOST,
                             port=DB_PORT)[db_name]
     collection = db[collection_name]

demo_project/demo/views.py

@@ -27,7 +27,6 @@
 
 import markdown
 import datetime
-import pymongo
 from dateutil.parser import parse
 
 class MongoJson(FlotAsJson):
@@ -158,16 +157,20 @@ def get_context_data(self, **kwargs):
 def home(request):
     chart = flot.LineChart(SimpleDataSource(data=data), html_id="line_chart")
     g_chart = gchart.LineChart(SimpleDataSource(data=data))
+    context = {'chart': chart,
+               'g_chart': g_chart}
+    return render(request, 'demo/home.html', context)
+
+
+def other(request):
     cursor = get_mongo_cursor("graphos_mongo",
                               "zips",
                               max_docs=100)
     m_data = MongoDBDataSource(cursor=cursor, fields=['_id', 'pop'])
     m_chart = flot.LineChart(m_data)
-
-    context = {'chart': chart,
-               'g_chart': g_chart,
-               'm_chart': m_chart}
-    return render(request, 'demo/home.html', context)
+    context = {}
+    context['m_chart'] = m_chart
+    return render(request, 'demo/other.html', context)
 
 
 @cache_page(60*60*24)