Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rapidsms/rapidsms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mvpdev/rapidsms-dimagi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing 745 changed files with 207,870 additions and 79 deletions.
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
__version__.py
*.pyc
*.swp
local.ini
core.*
.project
.pydevproject
*.sqlite3
logs/*
apps/airtime/fixtures/airtime.json
apps/airtime/fixtures/message_counter.json
apps/nigeria/fixtures/coupons-nopassword.json
apps/nigeria/fixtures/message_counter.json
*~
\#*
*.log*
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[submodule "contrib/pygsm"]
path = contrib/pygsm
url = git://github.com/rapidsms/pygsm.git
31 changes: 31 additions & 0 deletions DEVELOPMENT
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
To develop RapidSMS, you'll need to symlink
a few subdirectories into your Python path,
because we're currently developing more than
one library in a single repository.

In Bash, we do this:

cd rapidsms/lib
sudo ln -s * /usr/lib/python2.6/site-packages

Now all of the subdirectories (which are
Python modules) of lib are available globally.
This obviously means that you can only run a
single version of RapidSMS on each computer.

If you don't want to mess with your system
directories, you can also simply run the
following from a Bash shell:

export PYTHONPATH=/home/username/rapidsms/lib

Change the path, of course, to match wherever you
cloned the RapidSMS repository to. Note that you
will have to run this every time you start work on
RapidSMS. However, it offers the advantage of
allowing you to have more than one clone of
RapidSMS on your system.

We're going to find a better way to do this,
just not right now. Relative imports sounds
good.
165 changes: 165 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include rapidsms README LICENSE rapidsms.ini
recursive-include lib *
5 changes: 5 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Except where otherwise specified, all of the files in this distribution are
provided under version 3 or any subsequent version of the GNU Lesser General
Public License.


1 change: 1 addition & 0 deletions apps/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions apps/admin/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

11 changes: 11 additions & 0 deletions apps/admin/app.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env python
# vim: ai ts=4 sts=4 et sw=4

import rapidsms

class App(rapidsms.app.App):
'''Do nothing. This app is for django integration only and
has no sms functionality. This file and class exist only
so the router does not print an error messsage.'''
#TODO find a more sensible way of allowing non-sms apps
pass
10 changes: 10 additions & 0 deletions apps/admin/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env python
# vim: ai ts=4 sts=4 et sw=4

from django.conf.urls.defaults import *
from django.contrib import admin
admin.autodiscover()

urlpatterns = patterns('',
url(r'^admin/(.*)', admin.site.root, name='django-admin'),
)
Empty file added apps/airtime/__init__.py
Empty file.
78 changes: 78 additions & 0 deletions apps/airtime/app.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# vim: ai ts=4 sts=4 et sw=4
import rapidsms
from time import time
from reporters.models import PersistantConnection
from airtime.models import AirtimePins
from time import localtime, strftime, time
from datetime import datetime

class App (rapidsms.app.App):
def start (self):
# specifies the frequency (in seconds) to send airtime credits to responders
self._frequency = 3 * 24 * 3600 # 3 days in seconds

def parse (self, message):
"""Parse and annotate messages in the parse phase."""
pass

def handle (self, message):
"""Add your main application logic in the handle phase."""
pass

def cleanup (self, message):
"""Perform any clean up after all handlers have run in the
cleanup phase."""
pass

def outgoing (self, message):
# I'm going to assume that I've gotten the reporter's connection
if hasattr(message, 'is_airtime'):
return True
con = PersistantConnection.from_message(message)

# determine if the user is due for a recharge
time_period = time() - self._frequency
try:
last_airtime = AirtimePins.objects.filter(time_used__gt=strftime('%Y-%m-%d %H:%M:%S', localtime(time_period)), connection=con).latest('time_used')
try:
# The user is due hence let's obtain a recharge pin
airtime = AirtimePins.vend_airtime(con.identity)
airtime.used = True
airtime.time_used = datetime.now()
airtime.connection = con
airtime.save()

msg_text = "Thanks for using RapidSMS. Please load this credit: %s" % airtime.pin
msg = message.connection.backend.message(con.identity, msg_text)
# The is_airtime attribute/flag added to the msg object is required for airtime checks on outgoing messages on a call to outgoing method in order to avoid an infinite loop/call
msg.is_airtime = True
msg.send()

except (AirtimePins.DoesNotExist):
# There probably should be a more elegant way of handling this
self.error("No airtime pins available!")
pass
except (AirtimePins.DoesNotExist):
try:
# The user is due hence let's obtain a recharge pin
airtime = AirtimePins.vend_airtime(con.identity)
airtime.used = True
airtime.time_used = datetime.now()
airtime.connection = con
airtime.save()

msg_text = "Thanks for using RapidSMS. Please load this credit: %s" % airtime.pin
msg = message.connection.backend.message(con.identity, msg_text)
# The is_airtime attribute/flag added to the msg object is required for airtime checks on outgoing messages on a call to outgoing method in order to avoid an infinite loop/call

msg.is_airtime = True
msg.send()

except (AirtimePins.DoesNotExist):
# There probably should be a more elegant way of handling this
self.error("No airtime pins available!")
pass
return True
def stop (self):
"""Perform global app cleanup when the application is stopped."""
pass
Loading