rsence-pre 3.0.0.8 → 3.0.0.9

data/lib/rsence/value.rb

@@ -5,98 +5,102 @@ module RSence
   # HValue is the model for client-server synchronized values.
   # A value contains its payload {#data} and enough meta-data to define its behavior.
   class HValue
-    
+
     # The validity of the data. Defaults to false, when the data comes from the client.
     # @return [Boolean] True, when set by the server. False when initially set by the client. Also false, unless all responders return true.
     attr_reader :is_valid
-    
+
     # @private Is true when changed by the server. Causes the ValueManager to send its client-side representation.
     attr_reader :sync
-    
+
     # @private The unique ID of the value.
     attr_reader :value_id
     alias val_id value_id
-    
+
     # The payload data. Use {#set} to change.
     attr_reader :data
-    
+
     # @private List of responders
     attr_reader :members
-    
+
     # @private
     attr_writer :is_valid
-    
+
     # @private
     def value_id=(new_id)
       @value_id = new_id
     end
     # @private
     alias val_id= value_id=
-    
+
     alias valid is_valid
     alias valid? is_valid
-    
+
     # @private Method for binding the value to the session data.
     def add( msg )
-      
+
       # get the value storage from the session data
       session_values = msg.session[:values][:by_id]
-      
+
       ## Store the object here
       session_values[ @value_id ] = self
-      
+
       ## Sends the client-side description
       restore( msg )
-      
+
       ## Set the valid flag, so we know that the value is initially in sync
       @is_valid = true
     end
-    
+
     # @private (Re-)Send the client-size representation
     def restore( msg )
-      
+
       ## Tags itself as a new value from the client's point of view
       @is_new_to_client = true
-      
+
       add_to_sync( msg )
-      
+
     end
-    
+
     # Value meta-data. The third constructor parameter
     attr_accessor :meta
-    
+
     # Creates a new client-server automatically synchronized data wrapper object.
     # @param [Message] msg Just pass on the +msg+ from the scope you call from.
     # @param [#to_json] data Any data that can be converted to JSON.
     # @param [Hash] meta Has no effect yet.
-    def initialize( msg, data, meta = { :name => nil } )
-      
+    def initialize( msg, data, meta = { :name => nil, :type => 0 } )
+
       ## Get an unique integer id for the value
       if RSence.args[:debug] and meta[:name] and not msg.valuemanager.id_exists?( msg, meta[:name] )
         @value_id   = meta[:name]
       else
         @value_id = msg.valuemanager.ses_unique_id( msg )
       end
-      
+
       @meta = meta
-      
+
+      if meta[:type] == 2
+        @buffer = []
+      end
+
       ## set the data of the hvalue
       set( msg, data, true )
-      
+
       ## the @sync flag is raised, when the client data is older than the server data
       @sync  = false
-      
+
       ## the @is_valid flag is lowered, when the client data is newer than the server data
       @is_valid = true
-      
+
       ## Bind the value to the value manager and report it to the client
       add( msg )
-      
+
       ## storage for validator bindings
       @members = {}
-      
+
     end
-    
+
     # Binds the value to a responder. The responder is an instance of {Plugins::Plugin__ Plugin} or {Plugins::GUIPlugin__ GUIPlugin}.
     # Responders are called once, when the client requests the data to be changed.
     # Responders must return +true+, if they accept the change. Otherwise the data is treated as invalid.
@@ -112,7 +116,7 @@ module RSence
       @members[plugin_name].push( method_name ) unless @members[plugin_name].include?( method_name )
       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
@@ -120,7 +124,7 @@ module RSence
       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.
@@ -132,7 +136,7 @@ module RSence
       return false unless @members.has_key?( plugin_name )
       if not method_name
         @members.delete( plugin_name )
-      else 
+      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 )
@@ -140,23 +144,32 @@ module RSence
       end
       return true
     end
-    
+
     # Releases all responders.
     # @return [true]
     def release_all
       @members = {}
       return true
     end
-    
+
     # @deprecated Use {#release} as the opposite to bind.
     alias unbind release
-    
+
     # @private Tell all bound instances that the value is changed.
     def tell( msg )
       invalid_count = 0
       @members.each_key do |plugin_name|
         @members[plugin_name].each do |method_name|
