Moksha-commits

moksha-commits@lists.fedorahosted.org

529 discussions

moksha/public
by John (J5) Palmieri 28 Oct '11

28 Oct '11

moksha/public/javascript/moksha.js | 44 +++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) New commits: commit bd3068cee52c8683c2e510205321a5dfa9d9fb7e Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Fri Oct 28 15:08:16 2011 -0400 add url_mask method to allow dynamic_goto to correctly rewrite url diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js index 4f811b8..fda03ec 100644 --- a/moksha/public/javascript/moksha.js +++ b/moksha/public/javascript/moksha.js @@ -414,16 +414,52 @@ moksha = { window.location.href = moksha.url(url, params); }, + + // Applys a mask in the form of '/*/path' where the wild card inserts the + // element from the source_url. + // + // example: + // source_url = '/foo/bar/baz'; + // mask = '/alpha/*/beta'; + // url_mask(source_url, mask); + // > '/alpha/bar/beta' + url_mask: function (source_url, mask) { + var result = ''; + var split_mask = mask.split('/'); + var split_source = source_url.split('/'); + for (var i=0; i < split_mask.length; i++) { + if (i >= split_source.length) + return result; + + if (split_mask[i] == '*') + result += split_source[i]; + else + result += split_mask[i]; + result += '/' + } + return result; + }, + /******************************************************************** - * Take a url and target, attach the csrf hash if available and load + * Dynamically load a portion of the page ********************************************************************/ - dynamic_goto: function(url, params) { + dynamic_goto: function(url, params, target, display_path) { if (typeof(params) != 'object') params = {} - var new_path = moksha.url(url, params); var current_path = location.pathname; - window.history.pushState({}, "", moksha.url(url, params)); + display_path = moksha.url(display_path); + + var masked_url = moksha.url_mask(current_path, display_path); + + window.history.pushState({}, "", masked_url); + function load_finish(html) { + $(target).html(html); + } + moksha.html_load(url, params, load_finish); + + // prevent link from reloading entire page if attached to onClick handler + return false; }, /*

1 0

Changes to 'tito'
by Luke Macken 18 Sep '11

18 Sep '11

New branch 'tito' available with the following commits: commit c681c50317a8c8314ee5b5aaca435e74c2a30f19 Author: Luke Macken <lmacken(a)redhat.com> Date: Sun Sep 18 01:18:10 2011 -0400 Automatic commit of package [moksha] release [0.6.1-1]. commit 80638252e34d4ecb4f32106aaf553a183df37e61 Author: Luke Macken <lmacken(a)redhat.com> Date: Sun Sep 18 01:16:48 2011 -0400 Initialized to use tito. commit b75325b8fd0fb3ea2d393ddb81c27f32ae7e0b96 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 18:13:37 2011 -0400 More version changes

1 0

4 commits - MANIFEST.in moksha/apps moksha/hub moksha.spec setup.py
by Luke Macken 19 Aug '11

19 Aug '11

