tcl-rivet-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mxman...@apache.org
Subject svn commit: r1041308 - in /tcl/rivet/trunk: ChangeLog Makefile.in README contrib/README contrib/form.tcl debian/changelog debian/libapache2-mod-rivet.docs debian/libapache2-mod-rivet.postinst doc/xml/commands.xml rivet/rivet-tcl/cookie.tcl
Date Thu, 02 Dec 2010 08:33:15 GMT
Author: mxmanghi
Date: Thu Dec  2 08:33:14 2010
New Revision: 1041308

URL: http://svn.apache.org/viewvc?rev=1041308&view=rev
Log:
2010-12-02 Massimo Manghi <mxmanghi@apache.org>
    * debian/libapache2-mod-rivet.docs: debian package installs the files in contrib/ along
with the docs
    * debian/libapache2-mod-rivet.postinst,debian/changelog: removed redundant lines from
postist script (Debian package)
    * rivet/rivet-tcl/cookie.tcl: add command "cookie unset"
    * contrib/form.tcl,contrib/README: add a form.tcl based on TclOO. New README explanatory
file
    * doc/xml/commands.xml: new command "cookie unset" explained


Added:
    tcl/rivet/trunk/contrib/README
    tcl/rivet/trunk/contrib/form.tcl
Modified:
    tcl/rivet/trunk/ChangeLog
    tcl/rivet/trunk/Makefile.in
    tcl/rivet/trunk/README
    tcl/rivet/trunk/debian/changelog
    tcl/rivet/trunk/debian/libapache2-mod-rivet.docs
    tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst
    tcl/rivet/trunk/doc/xml/commands.xml
    tcl/rivet/trunk/rivet/rivet-tcl/cookie.tcl

Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Thu Dec  2 08:33:14 2010
@@ -1,3 +1,9 @@
+2010-12-02 Massimo Manghi <mxmanghi@apache.org>
+    * debian/libapache2-mod-rivet.*,debian/changelog: removed redundant lines from postist
script (Debian package)
+    * rivet/rivet-tcl/cookie.tcl: add command "cookie unset"
+    * contrib/form.tcl,contrib/README: add a form.tcl based on TclOO. New README explanatory
file
+    * doc/xml/commands.xml: new command "cookie unset" explained
+    
 2010-10-27 Massimo Manghi <mxmanghi@apache.org>
     * branches/2_0: changes done in branches 2_0 reintegrated into trunk. This implied the
following changes in trunk 
     * debian/[clean,docs,*.substvars,dirs,files,install]: not needed, hence removed from
repository

Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Thu Dec  2 08:33:14 2010
@@ -18,7 +18,7 @@
 #
 # top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
 #
-# $Id: Makefile.am 1024313 2010-10-19 16:29:56Z mxmanghi $
+# $Id: Makefile.am 1024231 2010-10-19 13:39:17Z mxmanghi $
 #
 # 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
 # 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them

Modified: tcl/rivet/trunk/README
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/README?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/README (original)
+++ tcl/rivet/trunk/README Thu Dec  2 08:33:14 2010
@@ -1,7 +1,7 @@
 			     Apache Rivet
 			     ============
 
-See the doc/html/ directory for installation and usage instructions.
+See the doc/html/installation.html directory for installation and usage instructions.
 
 See INSTALL for brief installation instructions - although the above
 docs in HTML are more thorough and extensive.

Added: tcl/rivet/trunk/contrib/README
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/contrib/README?rev=1041308&view=auto
==============================================================================
--- tcl/rivet/trunk/contrib/README (added)
+++ tcl/rivet/trunk/contrib/README Thu Dec  2 08:33:14 2010
@@ -0,0 +1,10 @@
+
+ README file for 'contrib', directory that stores various contribution
+ that don't fit well in the current distribution of Rivet
+=======================================================================
+$Id: $
+=======================================================================
+
+ rvt.vim: Syntax highlighting of rvt files in Vim
+ form.tcl: TclOO form package (contributed by Clif Flynt)
+ two-mode-mode.el: Switches between tcl and sgml(html) modes (David Welton)