-          invalid_count += 1 unless msg.plugins.run_plugin( plugin_name, method_name, msg, self ) 
+          if @meta[:type] == 1
+            data = @data
+            for item in data
+              @data = item
+              msg.plugins.run_plugin( plugin_name, method_name, msg, self )
+            end
+            @data = data
+          else
+            invalid_count += 1 unless msg.plugins.run_plugin( plugin_name, method_name, msg, self )
+          end
         end
       end
       if invalid_count == 0
@@ -164,29 +177,29 @@ module RSence
         msg.session[:values][:check].delete( @value_id )
       end
     end
-    
+
     # @private Handle updates from the client.
     def from_client( msg, data )
       # only process changes, if different from the one already stored.
       if @data != data
-        
+
         # puts "data sync from client: #{@data.inspect} -> #{data.inspect} (#{@meta[:name]})"
 
         ## set takes care of the setting..
         @data = data
-        
+
         ## change the valid state, because the value was set by the client!
         @is_valid = false
-        
+
         ## add the id to the values to be checked
         check_ids = msg.session[:values][:check]
         unless check_ids.include?( @value_id )
           check_ids.push( @value_id )
         end
       end
-      
+
     end
-    
+
     # @private Adds the value to the sync array.
     def add_to_sync( msg )
       ## add the id to the values to be synchronized (to client)
@@ -195,68 +208,75 @@ module RSence
         sync_ids.push( @value_id )
       end
     end
-    
+
     # Sets the data of the value, the change will be synced with the client.
     # @param [Message] msg The {Message} instance.
     # @param [#to_json] data Any data that can be mapped to JSON and handled by the client.
     # @param [Boolean] dont_tell_client Doesn't notify the client about the change, if true.
     def set( msg, data, dont_tell_client=false )
-      
+
       @data   = data
-      
+
       # won't tell the client about the change, usually not needed
       unless dont_tell_client
+        @buffer.push( data ) if @meta[:type] == 2
         ## update the flags
         @sync  = false
         @is_valid = true
-        
+
         add_to_sync( msg )
       end
     end
-    
+
     # Sets the key of the hash data of the value, the change will be synced with the client.
     # @param [Message] msg The {Message} instance.
     # @param [String] key The key of data to change
     # @param [#to_json] data Any data that can be mapped to JSON and handled by the client.
     # @param [Boolean] dont_tell_client Doesn't notify the client about the change, if true.
     def set_key( msg, key, data, dont_tell_client=false )
-      
+
       @data[key] = data
-      
+
       # won't tell the client about the change, usually not needed
       unless dont_tell_client
         ## update the flags
         @sync  = false
         @is_valid = true
-        
+
         add_to_sync( msg )
       end
     end
-    
+
     # @private Tell the client that the value changed.
     def to_client( msg )
+      if @meta[:type] == 2
+        data = @buffer.clone
+        @buffer = []
+      else
+        data = @data
+      end
       if @is_new_to_client
         ## Initialize a new client value
-        msg.reply_value( :new, @value_id, @data )
+        msg.reply_value( :new, @value_id, data, @meta[:type] )
         @is_new_to_client = false
       else
         ## Sets the client value
-        msg.reply_value( :set, @value_id, @data )
+        msg.reply_value( :set, @value_id, data )
       end
     end
-    
+
     # Destructor method. If msg is supplied, deletes the client representation too.
     # @param [false, Message] A {Message} instance. When supplied, deletes the client representation.
     def die!( msg=false )
-      
+
       release_all
-      
+
       # get the value storage from the session data
       session_values = msg.session[:values][:by_id]
-      
+
       ## Store the object here
       session_values.delete( @value_id )
-      
+
       if msg and not @is_new_to_client
         msg.reply_value( :del, @value_id )
       end
@@ -266,7 +286,7 @@ module RSence
     def inspect
       "#<RSence::HValue value_id:#{@value_id.inspect}, valid: #{@is_valid.inspect}, sync: #{@sync.inspect}, is_new_to_client: #{@is_new_to_client.inspect}, meta: #{@meta.inspect[0..100]}, data: #{@data.inspect[0..100]} ...>"
     end
-    
+
   end
 
 end

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -107,7 +107,11 @@ class ClientPkgBuild
     tmpl.gsub!( HEIGHT_RE, ']H[')
     tmpl.gsub!( TMPL_RE ) do
       ( js_type, js_code ) = [ $1, $2 ]