MANIFEST.in | 1 moksha.spec | 30 ++++++++++++++++++++++--- moksha/apps/demo/MokshaJQPlotDemo/run_tests.py | 11 +++++++++ moksha/hub/hub.py | 7 +++++ setup.py | 2 - 5 files changed, 46 insertions(+), 5 deletions(-) New commits: commit 8ec1f9df219a35d6fc29fd004cb37c04245bf49f Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 14:38:03 2011 -0400 getting ready for 0.6.0 diff --git a/moksha.spec b/moksha.spec index 9c5c69c..7802435 100644 --- a/moksha.spec +++ b/moksha.spec @@ -2,7 +2,7 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: moksha -Version: 0.5.0 +Version: 0.6.0 Release: 1%{?dist} Summary: A platform for creating real-time web applications Group: Applications/Internet @@ -34,6 +34,18 @@ BuildRequires: python-bunch BuildRequires: TurboGears2 BuildRequires: python-daemon +BuildRequires: pyOpenSSL +BuildRequires: python-babel +BuildRequires: orbited +BuildRequires: python-repoze-who-testutil + +%if 0%{?el5} +BuildRequires: python-sqlite2 +BuildRequires: python-hashlib +Requires: python-sqlite2 +Requires: python-hashlib +%endif + Requires: TurboGears2 Requires: python-toscawidgets >= 0.9.1 Requires: python-zope-sqlalchemy @@ -53,6 +65,10 @@ Requires: python-twisted Requires: python-stomper Requires: python-daemon +Requires: pyOpenSSL +Requires: python-babel + + %description Moksha is a platform for creating real-time collaborative web applications. It provides a set of Python and JavaScript API's that make it simple to create @@ -87,7 +103,7 @@ This package contains an Apache mod_wsgi configuration for Moksha. %{__sed} -i -e 's/$VERSION/%{version}/g' docs/conf.py make -C docs html -%{__rm} docs/_build/html/.buildinfo +#%{__rm} docs/_build/html/.buildinfo %install %{__rm} -rf %{buildroot} @@ -130,7 +146,7 @@ make -C docs html %check PYTHONPATH=$(pwd) python run_tests.py pushd moksha/apps/demo/MokshaJQPlotDemo/ -PYTHONPATH=$(pwd) python run_tests.py +PYTHONPATH=$(pwd):../../../../ python run_tests.py popd # Remove the tests @@ -189,6 +205,11 @@ fi %doc docs/_build/html %changelog +* Fri Aug 19 2011 Luke Macken <lmacken(a)redhat.com> - 0.6.0-1 +- 0.6.0 release +- Update our dependencies to finally get the test suite running +- Improve how we run our unit tests, to get them working on RHEL5 + * Wed Dec 15 2010 Luke Macken <lmacken(a)redhat.com> - 0.5.0-4 - Add a logrotate configuration diff --git a/setup.py b/setup.py index 63fb211..ce5631c 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup, find_packages setup( name='moksha', - version='0.5.0', + version='0.6.0', description='', author='', author_email='', commit 801e21161783330b4fef3ad1eed0d287cd682e22 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 13:58:48 2011 -0400 Apparently Twisted 8.2.0 on RHEL5 doesn't have the ReactorNotRunning exception diff --git a/moksha/hub/hub.py b/moksha/hub/hub.py index 219abc1..7e3c072 100644 --- a/moksha/hub/hub.py +++ b/moksha/hub/hub.py @@ -32,7 +32,12 @@ from moksha.hub.reactor import reactor from tg import config from orbited import json from paste.deploy import appconfig -from twisted.internet.error import ReactorNotRunning + +try: + from twisted.internet.error import ReactorNotRunning +except ImportError: # Twisted 8.2.0 on RHEL5 + class ReactorNotRunning(object): + pass from moksha.lib.helpers import trace, defaultdict, get_moksha_config_path, get_moksha_appconfig from moksha.hub.amqp import AMQPHub commit 50e7e99fc122060d37909c5252dd43f4f7edea79 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 13:48:52 2011 -0400 More test runner updates diff --git a/MANIFEST.in b/MANIFEST.in index 67d78f0..c0a566e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include moksha.spec stop-moksha start-moksha orbited.cfg include LICENSE README AUTHORS COPYING include development.ini test.ini include setup.py pavement.py +include run_tests.py graft moksha graft docs diff --git a/moksha.spec b/moksha.spec index 19fa1f7..9c5c69c 100644 --- a/moksha.spec +++ b/moksha.spec @@ -128,7 +128,10 @@ make -C docs html %check -PYTHONPATH=$(pwd) paver test +PYTHONPATH=$(pwd) python run_tests.py +pushd moksha/apps/demo/MokshaJQPlotDemo/ +PYTHONPATH=$(pwd) python run_tests.py +popd # Remove the tests %{__rm} -r %{buildroot}%{python_sitelib}/%{name}/tests commit ef1fa03d753f5d8a0b32831320a1b3e076ace363 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 13:46:30 2011 -0400 Add a test runner for our jqplot demo too diff --git a/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py b/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py new file mode 100755 index 0000000..ebeefd5 --- /dev/null +++ b/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +""" +nose runner script. +""" +__requires__ = 'moksha' + +import pkg_resources +import nose + +if __name__ == '__main__': + nose.main()

1 0

run_tests.py
by Luke Macken 19 Aug '11

19 Aug '11

run_tests.py | 11 +++++++++++ 1 file changed, 11 insertions(+) New commits: commit 36e90a22b4bc4f5664320df77dd155c3d0541fe2 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Aug 19 13:45:18 2011 -0400 Add a simple test-runner to work around some setuptools issues on RHEL5 diff --git a/run_tests.py b/run_tests.py new file mode 100755 index 0000000..ebeefd5 --- /dev/null +++ b/run_tests.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +""" +nose runner script. +""" +__requires__ = 'moksha' + +import pkg_resources +import nose + +if __name__ == '__main__': + nose.main()

1 0

moksha/public
by John (J5) Palmieri 04 Aug '11

04 Aug '11

moksha/public/javascript/moksha.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a8cbcaad4619d0aa517e20d2b96e4cebd903be8 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu Aug 4 13:41:24 2011 -0400 make sure to call moksha.url on the profile collector url diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js index 96f973f..ed18ee0 100644 --- a/moksha/public/javascript/moksha.js +++ b/moksha/public/javascript/moksha.js @@ -557,7 +557,7 @@ moksha = { 'end_time' : end_time}; // fire and forget the profile collector - moksha.json_load('/moksha_connector/prof_collector', profile_info, function(data){}, null, null); + moksha.json_load(moksha.url('/moksha_connector/prof_collector'), profile_info, function(data){}, null, null); } return moksha.json_load(path, params, profile_callback, $overlay_div, loading_icon); }

1 0

moksha/middleware
by John (J5) Palmieri 03 Aug '11

03 Aug '11

