[merlot] 4 new revisions pushed by esar...@gmail.com on 2011-04-03 22:26 GMT

2 views

Skip to first unread message

mer...@googlecode.com

unread,

Apr 3, 2011, 6:27:48 PM4/3/11

to merlot-...@googlegroups.com

4 new revisions:

Revision: 32949e19be91
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sat Apr 2 16:21:32 2011
Log: Started branch to upgrade to Grok 1.3.
http://code.google.com/p/merlot/source/detail?r=32949e19be91

Revision: 78f0519b5a2c
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 14:58:47 2011
Log: Updated paster configuration files.
http://code.google.com/p/merlot/source/detail?r=78f0519b5a2c

Revision: 934c34399936
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 14:59:43 2011
Log: Updated zope.conf configuration file to make devmode configurable.
http://code.google.com/p/merlot/source/detail?r=934c34399936

Revision: ec1e8e2a1bc2
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 15:19:53 2011
Log: Made Merlot work with Grok 1.3.2.
http://code.google.com/p/merlot/source/detail?r=ec1e8e2a1bc2

==============================================================================
Revision: 32949e19be91
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sat Apr 2 16:21:32 2011
Log: Started branch to upgrade to Grok 1.3.
http://code.google.com/p/merlot/source/detail?r=32949e19be91

==============================================================================
Revision: 78f0519b5a2c
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 14:58:47 2011
Log: Updated paster configuration files.
http://code.google.com/p/merlot/source/detail?r=78f0519b5a2c

Modified:
/etc/debug.ini.in
/etc/deploy.ini.in

=======================================
--- /etc/debug.ini.in Wed Mar 23 23:51:59 2011
+++ /etc/debug.ini.in Sun Apr 3 14:58:47 2011
@@ -1,5 +1,5 @@
[DEFAULT]
-zope_conf = %(here)s/zope.conf
+zope_conf = %(here)s/zope.debug.conf

[server:main]
use = egg:Paste#http
@@ -7,7 +7,7 @@
port = ${:port}

[pipeline:main]
-pipeline = accesslogging evalexception grok
+pipeline = accesslogging evalexception fanstatic grok

[filter:accesslogging]
use = egg:Paste#translogger
@@ -15,6 +15,11 @@
[filter:evalexception]
use = egg:z3c.evalexception#ajax

+[filter:fanstatic]
+use = egg:fanstatic#fanstatic
+versioning = true
+recompute_hashes = true
+
[app:grok]
use = egg:grokcore.startup#debug
exempt-exceptions = zope.security.interfaces.IUnauthorized
=======================================
--- /etc/deploy.ini.in Wed Mar 23 23:51:59 2011
+++ /etc/deploy.ini.in Sun Apr 3 14:58:47 2011
@@ -1,5 +1,5 @@
[DEFAULT]
-zope_conf = %(here)s/zope.conf
+zope_conf = %(here)s/zope.deploy.conf

[server:main]
use = egg:Paste#http
@@ -7,14 +7,26 @@
port = ${:port}

[pipeline:main]
-pipeline = gzip grok
-
-[app:grok]
-use = egg:grokcore.startup
+pipeline = accesslogging gzip fanstatic grok
+
+[filter:accesslogging]
+use = egg:Paste#translogger
+setup_console_handler = False

[filter:gzip]
use = egg:Paste#gzip

+[filter:fanstatic]
+use = egg:fanstatic#fanstatic
+bottom = true
+versioning = true
+minified = true
+rollup = true
+recompute_hashes = false
+
+[app:grok]
+use = egg:grokcore.startup
+
# Logging configuration

[loggers]

==============================================================================
Revision: 934c34399936
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 14:59:43 2011
Log: Updated zope.conf configuration file to make devmode configurable.
http://code.google.com/p/merlot/source/detail?r=934c34399936

Modified:
/etc/zope.conf.in

=======================================
--- /etc/zope.conf.in Wed Mar 23 23:51:59 2011
+++ /etc/zope.conf.in Sun Apr 3 14:59:43 2011
@@ -31,9 +31,7 @@
# logfiles are setup in the debug.ini and deploy.ini files.
</eventlog>

