Skip to content

Commit

Permalink
Showing 169 changed files with 4,058 additions and 207 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.gitignore
*~
*.pyc
third_party/*
templates/prod/*
.coverage
.viminfo
gae_runtime/*
File renamed without changes.
2 changes: 1 addition & 1 deletion app.yaml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ handlers:
Cache-Control: 'public, max-age=600'
- url: /css
# NB: not minified. TODO(sll): fix.
static_dir: templates/dev/head/assets/css
static_dir: oppia/templates/dev/head/assets/css
secure: always
- url: /img
static_dir: third_party/bootstrap/img
2 changes: 1 addition & 1 deletion build.py
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ def process_js(filename, target):
ensure_directory_exists(OUT_DIR)
shutil.rmtree(OUT_DIR)

for root in os.listdir(os.getcwd()):
for root in os.listdir(os.path.join(os.getcwd(), 'oppia')):
if '.git' in root or 'third_party' in root or 'lib' in root or 'data' in root:
continue

Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Koji Ashida'


import Coord2DClassifier
import data.classifiers.Coord2DClassifier.Coord2DClassifier as Coord2DClassifier
import test_utils


2 changes: 1 addition & 1 deletion data/classifiers/ListClassifier/list_classifier_test.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Sean Lip'


import ListClassifier
import data.classifiers.ListClassifier.ListClassifier as ListClassifier
import test_utils


Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Sean Lip'


import MultipleChoiceClassifier
import data.classifiers.MultipleChoiceClassifier.MultipleChoiceClassifier as MultipleChoiceClassifier
import test_utils


Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Sean Lip'


import MusicNoteClassifier
import data.classifiers.MusicNoteClassifier.MusicNoteClassifier as MusicNoteClassifier
import test_utils


Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Sean Lip'


import NumericClassifier
import data.classifiers.NumericClassifier.NumericClassifier as NumericClassifier
import test_utils


1 change: 0 additions & 1 deletion data/classifiers/SetClassifier/set_classifier_test.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
__author__ = 'Sean Lip'


import SetClassifier
import test_utils


2 changes: 1 addition & 1 deletion data/classifiers/TextClassifier/text_classifier_test.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
__author__ = 'Sean Lip'


import TextClassifier
import data.classifiers.TextClassifier.TextClassifier as TextClassifier
import test_utils


7 changes: 5 additions & 2 deletions feconf.py
Original file line number Diff line number Diff line change
@@ -70,11 +70,14 @@
# The directory containing the HTML/JS/CSS templates.
TEMPLATE_DIR = os.path.join(
os.path.dirname(__file__),
'templates/dev/head' if DEV else 'templates/prod/head'
'oppia/templates/dev/head' if DEV else 'oppia/templates/prod/head'
)

# The directory containing third-party files.
THIRD_PARTY_DIR = 'third_party'
THIRD_PARTY_DIR = 'oppia/third_party'

# The directory containing data files for tests.
TESTS_DATA_DIR = 'oppia/tests/data'

# The directories containing sample classifiers, explorations and widgets.
SAMPLE_CLASSIFIERS_DIR = 'data/classifiers'
21 changes: 11 additions & 10 deletions main.py
Original file line number Diff line number Diff line change
@@ -18,16 +18,17 @@

import webapp2

from controllers import admin
from controllers import base
from controllers import editor
from controllers import feedback
from controllers import gallery
from controllers import pages
from controllers import profile
from controllers import reader
from controllers import resources
from controllers import widgets
import oppia.controllers.admin as admin
import oppia.controllers.base as base
import oppia.controllers.editor as editor
import oppia.controllers.feedback as feedback
import oppia.controllers.gallery as gallery
import oppia.controllers.pages as pages
import oppia.controllers.profile as profile
import oppia.controllers.reader as reader
import oppia.controllers.resources as resources
import oppia.controllers.widgets as widgets

import feconf


File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

import test_utils

from apps.base_model.models import IdModel
from oppia.apps.base_model.models import IdModel


class IdModelUnitTests(test_utils.AppEngineTestBase):
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/classifier/models.py → oppia/apps/classifier/models.py
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@

import os

from apps.base_model.models import BaseModel
from apps.base_model.models import IdModel
from oppia.apps.base_model.models import BaseModel
from oppia.apps.base_model.models import IdModel
import feconf
import utils

Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

__author__ = 'Sean Lip'

from apps.classifier.models import Classifier
from oppia.apps.classifier.models import Classifier
import test_utils


File renamed without changes.
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@

__author__ = 'Sean Lip'

from apps.base_model.domain import BaseDomainObject
from apps.exploration.models import ExplorationModel
from apps.state.models import State
from oppia.apps.base_model.domain import BaseDomainObject
from oppia.apps.exploration.models import ExplorationModel
from oppia.apps.state.models import State
import feconf


Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@

import test_utils

from apps.exploration.domain import Exploration
import apps.exploration.services as exp_services
from apps.state.models import State
from apps.widget.models import InteractiveWidget
from oppia.apps.exploration.domain import Exploration
import oppia.apps.exploration.services as exp_services
from oppia.apps.state.models import State
from oppia.apps.widget.models import InteractiveWidget


class FakeExploration(Exploration):
@@ -151,7 +151,8 @@ def test_state_operations(self):

# It is OK to rename a state to itself.
exploration.rename_state(second_state.id, second_state.name)
self.assertEqual(second_state.name, 'State 2')
renamed_second_state = exploration.get_state_by_id(second_state.id)
self.assertEqual(renamed_second_state.name, 'State 2')

# But it is not OK to add or rename a state using a name that already
# exists.
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@

__author__ = 'Sean Lip'

from apps.base_model.models import IdModel
from apps.parameter.models import Parameter
from oppia.apps.base_model.models import IdModel
from oppia.apps.parameter.models import Parameter

from google.appengine.ext import ndb

22 changes: 11 additions & 11 deletions apps/exploration/services.py → oppia/apps/exploration/services.py
Original file line number Diff line number Diff line change
@@ -28,17 +28,17 @@
import logging
import os

from apps.exploration.domain import Exploration
from apps.exploration.models import ExplorationModel
from apps.image.models import Image
from apps.parameter.models import ParamChange
from apps.parameter.models import Parameter
from apps.state.models import AnswerHandlerInstance
from apps.state.models import Content
from apps.state.models import Rule
from apps.state.models import State
from apps.state.models import WidgetInstance
from apps.widget.models import InteractiveWidget
from oppia.apps.exploration.domain import Exploration
from oppia.apps.exploration.models import ExplorationModel
from oppia.apps.image.models import Image
from oppia.apps.parameter.models import ParamChange
from oppia.apps.parameter.models import Parameter
from oppia.apps.state.models import AnswerHandlerInstance
from oppia.apps.state.models import Content
from oppia.apps.state.models import Rule
from oppia.apps.state.models import State
from oppia.apps.state.models import WidgetInstance
from oppia.apps.widget.models import InteractiveWidget

import feconf
import utils
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@

import test_utils

from apps.base_model.models import BaseModel
from apps.exploration.domain import Exploration
import apps.exploration.services as exp_services
from apps.widget.models import InteractiveWidget
from oppia.apps.base_model.models import BaseModel
from oppia.apps.exploration.domain import Exploration
import oppia.apps.exploration.services as exp_services
from oppia.apps.widget.models import InteractiveWidget


class ExplorationServicesUnitTests(test_utils.AppEngineTestBase):
14 changes: 7 additions & 7 deletions apps/exploration/tests.py → oppia/apps/exploration/tests.py
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

import test_utils

from apps.exploration.domain import Exploration
from apps.exploration.models import ExplorationModel
import apps.exploration.services as exp_services
from apps.image.models import Image
from apps.parameter.models import Parameter
from apps.state.models import State
from apps.widget.models import InteractiveWidget
from oppia.apps.exploration.domain import Exploration
from oppia.apps.exploration.models import ExplorationModel
import oppia.apps.exploration.services as exp_services
from oppia.apps.image.models import Image
from oppia.apps.parameter.models import Parameter
from oppia.apps.state.models import State
from oppia.apps.widget.models import InteractiveWidget

from google.appengine.ext.db import BadValueError

File renamed without changes.
2 changes: 1 addition & 1 deletion apps/image/models.py → oppia/apps/image/models.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

import imghdr

from apps.base_model.models import IdModel
from oppia.apps.base_model.models import IdModel
import feconf

from google.appengine.ext import ndb
7 changes: 5 additions & 2 deletions apps/image/tests.py → oppia/apps/image/tests.py
Original file line number Diff line number Diff line change
@@ -16,7 +16,10 @@

__author__ = 'Jeremy Emerson'

from apps.image.models import Image
import os

from oppia.apps.image.models import Image
import feconf
import test_utils

from google.appengine.ext.db import BadValueError
@@ -37,7 +40,7 @@ def test_image_class(self):
image.raw = 'The image'

# Set the 'raw' property to be a valid image, then do a put().
with open('tests/data/img.png') as f:
with open(os.path.join(feconf.TESTS_DATA_DIR, 'img.png')) as f:
image_file = f.read()
image.raw = image_file
image.put()
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/parameter/models.py → oppia/apps/parameter/models.py
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@

import re

from apps.base_model.models import BaseModel
from apps.types.models import get_object_class
from oppia.apps.base_model.models import BaseModel
from oppia.apps.types.models import get_object_class
import utils

from google.appengine.ext import ndb
2 changes: 1 addition & 1 deletion apps/parameter/tests.py → oppia/apps/parameter/tests.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
__author__ = 'Sean Lip'

import test_utils
from apps.parameter.models import Parameter
from oppia.apps.parameter.models import Parameter


class ParameterUnitTests(test_utils.AppEngineTestBase):
File renamed without changes.
8 changes: 4 additions & 4 deletions apps/state/models.py → oppia/apps/state/models.py
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@

import importlib

from apps.base_model.models import BaseModel
from apps.base_model.models import IdModel
from apps.parameter.models import ParamChangeProperty
from apps.widget.models import InteractiveWidget
from oppia.apps.base_model.models import BaseModel
from oppia.apps.base_model.models import IdModel
from oppia.apps.parameter.models import ParamChangeProperty
from oppia.apps.widget.models import InteractiveWidget
from data.objects.models import objects
import feconf
import utils
8 changes: 4 additions & 4 deletions apps/state/tests.py → oppia/apps/state/tests.py
Original file line number Diff line number Diff line change
@@ -19,10 +19,10 @@
import feconf
import test_utils

from apps.exploration.domain import Exploration
import apps.exploration.services as exp_services
from apps.state.models import State
from apps.widget.models import InteractiveWidget
from oppia.apps.exploration.domain import Exploration
import oppia.apps.exploration.services as exp_services
from oppia.apps.state.models import State
from oppia.apps.widget.models import InteractiveWidget


class StateModelUnitTests(test_utils.AppEngineTestBase):
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

__author__ = 'Sean Lip'

from apps.base_model.models import BaseModel
from oppia.apps.base_model.models import BaseModel

from google.appengine.ext import ndb

Original file line number Diff line number Diff line change
@@ -21,10 +21,10 @@
import collections
import utils

from apps.exploration.domain import Exploration
import apps.exploration.services as exp_services
from apps.statistics.models import Counter
from apps.statistics.models import Journal
from oppia.apps.exploration.domain import Exploration
import oppia.apps.exploration.services as exp_services
from oppia.apps.statistics.models import Counter
from oppia.apps.statistics.models import Journal


IMPROVE_TYPE_DEFAULT = 'default'
Loading
Oops, something went wrong.

0 comments on commit 2907fbc

Please sign in to comment.