Renamed djanalytics in all files

INSTALL.md

@@ -3,10 +3,10 @@ Note: These instructions may be obsolete.
 To install a development setup: 
 
     apt-get install python-pip python-matplotlib python-scipy emacs mongodb apache2-utils python-mysqldb subversion ipython nginx git redis-server
-    git clone https://github.com/MITx/djanalytics
-    cd djanalytics
+    git clone https://github.com/MITx/edinsights
+    cd edinsights
     pip install -r requirements.txt    
-    cd src/djanalytics/
+    cd src/edinsights/
     python manage.py syncdb
     python manage.py migrate
     python manage.py runserver localhost:9022
@@ -14,7 +14,7 @@ To install a development setup:
 To install a setup to build from: 
 
     apt-get install python-pip python-matplotlib python-scipy emacs mongodb apache2-utils python-mysqldb subversion ipython nginx git redis-server
-    git clone https://github.com/MITx/djanalytics
-    cd djanalytics
+    git clone https://github.com/MITx/edinsights
+    cd edinsights
     pip install -r requirements.txt    
     sudo python setup.py install

README.md

-djanalytics
+edinsights
 ===========
 
 This is a development version of an analytics framework for the edX
@@ -248,7 +248,7 @@ This section lists some long-term architectural design goals of the
 system. 
 
 The architecture is explicitly designed to eventually scale to running
-different analytics on different servers. djanalytics.core.djobject
+different analytics on different servers. edinsights.core.djobject
 provides a query object and a view object, which can be used to access
 queries and views in an identical way, regardless of whether or not
 there is a network in between. In the future, we would like to support

docs/Makefile

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/djanalytics.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/edinsights.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/djanalytics.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/edinsights.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/djanalytics"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/djanalytics"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/edinsights"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/edinsights"
 	@echo "# devhelp"
 
 epub:

docs/source/conf.py

 # -*- coding: utf-8 -*-
 #
-# djanalytics documentation build configuration file, created by
+# edinsights documentation build configuration file, created by
 # sphinx-quickstart on Sat Mar 30 06:06:18 2013.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -13,7 +13,7 @@
 
 import sys, os
 
-sys.path.insert(0, os.path.abspath('../../src/djanalytics/'))
+sys.path.insert(0, os.path.abspath('../../src/edinsights/'))
 
 print sys.path
 
@@ -48,7 +48,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'djanalytics'
+project = u'edinsights'
 copyright = u'2013, Piotr Mitros, Vik Parachuri'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -172,7 +172,7 @@ html_static_path = ['_static']
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'djanalyticsdoc'
+htmlhelp_basename = 'edinsightsdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -191,7 +191,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'djanalytics.tex', u'djanalytics Documentation',
+  ('index', 'edinsights.tex', u'edinsights Documentation',
    u'Piotr Mitros, Vik Parachuri', 'manual'),
 ]
 
@@ -221,7 +221,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'djanalytics', u'djanalytics Documentation',
+    ('index', 'edinsights', u'edinsights Documentation',
      [u'Piotr Mitros, Vik Parachuri'], 1)
 ]
 
@@ -235,8 +235,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'djanalytics', u'djanalytics Documentation',
-   u'Piotr Mitros, Vik Parachuri', 'djanalytics', 'One line description of project.',
+  ('index', 'edinsights', u'edinsights Documentation',
+   u'Piotr Mitros, Vik Parachuri', 'edinsights', 'One line description of project.',
    'Miscellaneous'),
 ]
 

docs/source/index.rst

-.. djanalytics documentation master file, created by
+.. edinsights documentation master file, created by
    sphinx-quickstart on Sat Mar 30 06:06:18 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to djanalytics's documentation!
+Welcome to edinsights's documentation!
 =======================================
 
 ..
@@ -15,7 +15,7 @@ Welcome to djanalytics's documentation!
 core.decorators
 ======================
 
-core.decorators is the bulk of the public interface of djanalytics. 
+core.decorators is the bulk of the public interface of edinsights. 
 
 .. automodule:: core.decorators
    :members:

example/README.md

-This is a minimal application built on top of djanalytics. 
+This is a minimal application built on top of edinsights. 
 
 All it does is stream events verbatim into a database. 
 
-To run this, first install djanalytics: 
+To run this, first install edinsights: 
 
     sudo python setup.py install
 

example/src/mongolog/modules/dump_to_db.py

 import sys
 
-from djanalytics.core.decorators import event_handler
+from edinsights.core.decorators import event_handler
 
 @event_handler()
 def dump_to_db(mongodb, events):

example/src/mongolog/mongolog/settings.py

@@ -2,7 +2,7 @@
 
 # Django settings for edxanalytics project.
 
-#### djanalytics-specific settings
+#### edinsights-specific settings
 
 import datetime
 import os.path
@@ -15,8 +15,8 @@ from pkg_resources import resource_filename
 DJ_REQUIRED_APPS = ( 'djeventstream.httphandler',
     'djcelery',
     'south',
-    'djanalytics.core',
-    'djanalytics.modulefs',
+    'edinsights.core',
+    'edinsights.modulefs',
 #    'modules',
 )
 

