updating to head

nagaozen · Aug 6, 2010 · 065de83 · 065de83
1 parent e0524b7
commit 065de83
Show file tree

Hide file tree

Showing 264 changed files with 18,156 additions and 9,574 deletions.
diff --git a/README.md b/README.md
@@ -102,9 +102,10 @@ for sure.
     - [Color](/lib/axe/docs/files/lib/axe/classes/Utilities/color-asp.html)
     - [CSV](/lib/axe/docs/files/lib/axe/classes/Parsers/csv-asp.html) _(not implemented yet)_
     - [CustomEvent](/lib/axe/docs/files/lib/axe/classes/customevent-asp.html)
+    - [Email](/lib/axe/docs/files/lib/axe/classes/Utilities/email-asp.html)
     - [Interface](/lib/axe/docs/files/lib/axe/classes/interface-asp.html)
     - [List](/lib/axe/docs/files/lib/axe/classes/Utilities/list-asp.html)
-    - [Logger](/lib/axe/docs/files/lib/axe/classes/Utilities/logger-asp.html)
+    - [Logger](/lib/axe/docs/files/lib/axe/classes/Utilities/logger-asp.html) _(not implemented yet)_
     - [Markdown](/lib/axe/docs/files/lib/axe/classes/Parsers/markdown-asp.html)
     - [Paginator](/lib/axe/docs/files/lib/axe/classes/Utilities/paginator-asp.html)
     - [RSS](/lib/axe/docs/files/lib/axe/classes/Feeds/rss-asp.html) _(work in progress)_
@@ -113,7 +114,7 @@ for sure.
     - [Textile](/lib/axe/docs/files/lib/axe/classes/Parsers/textile-asp.html) _(not implemented yet)_
     - [Translator](/lib/axe/docs/files/lib/axe/classes/Utilities/translator-asp.html) _(work in progress)_
     - [UnitTest](/lib/axe/docs/files/lib/axe/classes/unittest-asp.html)
-    - [XSession](/lib/axe/docs/files/lib/axe/classes/xsession-asp.html) _(not implemented yet)_
+    - [XSession](/lib/axe/docs/files/lib/axe/classes/Utilities/xsession-asp.html) _(not implemented yet)_
 * new services
     - [Akismet](/lib/axe/docs/files/lib/axe/classes/Services/akismet-asp.html)
     - [reCaptcha](/lib/axe/docs/files/lib/axe/classes/Services/recaptcha-asp.html)

diff --git a/app/cache/__defaultController_defaultAction___.html b/app/cache/__defaultController_defaultAction___.html
@@ -16,7 +16,7 @@ <h1>ASP Xtreme Evolution</h1>
         <img src="/lib/axe/assets/img/logomark-icons.jpg" alt="ASP Xtreme Evolution" title="ASP Xtreme Evolution" xmlns=""></img>
         <p xmlns="">ASP Xtreme Evolution goal is to be a versatile MVC URL-Friendly base for Classic ASP applications with some additional features that are not ASP native. It should implement things that are common to most applications removing the pain of starting a new software and helping you to structure it so that you get things right from the beginning. Our key concepts are choice and freedom over limiting conventions, polyglotism, sustained quality, extensibility which we try to implement in a clean, maintainable and extensible way.</p>
         <h2 xmlns="">Engine information</h2>
-        <p xmlns="">ASP Xtreme Evolution v1.1.0.0 running over VBScript v5.8.18702</p>
+        <p xmlns="">ASP Xtreme Evolution v1.2.0.0 running over VBScript v5.8.18702</p>
         <p xmlns="">LCID: 1033 - Codepage: 65001 - Charset: UTF-8</p>
         <h2 xmlns="">Important Notes</h2>
         <ul xmlns="">
@@ -178,6 +178,9 @@ <h3 xmlns="">Added</h3>
               <li>
                 <a href="/lib/axe/docs/files/lib/axe/classes/customevent-asp.html">CustomEvent</a>
               </li>
+              <li>
+                <a href="/lib/axe/docs/files/lib/axe/classes/Utilities/email-asp.html">Email</a>
+              </li>
               <li>
                 <a href="/lib/axe/docs/files/lib/axe/classes/interface-asp.html">Interface</a>
               </li>