moksha/middleware/connector.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 641958b7a8aa713ef96ea5027ed759b8f443af05 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Wed Aug 3 16:42:43 2011 -0400 if cProfile doesn't exist use profile instead * RHEL 5 ships with python 2.4, cProfile was introduced in python 2.5 diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index dfc126d..d2c3445 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -169,8 +169,10 @@ class MokshaConnectorMiddleware(object): r = None if asbool(config.get('profile.connectors')): - import cProfile - + try: + import cProfile as profile + except ImportError: + import profile directory = config.get('profile.dir', '') # Make sure the id is unique for each thread @@ -200,7 +202,7 @@ class MokshaConnectorMiddleware(object): # profile call file_name = os.path.join(directory, prof_file_name) - cProfile.runctx("result['r'] = conn_obj._dispatch(op, path, remote_params, **dispatch_params)", + profile.runctx("result['r'] = conn_obj._dispatch(op, path, remote_params, **dispatch_params)", None, {'conn_obj': conn_obj, 'op': op,

1 0

moksha/middleware
by Luke Macken 30 Jul '11

30 Jul '11

moksha/middleware/connector.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit a497e7ae2309b7943ff60b7abde3a64f6cead07f Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jul 29 21:41:14 2011 -0400 Get our connector middleware working on py2.4 again diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index b9389e1..dfc126d 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -17,12 +17,15 @@ import logging import pkg_resources -import simplejson as json import urllib import time import os.path import threading -import json + +try: + import json +except ImportError: + import simplejson as json from paste.deploy.converters import asbool from webob import Request, Response

1 0

moksha/middleware
by John (J5) Palmieri 27 Jul '11

27 Jul '11

moksha/middleware/connector.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 4bacdedbe5fd1ba72f274f44da19cdd2cebffa09 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Wed Jul 27 16:52:11 2011 -0400 make profiling output json friendly diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index 44c4f39..b9389e1 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -22,6 +22,7 @@ import urllib import time import os.path import threading +import json from paste.deploy.converters import asbool from webob import Request, Response @@ -76,7 +77,7 @@ class MokshaConnectorMiddleware(object): # output profiling data file_name = os.path.join(directory, prof_file_name) f = open(file_name, 'w') - f.write("{'id': %s, 'start_time': %s, 'callback_start_time': %s, 'end_time': %s}" + f.write('{"id": "%s", "start_time": %s, "callback_start_time": %s, "end_time": %s}' % (profile_id, p['start_time'], p['callback_start_time'], p['end_time'])) f.close() return Response('{}')(environ, start_response) @@ -186,8 +187,8 @@ class MokshaConnectorMiddleware(object): # output call info file_name = os.path.join(directory, info_file_name) f = open(file_name, 'w') - f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s, 'ip': '%s', 'timestamp': %f, 'id_counter': %i, 'id': %s}" - % (conn_name, op, path, str(remote_params), ip, timestamp, prof_id_counter, profile_id)) + f.write('{"name": "%s", "op": "%s", "path": "%s", "remote_params": %s, "ip": "%s", "timestamp": %f, "id_counter": %i, "id": "%s"}' + % (conn_name, op, path, json.dumps(remote_params), ip, timestamp, prof_id_counter, profile_id)) f.close() # in order to get the results back we need to pass an object

1 0

moksha/middleware
by John (J5) Palmieri 27 Jul '11

27 Jul '11

moksha/middleware/connector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 49a0a3ec76cc53805645c7770e6265d818f69753 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Wed Jul 27 14:22:37 2011 -0400 add full id to info file diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index 803081d..44c4f39 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -186,8 +186,8 @@ class MokshaConnectorMiddleware(object): # output call info file_name = os.path.join(directory, info_file_name) f = open(file_name, 'w') - f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s, 'ip': '%s', 'timestamp': %f, 'id_counter': %i}" - % (conn_name, op, path, str(remote_params), ip, timestamp, prof_id_counter)) + f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s, 'ip': '%s', 'timestamp': %f, 'id_counter': %i, 'id': %s}" + % (conn_name, op, path, str(remote_params), ip, timestamp, prof_id_counter, profile_id)) f.close() # in order to get the results back we need to pass an object

1 0

moksha/middleware
by John (J5) Palmieri 27 Jul '11

27 Jul '11

moksha/middleware/connector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c1903df507a035ef5aa76261bafd61f58c796be8 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Wed Jul 27 13:56:30 2011 -0400 add more information to the .info file so we can sort diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index 3447de0..803081d 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -186,8 +186,8 @@ class MokshaConnectorMiddleware(object): # output call info file_name = os.path.join(directory, info_file_name) f = open(file_name, 'w') - f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s}" - % (conn_name, op, path, str(remote_params))) + f.write("{'name': '%s', 'op': '%s', 'path': '%s', 'remote_params': %s, 'ip': '%s', 'timestamp': %f, 'id_counter': %i}" + % (conn_name, op, path, str(remote_params), ip, timestamp, prof_id_counter)) f.close() # in order to get the results back we need to pass an object

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Moksha-commits