compass_ae_console 2.0.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fcfb01271f7ba1c6474ee78c6c2440ffd85e2fb8
+  data.tar.gz: 59cee03a3a8e0fb847b0fbdd67b9f0189fa7d35f
+SHA512:
+  metadata.gz: 24b0b9a9eb3bd3bb57e041eb0bb40c2bfd5375ac0ec7ac49110650e87712d185d8ba38bf82eb299a17fddc71658fa626ebeedbd4bb996a14fa574c56b4a07249
+  data.tar.gz: e66eb2b633e7a04ef1c621ed281fe31ed571dcecab7cc12ba22c385ec75f9c5952b35ad778c0b4a6d5785842a898a9ed29922ebfa540570028c634bcf4362980

data/app/controllers/compass_ae_console/erp_app/desktop/base_controller.rb

@@ -3,9 +3,8 @@ module CompassAeConsole
     module Desktop
       class BaseController < ::ErpApp::Desktop::BaseController
         def command
-          logger.debug("command received:#{params}")
           begin
-            result=""
+            result = ""
 
             # NOTE- the console uses a shared binding. this is due to the fact
             # that binding instances are not serializable and cant be stored
@@ -15,127 +14,138 @@ module CompassAeConsole
 
             # the shared binding is needed to allow for variable scope visibility
             # across multiple requests 
-            if($session_binding==nil)
+            if ($session_binding==nil)
               $session_binding=binding
             end
 
             command_message=params[:command_message]
-            logger.debug("console session context:#{$session_binding}")
-            logger.debug("command:#{command_message}")
 
             # here we handle any desktop console-specific command
             # these can include non-eval related funtions
             # or provide shortcuts to common eval expressions
-            result = case command_message 
-            when /^-help/
-              help_message
-            when /^-clear/
-              #this is actually handled in the console desktop application
-              #evaluate_command("")
-            when /^-time/
-              evaluate_command("Time.now")
-            when /^-whoami/
-              evaluate_command("current_user.username")
-            else
-              evaluate_command(command_message)  
-            end
+            result = case command_message
+                       when /^-help/
+                         help_message
+                       when /^-clear/
+                         #this is handled in the console desktop application
+                       when /^-time/
+                         evaluate_command("Time.now")
+                       when /^-whoami/
+                         evaluate_command("current_user.username")
+                       else
+                         evaluate_command(command_message)
+                     end
 
-            logger.debug("result#{result}")
-
-            result_message =result.to_s.gsub("\n", "<br />\n")
-            render :json=> {:success=>"#{result_message}<hr><br>"}
+            result_message = result.to_s.gsub("\n", "<br />\n")
+            render :json => {:success => "#{result_message}<hr><br>"}
           end
         end
+
         private
+
         #****************************************************************************
         def help_message()
-          message = "<font color='lightgray'><b>Compass Desktop Console Help<b><hr>"
+          message = "<span color='lightgray'><b>Compass Desktop Console Help<b><hr>"
           message<< "<ul>"
-          message<< "<li>-clear : <font color='yellow'>Clear screen contents.</font></li>"
-          message<< "<li>-help : <font color='yellow'>This help list.</font></li>"
-          message<< "<li>-time : <font color='yellow'>Current time.</font></li>"
-          message<< "<li>-whoami : <font color='yellow'>Logged in as.</font></li>"
-          message<< "</ul> </font>"
+          message<< "<li>-clear : Clear screen contents.</li>"
+          message<< "<li>-help : This help list.</li>"
+          message<< "<li>-time : Current time.</li>"
+          message<< "<li>-whoami : Logged in as.</li>"
+          message<< "</ul> </span>"
         end
+
         #****************************************************************************
         def highlight_class(klass)
-          klass.columns.map do |column|
-            "<font color='yellow'>#{column.name}</font><font color='lightgray'>:</font><font color='gold'>#{column.type}</font>"
+          "".tap do |buffer|
+            klass.columns.each do |column|
+              buffer << "<div>#{column.name}<span style='color:gray'>:</span><span style='color:gold'>#{column.type}</span></div>"
+            end
           end
         end
