rsence-pre 2.1.0.3.pre → 2.1.0.4.pre

data/VERSION

@@ -1 +1 @@
-2.1.0.3.pre
+2.1.0.4.pre

data/js/comm/values/values.js

@@ -144,11 +144,15 @@ COMM.Values = HClass.extend({
   * - 'b': Boolean (true/false)
   * - 'n': Number (integers and floats)
   * - 's': String
+  * - '~': Null
+  * - '-': Undefined
   *
   **/
   type: function(_obj){
-    if(_obj === null || _obj === undefined){
-      console.log('null or undefined obj:',_obj);
+    if(_obj === null){
+      return '~';
+    }
+    else if (_obj === undefined){
       return '-';
     }
     var _type = (typeof _obj).slice(0,1);
@@ -366,9 +370,12 @@ COMM.Values = HClass.extend({
   *
   **/
   clone: function( _obj, _shallow ){
-    if(_obj === null || _obj === undefined){
-      console.log('null or undefined obj:',_obj);
-      return _obj;
+    if(_obj === null){
+      return null;
+    }
+    else if (_obj === undefined){
+      console.log('Undefined object, supplementing with null.');
+      return null;
     }
     var _item,
         _cloned;

data/js/core/rsence_ns/rsence_ns.js

@@ -12,10 +12,17 @@
 // ..into this namespace.
 // Additional logic for handling the namespaces will however be required.
 var RSence = {
+  
+  // Configuration method for the html document of the server
   serverConf: function(_clientPrefix,_helloUrl){
     COMM.ClientPrefix=_clientPrefix;
     COMM.Transporter.HelloUrl=_helloUrl;
     HThemeManager.themePath=_clientPrefix+'/themes';
+  },
+  
+  // Structure reserved for JSONRenderer instances remotely populated by the server
+  guiTrees: {
+    
   }
 };
 

data/js/foundation/json_renderer/json_renderer.js

@@ -24,7 +24,7 @@
 //var//RSence.Foundation
 COMM.JSONRenderer = HClass.extend({
   
-  version: 0.6,
+  version: 0.7,
 
 /** = Description
   * Renders JSON structured data, see some of the demos for usage examples.
@@ -48,6 +48,9 @@ COMM.JSONRenderer = HClass.extend({
     this.scopeDepth = 0;
     this.view = this.renderNode( this.data, this.parent );
   },
+  die: function(){
+    this.view.die();
+  },
   defineInScope: function( _definition ){
     var _isArr = (_definition instanceof Array),
         _isObj = (_definition instanceof Object);

data/js/lists/propertylist/propertylist.js

@@ -192,7 +192,9 @@ HPropertyList = HControl.extend({
     a: 'Array',
     s: 'String',
     n: 'Number',
-    b: 'Boolean'
+    b: 'Boolean',
+    '~': 'Null',
+    '-': 'Undefined'
   },
   keyRowStyle: "position:absolute;z-index:1;right:0px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;",
   addKeyColumnControl: function( token, i ){

data/lib/plugins/gui_plugin.rb

@@ -35,9 +35,11 @@ module RSence
       def init
         super
         yaml_src = file_read( "gui/#{@name}.yaml" )
-        yaml_src = file_read( "gui/main.yaml" ) unless yaml_src
+        unless yaml_src
+          yaml_src = file_read( "gui/main.yaml" )
+        end
         if yaml_src
-          @gui = GUIParser.new( self, yaml_src )
+          @gui = GUIParser.new( self, yaml_src, @name )
         else
           @gui = nil
         end
@@ -128,9 +130,10 @@ module RSence
         uninstall_client_pkgs if @client_pkgs
       end
       
-      # @private Sends gui specification to the main plugin
-      def spec_ui( msg )
-        # TODO
+      # @private Returns structured, processed gui tree to the caller.
+      def struct_ui( msg )
+        return {} unless @gui
+        @gui.struct( msg, gui_params( msg ) )
       end
       
       # Automatically inits the UI using {GUIParser#init}

data/lib/plugins/guiparser.rb

@@ -28,12 +28,10 @@ module RSence
       
       # include ::RSence
       
-      # Use this method to send the client all commands required to construct the GUI Tree using JSONRenderer.
-      # @param [Message] msg The +Message+ instance +msg+ used all over the place.
-      # @param [Hash] params Containing all parameters referred from the YAML file, see: {GUIPlugin__#gui_params GUIPlugin#gui_params}
-      def init( msg, params )
+      def struct( msg, params )
         gui_data = YAML.load( @yaml_src )
         parse_gui( gui_data, params )
+        return gui_data if gui_data.class == Array
         if gui_data.has_key?('dependencies')
           @parent.include_js( msg, gui_data['dependencies'] )
           gui_data.delete('dependencies')
@@ -44,9 +42,36 @@ module RSence
             msg.reply( js_src )
           end
         end
-        gui_name = @parent.name
+        return gui_data
+      end
+      
+      # Use this method to send the client all commands required to construct the GUI Tree using JSONRenderer.
+      # @param [Message] msg The +Message+ instance +msg+ used all over the place.
+      # @param [Hash] params Containing all parameters referred from the YAML file, see: {GUIPlugin__#gui_params GUIPlugin#gui_params}
+      def init( msg, params )
+        gui_data = struct( msg, params )
+        if gui_data.class == Array
+          gui_data = {
+            'type' => 'GUITree',
+            'version' => 0.7,
+            'class' => 'RSence.GUIApp',
+            'options' => {
+              'priority' => 0,
+              'label' => "#{@gui_name.capitalize} (autogenerated)"
+            },
+            'subviews' => gui_data
+          }
+        end
         json_data = JSON.dump( gui_data )
-        msg.reply( "JSONRenderer.nu(#{json_data});", true )
+        msg.reply( "RSence.guiTrees[#{@gui_name.to_json}]=JSONRenderer.nu(#{json_data});", true )
+      end
+      
+      def kill( msg )
+        gui_name = @parent.name
+        gui_ns = "RSence.guiTrees[#{@gui_name.to_json}]"
+        msg.reply( "#{gui_ns}.die();", true )
+        msg.reply( "#{gui_ns}=null;", true )
+        msg.reply( "delete #{gui_ns};", true )
       end
       
       # Use this method to extract all the value id's of the +ses+ hash.
@@ -113,8 +138,13 @@ module RSence
       # = Parameters
       # +parent+::    The Plugin instance called from, use +self+ when constructing in a Plugin method.
       # +yaml_src+::  The YAML source template for the GUI
-      def initialize( parent, yaml_src )
+      def initialize( parent, yaml_src, gui_name=false )
         @parent = parent
+        if gui_name
+          @gui_name = gui_name.to_s
+        else
+          @gui_name = parent.name.to_s
+        end
         @yaml_src = yaml_src
       end
       

data/lib/plugins/pluginmanager.rb

@@ -87,20 +87,18 @@ module RSence
     # Calls the method +method_name+ with args +args+ of the plugin +plugin_name+.
     # Returns false, if no such plugin or method exists.
     def call( plugin_name, method_name, *args )
-      unless @name_prefix
-        plugin_name_s = plugin_name.to_s
-        if plugin_name_s.include?(':')
-          colon_index = plugin_name_s.index(':')
-          sub_manager_name = plugin_name_s[0..(colon_index-1)].to_sym
-          plugin_name = plugin_name_s[(colon_index+1)..-1].to_sym
-          if @registry.has_key?( sub_manager_name )
-            sub_manager = @registry[sub_manager_name]
-            if sub_manager.respond_to?( :plugin_plugins )
-              return sub_manager.plugin_plugins.call( plugin_name, method_name, *args )
-            end
+      plugin_name_s = plugin_name.to_s
+      if plugin_name_s.include?(':')
+        colon_index = plugin_name_s.index(':')
+        sub_manager_name = plugin_name_s[0..(colon_index-1)].to_sym
+        plugin_name = plugin_name_s[(colon_index+1)..-1].to_sym
+        if @registry.has_key?( sub_manager_name )
+          sub_manager = @registry[sub_manager_name]
+          if sub_manager.respond_to?( :plugin_plugins )
+            return sub_manager.plugin_plugins.call( plugin_name, method_name, *args )
           end
-          return false
         end
+        return false
       end
       plugin_name = plugin_name.to_sym
       if callable?( plugin_name, method_name )

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 961916136
+  hash: 961916148
   prerelease: true
   segments: 
   - 2
   - 1
   - 0
-  - 3
+  - 4
   - pre
-  version: 2.1.0.3.pre
+  version: 2.1.0.4.pre
 platform: ruby
 authors: 
 - Riassence Inc.