rsence-pre 2.1.0.10 → 2.1.0.11

data/VERSION

@@ -1 +1 @@
-2.1.0.10.pre
+2.1.0.11.pre

data/js/core/elem/elem.js

@@ -1184,6 +1184,10 @@ ELEM = {
   /* The ELEM "post-constructor" */
   _init: function() {
     
+    if(RSenceInit !== undefined){
+      RSenceInit();
+    }
+    
     var _this = ELEM;
     
     if (BROWSER_TYPE.ie) {

data/js/foundation/view/view.js

@@ -879,9 +879,18 @@ HView = HClass.extend({
       var _winSize = ELEM.windowSize();
       return [ _winSize[0], _winSize[1] ];
     }
-    else{
-      var _rect = this.parent.rect;
-      return [ _rect.width, _rect.height ];
+    else {
+      var
+      _rect = this.parent.rect,
+      _width = _rect.width,
+      _height = _rect.height;
+      if (this.parent.flexLeft && this.parent.flexRight){
+        _width = parseInt( ELEM.getStyle(this.parent.elemId,'width',true), 10 );
+      }
+      if (this.parent.flexBottom && this.parent.flexTop){
+        _height = parseInt( ELEM.getStyle(this.parent.elemId,'height',true), 10 );
+      }
+      return [ _width, _height ];
     }
   },
   
@@ -987,7 +996,6 @@ HView = HClass.extend({
           _validHeight && this.setMinHeight( _height );
           _bottom = _parentHeight - _bottomOffset;
         }
-        
         this.rect = HRect.nu(_leftOffset,_topOffset,_right,_bottom);
         
       }

data/lib/plugins/plugin.rb

@@ -344,17 +344,69 @@ module RSence
         name = name_with_manager_s
         ses[value_name] = HValue.new( msg, default_value, { :name => "#{name}.#{value_name}" } )
         if value_properties.has_key?(:responders)
-          value_properties[:responders].each do |responder|
-            if responder.has_key?(:plugin)
-              responder_plugin = responder[:plugin]
-            else
-              responder_plugin = name
+          init_responders( msg, ses[value_name], value_properties[:responders] )
+        end
+      end
+      
+      # @private  Initialize a responder for a value.
+      def init_responder( msg, value, responder )
+        name = name_with_manager_s
+        if responder.has_key?(:plugin)
+          responder_plugin = responder[:plugin]
+        else
+          responder_plugin = name
+        end
+        if responder.has_key?(:method)
+          responder_method = responder[:method]
+          if not value.bound?( responder_plugin, responder_method )
+            value.bind( responder_plugin, responder[:method] )
+          end
+        end
+      end
+      
+      # @private  Initialize several responders for a value
+      def init_responders( msg, value, responders )
+        members = value.members
+        release_list = []
+        members.each_key do |pre_plugin|
+          members[pre_plugin].each do |pre_method|
+            found = false
+            responders.each do |responder|
+              name = name_with_manager_s
+              if responder.has_key?(:plugin)
+                responder_plugin = responder[:plugin]
+              else
+                responder_plugin = name
+              end
+              if responder.has_key?(:method)
+                responder_method = responder[:method]
+                if responder_plugin == pre_plugin and responder_method == pre_method
+                  found = true
+                  break
+                end
+              end
             end
-            if responder.has_key?(:method)
-              ses[value_name].bind( responder_plugin, responder[:method] )
+            unless found
+              release_list.push( [ pre_plugin, pre_method ] )
             end
           end
         end
+        release_list.each do | rel_plugin, rel_method |
+          value.release( rel_plugin, rel_method )
+        end
+        responders.each do |responder|
+          init_responder( msg, value, responder )
+        end
+      end
+      
+      # @private  Releases all responders of a value
+      def release_responders( msg, value )
+        members = value.members
+        members.each_key do |responder_plugin|
+          members.each do |responder_method|
+            value.release( responder_plugin, responder_method )
+          end
+        end
       end
       
       # @private  Initializes session values, if the contents of the +values.yaml+ 
@@ -426,6 +478,11 @@ module RSence
         ses = get_ses( msg )
         @values.each do | value_name, value_properties |
           if ses.has_key?( value_name ) and ses[ value_name ].class == HValue
+            if value_properties.has_key?(:responders)
+              init_responders( msg, ses[value_name], value_properties[:responders] )
+            else
+              release_responders( msg, ses[value_name] )
+            end
             unless value_properties[:restore_default] == false
               if value_properties.has_key?(:value_call)
                 default_value = init_value_call( msg, value_properties[:value_call] )

data/lib/plugins/pluginmanager.rb

@@ -23,6 +23,11 @@ module RSence
     
     attr_reader :transporter, :sessions
     
+    @@incr = 0
+    def incr
+      return @@incr
+    end
+    
     # Returns the registry data for plugin bundle +plugin_name+
     def registry( plugin_name=false )
       return @registry unless plugin_name
@@ -610,6 +615,8 @@ module RSence
         puts "done!" if RSence.args[:verbose]
       end
       if not (to_load.empty? and to_unload.empty? and to_reload.empty?)
+        @@incr += 1
+        puts "@@incr: #{@@incr}"
         puts "Plugin bundles:"
         puts "  loaded: #{to_load.join(', ')}" unless to_load.empty?
         puts "  unloaded: #{to_unload.join(', ')}" unless to_unload.empty?

data/lib/session/msg.rb

@@ -174,7 +174,17 @@ module RSence
     def user_id
       @session[:user_id]
     end
-  
+    
+    # @private used for automatic reload of page, when the plugins have been changed.
+    def refresh_page?( plugin_incr )
+      if plugin_incr != @session[:plugin_incr]
+        puts "@session[:plugin_incr] = #{@session[:plugin_incr].inspect}  vs  plugin_incr = #{plugin_incr.inspect}"
+        @session[:plugin_incr] = plugin_incr
+        return true
+      end
+      return false
+    end
+    
     # Setter for the user id
     # @param [Number, String] user_id The user id to set. Use in login situations to store the user id.
     # @return [nil]

data/lib/session/sessionmanager.rb

@@ -74,7 +74,9 @@ module RSence
       
         # the time, when the session will time out
         :timeout    =>  timeout,
-      
+        
+        :plugin_incr => 0,
+        
         # session id, used internally
         :ses_id     =>  ses_id,
       

data/lib/transporter/transporter.rb

@@ -180,7 +180,7 @@ module RSence
         ## Calls the restore_ses of plugins, when a session is restored (page reload with previously active session)
         if msg.restored_session
           msg.session[:deps] = []
-        
+          
           if msg.cloned_source
             begin
               @plugins.delegate( :cloned_target, msg, msg.cloned_source )
@@ -190,24 +190,29 @@ module RSence
               xhr_traceback_handler( e, "Transporter::PluginDelegateClonedTargetError: @plugins.delegate 'cloned_target' failed." )
             end
           end
-        
+          
           begin
             @plugins.delegate( :restore_ses, msg )
+            msg.session[:plugin_incr] == @plugins.incr
           rescue => e
             response_success = false
             xhr_error_handler( msg, :plugin_delegate_restore_ses_error, e.message )
             xhr_traceback_handler( e, "Transporter::PluginDelegateRestoreSesError: @plugins.delegate 'restore_ses' failed." )
           end
-        
+          
         elsif msg.new_session
+          
           begin
             @plugins.delegate( :init_ses, msg )
+            msg.session[:plugin_incr] == @plugins.incr
           rescue => e
             response_success = false
             xhr_error_handler( msg, :plugin_delegate_init_ses_error, e.message )
             xhr_traceback_handler( e, "Transporter::PluginDelegateInitSesError: @plugins.delegate 'init_ses' failed." )
           end
+          
         elsif msg.cloned_targets
+          
           begin
             @plugins.delegate( :cloned_source, msg, msg.cloned_targets )
           rescue => e
@@ -215,6 +220,10 @@ module RSence
             xhr_error_handler( msg, :plugin_delegate_cloned_source_error, e.message )
             xhr_traceback_handler( e, "Transporter::PluginDelegateClonedSourceError: @plugins.delegate 'cloned_source' failed." )
           end
+          
+        elsif msg.refresh_page?( @plugins.incr )
+          # Forces the client to reload, if plugins are incremented
+          msg.reply("window.location.reload( true );")
         end
         
         ## Calls validators for changed values

data/lib/values/hvalue.rb

@@ -122,6 +122,14 @@ module RSence
       return true
     end
     
+    # Checks, if the plugin_name and method_name pairing is already bound with the bind method. Returns true or false.
+    def bound?( plugin_name, method_name )
+      plugin_name = plugin_name.to_sym unless plugin_name.class == Symbol
+      method_name = method_name.to_sym unless method_name.class == Symbol
+      return false unless @members.has_key?(plugin_name)
+      return @members[plugin_name].include?(method_name)
+    end
+    
     # Releases the responder of the value, both params as in bind, but optional +method_name+ can be omitted, matching all methods bound to the +plugin_name+.
     # @param [Symbol] plugin_name The name of the plugin acting as a responder to the value.
     # @param [Symbol] method_name The name of the method of the plugin acting as a responder to the value.
@@ -135,6 +143,9 @@ module RSence
         @members.delete( plugin_name )
       else 
         @members[plugin_name].slice!(@members[plugin_name].index( method_name )) if @members[plugin_name].include?(method_name)
+        if @members[plugin_name].empty?
+          @members.delete( plugin_name )
+        end
       end
       return true
     end

data/plugins/index_html/tmpl/index.html

@@ -9,7 +9,9 @@ __SCRIPT_DEPS__
 
 <script>
 
-/** Runtime configuration: **/
-RSence.serverConf('__CLIENT_BASE__','__CLIENT_HELLO__');
+var RSenceInit = function(){
+  /** Runtime configuration: **/
+  RSence.serverConf('__CLIENT_BASE__','__CLIENT_HELLO__');
+};
 
 </script></head><body id="body"><noscript>__NOSCRIPT__</noscript></body></html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 115
+  hash: 113
   prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - 10
-  version: 2.1.0.10
+  - 11
+  version: 2.1.0.11
 platform: ruby
 authors: 
 - Riassence Inc.