Added: tcl/rivet/trunk/contrib/form.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/contrib/form.tcl?rev=1041308&view=auto
==============================================================================
--- tcl/rivet/trunk/contrib/form.tcl (added)
+++ tcl/rivet/trunk/contrib/form.tcl Thu Dec  2 08:33:14 2010
@@ -0,0 +1,501 @@
+# form.tcl -- generate forms automatically.
+
+# Copyright 2002-2004 The Apache Software Foundation
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#	http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+package provide form 1.0
+
+#
+# Rivet form class
+#
+::oo::class create form {
+    variable DefaultValues DefaultArgs arguments defaults
+
+    constructor {args} {
+	# set the form method to be a post and the action to be
+	# a refetching of the current page
+	set arguments(method) post
+	set arguments(action) [env DOCUMENT_URI]
+	trace add variable defaults write "[self] setDefaults"
+
+	# use $this for the type for form-global stuff like form arguments
+	my import_data form arguments $args
+
+	if {[info exists arguments(defaults)]} {
+
+	    # make the public variable contain the name of the array
+	    # we are sucking default values out of
+	    set defaults $arguments(defaults)
+
+	    upvar $arguments(defaults) tempDefaults
+	    array set DefaultValues [array get tempDefaults]
+	    unset arguments(defaults)
+	}
+    }
+
+    destructor {
+
+    }
+
+    method destroy {} {
+	::oo::delete object [self]
+    }
+
+    #
+    # import_data -- given a field type, field name, name of an array, and a 
+    # list of key-value pairs, prepend any default key-value pairs,
+    # set a default value if one exists, then store the resulting
+    # key-value pairs in the named array
+    #
+      method import_data {type arrayName list} {
+	upvar 1 $arrayName data
+
+	#
+	# If there are elements in the defaultArgs array for the
+	# specified type, combine them with the list of key-value
+	# pairs, putting the DefaultArgs values first so the
+	# key-value pairs from list can possibly override them.
+	#
+	if {[info exists DefaultArgs($type)]} {
+	    set list [concat $DefaultArgs($type) $list]
+	}
+
+	#
+	# if there is a default value for the name stored in the
+	# DefaultValues array in this class, set the value
+	# element of the array the caller named to contain that
+	# value
+	#
+	if {[info exists DefaultValues([self])]} {
+	    set data(value) $DefaultValues([self])
+	}
+
+	#
+	# if we don't have an even number of key-value pairs,
+	# that just ain't right
+	#
+	if {[expr [llength $list] % 2]} {
+	    return -code error "Unmatched key-value pairs -- [llength $list] in [string map {<
^ > v} $list] "
+	}
+
+	#
+	# for each key-value pair in the list, strip the first
+	# dash character from the key part and map it to lower
+	# case, then use that as the key for the passed-in
+	# array and store the corresonding value in there
+	#
+	# we also prep and return the list of key-value pairs, normalized
+	# with the lowercase thing
+	#
+	set return ""
+	foreach {var val} $list {
+	    set var [string range [string tolower $var] 1 end]
+	    set data($var) $val
+	    if {($var == "values") || ($var == "labels")} { continue }
+	    lappend return -$var $val
+	}
+	return $return
+    }
+
+    #
+    # my argstring - given an array name, construct areturn string of the
+    # style key1="data1" key2="data2" etc for each key value pair in the
+    # array
+    #
+    method argstring {arrayName} {
+	upvar 1 $arrayName data
+	set string ""
+	foreach arg [lsort [array names data]] {
+	    append string " $arg=\"$data($arg)\""
+	}
+	return $string
+    }
+
+    #
+    # default_value -- if only a name is given, returns a default value
+    # for that name if one exists else an empty list.
+    #
+    # if a name and a value are given, the default value  is set to that
+    # name (and the new default value is returned).
+    #
+    method default_value {name {newValue ""}} {
+	if {[lempty $newValue]} {
+	    if {![info exists DefaultValues($name)]} { return }
+	    return $DefaultValues($name)
+	}
+	return [set DefaultValues($name) $newValue]
+    }
+
+    #
+    # default_args - given a type and a variable number of arguments,
+    #  if there are no arguments other than the type, return the
+    #  element of that name from the DefaultArgs array, if that element
+    #  exists, else return an empty list.
+    #
+    # if a name and a value are given, sets the DefaultArgs to the variable
+    # list of arguments.
+    #
+    method default_args {type args} {
+
+	# if only one argument was specified
+	if {[lempty $args]} {
+	    if {![info exists DefaultArgs($type)]} { return }
+	    return $DefaultArgs($type)
+	}
+
+	# make sure we have an even number of key-value pairs
+	if {[expr [llength $args] % 2]} {
+	    return -code error "Unmatched key-value pairs"
+	}
+
+	# set the DefaultArgs for the specified type
+	return [set DefaultArgs($type) $args]
+    }
+
+    #
+    # start - generate the <form> with all of its arguments
+    #
+    method start {{args ""}} {
+        if {![lempty $args]} {
+	    # replicated in constructor
+	    my import_data form arguments $args
+	}
+	html "<form [my argstring arguments]>"
+    }
+
+    #
+    # end - generate the </form>
+    #
+    method end {} {
+	html "</form>"
+    }
+
+    #
+    # field - emit a field of the given field type and name, including
+    # any default key-value pairs defined for this field type and
+    # optional key-value pairs included with the statement
+    #
+    method field {type name args} {
+	# import any default key-value pairs, then any specified in this
+	# field declaration
+	my import_data $type data $args
+
+	# generate the field definition
+	set string "<input type=\"$type\" name=\"$name\""
+
+	# For strange reasons, [info exists data(index)] reports 0
+	set indices {}
+	set indices [array names data]
+
+	append string [my argstring data]
+
+	switch -- $type {
+	    "radio" -
+	    "checkbox" {
+		# if there's no value defined, create an empty value
+		if {![info exists data(value)]} { 
+		    set data(value) "" 
+		}
+
+		if {[lsearch $indices post] < 0} { 
+		    set data(post) "" 
+		}
+
+		# if there's no label defined, make the label be the
+		# same as the value
+		if {![info exists data(label)]} { 
+		    set data(label) $data(value) 
+		}
+
+		# ...and if the is a default value for this field
+		# and it matches the value we have for it, make
+		# the field show up as selected (checked)
+
+		if {[info exists DefaultValues($name)]} {
+		    if {[lsearch $DefaultValues($name) $data(value)] >= 0} {
+			append string { checked="checked"}
+		    }
+		}
+	    }
+	}
+	append string " />"
+	# ...and emit it
+	if {($type == "radio") || ($type == "checkbox")} {
+	    html $string$data(label)$data(post)
+	} else {
+	    html $string
+	}
+    }
+
+    #
+    # text -- emit an HTML "text" field
+    #
+    method text {name args} {
+	my field text $name {*}$args
+    }
+
+    #
+    # password -- emit an HTML "password" field
+    #
+    method password {name args} {
+	my field password $name {*}$args
+    }
+
+    #
+    # hidden -- emit an HTML "hidden" field
+    #
+    method hidden {name args} {
+	my field hidden $name {*}$args
+    }
+
+    #
+    # submit -- emit an HTML "submit" field
+    #
+    method submit {name args} {
+	my field submit $name {*}$args
+    }
+
+    #
+    # button -- emit an HTML "button" field
+    #
+    method button {name args} {
+	my field button $name {*}$args
+    }
+
+    #
+    # reset -- emit an HTML "reset" button
+    #
+    method reset {name args} {
+	my field reset $name {*}$args
+    }
+
+    #
+    #  image -- emit an HTML image field
+    #
+    method image {name args} {
+	my field image $name {*}$args
+    }
+
+    #
+    # checkbox -- emit an HTML "checkbox" form field
+    #
+    method checkbox {name args} {
+	my field checkbox $name {*}$args
+    }
+
+    #
+    # radio -- emit an HTML "radiobutton" form field
+    #
+    method radio {name args} {
+	my field radio $name {*}$args
+    }
+
+    #
+    # color -- emit an HTML 5 "color" form field
+    #
+    method color {name args} {
+        my field color $name {*}$args
+    }
+
+    #
+    # date -- emit an HTML 5 "date" form field
+    #
+    method date {name args} {
+        my field date $name {*}$args
+    }
+
+    #
+    # datetime -- emit an HTML 5 "datetime" form field
+    #
+    method datetime {name args} {
+        my field datetime $name {*}$args
+    }
+
+    #
+    # datetime_local -- emit an HTML 5 "datetime-local" form field
+    #
+    method datetime_local {name args} {
+        my field datetime-local $name {*}$args
+    }
+
+    #
+    # email -- emit an HTML 5 "email" form field
+    #
+    method email {name args} {
+        my field email $name {*}$args
+    }
+
+    #
+    # file -- emit an HTML 5 "file" form field
+    #
+    method file {name args} {
+        my field email $name {*}$args
+    }
+
+    #
+    # month -- emit an HTML 5 "month" form field
+    #
+    method month {name args} {
+        my field month $name {*}$args
+    }
+
+    #
+    # number -- emit an HTML 5 "number" form field
+    #
+    method number {name args} {
+        my field number $name {*}$args
+    }
+
+    #
+    # range -- emit an HTML 5 "range" form field
+    #
+    method range {name args} {
+        my field range $name {*}$args
+    }
+
+    #
+    # search -- emit an HTML 5 "search" form field
+    #
+    method search {name args} {
+        my field search $name {*}$args
+    }
+
+    #
+    # tel -- emit an HTML 5 "tel" form field
+    #
+    method tel {name args} {
+        my field tel $name {*}$args
+    }
+
+    #
+    # time -- emit an HTML 5 "time" form field
+    #
+    method time {name args} {
+        my field time $name {*}$args
+    }
+
+    #
+    # url -- emit an HTML 5 "url" form field
+    #
+    method url {name args} {
+        my field url $name {*}$args
+    }
+
+    #
+    # week -- emit an HTML 5 "week" form field
+    #
+    method week {name args} {
+        my field week $name {*}$args
+    }
+
+    #
+    # radiobuttons -- 
+    #
+    method radiobuttons {name args} {
+	set data(values) [list]
+	set data(labels) [list]
+	set list [my import_data radiobuttons data $args]
+
+	if {[lempty $data(labels)]} { 
+	    set data(labels) $data(values) 
+	}
+
+	foreach label $data(labels) value $data(values) {
+	  my radio $name {*}$list -label $label -value $value
+	}
+    }
+
+    #
+    # select -- generate a selector
+    #
+    # part of the key value pairs can include -values with a list,
+    # and -labels with a list and it'll populate the <option>
+    # elements with them.  if one matches the default value,
+    # it'll select it too.
+    #
+    method select {name args} {
+	# start with empty values and labels so they'll exist even if not set
+	set data(values) [list]
+	set data(labels) [list]
+
+	# import any default data and key-value pairs from the method args
+	my import_data select data $args
+
+	# pull the values and labels into scalar variables and remove them
+	# from the data array
+	set values $data(values)
+	set labels $data(labels)
+	unset data(values) data(labels)
+
+	# get the default value, use an empty string if there isn't one
+	set default ""
+	if {[info exists DefaultValues($name)]} {
+	    set default $DefaultValues($name)
+	}
+
+	# if there is a value set in the value field of the data array,
+	# use that instead (that way if we're putting up a form with
+	# data already, the data'll show up)
+	if {[info exists data(value)]} {
+	    set default $data(value)
+	    unset data(value)
+	}
+
+	#
+	# if there are no separate labels defined, use the list of
+	# values for the labels
+	#
+	if {[lempty $labels]} { 
+	    set labels $values 
+	}
+
+	# emit the selector
+	html "<select name=\"$name\" [my argstring data]>"
+
+	# emit each label-value pair
+	foreach label $labels value $values {
+	    if {$value == $default} {
+		set string "<option value=\"$value\" selected=\"selected\">"
+	    } else {
+		set string "<option value=\"$value\">"
+	    }
+	    html "$string$label</option>"
+	}
+	html "</select>"
+    }
+
+    #
+    # textarea -- emit an HTML "textarea" form field
+    #
+    method textarea {name args} {
+	my import_data textarea data $args
+	set value ""
+	if {[info exists data(value)]} {
+	    set value $data(value)
+	    unset data(value)
+	}
+	html "<textarea name=\"$name\" [my argstring data]>$value</textarea>"
+    }
+
+    #
+    # defaults -- when set, the value is the name of an array to suck
+    # the key-value pairs out of and copy them into DefaultValues
+    #
+    method setDefaults {args} {
+	upvar 1 $defaults array
+	array set DefaultValues [array get array]
+    }
+
+} ; ## ::oo::class form