-        
+
         def hightlight_instance(instance)
           "".tap do |buffer|
             instance.attributes.keys.sort.each do |model_attribute_key|
-              Rails.logger.debug("key:#{model_attribute_key}")
-              buffer << "<font color='yellow'>#{model_attribute_key}</font> <font color='lightgray'>=</font><font color='gold'>#{instance.attributes[model_attribute_key]}</font> <font color='lightgray'>, </font>"
+              buffer << "<div>#{model_attribute_key} <span style='color:lightgray'>=</span><span style='color:gold'>#{instance.attributes[model_attribute_key]}</span></div>"
             end
           end
         end
+
         #****************************************************************************
 
         def evaluate_command(command_message)
-          Rails.logger.debug("evaluate_command(#{command_message}")
           begin
             result_eval = $session_binding.eval(command_message)
-            if(result_eval.respond_to?("superclass") &&  result_eval.superclass == ActiveRecord::Base)
-              result = render_active_record_model(result_eval)
-            elsif(result_eval.class.respond_to?("superclass") &&  result_eval.class.superclass == ActiveRecord::Base)
-              result = render_array([result_eval])
-            elsif (result_eval.is_a? Array)
-              result = render_array(result_eval)
-            elsif (result_eval.is_a? Hash)
-              result = render_hash(result_eval)
-            else
-              result = "#{result_eval.to_s}<br>"
-            end
-          rescue Exception => e
-            result = "<font color='red'>#{e.to_s}</font>"
+
+            result = if result_eval.respond_to?("columns") # If it responds to columns, this is an ActiveRecord model
+
+                       render_active_record_model(result_eval)
+                     elsif result_eval.respond_to?("class") && result_eval.class.ancestors.include?(ActiveRecord::Base)
+
+                       render_model(result_eval)
+                     elsif result_eval.is_a? Array
+
+                       render_array(result_eval)
+                     elsif result_eval.is_a? Hash
+
+                       render_hash(result_eval)
+                     else
+
+                       "#{result_eval.inspect}"
+                     end
+          rescue => ex
+            result = "<span style='color:red'>#{ex.to_s}</span>"
           end
 
           result
         end
+
         #****************************************************************************
         def render_active_record_model(result_eval)
-          Rails.logger.debug("render_active_record_model:#{result_eval}")
-          "<font color='YellowGreen'>#{result_eval.class} </font><br>#{highlight_class(result_eval)} "
+          "<div>#{highlight_class(result_eval)}<div>"
         end
+
+        #****************************************************************************
+        def render_model(result_eval)
+          "<div style='color:YellowGreen'>#{result_eval.class}</div><div>#{hightlight_instance(result_eval)}<div>"
+        end
+
         #****************************************************************************
         def render_array(result_eval)
-          result="#{result_eval.class.to_s}<br>"
-          Rails.logger.debug("render_array:#{result_eval}")
-          count=0
+          result = "#{result_eval.class.to_s}"
+          count = 0
+
           result_eval.each do |array_element|
-            if(array_element.is_a? ActiveRecord::Base)
-              result << "<font color='YellowGreen'>#{array_element.class}<font color='yellow'>[</font><font color='white'>#{count}</font><font color='yellow'>]</font> </font>#{hightlight_instance(array_element)} <br><br>"
+            if array_element.is_a? ActiveRecord::Base
+              result << "<span style='color:YellowGreen'>#{array_element.class}[<span color='white'>#{count}</span>] </span>#{hightlight_instance(array_element)} <br>"
             else
-              result << "<font color='YellowGreen'>#{array_element.class}<font color='yellow'>[</font><font color='white'>#{count}</font><font color='yellow'>]</font> </font>#{array_element} <br><br>"
+              result << "<span style='color:YellowGreen'>#{array_element.class}[<span color='white'>#{count}</span>] </span>#{array_element} <br>"
             end
             count=count+1
           end
           result
         end
+
         #****************************************************************************
         def render_hash(result_eval)
-          Rails.logger.debug("render_hash:#{result_eval}")
-          result="#{result_eval.class.to_s}<br>"
-          count=0
+          result = "#{result_eval.class.to_s}<br>"
+          count = 0
+
           result_eval.keys.each do |hash_key|
             symbol_modifier=''
