Merge pull request #30 from neodark/master

Django 1.7 compliant and separation between library and sample
umutbozkurt · Sep 8, 2014 · 7b8cdd7 · 7b8cdd7
2 parents d37a9ef + c2a0a3e
commit 7b8cdd7
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,22 @@ Install
 ---------
 ``` pip install django-rest-framework-mongoengine```
 
+-----------------
+Install as package
+-----------------
+You can use this library as a package to your project:
+
+ - Step 1: Installing required files
+``` pip install -r requirements.txt```
+ - Step 2: make sure you're having a mongodb running locally:
+```/bin/mongod --dbpath [path_to_data/db/]```
+ - Step 3: Create users and table in dbsqlite and django admin:
+``` python manage.py syncdb```
+ - Step 4: Run the SampleApp demo:
+``` python manage.py runserver```
+
+Then run <b>http://localhost:8000/</b> on your favorite browser to test the interface
+
 -----------------
 Requirements
 -----------------

diff --git a/..._framework_mongoengine/Sample/__init__.py → Sample/__init__.py b/..._framework_mongoengine/Sample/__init__.py → Sample/__init__.py
diff --git a/..._framework_mongoengine/Sample/settings.py → Sample/settings.py b/..._framework_mongoengine/Sample/settings.py → Sample/settings.py
@@ -26,6 +26,20 @@
 
 ALLOWED_HOSTS = []
 
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+#     'django.template.loaders.eggs.Loader',
+)
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    os.path.join(BASE_DIR, '.','templates'),
+)
+
 
 # Application definition
 
@@ -36,8 +50,8 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.admin',
     'SampleApp',
+    'homepage',
     'rest_framework'
 )
 

diff --git a/rest_framework_mongoengine/Sample/urls.py → Sample/urls.py b/rest_framework_mongoengine/Sample/urls.py → Sample/urls.py
@@ -1,10 +1,11 @@
 from django.conf.urls import patterns, include, url
-from rest_framework_mongoengine.SampleApp import views
+from SampleApp import views
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^$',  include('homepage.urls')),
     url(r'^users/$', views.UserList.as_view()),
     url(r'^users/(?P<id>[\w]{24})/$', views.UserDetails.as_view()),
     url(r'^blogs/$', views.BlogList.as_view()),

diff --git a/rest_framework_mongoengine/Sample/wsgi.py → Sample/wsgi.py b/rest_framework_mongoengine/Sample/wsgi.py → Sample/wsgi.py
diff --git a/...amework_mongoengine/SampleApp/__init__.py → SampleApp/__init__.py b/...amework_mongoengine/SampleApp/__init__.py → SampleApp/__init__.py
diff --git a/..._framework_mongoengine/SampleApp/admin.py → SampleApp/admin.py b/..._framework_mongoengine/SampleApp/admin.py → SampleApp/admin.py
diff --git a/...framework_mongoengine/SampleApp/models.py → SampleApp/models.py b/...framework_mongoengine/SampleApp/models.py → SampleApp/models.py
diff --git a/...work_mongoengine/SampleApp/serializers.py → SampleApp/serializers.py b/...work_mongoengine/SampleApp/serializers.py → SampleApp/serializers.py
diff --git a/..._framework_mongoengine/SampleApp/tests.py → SampleApp/tests.py b/..._framework_mongoengine/SampleApp/tests.py → SampleApp/tests.py
diff --git a/..._framework_mongoengine/SampleApp/views.py → SampleApp/views.py b/..._framework_mongoengine/SampleApp/views.py → SampleApp/views.py
diff --git a/homepage/__init__.py b/homepage/__init__.py
diff --git a/homepage/admin.py b/homepage/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/homepage/migrations/__init__.py b/homepage/migrations/__init__.py
diff --git a/homepage/models.py b/homepage/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/homepage/tests.py b/homepage/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/homepage/urls.py b/homepage/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import *
+from django.conf import settings
+
+
+urlpatterns = patterns('homepage.views',
+    url(r'^$', 'home',      name="home"),
+)
diff --git a/homepage/views.py b/homepage/views.py
@@ -0,0 +1,16 @@
+from django.shortcuts import render
+
+from django.conf import settings
+from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+# Create your views here.
+
+def home(request):
+
+    param1 = "parameter_1"
+    return render_to_response('homepage/index.html',
+    {
+        'param':param1
+    },
+    context_instance = RequestContext(request))                                    
diff --git a/rest_framework_mongoengine/manage.py → manage.py b/rest_framework_mongoengine/manage.py → manage.py
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+Django==1.7
+mongoengine==0.8.7
+djangorestframework==2.4.2
diff --git a/templates/homepage/index.html b/templates/homepage/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Django Rest Framework Mongoengine</title>
+  </head>
+  <b>Sample App using django-rest-framework and Mongoengine</b>
+  <body>
+          <div class="nav-collapse collapse">
+            <ul class="nav"><b>REST API</b>
+              <li><a href="/users">Users</a></li>
+              <li><a href="/blogs">Blogs</a></li>
+              <li><a href="/posts">Posts</a></li>
+              <li><a href="/comments">Comments</a></li>
+            </ul>
+            <ul class="nav"><b>Django Admin</b>
+              <li><a href="/admin">Admin</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+  </body>
+</html>
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.