Modified: tcl/rivet/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/changelog?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/changelog (original)
+++ tcl/rivet/trunk/debian/changelog Thu Dec  2 08:33:14 2010
@@ -1,3 +1,10 @@
+libapache2-mod-rivet (2.0.2-2) unstable; urgency=low
+
+  * removed redundant code in libapache2-mod-rivet.postinst
+  * files in contrib/ are now installed with the docs 
+
+ -- Massimo Manghi <mxmanghi@apache.org>  Tue, 30 Nov 2010 12:31:27 +0100
+
 libapache2-mod-rivet (2.0.2-1) unstable; urgency=low
 
   * Initial package of Rivet for Debian

Modified: tcl/rivet/trunk/debian/libapache2-mod-rivet.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.docs?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.docs (original)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.docs Thu Dec  2 08:33:14 2010
@@ -2,3 +2,4 @@ BUGS
 README
 TODO
 CHANGES
+contrib/

Modified: tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst (original)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst Thu Dec  2 08:33:14 2010
@@ -22,11 +22,9 @@ APACHE2CONF="/etc/apache2/"
 case "$1" in
     configure)
 	if [ -z "$2" ] ; then
-            CD=`pwd`
-            cd $APACHE2CONF/mods-enabled
-            ln -s ../mods-available/rivet.load ./rivet.load
-            ln -s ../mods-available/rivet.conf ./rivet.conf
-            cd $CD
+
+# enabling the module
+
             a2enmod -q rivet
 
             if [ -e /etc/apache2/mods-enabled/rivet.load ] ; then