-            if(hash_key.is_a? Symbol)
+            if hash_key.is_a? Symbol
               symbol_modifier=':'
             end
-            if(hash_key.is_a? ActiveRecord::Base)
-
-              result<< "<font color='YellowGreen'>#{result_eval.class}<font color='yellow'>[</font><font color='white'>#{symbol_modifier}#{hash_key}</font><font color='yellow'>] => </font> </font>#{highlight(result_eval[hash_key])} <br>"
+            if hash_key.is_a? ActiveRecord::Base
+              result<< "<span style='color:YellowGreen'>#{result_eval.class}[<span style='color:white'>#{symbol_modifier}#{hash_key}</span>] => </span>#{highlight(result_eval[hash_key])} <br>"
             else
-              result<<"<font color='YellowGreen'>#{result_eval.class}<font color='yellow'>[</font><font color='white'>#{symbol_modifier}#{hash_key}</font><font color='yellow'>] => </font> </font>#{result_eval[hash_key]} <br>"
+              result<<"<span style='color:YellowGreen'>#{result_eval.class}</span>[<span style='color:white'>#{symbol_modifier}#{hash_key}</span>] => #{result_eval[hash_key]} <br>"
             end
             count=count+1
           end
           result
         end
       end
-    end#end BaseController
-  end#end ErpApp
-end#end Console
+    end #end BaseController
+  end #end ErpApp
+end #end Console

data/lib/compass_ae_console.rb

@@ -1,6 +1,5 @@
 #compass libraries
 require 'erp_app'
-require 'erp_forms'
 
 require "compass_ae_console/version"
 require "compass_ae_console/engine"

data/lib/compass_ae_console/engine.rb

@@ -3,7 +3,7 @@ module CompassAeConsole
     isolate_namespace CompassAeConsole
     
     initializer "compass_console.merge_public" do |app|
-      app.middleware.insert_before Rack::Lock, ::ActionDispatch::Static, "#{root}/public"
+      app.middleware.insert_before Rack::Runtime, ::ActionDispatch::Static, "#{root}/public"
     end
 
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)

data/lib/compass_ae_console/version.rb

@@ -1,9 +1,13 @@
 module CompassAeConsole
   module VERSION #:nodoc:
-    MAJOR = 2
+    MAJOR = 3
     MINOR = 0
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
+
+  def self.version
+    CompassAeConsole::VERSION::STRING
+  end
 end

data/public/javascripts/erp_app/desktop/applications/compass_ae_console/module.js

