rsence-pre 2.1.0.1.pre → 2.1.0.2.pre

data/VERSION

@@ -1 +1 @@
-2.1.0.1.pre
+2.1.0.2.pre

data/js/controls/dialogs/sheet/sheet.js

@@ -10,16 +10,21 @@
 /*** = Description
   ** HSheet is a container component that toggles its visibility
   ** based on its value. When the value is 0, it's visible, otherwise 
-  ** it's hidden. It expands to fill its parent view, the rect 
-  ** specifies the size of the sheet inside. The sheet is 
-  ** centered. It's practical when combined with button 
-  ** values. Also see HAlertSheet and HConfirmSheet components.
-  **
+  ** it's hidden. It expands to fill its parent view.
+  ** 
+  ** Its rect specifies the relative size and position of the centered inner
+  ** sheet, which acts as a subview.
+  ** 
+  ** It's practical when combined with button values.
+  ** 
+  ** Also see HAlertSheet and HConfirmSheet components.
+  ** 
   ***/
 var//RSence.Controls
 HSheet = HControl.extend({
+  
   componentName: 'sheet',
-
+  
 /** = Description
   * Shows of hides HSheet depending on the value.
   * If the value is 0 the HSheet#show() will be called. 
@@ -34,7 +39,7 @@ HSheet = HControl.extend({
       this.hide();
     }
   },
-
+  
 /** = Description
   * Draws the sheet rectangle once it has been created and 
   * if it has not been set as hidden by constructor.
@@ -45,13 +50,15 @@ HSheet = HControl.extend({
   **/
   drawRect: function() {
     if (this.parent && this.rect.isValid) {
-      var _this = this,
-          _elemId = _this.elemId,
-          _styl = ELEM.setStyle,
-          _rect = _this.rect,
-          _width = _rect.width,
-          _left = 0-Math.floor(_rect.width/2),
-          _height = _rect.height;
+      var
+      _this = this,
+      _elemId = _this.elemId,
+      _styl = ELEM.setStyle,
+      _rect = _this.rect,
+      _width = _rect.width,
+      _top = _rect.top,
+      _left = 0-Math.floor(_rect.width/2)+_rect.left,
+      _height = _rect.height;
       
       _styl( _elemId, 'left', '0px', true);
       _styl( _elemId, 'top', '0px', true);
@@ -65,7 +72,7 @@ HSheet = HControl.extend({
       if(_this['markupElemIds']){
         var _stateId = _this.markupElemIds['state'];
         _styl( _stateId, 'left', _left+'px', true );
-        _styl( _stateId, 'top', '0px', true );
+        _styl( _stateId, 'top', _top+'px', true );
         _styl( _stateId, 'width', _width+'px', true );
         _styl( _stateId, 'height', _height+'px', true );
       }

data/js/util/reloadapp/reloadapp.js

@@ -127,7 +127,7 @@ ReloadApp = HApplication.extend({
         );
       }
     }).nu(
-      HRect.nu( _alertX, _alertY, _alertX+_alertWidth, _alertY+_alertHeight ),
+      HRect.nu( 0, 0, _alertWidth, _alertHeight ),
       _this, {
         label: _title,
         value: 0

data/lib/plugins/gui_plugin.rb

@@ -29,18 +29,6 @@ module RSence
       # @return [:GUIPlugin]
       def self.bundle_type; :GUIPlugin; end
       
-      
-      # @private Placeholder for actual gui yaml file.
-      @@default_yaml_src = <<-END
-type: GUITree
-version: 0.6
-
-class: RSence.GUIApp
-options:
-  label: "Dummy Application"
-
-      END
-      
       # In addition to {Plugin__#init Plugin#init}, also automatically initializes a {GUIParser} instance as +@gui+
       #
       # @return [nil]
@@ -48,8 +36,11 @@ options:
         super
         yaml_src = file_read( "gui/#{@name}.yaml" )
         yaml_src = file_read( "gui/main.yaml" ) unless yaml_src
-        yaml_src = @@default_yaml_src unless yaml_src
-        @gui = GUIParser.new( self, yaml_src )
+        if yaml_src
+          @gui = GUIParser.new( self, yaml_src )
+        else
+          @gui = nil
+        end
         @client_pkgs = false
       end
   
@@ -79,6 +70,7 @@ options:
       #   end
       #
       def gui_params( msg )
+        return unless @gui
         { :values => @gui.values( get_ses( msg ) ) }
       end
       
@@ -147,11 +139,13 @@ options:
       #
       # @return [nil]
       def init_ui( msg )
+        return unless @gui
         @gui.init( msg, gui_params( msg ) )
       end
       
       # @private Automatically kills the UI using {GUIParser#kill}
       def kill_ui( msg )
+        return unless @gui
         @gui.kill( msg )
       end
       

data/lib/plugins/plugin_plugins.rb

@@ -25,7 +25,11 @@ module RSence
       # Extended {#init}, delegates calls to the sub-plugins.
       def init
         super
-        @plugin_plugins = RSence::PluginManager.new( [ bundle_path('plugins') ] )
+        @plugin_plugins = RSence::PluginManager.new({
+          :plugin_paths => [ bundle_path('plugins') ],
+          :autoreload => @plugins.autoreload,
+          :parent_manager => @plugins
+        })
       end
       
       # Extended {#open}, delegates calls to the sub-plugins.

data/lib/plugins/pluginmanager.rb

@@ -25,7 +25,13 @@ module RSence
     
     # Returns the registry data for plugin bundle +plugin_name+
     def registry( plugin_name )
-      return @registry[ plugin_name ]
+      if @registry.has_key?( plugin_name )
+        return @registry[ plugin_name ]
+      elsif @parent_manager
+        return @parent_manager.registry( plugin_name )
+      else
+        throw "Plugin not in registry: #{plugin_name.inspect}"
+      end
     end
     alias [] registry
     
@@ -37,6 +43,8 @@ module RSence
         elsif block == nil
           call( sym, *args )
         end
+      elsif @parent_manager
+        return @parent_manager.method_missing( sym, *args, &block )
       end
     end
     
@@ -584,20 +592,29 @@ module RSence
     
     # Initialize with a list of directories as plugin_paths.
     # It's an array containing all plugin directories to scan.
-    def initialize( plugin_paths, transporter=nil,
-                    autoreload=false, name_prefix=false,
-                    resolved_deps=[], resolved_categories={} )
-      if transporter
-        @transporter = transporter
-        @sessions    = transporter.sessions
-      end
-      @name_prefix = name_prefix
-      @plugin_paths = plugin_paths
-      @deps = Dependencies.new( resolved_deps, resolved_categories )
-      puts "Loading #{name_prefix+' ' if name_prefix}plugins..." if RSence.args[:verbose]
+    def initialize( options )
+      options = {
+        :plugin_paths => nil,
+        :transporter => nil,
+        :autoreload => false,
+        :name_prefix => false,
+        :resolved_deps => [],
+        :resolved_categories => {},
+        :parent_manager => nil
+      }.merge( options )
+      
+      self.plugin_paths = options[:plugin_paths]
+      self.transporter = options[:transporter]
+      self.autoreload = options[:autoreload]
+      self.name_prefix = options[:name_prefix]
+      self.parent_manager = options[:parent_manager]
+      
+      @deps = Dependencies.new( options[:resolved_deps], options[:resolved_categories] )
+      
+      puts "Loading #{@name_prefix+' ' if @name_prefix}plugins..." if RSence.args[:verbose]
       init_bundles!
-      puts %{Plugins #{"of #{name_prefix} " if name_prefix}loaded.} if RSence.args[:verbose]
-      if autoreload
+      puts %{Plugins #{"of #{@name_prefix} " if @name_prefix}loaded.} if RSence.args[:verbose]
+      if @autoreload
         @thr = Thread.new do
           Thread.pass
           while true
@@ -610,7 +627,39 @@ module RSence
           end
         end
       end
+      
     end
+    
+    attr_reader :transporter
+    attr_reader :sessions
+    def transporter=( transporter )
+      if transporter
+        @transporter = transporter
+        @sessions    = transporter.sessions
+      end
+    end
+    
+    attr_reader :autoreload
+    def autoreload=( autoreload )
+      @autoreload = autoreload
+    end
+    
+    attr_reader :name_prefix
+    def name_prefix=( name_prefix )
+      @name_prefix = name_prefix
+    end
+    
+    attr_reader :plugin_paths
+    def plugin_paths=( plugin_paths )
+      @plugin_paths = plugin_paths
+    end
+    
+    # Optionally set a parent plugin manager to fall back on
+    attr_reader :parent_manager
+    def parent_manager=( parent_manager )
+      @parent_manager = parent_manager
+    end
+    
   end
 end
 

data/lib/transporter/transporter.rb

@@ -43,14 +43,14 @@ module RSence
       core_pkgs = {
         :core => [:transporter, :session_storage, :session_manager, :value_manager]
       }
-      @plugins = PluginManager.new(
-        RSence.config[:plugin_paths],
-        self,
-        RSence.args[:autoupdate],
-        false,
-        core_pkgs[:core],
-        core_pkgs
-      )
+      @plugins = PluginManager.new( {
+        :plugin_paths => RSence.config[:plugin_paths],
+        :transporter => self,
+        :autoupdate => RSence.args[:autoupdate],
+        :name_prefix => false,
+        :resolved_deps => core_pkgs[:core],
+        :resolved_categories => core_pkgs
+      })
       if RSence.launch_pid != Process.pid
         Process.kill( 'TERM', RSence.launch_pid )
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 961916128
+  hash: 961916140
   prerelease: true
   segments: 
   - 2
   - 1
   - 0
-  - 1
+  - 2
   - pre
-  version: 2.1.0.1.pre
+  version: 2.1.0.2.pre
 platform: ruby
 authors: 
 - Riassence Inc.