Modified: tcl/rivet/trunk/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/commands.xml?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/commands.xml (original)
+++ tcl/rivet/trunk/doc/xml/commands.xml Thu Dec  2 08:33:14 2010
@@ -643,11 +643,11 @@
       </refsect1>
     </refentry>
 
-
+    <!-- Reference page for command 'cookie' -->
     <refentry id="cookie">
       <refnamediv>
 	<refname>cookie</refname>
-	<refpurpose>get and set cookies.</refpurpose>
+	<refpurpose>get, set and delete cookies.</refpurpose>
       </refnamediv>
 
       <refsynopsisdiv>
@@ -668,18 +668,37 @@
 	  <arg>get</arg>
 	  <arg><replaceable>cookieName</replaceable></arg>
 	</cmdsynopsis>
+	<cmdsynopsis>
+	  <command>cookie</command>
+	  <arg>delete</arg>
+	  <arg><replaceable>cookieName</replaceable></arg>
+	</cmdsynopsis>
+	<cmdsynopsis>
+	  <command>cookie</command>
+	  <arg>unset</arg>
+	  <arg><replaceable>cookieName</replaceable></arg>
+	</cmdsynopsis>
       </refsynopsisdiv>
 
       <refsect1>
 	<title>Description</title>
 	<para>
-	  <command>cookie</command> gets or sets a cookie.  When you
+	  <command>cookie</command> gets, sets, unsets or deletes a cookie.  When you
 	  get a cookie, the command returns the value of the cookie,
 	  or an empty string if no cookie exists.
 	</para>