@@ -186,6 +189,7 @@ <h3 xmlns="">Added</h3>
               </li>
               <li>
                 <a href="/lib/axe/docs/files/lib/axe/classes/Utilities/logger-asp.html">Logger</a>
+                <em>(not implemented yet)</em>
               </li>
               <li>
                 <a href="/lib/axe/docs/files/lib/axe/classes/Parsers/markdown-asp.html">Markdown</a>
@@ -215,7 +219,7 @@ <h3 xmlns="">Added</h3>
                 <a href="/lib/axe/docs/files/lib/axe/classes/unittest-asp.html">UnitTest</a>
               </li>
               <li>
-                <a href="/lib/axe/docs/files/lib/axe/classes/xsession-asp.html">XSession</a>
+                <a href="/lib/axe/docs/files/lib/axe/classes/Utilities/xsession-asp.html">XSession</a>
                 <em>(not implemented yet)</em>
               </li>
             </ul>

diff --git a/app/config.xml b/app/config.xml
@@ -2,9 +2,9 @@
 <configurations>
     <common>
         <name>ASP Xtreme Evolution</name>
-        <version>1.1.0.0</version>
+        <version>1.2.0.0</version>
         <environment>development</environment>
-        <uri>http://192.168.0.155:50001</uri>
+        <uri>http://192.168.0.20:50001</uri>
     </common>
     <cache>
         <lifetime>6</lifetime>

diff --git a/app/views/error.asp b/app/views/error.asp
@@ -45,15 +45,23 @@ end if
 dim AspError, category, message
 set AspError = Server.getLastError()
 if((AspError.description <> "") and (AspError.file <> "") and (AspError.line > 0)) then
-    category = AspError.category
+    category = strsubstitute( _
+        "{0}{1} (0x{2})", _
+        array( _
+            AspError.category, _
+            iif(AspError.aspCode > "", Server.htmlEncode(", " & AspError.aspCode), ""), _
+            Hex(AspError.number) _
+        ) _
+    )
+    
     message = strsubstitute( _
         "<p><strong>{0}</strong> @ <code>{1}</code>{2}{3}</p>{4}", _
         array( _
             AspError.description, _
             AspError.file, _
             iif(AspError.line > 0, (", line: <code>" & AspError.line & "</code>"), ""), _
             iif(AspError.column > 0, (", column: " & AspError.column & "</code>"), ""), _
-            iif(AspError.source > "", "<pre><code>" & Server.HTMLEncode(AspError.source) & "</code></pre>", "") _
+            iif(AspError.source > "", "<pre><code>" & Server.htmlEncode(AspError.source) & "</code></pre>", "") _
         ) _
     )
 end if

diff --git a/lib/axe/classes/Utilities/Email/interface.asp b/lib/axe/classes/Utilities/Email/interface.asp
@@ -27,7 +27,7 @@
 ' Class: Email_Interface
 ' 
 ' Defines the common specifications required to implement a working adapter of 
-' Email.asp.
+' Email class.
 ' 
 ' About:
 ' 