-# Comment this line to disable developer mode. This should be done in
-# production
-devmode on
+devmode ${devmode}

# Extra configuration lines can be added to zope_conf's extra option. Put
for
# instance productconf sections in here.

==============================================================================
Revision: ec1e8e2a1bc2
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 15:19:53 2011
Log: Made Merlot work with Grok 1.3.2.
http://code.google.com/p/merlot/source/detail?r=ec1e8e2a1bc2

Added:
/merlot/resource.py
Modified:
/buildout.cfg
/merlot/configure.zcml
/merlot/doctests/functional_auth.rst
/merlot/tests.py
/setup.py
/versions.cfg

=======================================
--- /dev/null
+++ /merlot/resource.py Sun Apr 3 15:19:53 2011
@@ -0,0 +1,4 @@
+from fanstatic import Library, Resource
+
+library = Library('merlot', 'static')
+
=======================================
--- /buildout.cfg Wed Mar 23 23:51:59 2011
+++ /buildout.cfg Sun Apr 3 15:19:53 2011
@@ -1,20 +1,20 @@
[buildout]
extends =
- http://grok.zope.org/releaseinfo/1.2/versions.cfg
+ http://grok.zope.org/releaseinfo/1.3.2/versions.cfg
versions.cfg
extends-cache = extends-cache
-find-links = http://grok.zope.org/releaseinfo/1.2/eggs
develop = .
parts =
app
merlot_server
- debug_ini
- deploy_ini
+ paster_debug_ini
+ paster_deploy_ini
i18n
mkdirs
site_zcml
test
- zope_conf
+ zope_conf_debug
+ zope_conf_deploy
zpasswd
interactive_debugger
omelette
@@ -43,18 +43,18 @@
inline =
#!/bin/bash
export zope_i18n_compile_mo_files=True
- paster serve ${debug_ini:output}
+ paster serve ${paster_debug_ini:output}
output = ${buildout:bin-directory}/merlot
mode = 755

-[deploy_ini]
+[paster_deploy_ini]
recipe = collective.recipe.template
input = etc/deploy.ini.in
output = ${buildout:parts-directory}/etc/deploy.ini
host = 127.0.0.1
port = 8080

-[debug_ini]
+[paster_debug_ini]
recipe = collective.recipe.template
input = etc/debug.ini.in
output = ${buildout:parts-directory}/etc/debug.ini
@@ -86,18 +86,27 @@
recipe = zc.recipe.testrunner
eggs = Merlot
defaults = ['--exit-with-status', '--auto-color', '--auto-progress', '-v']
-#defaults = ['--tests-pattern', '^f?tests$', '-v']

[zope_conf]
-recipe = collective.recipe.template
input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
filestorage = ${buildout:directory}/var/filestorage
blobstorage = ${buildout:directory}/var/blobstorage
logfiles = ${buildout:directory}/var/log
extra =
# 'extra' is copied verbatim. Use it for product config sections and so.

+[zope_conf_debug]
+<= zope_conf
+recipe = collective.recipe.template
+output = ${buildout:parts-directory}/etc/zope.debug.conf
+devmode = on
+
+[zope_conf_deploy]
+<= zope_conf
+recipe = collective.recipe.template
+output = ${buildout:parts-directory}/etc/zope.deploy.conf
+devmode = off
+
# This section is named so that the zpasswd utility is
# called 'zpasswd'
[zpasswd]
@@ -113,7 +122,7 @@
eggs = Merlot
module = grokcore.startup.startup
method = interactive_debug_prompt
-arguments = zope_conf="${zope_conf:output}"
+arguments = zope_conf="${zope_conf_debug:output}"

# Creates a unified directory structure (parts/omelette) of installed
packages,
# symlinking to the actual contents, in order to ease navigation.
=======================================
--- /merlot/configure.zcml Wed Mar 23 23:51:59 2011
+++ /merlot/configure.zcml Sun Apr 3 15:19:53 2011
@@ -1,11 +1,10 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok"
xmlns:i18n="http://namespaces.zope.org/i18n">
- <include package="grok" />
-
-
+
+ <include package="grok" />
<includeDependencies package="." />
<grok:grok package="." />
<i18n:registerTranslations directory="locales" />
+
</configure>
=======================================
--- /merlot/doctests/functional_auth.rst Wed Mar 23 23:51:59 2011
+++ /merlot/doctests/functional_auth.rst Sun Apr 3 15:19:53 2011
@@ -50,29 +50,29 @@
>>> browser = Browser()
>>> browser.open('http://localhost/app')
>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2F%40%40index'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2F%40%40index'