+	<para>
+	  <command>cookie delete</command> will set the timeout value to -1 minutes
- 
+	  deleting the cookie in the browser.
+	</para>
+	<para>
+	  <command>cookie unset</command> will remove the defined cookie in the server

+	  (perhaps preparatory to checking/resetting the cookie).
+	</para>
       </refsect1>
     </refentry>
 
+    <!-- Reference page for command 'clock_to_rfc' -->
     <refentry id="clock_to_rfc">
       <refnamediv>
 	<refname>clock_to_rfc850_gmt</refname>

Modified: tcl/rivet/trunk/rivet/rivet-tcl/cookie.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/rivet-tcl/cookie.tcl?rev=1041308&r1=1041307&r2=1041308&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/rivet-tcl/cookie.tcl (original)
+++ tcl/rivet/trunk/rivet/rivet-tcl/cookie.tcl Thu Dec  2 08:33:14 2010
@@ -104,5 +104,11 @@ proc cookie {cmd name args} {
 	    ## with a time that has already expired.
 	    cookie set $name "" -minutes -1
 	}
+	"unset" {
+	    ::request::global RivetCookies
+	    if {![array exists RivetCookies]} { load_cookies RivetCookies }
+	    if {![info exists RivetCookies($name)]} { return }
+	    unset RivetCookies($name)
+	}
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org


Mime
View raw message