example/src/mongolog/mongolog/urls.py

@@ -17,4 +17,4 @@ urlpatterns = patterns('',
     # url(r'^admin/', include(admin.site.urls)),
 )
 
-import djanalytics.core.views
+import edinsights.core.views

setup.py

 from distutils.core import setup
 from setuptools import find_packages
 
-setup(name = 'djanalytics', 
+setup(name = 'edinsights', 
       version = '0.0',
-      package_dir = {'djanalytics':'src/djanalytics'}, 
-      packages = ['djanalytics', 'djanalytics.core', 'djanalytics.modulefs', 'djanalytics.modules', 'djanalytics.modules.testmodule'],
+      package_dir = {'edinsights':'src/edinsights'}, 
+      packages = ['edinsights', 'edinsights.core', 'edinsights.modulefs', 'edinsights.modules', 'edinsights.modules.testmodule'],
       author="Piotr Mitros, Vik Paruchuri", 
-      data_files = [("djanalytics/modules/testmodule/static/", ["src/djanalytics/modules/testmodule/static/hello.html"]), 
-                    ("djanalytics/modules/testmodule/templates/", ["src/djanalytics/modules/testmodule/templates/hello.html"])],
+      data_files = [("edinsights/modules/testmodule/static/", ["src/edinsights/modules/testmodule/static/hello.html"]), 
+                    ("edinsights/modules/testmodule/templates/", ["src/edinsights/modules/testmodule/templates/hello.html"])],
       license = "AGPLv3, see LICENSE.txt")

src/edinsights/core/auth.py

 '''
-This allows djanalytics to have authentication on provided URLs. 
+This allows edinsights to have authentication on provided URLs. 
 
 All views are decorated with the @auth decorator. 
 
 The @auth decorator looks at settings.py for a DJA_AUTH setting. The
 DJA_AUTH setting maps function names to authentication decorators. For
-example, to require all djanalytics URLs to have a login, add the
+example, to require all edinsights URLs to have a login, add the
 following to settings.py:
 
 import django.contrib.auth.decorators

src/edinsights/core/decorators.py

@@ -162,7 +162,7 @@ def cron(period, params=None):
     def factory(f):
         @periodic_task(run_every=period, name=f.__name__)
         def run():
-            import djanalytics.core.views
+            import edinsights.core.views
             mongodb = core.views.get_mongo(f)
             fs = core.views.get_filesystem(f)
             f(fs, mongodb, params)

src/edinsights/core/djobject.py

-''' This is a generic interface to djanalytics. It presents views,
+''' This is a generic interface to edinsights. It presents views,
 etc. as Python objects. 
 
 This is prototype-grade code. 
@@ -15,7 +15,7 @@ import requests
 import urllib
 
 def http_rpc_helper(baseurl, view_or_query, function, headers = {}, timeout = None):
-    ''' Make an RPC call to a remote djanalytics instance
+    ''' Make an RPC call to a remote edinsights instance
     '''
     if baseurl: 
         baseembedurl = baseurl+view_or_query+"/"
@@ -39,11 +39,11 @@ def http_rpc_helper(baseurl, view_or_query, function, headers = {}, timeout = No
     return rpc_call
 
 def local_call_helper(view_or_query, function):
-    ''' Make a call (functionally identical to RPC) to the local djanalytics instance
+    ''' Make a call (functionally identical to RPC) to the local edinsights instance
     '''
-    import djanalytics.core.registry
+    import edinsights.core.registry
     def rpc_call(**kwargs):
-        return djanalytics.core.registry.handle_request(view_or_query, function, **kwargs)
+        return edinsights.core.registry.handle_request(view_or_query, function, **kwargs)
     return rpc_call
 
 class multi_embed():
@@ -131,8 +131,8 @@ class single_embed(object):
                 url = self._baseurl+"schema"
                 self._schema = json.loads(requests.get(url).content)
             else: 
-                import djanalytics.core.registry
-                self._schema = djanalytics.core.registry.schema_helper()
+                import edinsights.core.registry
+                self._schema = edinsights.core.registry.schema_helper()
 
     def __getattr__(self, attr):
         ## Disallow internal. This is necessary both for analytics,
@@ -264,7 +264,7 @@ class djobject():
 
 if __name__ == "__main__":
     djo = djobject(baseurl = "http://127.0.0.1:8000/")
-    if True: # Internal test -- from djanalytics
+    if True: # Internal test -- from edinsights
         print djo.query.djt_event_count()
         print djo.query.djt_user_event_count(user = "bob")
         print dir(djo.query)

src/edinsights/core/registry.py

@@ -6,7 +6,7 @@ log=logging.getLogger(__name__)
 event_handlers = []
 request_handlers = {'view':{}, 'query':{}}
 
-from djanalytics.core.views import default_optional_kwargs
+from edinsights.core.views import default_optional_kwargs
 funcskips = default_optional_kwargs.keys()+['params'] # params are additional GET/POST parameters
 
 def register_handler(cls, category, name, description, f, args):

src/edinsights/core/render.py

@@ -114,7 +114,7 @@ class ModuleStorage(FileSystemStorage):
         ''' Returns the absolute path to a file, stripping out
         /djmodules/[module] from the beginning. If the system requests
         /djmodules/testmodule/hello.html, this will return
-        /home/user/djanalytics/src/modules/testmodule/static/hello.html
+        /home/user/edinsights/src/modules/testmodule/static/hello.html
         '''
         rootpath = os.path.relpath(os.path.join(name), self.base_url)
         return FileSystemStorage.path(self, rootpath)

src/edinsights/core/static/index.html

@@ -4,5 +4,5 @@
 <li> <a href="/schema?f=html">schema</a> will give a list of views and queries. 
 <li> <a href="/event_properties">Event properties</a> will give a list of event properties. 
 </ul>
-Docs are on <a href=https://github.com/MITx/djanalytics>github</a>. 
+Docs are on <a href=https://github.com/MITx/edinsights>github</a>. 
 </html>

src/edinsights/core/urls.py

@@ -2,13 +2,13 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('',
     # Examples:
-    url(r'^view/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_view'),
-    url(r'^query/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_query'),
-    url(r'^schema$', 'djanalytics.core.views.schema'),
-    url(r'^event_properties$', 'djanalytics.core.views.event_properties'),
-    # url(r'^probe$', 'djanalytics.core.views.handle_probe'),
-    # url(r'^probe/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_probe'),
-    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_probe'),
-    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_probe'),
-    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'djanalytics.core.views.handle_probe'),
+    url(r'^view/([A-Za-z_+]+)$', 'edinsights.core.views.handle_view'),
+    url(r'^query/([A-Za-z_+]+)$', 'edinsights.core.views.handle_query'),
+    url(r'^schema$', 'edinsights.core.views.schema'),
+    url(r'^event_properties$', 'edinsights.core.views.event_properties'),
+    # url(r'^probe$', 'edinsights.core.views.handle_probe'),
+    # url(r'^probe/([A-Za-z_+]+)$', 'edinsights.core.views.handle_probe'),
+    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'edinsights.core.views.handle_probe'),
+    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'edinsights.core.views.handle_probe'),
+    # url(r'^probe/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'edinsights.core.views.handle_probe'),
 )

src/edinsights/core/util.py

@@ -6,7 +6,7 @@ from pymongo import MongoClient
 from django.conf import settings
 from django.core.cache import cache
 
-from djanalytics.modulefs import modulefs
+from edinsights.modulefs import modulefs
 
 connection = MongoClient()
 

src/edinsights/modules/testmodule/__init__.py

@@ -4,12 +4,12 @@
 
 modules_to_import = []
 
-from djanalytics.core.decorators import query, event_handler, view, event_property
+from edinsights.core.decorators import query, event_handler, view, event_property
 
 @view()
 def djt_hello_template():
     ''' Example of how to use mako templates in a view '''
-    from djanalytics.core.render import render
+    from edinsights.core.render import render
     return render("hello.html", {})
 
 @query()

src/edinsights/modules/tests.py

@@ -88,7 +88,7 @@ class SimpleTest(TestCase):
         self.send_event(c, { 'fs_forgets_contents' : "hello world!", 'filename' : "foo3.txt", 'fs_forgets_expiry' : 15})
         self.send_event(c, { 'fs_forgets_contents' : "hello world!", 'filename' : "foo4.txt", 'fs_forgets_expiry' : 15})
         verify({"foo1.txt":True, "foo2.txt":True, "foo3.txt":True, "foo4.txt":True})
-        from djanalytics.modulefs.modulefs import expire_objects
+        from edinsights.modulefs.modulefs import expire_objects
         expire_objects()
         verify({"foo1.txt":False, "foo2.txt":False, "foo3.txt":True, "foo4.txt":True})
         self.send_event(c, { 'filename' : "foo3.txt", 'fs_forgets_expiry' : -15})

src/edinsights/settings.py

-# Django settings for djanalytics project.
+# Django settings for edinsights project.
 
 #### Additional setting required for core
 
@@ -143,7 +143,7 @@ MIDDLEWARE_CLASSES = (
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'djanalytics.urls'
+ROOT_URLCONF = 'edinsights.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".

src/edinsights/urls.py

@@ -8,7 +8,7 @@ from django.contrib.auth.decorators import login_required
 
 urlpatterns = patterns('',
     # Examples:
-    url(r'^$', 'djanalytics.core.views.index'),
+    url(r'^$', 'edinsights.core.views.index'),
     url('^', include('core.urls')),
     url(r'^httpevent$', 'djeventstream.httphandler.views.http_view'),
     # url(r'^view/([A-Za-z_+]+)/([A-Za-z_+]+)$', 'core.views.handle_view'),