-      js_code = CoffeeScript.compile( js_code, :bare => true ) if js_code.start_with?('#!coffee')
+      begin
+        js_code = CoffeeScript.compile( js_code, :bare => true ) if js_code.start_with?('#!coffee')
+      rescue ExecJS::RuntimeError
+        js_code = "console.log('Invalid coffee in template #{theme_name}/#{component_name}:',#{js_code.to_json})"
+      end
       if cached_idx.has_key?( js_code )
         seq_id = cached_idx[ js_code ]
       else

data/plugins/client_pkg/lib/client_pkg_serve.rb

@@ -3,27 +3,27 @@ module ClientPkgServe
   def broker_urls
     ::RSence.config[:broker_urls]
   end
-  
+
   def match( uri, request_type )
     uri.match( /^#{broker_urls[:h]}/ )
   end
-  
+
   # Helper method to return the time formatted according to the HTTP RFC
   def httime(time)
     return time.gmtime.strftime('%a, %d %b %Y %H:%M:%S %Z')
   end
-  
+
   def build_busy_wait
     while @build_busy
       puts "-- build not finished, waiting.. --"
       sleep 0.4
     end
   end
-  
+
   def set_headers( response )
     # Sets the response date header to the current time:
     response['Date'] = httime( Time.now )
-    
+
     # Controls caching with headers based on the configuration
     if ::RSence.config[:cache_maximize]
       response['Expires'] = httime(Time.now+::RSence.config[:cache_expire])
@@ -31,7 +31,7 @@ module ClientPkgServe
       response['Cache-Control'] = 'no-cache'
     end
   end
-  
+
   def check_ua( request )
     support_gzip = (request.header.has_key?('Accept-Encoding') and request.header['Accept-Encoding'].include?('gzip'))
     support_gzip = false if ::RSence.config[:no_gzip]
@@ -51,27 +51,27 @@ module ClientPkgServe
       :version => version
     }
   end
-  
+
   def support_gzip?( ua )
     doesnt_support = (ua[:safari] and ua[:version] < 533)
     return ( not doesnt_support )
   end
-  
+
   def serve_js( request, response, request_path, ua )
     # the file-specific identifier ('core', 'basic' etc)
     req_file = request_path[3][0..-4]
-    
+
     if not @client_cache.js_cache.has_key?( req_file )
       response.status = 404
       response.body   = '/* 404 - Not Found */'
     else
-      
+
       response.status = 200
       response['Content-Type'] = 'text/javascript; charset=utf-8'
-      
+
       # these browsers have issues with gzipped js content
       support_gzip = support_gzip?( ua )
-      
+
       if support_gzip
         #response['Transfer-Encoding'] = 'chunked,gzip'
         response['Last-Modified'] = @client_cache.last_modified
@@ -80,39 +80,39 @@ module ClientPkgServe
         response['Content-Encoding'] = 'gzip'
         response.body   = body
       else
-        
+
         response['Last-Modified'] = @client_cache.last_modified
         body = @client_cache.js_cache[ req_file ]
         response['Content-Length'] = body.bytesize.to_s
         response.body = body
-        
+
       end
     end
   end
-  
+
   def serve_theme( request, response, request_path, ua )
     # Get the name of the theme
     theme_name = request_path[3]
-    
+
     # Get the theme resource type (html/css/gfx)
     theme_part = request_path[4].to_sym
-    
+
     # Get the theme resource identifier
     req_file  = request_path[5]
-    
+
     # checks for theme name
     has_theme = @client_cache.theme_cache.has_key?( theme_name )
-    
+
     # checks for theme part (css/html/gfx)
     if theme_part == :css or theme_part == :html
       has_theme_part = false
     else
       has_theme_part = ( has_theme and @client_cache.theme_cache[theme_name].has_key?(theme_part) )
     end
-    
+
     # checks for theme file
     has_theme_file = ( has_theme_part and @client_cache.theme_cache[theme_name][theme_part].has_key?( req_file ) )
-    
+
     if not has_theme
       response.status = 404
       response.body   = '404 - Theme Not Found'
@@ -143,30 +143,38 @@ module ClientPkgServe
       response.body = body
     end
   end
-  
+
   ## Responds to get-requests
   def get( request, response, session )
-    
-    build_busy_wait
-    
+
+    if @build_busy
+      puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- Client build busy."
+      response['Retry-After'] = '1'
+      response['Content-Type'] = 'text/plain'
+      response['Refresh'] = "1; #{env['REQUEST_URI']}"
+      response['Content-Length'] = '0'
+      response.body = ''
+      response.status = 503
+    end
+
     ua = check_ua( request )