@@ -1,176 +1,38 @@
-//**************************************************
-// Compass Desktop Console
-//**************************************************
-var desktop_console_history=new Array();
-var desktop_console_history_index=0;
-//----------------------------------
-// add startsWith method to string
-String.prototype.startsWith = function (str){
-    return this.indexOf(str) == 0;
-};
-//---------------------------------
-var startup_heading="<font color='goldenrod'><b>Compass Console Version 0.01</b>&nbsp;(<font color='white'>-help</font> for Help)</font><br>"
-//---------------------------------
-function sendCommand(destination,command){
-    update_history_panel("<font color='white'>"+command+"</font>")
-     
-    if(command.startsWith("-clear")){
-        clear_history_panel(startup_heading+"<br><hr>");
-    }else{
-     
-    Ext.Ajax.request({
-        url: '/compass_ae_console/erp_app/desktop/command',
-        params: {
-             
-            command_message: command
-        },
-        success: function(response){
-            var text = response.responseText;
-            var result =Ext.JSON.decode(text)
-            update_history_panel("<font color='yellow'>"+result.success+"</font>")
-        }
-    });
-    }
-}
-//---------------------------------
-function clear_history_panel(text){
-    var panel=Ext.getCmp('console_history_panel');
-    
-    panel.update(""+text+"<br>");
-                
-    var d = panel.body.dom;
-    d.scrollTop = d.scrollHeight - d.offsetHeight+10;
-    panel.doLayout();
-}
-//---------------------------------
-function update_history_panel(text){
-    var panel=Ext.getCmp('console_history_panel');
-    var old = panel.body.dom.innerHTML;
-    panel.update(old+""+text+"<br>");
-                
-    var d = panel.body.dom;
-    d.scrollTop = d.scrollHeight - d.offsetHeight+10;
-    panel.doLayout();
-}
-
-//---------------------------------
-var console_history_panel ={
-    xtype: 'panel',
-    id : 'console_history_panel',
-    region: 'center',
-    bodyStyle: "background-color:#000;",
-    autoScroll:true,
-    html : startup_heading
-}
-
-//---------------------------------
-
-var console_text_area ={
-    xtype: 'textarea',
-    region : 'south',
-    autoscroll: true,
-    id: "console_text_area",
-    enableKeyEvents: true,
-    listeners: {
-        afterrender: function(field) {
-            field.focus();
-          },
-        // use key-up for textarea since ENTER does not affect focus traversal
-        keyup: function(field, e){
-            //console.log("textarea keyup:"+e);
-            if (e.getKey() == e.ENTER){
-                     
-                sendCommand('console_text_area',field.getValue());
-                // add to history 
-                desktop_console_history[desktop_console_history.length]=field.getValue().substring(0,field.getValue().length-1);
-                //update index
-                desktop_console_history_index=desktop_console_history.length
-                field.setValue("");
-            }else if (e.getKey() == e.UP){
-                     
-                if(desktop_console_history.length==0){
-                // no history to display
-                }else{
-                    desktop_console_history_index--;
-                    if(desktop_console_history_index >=0){
-                         
-                    }
-                    else{
-                        desktop_console_history_index=desktop_console_history.length-1
-                }
-                    field.setValue(desktop_console_history[desktop_console_history_index]);    
-                }
-                   
-            }else if (e.getKey() == e.DOWN){
-                     
-                if(desktop_console_history.length==0){
-                // no history to display
-                }else{
-                    desktop_console_history_index++;
-                    if(desktop_console_history_index >=(desktop_console_history.length)){
-                         desktop_console_history_index=0
-                    }
-                    else{
-                        //desktop_console_history_index=desktop_console_history.length-1
-                }
-                    field.setValue(desktop_console_history[desktop_console_history_index]);    
-                }
-            }
-        }
-    
-    }
-}
-//---------------------------------
-var console_panel={
-    xtype: 'panel',
-    layout: 'border',
-    items :[ console_history_panel,console_text_area]
-       
-}
-
-//---------------------------------
-
-Ext.define("Compass.ErpApp.Desktop.Applications.CompassAeConsole",{
-    extend:"Ext.ux.desktop.Module",
-    id:'compass_console-win',
-    init : function(){
+Ext.define("Compass.ErpApp.Desktop.Applications.CompassAeConsole", {
+    extend: "Ext.ux.desktop.Module",
+    id: 'compass_console-win',
+    init: function () {
         this.launcher = {
             text: 'Compass Console',
-            iconCls:'icon-console',
+            iconCls: 'icon-console',
             handler: this.createWindow,
             scope: this
-        }
+        };
     },
 
-    createWindow : function(){
+    createWindow: function () {
         var desktop = this.app.getDesktop();
         var win = desktop.getWindow('console');
-        if(!win){
+        if (!win) {
             win = desktop.createWindow({
                 id: 'console',
-                title:'Compass Console',
-                width:1000,
-                height:670,
-                iconCls: 'console_icon',
-                shim:false,
-                animCollapse:false,
-                resizable : false,
-                constrainHeader:true,
+                title: 'Compass Console',
+                width: 800,
+                height: 600,
+                iconCls: 'icon-console',
+                shim: false,
+                animCollapse: false,
+                resizable: true,
+                constrainHeader: true,
                 layout: 'fit',
-                items:[console_panel]
-                ,
-                tools:[ 
-                {
-                    type:'help',
-                    tooltip: 'about',
-                    handler: function(event, toolEl, panel){
-                        Ext.Msg.alert("About","<center><b>Compass Console</b><br><i>Version 0.01</i>")
+                items: [
+                    {
+                      xtype: 'compass_ae_console_panel',
+                      header: false
                     }
-                }]
-                 
+                ]
             });
         }
         win.show();
-        sendCommand('console_text_area',"Rails.version ");
     }
 });