maglev-database-explorer 0.0.2 → 0.0.3

data/public/amber/st/Maglev-Core.st

@@ -112,7 +112,7 @@ showReloadObjectWindow: oop
 	^ window
 ! !
 
-Maglev class instanceVariableNames: 'instance defaultWorkspaceId persistentRootId maglevSystemId evalObjectId'!
+Maglev class instanceVariableNames: 'instance defaultWorkspaceId persistentRootId maglevSystemId evalObjectId swatchDesign'!
 
 !Maglev class methodsFor: 'accessing'!
 
@@ -167,6 +167,20 @@ ready
 	MaglevWebBrowserWindow showNew.
 ! !
 
+!Maglev class methodsFor: 'rendering'!
+
+swatchDesign
+	swatchDesign 
+		ifNil: [ |html|
+			html := HTMLCanvas onJQuery: 'head' asJQuery.
+			swatchDesign := html link 
+				href: 'themes/geo-bootstrap/swatch/bootstrap.css';
+				rel: 'stylesheet']
+		ifNotNil: [
+			swatchDesign asJQuery remove.
+			swatchDesign := nil].
+! !
+
 !Maglev class methodsFor: 'singleton'!
 
 instance
@@ -1120,6 +1134,22 @@ allSelectorsWithCallback: aBlock
 		withCallback: aBlock.
 !
 
