Global functions and User Extensions rollup.

README.md

@@ -1,28 +1,60 @@
-SelBlocks 2
-=========
+# SelBlocks 2
+![SelBlocks Logo](https://raw.githubusercontent.com/refactoror/SelBlocks/master/sel-blocks-fx_xpi/chrome/skin/selblocksLogo.png)
 
-SelBlocks is a language extension for Selenium IDE
+SelBlocks is a language extension for Selenese that works on both the Selenium IDE and Selenium standalone server. It allows intelligent, data driven, tests to be recorded and composed in Selenium IDE, then run on any browser supported by Selenium server. With SelBlocks there is no need to translate the tests into another language at all! Experience web application testing and automation that's so easy a child could do it. Seriously, we've taught kids how to use this.
 
-It provides Selenium commands for javascript-like conditionals, looping, callable functions, error catching, and JSON/XML driven parameterization.
+> My eight year old nephew's eyes got huge when he said *"You mean I can click __all__ the buttons?"* and I told him yes. Then showed him how to do it.
+> -- Kastor
 
-Features
+## Features
 
+* Variables can be configured via external XML and/or JSON files.
+* Functions are namespaced. They can be defined in test libraries, then called from any test case in the suite with `testCaseTitle.functionName`.
+* Command parameters are javascript expressions that are evaluated with Selenium variables in scope, which can therefore be referenced by their simple names, e.g.: <tt>i+1</tt>
+* A function definition can appear anywhere, (they are skipped over in normal execution flow).
+* Functions can be called recursively.
+* Function and loop parameters use regular Selenium variables that are local to the block, overriding variables of the same name, and that are restored when the block exits.
 * Adds the following control structures to Selenese:
   * <code>if</code>, <code>elseIf</code>, <code>else</code>
   * <code>try</code>, <code>catch</code>, <code>finally</code>, <code>throw</code>
   * <code>for</code>, <code>foreach</code>, <code>while</code>, <code>continue</code>, <code>break</code>
   * <code>call</code>, <code>function</code>, <code>return</code>
-  * <code>loadJsonVars</code>, <code>loadXmlVars</code>, <code>forJson</code>, <code>forXml</code>
+  * <code>goto</code>, <code>gotoIf</code>, <code>label</code>, <code>skipNext</code>
+  * <code>forJson</code>, <code>forXml</code>
   * <code>exitTest</code>
-* Function and loop parameters use regular Selenium variables that are local to the block, overriding variables of the same name, and that are restored when the block exits.
-* Command parameters are javascript expressions that are evaluated with Selenium variables in scope, which can therefore be referenced by their simple names, e.g.: <tt>i+1</tt>
-* Variables can be configured via external XML and/or JSON files.
-* A function definition can appear anywhere, (they are skipped over in normal execution flow).
-* Functions can be called recursively.
+* Adds the following variable declarators to Selenese:
+  * *Scoped `store` command*
+    * <code>storeLocal</code> : stores variables in the current block scope, the builtin `store` command now creates local variables as well.
+    * <code>storeGlobal</code> : stores variables in global scope
+    * <code>storeAt</code> : stores variable values in the parent scope where they were defined, or creates a global variable if no parent scope defined it.
+    * <code>loadJsonVars</code> : creates variables in the current block scope, as defined by the given JSON file or URL.
+    * <code>loadXmlVars</code> : creates variables in the current block scope, as defined by the given XML file or URL.
+  * *Scoped storeEval* : built in Selenese command, storeEval stores the result of evaluating the given javascript.
+    * SelBlocks adds : <code>storeEvalLocal</code>, <code>storeEvalGlobal</code>, and <code>storeEvalAt</code>
+  * *Scoped storeText* : stores the text of the located element.
+    * SelBlocks adds : <code>storeLocalText</code>, <code>storeGlobalText</code>, and <code>storeAtText</code>
+  * *Scoped storeAttribute* : stores the value of the located attribute.
+    * SelBlocks adds : <code>storeLocalAttribute</code>, <code>storeGlobalAttribute</code>, and <code>storeAtAttribute</code>
+
+## Installation
+
+The [Firefox installer](https://addons.mozilla.org/en-US/firefox/addon/selenium-ide-sel-blocks/) is the latest published release. It is available from the firefox addons site, or just search for it in your addons menu.
+
+To install the latest development version, clone this repository and put a file in your firefox extensions directory called `[email protected]`. In that file just paste the full path to the `sel-blocks-fx_xpi` directory. Now, you'll be able to get the cutting edge latest stuff by pulling it in whenever you want. As an added bonus, when you switch branches the extension will load with that branch's code.
+
+The Selenium server extension file is at "/user extension/user-extensions.js". Grab a copy and follow the directions in the SeleniumHTMLRunner.cmd file.
+
+## Documentation
+
+Find the docs at http://refactoror.wikia.com/wiki/Selblocks_Reference
+
+## Author
+
+* [Chris Noe](https://github.com/refactoror)
 
-[Firefox Installer](https://addons.mozilla.org/en-US/firefox/addon/selenium-ide-sel-blocks/) / [Documentation](http://refactoror.wikia.com/wiki/Selblocks_Reference)
+## Contributors
 
-Contributors
+* [Matthew Kastor](https://github.com/matthewkastor)
 
 If you would like to contribute code to SelBlocks, you can do so by forking this project, and then submitting a pull request. Contributed code must be able to pass the full test suite, and should include additional tests to prove the correctness of the new or modified code.
 

build/createSelblocksUserExtensions.cmd

@@ -0,0 +1,10 @@
+@echo off
+SETLOCAL
+SET extensionsDir=%~dp0..\sel-blocks-fx_xpi\chrome\content\extensions
+SET userExtensionDir=%~dp0..\user extension
+
+SET copylist="%userExtensionDir%\scripts\config.js"+"%extensionsDir%\name-space.js"+"%extensionsDir%\logger.js"+"%extensionsDir%\function-intercepting.js"+"%extensionsDir%\xpath-processing.js"+"%extensionsDir%\expression-parser.js"+"%extensionsDir%\selenium-executionloop-handleAsExitTest.js"+"%extensionsDir%\selenium-executionloop-handleAsTryBlock.js"+"%extensionsDir%\selblocks.js"
+
+copy %copylist% /B "%userExtensionDir%\user-extensions.js" /B
+ENDLOCAL
+EXIT /B %ERRORLEVEL%

sel-blocks-fx_xpi/chrome/content/extensions/name-space.js

@@ -1,6 +1,11 @@
 // SelBlocks name-space
 var selblocks = { name: "SelBlocks" };
 
+// I don't want to redeclare the variable when the user-extension is generated
+// I don't want the scripts to blow up when the firefox extension is used.
+// This is an alias on the global scope that references the global scope.
+globalContext = this;
+
 (function($$){
 
   /* Starting with FF4 lots of objects are in an XPCNativeWrapper,