diff --git a/lib/axe/classes/Utilities/Translator/interface.asp b/lib/axe/classes/Utilities/Translator/interface.asp
@@ -0,0 +1,109 @@
+<%
+
+' File: interface.asp
+' 
+' AXE(ASP Xtreme Evolution) translator object interface specification.
+' 
+' License:
+' 
+' This file is part of ASP Xtreme Evolution.
+' Copyright (C) 2010 Fabio Zendhi Nagao
+' 
+' ASP Xtreme Evolution is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+' 
+' ASP Xtreme Evolution is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License for more details.
+' 
+' You should have received a copy of the GNU Lesser General Public License
+' along with ASP Xtreme Evolution. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+' Class: Translator_Interface
+' 
+' Defines the common specifications required to implement a working adapter of 
+' Translator class.
+' 
+' About:
+' 
+'     - Written by Fabio Zendhi Nagao <http://zend.lojcomm.com.br> @ Jun 2010
+' 
+class Translator_Interface' extends Interface
+    
+    ' --[ Inheritance ]---------------------------------------------------------
+    public Parent
+    
+    public property set Implementation(I)
+        set Parent.Implementation = I
+    end property
+    
+    public property get Implementation
+        set Implementation = Parent.Implementation
+    end property
+    
+    public property get requireds
+        requireds = Parent.requireds
+    end property
+    
+    public function check()
+        check = Parent.check()
+    end function
+    
+    ' --[ Interface definition ]------------------------------------------------
+    
+    ' Property: classType
+    ' 
+    ' Class type.
+    ' 
+    ' Contains:
+    ' 
+    '   (string) - type
+    ' 
+    public classType
+
+    ' Property: classVersion
+    ' 
+    ' Class version.
+    ' 
+    ' Contains:
+    ' 
+    '   (float) - version
+    ' 
+    public classVersion
+    
+    private sub Class_initialize()
+        classType    = typename(Me)
+        classVersion = "1.0.0"
+        
+        set Parent = new Interface
+        Parent.requireds = array("getText")
+    end sub
+    
+    private sub Class_terminate()
+        set Parent = nothing
+    end sub
+    
+    ' Function: getText
+    ' 
+    ' Fetch for the translation of the message in the right language.
+    ' 
+    ' Parameters:
+    ' 
+    '     (lang)    - An identificator for the word/phrase.
+    '     (message) - An identificator for the word/phrase.
+    ' 
+    ' Returns:
+    ' 
+    '     (string) - translated message
+    ' 
+    public default function getText(lang, message)
+    end function
+    
+end class
+
+%>
diff --git a/lib/axe/classes/Utilities/email.asp b/lib/axe/classes/Utilities/email.asp
@@ -28,6 +28,10 @@
 ' 
 ' Conceptual email object.
 ' 
+' Requires:
+' 
+'     - Email_Interface implementation
+' 
 ' About:
 ' 
 '     - Written by Fabio Zendhi Nagao <http://zend.lojcomm.com.br> @ May 2010
@@ -302,8 +306,7 @@ class Email
     ' 
     ' (end code)
     ' 
-    public sub send()
-        call [_ε]
+    public sub send() : call [_ε]
         call Adapter.send(Me)
     end sub
     

diff --git a/lib/axe/classes/Utilities/template.asp b/lib/axe/classes/Utilities/template.asp
@@ -85,40 +85,35 @@ class Template
     private sub Class_terminate()
     end sub
     
-    ' Subroutine: write
+    ' Function: setValue
     ' 
-    ' Subroutine to Response.write templates directly from arguments.
+    ' This is the class default method. It sets the instance value property.
     ' 
     ' Parameters:
     ' 
-    '   (string)   - Template with placeholders.
-    '   (string[]) - Array with the replacements.
+    '     (string) - template value
+    ' 
+    ' Returns:
+    ' 
+    '     (Template) - a self object reference
     ' 
     ' Example:
     ' 
     ' (start code)
     ' 
-    ' ' The infamous hello world example using Template.write
     ' dim XString : set XString = new Template
-    ' XString.write "{0} {1}", array("Hello", "World")
-    ' XString.write "{0} {1}", null
+    ' XString("{0} {1}").value' prints "{0} {1}"
+    ' XString("{0} {1}").substitute(array("Hello", "World"))' prints "Hello World"
+    ' XString("{0} {1}").toLowerCase(array("Hello", "World"))' prints "hello world"
+    ' XString("{0} {1}").<any_other_method_of_this_class>(arguments)' just works
     ' set XString = nothing
     ' 
     ' (end code)
     ' 
-    ' See also:
-    ' 
-    '   <substitute>
-    ' 
-    public sub write(sTemplate, saArgs)
-        dim i
-        if( isArray(saArgs) ) then
-            for i = 0 to ubound(saArgs)
-                sTemplate = Replace(sTemplate, "{" & i & "}", saArgs(i))
-            next
-        end if
-        Response.write sTemplate
-    end sub
+    public default function setValue(s)
+        value = s
+        set setValue = Me
+    end function
     
     ' Function: substitute
     ' 
@@ -144,10 +139,6 @@ class Template
     ' 
     ' (end code)
     ' 
-    ' See also:
-    ' 
-    '   <write>
-    ' 
     public function substitute(saArgs)
         dim sTemplate, i
         sTemplate = value
@@ -536,7 +527,7 @@ class Template
     ' 
     ' Parameters:
     ' 
-    '   (string)  - XString representation of the regular expression
+    '   (string)  - VBScript regular expression
     '   (boolean) - true|false indicating to enable a CI search or not
     '   (boolean) - true|false indicating to match or not all occurrences of the pattern
     '   (string[]) - Replacements