luca 0.9.42 → 0.9.65

data/src/tools/console.coffee

@@ -1,25 +1,25 @@
-codeMirrorOptions =
-  readOnly: true
-  autoFocus: false
-  theme: "monokai"
-  mode: "javascript"
+developmentConsole = Luca.register    "Luca.tools.DevelopmentConsole"
 
-Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
+developmentConsole.extends            "Luca.core.Container"
+
+developmentConsole.defines
   className: "luca-ui-console"
   name: "console"
   history: []
   historyIndex: 0
+  width: 1000
 
   componentEvents:
-    "code_input key:keyup" : "historyUp"
-    "code_input key:keydown" : "historyDown"
-    "code_input key:enter" : "runCommand"
+    "input key:keyup"    : "historyUp"
+    "input key:keydown"  : "historyDown"
+    "input key:enter"    : "runCommand"
 
   compileOptions:
     bare: true
 
   components:[
-    ctype: "code_mirror_field"
+    type: "code_mirror_field"
+    role: "code_mirror"
     additionalClassNames: "clearfix"
     name: "code_output"
     readOnly: true
@@ -28,8 +28,9 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
     lineWrapping: true
     gutter: false
   ,
-    ctype: "text_field"
+    type: "text_field"
     name: "code_input"
+    role: "input"
     lineNumbers: false
     height: '30px'
     maxHeight: '30px'
@@ -57,7 +58,10 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
 
   afterRender: ()->
     @$container().modal(backdrop: false)
-    @$container.css
+
+    if @width?
+      marginLeft = parseInt(@width) * 0.5 * -1
+      @$container().css("width", @width).css('margin-left', parseInt(marginLeft) )
 
   show: (options={})->
     @$container().modal('show')
@@ -78,19 +82,19 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
     @historyIndex -= 1
     @historyIndex = 0 if @historyIndex < 0
 
-    currentValue = Luca("code_input").getValue()
-    Luca("code_input").setValue( @history[ @historyIndex ] || currentValue )
+    currentValue = @getInput().getValue()
+    @getInput().setValue( @history[ @historyIndex ] || currentValue )
 
   historyDown: ()->
     @historyIndex += 1
     @historyIndex = @history.length - 1 if @historyIndex > @history.length - 1
 
-    currentValue = Luca("code_input").getValue()
+    currentValue = @getInput().getValue()
 
-    Luca("code_input").setValue( @history[ @historyIndex ] || currentValue)
+    @getInput().setValue( @history[ @historyIndex ] || currentValue)
 
   append: (code, result, skipFormatting=false)->
-    output = Luca("code_output")
+    output = @getCodeMirror()
     current = output.getValue()
 
     source = "// #{ code }" if code?
@@ -105,7 +109,12 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
 
   onSuccess: (result, js, coffee)->
     @saveHistory(coffee)
-    dump = JSON.stringify(result, null, "\t")
+
+    dump = ""
+
+    if _.isArray( result ) or _.isObject( result ) or _.isString( result ) or _.isNumber(result)
+      dump = JSON.stringify(result, null, "\t")
+
     dump ||= result.toString?()
 
     @append(js, dump || "undefined")
@@ -117,7 +126,7 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
     return unless code?.length > 0
 
     raw = _.string.strip(raw)
-    output = Luca("code_output")
+    output = @getCodeMirror()
     dev = @
 
     evaluator = ()->
@@ -142,6 +151,13 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
 
     try
       result = evaluator.call( @getContext() )
+
+      # capture luca objects for special inspection 
+      if Luca.isComponent( result )
+        result = Luca.util.inspectComponent( result )
+      else if Luca.isComponentPrototype( result )
+        result = Luca.util.inspectComponentPrototype( result )
+
       @onSuccess(result, code, raw) unless raw.match(/^console\.log/)
     catch error
       @onError(error, code, raw)
@@ -149,20 +165,34 @@ Luca.define("Luca.tools.DevelopmentConsole").extends("Luca.core.Container").with
   runCommand: ()->
     dev     = @
     compile = _.bind(Luca.tools.CoffeeEditor::compile, @)
-    raw = Luca("code_input").getValue()
+    raw = @getInput().getValue()
     compiled = compile raw, (compiled)->
       dev.evaluateCode(compiled, raw)
 
 Luca.util.launchers ||= {}
 
+Luca.util.inspectComponentPrototype = (componentPrototype)->
+  liveInstances = Luca.registry.findInstancesByClass( componentPrototype )
+
+Luca.util.inspectComponent = (component)->
+  component = Luca(component) if _.isString(component)
+
+  {
+    name:         component.name  
+    instanceOf:   component.displayName 
+    subclassOf:   component._superClass()::displayName
+    inheritsFrom: Luca.parentClasses( component )
+  }
+
 Luca.util.launchers.developmentConsole = (name="luca-development-console")->
   @_lucaDevConsole = Luca name, ()=>
-    @$el.append Backbone.View::make("div", id: "#{ name }-wrapper", class: "modal fade")
+    @$el.append Backbone.View::make("div", id: "#{ name }-wrapper", class: "modal fade large")
 
     console = new Luca.tools.DevelopmentConsole
       name: name
       container: "##{ name }-wrapper"
 
     console.render()
+    console.getCodeMirror().setHeight(602)
 
   @_lucaDevConsole.show()

data/src/util.coffee

@@ -3,14 +3,26 @@
 # references on objects which don't yet exist, as strings, which get
 # evaluated at runtime when such references will be available
 Luca.util.resolve = (accessor, source_object)->
-  source_object ||= (window || global)
-  _( accessor.split(/\./) ).inject (obj,key)->
-    obj = obj?[key]
-  , source_object
+  try
+    source_object ||= (window || global)
+    resolved = _( accessor.split(/\./) ).inject (obj,key)->
+      obj = obj?[key]
+    , source_object
+  catch e
+    console.log "Error resolving", accessor, source_object
+    throw e
+    
+  resolved
 
 # A better name for Luca.util.nestedValue
 Luca.util.nestedValue = Luca.util.resolve
 
+Luca.util.argumentsLogger = (prompt)->
+  ()-> console.log prompt, arguments
+
+Luca.util.read = (property, args...)->
+  if _.isFunction(property) then property.apply(@, args) else property
+
 # turns a word like form_view into FormView
 Luca.util.classify = (string="")->
   _.string.camelize( _.string.capitalize( string ) )
@@ -105,3 +117,4 @@ Luca.util.badge = (contents="", type, baseClass="badge")->
   cssClass = baseClass
   cssClass += " #{ baseClass }-#{ type }" if type?
   Luca.util.make("span",{class:cssClass},contents)
+