We can't access the projects container::

>>> browser.open('http://localhost/app/projects')
>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2Fprojects%2F%40%40index'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2Fprojects%2F%40%40index'

We can't access the reports either::

>>> browser.open('http://localhost/app/@@logs-report')
>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2F%40%40logs-report'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2F%40%40logs-report'

>>> browser.open('http://localhost/app/@@tasks-report')
>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2F%40%40tasks-report'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2F%40%40tasks-report'

We can't access the clients container::

>>> browser.open('http://localhost/app/clients')
>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2Fclients%2F%40%40index'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2Fclients%2F%40%40index'

Now we authenticate using the user we created using the login form::

@@ -250,7 +250,7 @@
As our credentials changed, we are kicked off the site::

>>> browser.url
- 'http://localhost/app/@@login?camefrom=%2Fapp%2Fusers%2F%40%40index'
+ 'http://localhost/app/@@login?camefrom=http%3A%2F%2Flocalhost%2Fapp%2Fusers%2F%40%40index'

The old credentials are no longer valid::

=======================================
--- /merlot/tests.py Wed Mar 23 23:51:59 2011
+++ /merlot/tests.py Sun Apr 3 15:19:53 2011
@@ -1,11 +1,12 @@
import z3c.testsetup
from zope.app.wsgi.testlayer import BrowserLayer
from zope.app.component.hooks import setSite
+from zope.fanstatic.testing import ZopeFanstaticBrowserLayer

import merlot
from merlot.app import Merlot

-browser_layer = BrowserLayer(merlot)
+browser_layer = ZopeFanstaticBrowserLayer(merlot)

def setup(test):
root = browser_layer.getRootFolder()
=======================================
--- /setup.py Thu Mar 24 13:46:50 2011
+++ /setup.py Sun Apr 3 15:19:53 2011
@@ -38,6 +38,12 @@
'zope.app.schema',
'zope.pluggableauth',
'zope.i18n',
+ 'fanstatic',
+ 'zope.fanstatic',
# Add extra requirements here
],
- )
+ entry_points={
+ 'fanstatic.libraries': [
+ 'merlot = merlot.resource:library',
+ ]}
+ )
=======================================
--- /versions.cfg Wed Mar 23 23:51:59 2011
+++ /versions.cfg Sun Apr 3 15:19:53 2011
@@ -1,43 +1,35 @@
[versions]
hurry.zoperesource = 0.5
+ipdb = 0.3
+repoze.sphinx.autointerface = 0.4
z3c.relationfield = 0.6.1
z3c.schema2xml = 1.0
zc.relation = 1.0
-zope.pluggableauth = 1.1
-collective.recipe.template = 1.8
-
-#Buildout tools
-collective.recipe.omelette = 0.9
-ipdb = 0.1
-
-#Required by:
-#ipdb 0.1
-ipython = 0.10

#Required by:
#plone.i18n 2.0
Unidecode = 0.04.1

#Required by:
-#Merlot 1.0
-WebOb = 0.9.6.1
+#z3c.relationfieldui 0.5
+hurry.resource = 0.4.1

#Required by:
-#z3c.relationfieldui 0.5
-hurry.resource = 0.9
+#ipdb 0.3
+ipython = 0.10.1

#Required by:
-#Merlot 1.0
+#Merlot 0.1
plone.i18n = 2.0

#Required by:
-#Merlot 1.0
+#Merlot 0.1
z3c.objpath = 1.0

#Required by:
-#Merlot 1.0
+#Merlot 0.1
z3c.relationfieldui = 0.5

-#Sphinx
-collective.recipe.sphinxbuilder = 0.7.0
-repoze.sphinx.autointerface = 0.4
+#Required by:
+#z3c.relationfield 0.6.1
+zope.app.intid = 3.7.1

Reply all

Reply to author

Forward

0 new messages