+compileRubySourceCode: sourceCode withCallback: aBlock
+	self 
+		evaluateWithoutUpdate: sourceCode
+		language: 'rubyClass'
+		with: Dictionary new
+		withCallback: aBlock.
+!
+
+compileSmalltalkSourceCode: sourceCode withCallback: aBlock
+	self 
+		evaluateWithoutUpdate: 'self compile: ''', sourceCode escapedString, '''.'
+		language: 'smalltalk'
+		with: Dictionary new
+		withCallback: aBlock.
+!
+
 ensureSuperListLoadedWithCallback: aBlock
 	superList 
 		ifNil: [MaglevAjax 

data/public/amber/st/Maglev-Database-Explorer.st

@@ -42,11 +42,19 @@ with: anObject
 ! !
 
 Widget subclass: #MaglevGsNMethodEditor
-	instanceVariableNames: 'object editorContainer errorBox rubyIcon stIcon envIdContainer sourceLocationContainer editor editorHeight editorWidth'
+	instanceVariableNames: 'object editorContainer errorBox rubyIcon stIcon envIdContainer sourceLocationContainer editor editorHeight editorWidth classObject'
 	package: 'Maglev-Database-Explorer'!
 
 !MaglevGsNMethodEditor methodsFor: 'accessing'!
 
+classObject
+	^ MaglevObject newObjectWithoutUpdate: (self methodObject at: 5)
+!
+
+classObject: anObject
+	classObject := anObject.
+!
+
 envId
 	^ self methodObject at: 2
 !
@@ -121,19 +129,19 @@ commandSave
 	|selectedCategory|
 	errorBox hide.
 	errorBox asJQuery empty.
-	object environmentId = 1
-		ifTrue: [object
-			compileRubySourceCode: editor getValue 
+	self envId = 1
+		ifTrue: [self classObject
+			compileRubySourceCode: (editor getValue replace: '⚡' with: '')
 			withCallback: [:success :obj |
-				obj isException
-					ifTrue: [self signalFailure: obj]
-					ifFalse: [self signalSuccess]]]
-		ifFalse: [object 
-			compileSmalltalkSourceCode: editor getValue 
+				success
+					ifTrue: [self signalSuccess]
+					ifFalse: [self signalFailure: obj]]]
+		ifFalse: [self classObject 
+			compileSmalltalkSourceCode: (editor getValue replace: '⚡' with: '')
 			withCallback: [:success :obj |
-				obj isException
-					ifTrue: [self signalFailure: obj]
-					ifFalse: [self signalSuccess]]].
+				success
+					ifTrue: [self signalSuccess]
+					ifFalse: [self signalFailure: obj]]].
 !
 
 signalFailure: aDescription
@@ -873,12 +881,18 @@ language
 !MaglevObjectDropdown methodsFor: 'initializing'!
 
 initializeEditor
-	|params|
+	|params extraKeys|
+	extraKeys := Object new
+		basicAt: 'Ctrl-D' put: [self evalPrintIt];
+		basicAt: 'Ctrl-P' put: [self evalPrintIt];
+		basicAt: 'Ctrl-S' put: [self evalPrintIt];
+		yourself.
 	params := Object new
 		basicAt: 'mode' put: 'text/x-ruby';
 		basicAt: 'styleActiveLine' put: true;
 		basicAt: 'lineNumbers' put: true;
 		basicAt: 'matchBrackets' put: true;
+		basicAt: 'extraKeys' put: extraKeys;
 		yourself. 
 	editor := CodeMirror value: (editorElement asJQuery at: 0) value: params.
 	editor setValue: ''.
@@ -948,21 +962,22 @@ languageChanged
 !MaglevObjectDropdown methodsFor: 'rendering'!
 
 renderButtonsOn: html
-	html button
+	"html button
 		class: 'btn btn-primary';
 		type: 'button';
 		with: 'Do it';
-		onClick: [self evalDoIt].
+		onClick: [self evalDoIt]."
 	html button
 		class: 'btn btn-primary';
 		type: 'button';
+		style: 'margin-right: 10px;';
 		with: 'Print it';
 		onClick: [self evalPrintIt].
-	html button
+	"html button
 		class: 'btn btn-primary';
 		type: 'button';
 		with: 'Inspect it';
-		onClick: [self evalInspectIt].
+		onClick: [self evalInspectIt]."
 	html div
 		class: 'btn-group';
 		style: 'float: right;';
@@ -2460,7 +2475,10 @@ renderListsOn: html
 !
 
 renderMethodObject: obj
-	methodContainer with: (MaglevGsNMethodEditor for: obj).
+	|methodEditor|
+	methodEditor := MaglevGsNMethodEditor for: obj.
+	methodEditor classObject: object.
+	methodContainer with: methodEditor.
 	waitingScreen hide.
 !
 
@@ -2537,7 +2555,7 @@ renderWindowTitleContentOn: html
 ! !
 
 MaglevClassWindow subclass: #MaglevSystemClassWindow
-	instanceVariableNames: 'transactionResultBox'
+	instanceVariableNames: 'transactionResultBox persistenceModeButton'
 	package: 'Maglev-Database-Explorer'!
 
 !MaglevSystemClassWindow methodsFor: 'interactions'!
@@ -2586,6 +2604,44 @@ continueTransaction
 
 defaultTab
 	^ 'Control Panel'
+!
+
+togglePersistentMode
+	self showTransactionWaitingBox.
+	object 
+		evaluate: 'self.__DBETogglePersistenceMode'
+		language: 'ruby'
+		withCallback: [:success :resultObj |
+			transactionResultBox asJQuery empty.
+			transactionResultBox removeClass: 'alert-info'.
+			success
+				ifTrue: [
+					transactionResultBox addClass: 'alert-success'.
+					resultObj value = true
+						ifTrue: [persistenceModeButton asJQuery addClass: 'active']
+						ifFalse: [persistenceModeButton asJQuery removeClass: 'active'].
+					transactionResultBox hide]
+				ifFalse: [transactionResultBox addClass: 'alert-error'].
+			transactionResultBox with: resultObj inlineViewComponent].
+!
+
+updatePersistentMode
+	self showTransactionWaitingBox.
+	object 
+		evaluate: 'self.__DBEPersistenceMode'
+		language: 'ruby'
+		withCallback: [:success :resultObj |
+			transactionResultBox asJQuery empty.
+			transactionResultBox removeClass: 'alert-info'.
+			success
+				ifTrue: [
+					transactionResultBox addClass: 'alert-success'.
+					resultObj value = true
+						ifTrue: [persistenceModeButton asJQuery addClass: 'active']
+						ifFalse: [persistenceModeButton asJQuery removeClass: 'active'].
+					transactionResultBox hide]
+				ifFalse: [transactionResultBox addClass: 'alert-error'].
+			transactionResultBox with: resultObj inlineViewComponent].
 ! !
 
 !MaglevSystemClassWindow methodsFor: 'rendering'!
@@ -2608,24 +2664,31 @@ renderControlPanelOn: html
 					type: 'button';
 					class: 'btn btn-warning';
 					value: 'Abort Transaction';
-					style: 'width: 32%; margin-right: 1%;';
+					style: 'width: 25%; margin-right: 1%;';
 					onClick: [self abortTransaction].
 				html input
 					type: 'button';
 					class: 'btn btn-warning';
 					value: 'Commit Transaction';
-					style: 'width: 32%; margin-right: 1%;';
+					style: 'width: 25%; margin-right: 1%;';
 					onClick: [self commitTransaction].
 				html input
 					type: 'button';
 					class: 'btn btn-warning';
 					value: 'Continue Transaction';
-					style: 'width: 33%;';
+					style: 'width: 25%; margin-right: 1%;';
 					onClick: [self continueTransaction].
+				persistenceModeButton := html input
+					type: 'button';
+					class: 'btn';
+					value: 'Persistent Mode';
+					style: 'width: 22%;';
+					onClick: [self togglePersistentMode].
 				transactionResultBox := html div
 					style: 'margin-top: 10px; margin-bottom: 0px;';
 					class: 'alert';
 					hide]].
+	self updatePersistentMode.
 !
 
 renderGemVersionReportOn: html
@@ -2788,7 +2851,7 @@ reloadStackWithCallback: aBlock
 
 selectStackFrame: anInteger
 	< self['@methodSelect']._asJQuery()[0].selectedIndex = anInteger - 1; >.
-	self renderFrame.
+	self renderFrame: anInteger.
 !
 
 stepInto

data/public/css/bootstrap.css

@@ -4164,9 +4164,9 @@ input[type="submit"].btn.btn-mini {
 }
 
 .nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #007fff;
-  border-bottom-color: #007fff;
+  margin-top: 8px;
+  /*border-top-color: #007fff;
+  border-bottom-color: #007fff;*/
 }
 
 .nav .dropdown-toggle:hover .caret,
@@ -6329,7 +6329,7 @@ div.subnav-fixed {
 
 .nav .open .dropdown-toggle,
 .nav > li.dropdown.open.active > a:hover {
-  color: #007fff;
+  /*color: #007fff;*/
 }
 
 .nav-tabs > li > a {

data/public/libs/codemirror/lib/codemirror.css

@@ -106,7 +106,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   line-height: 1;
   position: relative;
   overflow: hidden;
-  background: white;
+  /*background: white;*/
   color: black;
 }
 

data/public/themes/geo-bootstrap/README.md

@@ -0,0 +1,25 @@
+# Geo
+
+**Geo** is a timeless [Twitter Bootstrap](http://twitter.github.com/bootstrap) theme built for the modern web.
+
+## Usage
+
+Download `bootstrap.css` or `bootstrap.min.css` from `/swatch`. Replace the default Bootstrap stylesheet with one of these files.
+
+To use the image backgrounds download the graphics inside `/img`. Graphics used on our test page can be found inside `/img/test`.
+
+## Customization
+
+Geo was built with [Bootswatch Swatchmaker](https://github.com/thomaspark/bootswatch/tree/gh-pages/swatchmaker).
+
+To customize Geo edit `/swatch/variables.less` and `/swatch/bootswatch.less`. Refer to the Swatchmaker [README](https://github.com/thomaspark/bootswatch/tree/gh-pages/swatchmaker) for instructions to regenerate the Bootstrap stylesheet.
+
+## License
+
+Copyright (c) 2013 Divshot
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/public/themes/geo-bootstrap/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "geo-bootstrap",
+  "description": "Geo is the coolest theme for Twitter Bootstrap.",
+  "version": "1.0.0",
+  "author": "Divshot",
+  "homepage": "http://divshot.com/",
+  "license": "Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com:divshot/geo-bootstrap.git"
+  },
+  "engines": {
+    "node": ">= 0.8.11"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.0",
+    "grunt-recess": "~0.3.1",
+    "grunt-contrib-concat": "~0.1.3",
+    "grunt-contrib-clean": "~0.4.0"
+  }
+}