-    
+
     set_headers( response )
-    
+
     ## Split path into an array for determining what to serve
     request_uri = '/'+request.path.match( /^#{::RSence.config[:broker_urls][:h]}(.*)$/ )[1]
-    
+
     request_path = request_uri.split( '/' )
-    
+
     ## Requested type of client resource (js/themes)
     req_type = request_path[2]
-    
+
     unless ['js','themes'].include? req_type
       req_rev = req_type
       req_type = request_path[3]
       request_path.delete_at(2)
     end
-    
+
     ## Serve compiled client javascript component files:
     if req_type == 'js'
       serve_js( request, response, request_path, ua )
@@ -174,7 +182,7 @@ module ClientPkgServe
     elsif req_type == 'themes'
       serve_theme( request, response, request_path, ua )
     end
-    
+
   end
 end
 

data/plugins/main/js/main.js

@@ -1,39 +1,35 @@
 // List of apps initialized utilizing GUITrees, by GUIPlugin name
 RSence.apps = { };
 
-// Subview that utilizes GUITrees
-RSence.GUIView = HControl.extend({
-  
-});
-
 // Application that handles GUITrees, populates its values dynamically
 RSence.GUIApp = HApplication.extend({
   constructor: function(_options){
-    
+
     var
+    i = 0,
     _this      = this,
-    
+
     // Application priority
     _priority  = _options.priority?_options.priority:100,
-    
+
     // Application label / title
     _label     = _options.label?_options.label:'Untitled Application',
-    
+
     // Application description (multiline)
     _descr     = _options.descr?_options.descr:'No Description',
-    
+
     // Allow multiple instances?
     _allowMulti = _options.allowMulti?_options.allowMulti:false,
-    
+
     // The GUI Tree
     _valueObj   = _options.valueObj?_options.valueObj:false,
-    
+
     // Signal input (from server to client)
-    _sigInput   = _options.sigInput?COMM.Values.values[_options.sigInput]:false,
-    
+    _sigInput   = _options.sigInput?_this.getValueById(_options.sigInput):false,
+
     // Signal output (from client to server)
-    _sigOutput  = _options.sigOutput?COMM.Values.values[_options.sigOutput]:false,
-    
+    _sigOutput  = _options.sigOutput?_this.getValueById(_options.sigOutput):false,
+
     // Icon image url.
     // Minimum size is 16x16 and multiple sizes are stacked on top of each other,
     // largest topmost, smaller versions aligned left below in size order.
@@ -48,10 +44,10 @@ RSence.GUIApp = HApplication.extend({
     // 512x896 -> 512x512, 256x256 and 128x128
     // etc..
     _iconUrl    = _options.iconUrl?COMM.Values.values[_options.iconUrl]:false;
-    
+
     // Construct the application base:
     _this.base( _priority, _label );
-    
+
     // Options combined from vars above
     _this.options = HClass.extend(_options).extend({
       label: _label,
@@ -61,17 +57,39 @@ RSence.GUIApp = HApplication.extend({
       sigOutput: _sigOutput,
       icon: { url: _iconUrl, width: null, height: null },
       pid: this.appId,
+      elemId: 0,
       views: []
     }).nu();
-    
-    _this.valueObj = _valueObj;
-    _this.value = _valueObj.value;
-    
+    this.elemId = _this.options.elemId;
+
+    if( _options.values ){
+      _this.valueIds = _options.values;
+      _this.values = {};
+      for( i in _options.values ){
+        _this.values = _this.getValueById(i);
+      }
+    }
+
+    if( _options.localized ){
+      _this.localized = _options.localized;
+    }
+
+    if( _options.strings ){
+      _this.strings = _options.strings;
+    }
+
+    if(_valueObj){
+      _this.valueObj.bind(_this);
+    }
+    else {
+      _this.value = _options.value;
+    }
+
     // _this.app = _this;
-    
-    // 
+
+    //
     // _this.renderer = COMM.JSONRenderer.extend({
-    //   
+    //
     // }).nu( _this.value, _this );
     _this.drawSubviews();
     if( _this.options.subviews ){
@@ -82,11 +100,11 @@ RSence.GUIApp = HApplication.extend({
   drawSubviews: function(){
 
   },
-  
+
   die: function(){
     this.base();
-    
+
   }
-  
+
 });