rsence-pre 2.2.2.1 → 2.3.0.0

data/lib/rsence/sessionmanager.rb

@@ -84,7 +84,7 @@ module RSence
         # session id, used internally
         :ses_id     =>  ses_id,
       
-        # session key, used externally (client xhr)
+        # session key, used externally (client sync)
         :ses_key    =>  ses_sha,
       
         # session key, used externally (client cookies)
@@ -137,7 +137,7 @@ module RSence
       # new time-out
       ses_data[:timeout] = Time.now.to_i + @config[:timeout_secs]
     
-      # re-generates the ses_key for each xhr
+      # re-generates the ses_key for each sync
       if @config[:disposable_keys]
       
         # disposes the old (current) ses_key:
@@ -233,7 +233,7 @@ module RSence
     ### Otherwise stops the client and returns false.
     def check_ses( msg, ses_key, ses_seed=false )
     
-      # first, check if the session key exists (xhr)
+      # first, check if the session key exists (sync)
       if @session_keys.has_key?( ses_key )
       
         # get the session's id based on its key
@@ -455,7 +455,7 @@ module RSence
       ses_cookie_max_age = @config[:timeout_secs]
     
       ## Only match the handshaking address of rsence,
-      ## prevents unnecessary cookie-juggling in xhr's
+      ## prevents unnecessary cookie-juggling in sync's
       if @config[:trust_cookies]
         ses_cookie_path    = '/'
       elsif ses_cookie_path == nil
@@ -527,19 +527,19 @@ module RSence
         query = request.query
       end
       
-      ## Perform old-session cleanup on all xhr:s
+      ## Perform old-session cleanup on all sync:s
       expire_sessions
       
       ## The 'ses_id' request query key is required.
       ## The client defaults to '0', which means the
       ## client needs to be initialized.
       ## The client's ses_id is the server's ses_key.
-      if not query.has_key?( 'ses_key' )
+      if not options.has_key?( :ses_key )
         return Message.new( @transporter, request, response, options )
       else
         
         ## get the ses_key from the request query:
-        ses_key = query[ 'ses_key' ]
+        ses_key = options[:ses_key]
 
         ## The message object binds request, response
         ## and all user/session -related data to one

data/lib/rsence/sessionstorage.rb

@@ -240,7 +240,9 @@ module RSence
       end
       puts "Storing sessions..." if RSence.args[:verbose]
       db_open
-      @sessions.each do |ses_id,ses_data|
+      ses_ids = @sessions.keys
+      ses_ids.each do |ses_id|
+        ses_data = @sessions[ses_id]
         if @plugins
           @plugins.delegate( :dump_ses, ses_data )
           @plugins.delegate( :dump_ses_id, ses_id )

data/lib/rsence/transporter.rb

@@ -94,13 +94,13 @@ module RSence
       uri = request.fullpath
     
       if request_type == :post
-        ## /x handles xhr without cookies
+        ## /x handles sync without cookies
         if uri == broker_urls[:x] and @sessions.accept_requests
-          xhr( request, response, { :cookies => true, :servlet => false } )
+          sync( request, response, { :cookies => true, :servlet => false } )
           return true
-        ## /hello handles the first xhr (with cookies, for session key)
+        ## /hello handles the first sync (with cookies, for session key)
         elsif uri == broker_urls[:hello] and @sessions.accept_requests
-          xhr( request, response, { :cookies => true, :servlet => false } )
+          sync( request, response, { :cookies => true, :servlet => false } )
           return true
         end
       end
@@ -108,7 +108,7 @@ module RSence
     end
   
     # wrapper for the session manager stop client functionality
-    def xhr_error_handler(msg,err_name,err_extra_descr='')
+    def sync_error_handler(msg,err_name,err_extra_descr='')
       @sessions.stop_client_with_message( msg,
         @config[:messages][err_name][:title],
         @config[:messages][err_name][:descr]+err_extra_descr,
@@ -116,8 +116,8 @@ module RSence
       )
     end
   
-    # wrapper for tracebacks in xhr
-    def xhr_traceback_handler(e,err_descr='Transporter::UnspecifiedError')
+    # wrapper for tracebacks in sync
+    def sync_traceback_handler(e,err_descr='Transporter::UnspecifiedError')
       puts "=="*40 if RSence.args[:debug]
       puts err_descr
       if RSence.args[:debug]
@@ -127,10 +127,32 @@ module RSence
         puts "=="*40
       end
     end
+
+    def find_client_sync_error( options )
+      return false if options.length == 0
+      errors = []
+      options.each do |err|
+        if err.class == Hash and err.has_key?('err_msg')
+          errors.push( err['err_msg'] )
+        end
+      end
+      return false if errors.length == 0
+      return errors
+    end
   
     ## handles incoming XMLHttpRequests from the browser
-    def xhr(request, response, options = { :cookies => false, :servlet => false } )
-    
+    def sync(request, response, options = { :cookies => false, :servlet => false } )
+      request_body = request.body.read
+      begin
+        request_content = JSON.parse( request_body )
+      rescue JSON::ParseError
+        warn "Request body isn't valid JSON: #{request_body}"
+        request_content = ['-1:.o.:INVALID',{},[]]
+      end
+      options[:ses_key] = request_content[0]
+      options[:values] = request_content[1]
+      options[:messages] = request_content[2]
+
       session_conf = RSence.config[:session_conf]
     
       options[:cookies] = false unless options.has_key?(:cookies)
@@ -143,13 +165,15 @@ module RSence
       msg = @sessions.init_msg( request, response, options )
     
       response_success = true
-    
+      
+      client_errors = find_client_sync_error( options[:messages] )
+
       # If the client encounters an error, display error message
-      if request.query.has_key?('err_msg')
+      if client_errors #request.query.has_key?('err_msg')
         response_success = false
-        client_error_msg = request.query['err_msg'].inspect
+        client_error_msg = client_errors.inspect
         puts "\nCLIENT ERROR:\n#{client_error_msg}\n" if RSence.args[:debug]
-        xhr_error_handler(msg,:client_error,client_error_msg)
+        sync_error_handler(msg,:client_error,client_error_msg)
       end
     
       # If the session is valid, continue:
@@ -175,14 +199,14 @@ module RSence
         end
         
         ## Pass the client XML to the value manager
-        if request.query.has_key?( 'values' )
-          syncdata_str = request.query[ 'values' ]
+        if options[:values].has_key?('set')#request.query.has_key?( 'values' )
+          # syncdata_str = request.query[ 'values' ]
           begin
-            @valuemanager.xhr( msg, syncdata_str )
+            @valuemanager.sync( msg, options[:values]['set'] )
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :valuemanager_xhr_error, e.message )
-            xhr_traceback_handler( e, "Transporter::ValueManagerXHRError: @valuemanager.xhr failed." )
+            sync_error_handler( msg, :valuemanager_sync_error, e.message )
+            sync_traceback_handler( e, "Transporter::ValueManagerXHRError: @valuemanager.sync failed." )
           end
         end
       
@@ -195,8 +219,8 @@ module RSence
               @plugins.delegate( :cloned_target, msg, msg.cloned_source )
             rescue => e
               response_success = false
-              xhr_error_handler( msg, :plugin_delegate_cloned_target_error, e.message )
-              xhr_traceback_handler( e, "Transporter::PluginDelegateClonedTargetError: @plugins.delegate 'cloned_target' failed." )
+              sync_error_handler( msg, :plugin_delegate_cloned_target_error, e.message )
+              sync_traceback_handler( e, "Transporter::PluginDelegateClonedTargetError: @plugins.delegate 'cloned_target' failed." )
             end
           end
           
@@ -205,8 +229,8 @@ module RSence
             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." )
+            sync_error_handler( msg, :plugin_delegate_restore_ses_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateRestoreSesError: @plugins.delegate 'restore_ses' failed." )
           end
           
         elsif msg.new_session
@@ -216,8 +240,8 @@ module RSence
             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." )
+            sync_error_handler( msg, :plugin_delegate_init_ses_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateInitSesError: @plugins.delegate 'init_ses' failed." )
           end
           
         elsif msg.cloned_targets
@@ -226,8 +250,8 @@ module RSence
             @plugins.delegate( :cloned_source, msg, msg.cloned_targets )
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :plugin_delegate_cloned_source_error, e.message )
-            xhr_traceback_handler( e, "Transporter::PluginDelegateClonedSourceError: @plugins.delegate 'cloned_source' failed." )
+            sync_error_handler( msg, :plugin_delegate_cloned_source_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateClonedSourceError: @plugins.delegate 'cloned_source' failed." )
           end
           
         elsif msg.refresh_page?( @plugins.incr ) and @config[:client_autoreload]
@@ -244,8 +268,8 @@ module RSence
           @valuemanager.validate( msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :valuemanager_validate_error, e.message )
-          xhr_traceback_handler( e, "Transporter::ValueManagerValidateError: @valuemanager.validate failed." )
+          sync_error_handler( msg, :valuemanager_validate_error, e.message )
+          sync_traceback_handler( e, "Transporter::ValueManagerValidateError: @valuemanager.validate failed." )
         end
         
         ### Allows every plugin to respond to the idle call
@@ -253,8 +277,8 @@ module RSence
           @plugins.delegate( :idle, msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :plugin_idle_error, e.message )
-          xhr_traceback_handler( e, "Transporter::PluginIdleError: @plugins.idle failed." )
+          sync_error_handler( msg, :plugin_idle_error, e.message )
+          sync_traceback_handler( e, "Transporter::PluginIdleError: @plugins.idle failed." )
         end
         
         ### Processes outgoing values to client
@@ -262,8 +286,8 @@ module RSence
           @valuemanager.sync_client( msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :valuemanager_sync_client_error, e.message )
-          xhr_traceback_handler( e, "Transporter::ValueManagerSyncClientError: @valuemanager.sync_client failed." )
+          sync_error_handler( msg, :valuemanager_sync_client_error, e.message )
+          sync_traceback_handler( e, "Transporter::ValueManagerSyncClientError: @valuemanager.sync_client failed." )
         end
         
       else

data/lib/rsence/valuemanager.rb

@@ -114,10 +114,10 @@ module RSence
     end
   
     # @private Parses the json from the client and passes it on to associated values
-    def xhr( msg, syncdata_str )
+    def sync( msg, syncdata )
     
       # parses the json data sent by the client
-      syncdata = JSON.parse( syncdata_str )
+      # syncdata = JSON.parse( syncdata_str )
     
       session_values = msg.session[:values][:by_id]
       syncdata.each do |value_key, value_data|
@@ -125,7 +125,7 @@ module RSence
           value_obj = session_values[ value_key ]
           value_obj.from_client( msg, value_data )
         else
-          raise "HValue; unassigned value id! (#{val_id.inspect})"
+          warn "HValue; unassigned value key: (#{value_key.inspect})"
         end
       end
     end

data/plugins/client_pkg/client_pkg.rb

@@ -112,6 +112,11 @@ class ClientPkgPlugin < Servlet
   def del_package( pkg_name ); @client_build.del_package( pkg_name ); end
   def del_packages( packages ); @client_build.del_packages( packages ); end
   
+  def add_compound( compound_name, pkg_names ); @client_build.add_compound( compound_name, pkg_names ); end
+  def add_compounds( compounds ); @client_build.add_compounds( compounds ); end
+  def del_compound( compound_name ); @client_build.del_compound( compound_name ); end
+  def del_compounds( compounds ); @client_build.del_compounds( compounds ); end
+  
   def add_reserved_name( reserved_name ); @client_build.add_reserved_name( reserved_name ); end
   def add_reserved_names( reserved_names ); @client_build.add_reserved_names( reserved_names ); end
   def del_reserved_name( reserved_name ); @client_build.del_reserved_name( reserved_name ); end

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -213,7 +213,7 @@ class ClientPkgBuild
           begin
             coffee_src = read_file( src_path )
             js_data = CoffeeScript.compile( coffee_src, :bare => true )
-          rescue CoffeeScript::CompilationError
+          rescue CoffeeScript::CompilationError, ExecJS::RuntimeError
             if has_js
               js_data = %{console.log( "WARNING: CoffeeScript complilation failed for source file #{src_path.to_json}, using the js variant instead." );}
               js_data += read_file( File.join( bundle_path, bundle_name+'.js' ) )
@@ -436,13 +436,15 @@ class ClientPkgBuild
       @logger.log(  "Compound package..............:    Source |   Minimized |   GNUZipped" )
       @logger.log(  "                              :           |             |" )
     end
-    @compound_config.each do |pkg_name, js_order|
+    @compounds.each do |pkg_name, js_order|
       js_size = 0
       pkg_parts = []
       js_order.each do |js_pkg|
         pkg_part = @js[ js_pkg ]
         pkg_parts.push( pkg_part )
-        js_size += ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] )
+        pkg_size = ( @package_origsizes[ js_pkg ] or @destination_origsize[ js_pkg ] or @compound_origsize[ js_pkg ] )
+        warn "nil pkg size of: #{js_pkg}" if ( pkg_size.nil? or pkg_size == 0 ) and @debug
+        js_size += pkg_size.nil? ? 0 : pkg_size
       end
       js_src = pkg_parts.join("\n")
       @js[ pkg_name ] = js_src
@@ -457,6 +459,7 @@ class ClientPkgBuild
         else
           gz_size  = gz_data.bytesize
         end
+        @compound_origsize[ pkg_name ] = js_size
         print_stat( pkg_name, js_size, jsc_size, gz_size )
       end
     end
@@ -494,6 +497,7 @@ class ClientPkgBuild
   def compose_destinations
     @destination_files = {} # rename to package_products
     @destination_origsize = {}
+    @compound_origsize = {}
     @package_names.each do |package_name|
       @packages[package_name].each do |bundle_name|
         if @bundles_found.has_key?( bundle_name )
@@ -623,6 +627,27 @@ class ClientPkgBuild
     packages.each { |pkg_name| del_package( pkg_name ) }
   end
   
+  def add_compound( compound_name, pkg_names )
+    if @compounds.has_key?( compound_name )
+      warn "Compound #{compound_name} already exists, ignoring."
+    else
+      @compounds[ compound_name ] = pkg_names
+    end
+  end
+  def add_compounds( compounds )
+    compounds.each do | compound_name, pkg_names |
+      add_compound( compound_name, pkg_names )
+    end
+  end
+  def del_compound( compound_name )
+    if @compounds.has_key?( compound_name )
+      @compounds.delete( compound_name )
+    end
+  end
+  def del_compounds( compounds )
+    compounds.each { |compound_name| del_compound( compound_name ) }
+  end
+
   def add_reserved_name( reserved_name )
     @reserved_names.push( reserved_name ) unless @reserved_names.include? reserved_name
   end
@@ -719,7 +744,7 @@ class ClientPkgBuild
     @no_whitespace_removal = config[:no_whitespace_removal]
     @debug = RSence.args[:debug]
     @quiet = (not RSence.args[:verbose] and RSence.args[:suppress_build_messages])
-    @compound_config = config[:compound_packages]
+    @compounds = config[:compound_packages]
   end
   
   def find_newer( src_dir, newer_than, quiet=false )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.2.2.1
+  version: 2.3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '969'
+        version: '971'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '969'
+        version: '971'
 description: ! 'RSence is a different and unique development model and software frameworks
   designed first-hand for real-time web applications. RSence consists of separate,
   but tigtly integrated data- and user interface frameworks.
@@ -307,6 +307,7 @@ files:
 - js/foundation/control/valueaction/valueaction.js
 - js/foundation/control/valuematrix/valuematrix.js
 - js/foundation/control/valueresponder/valueresponder.js
+- js/foundation/eventmanager/eventmanager.coffee
 - js/foundation/eventmanager/eventmanager.js
 - js/foundation/geom/point/point.js
 - js/foundation/geom/rect/rect.js
@@ -341,6 +342,9 @@ files:
 - js/menus/popupmenu/themes/default/popupmenu.html
 - js/menus/popupmenu/themes/default/popupmenu.png
 - js/no_pkg/no_pkg.js
+- js/tables/table/table.coffee
+- js/tables/table/themes/default/table.css
+- js/tables/table/themes/default/table.html
 - js/util/reloadapp/reloadapp.js
 - js/util/reloadapp/themes/default/reloadapp_warning-ie6.gif
 - js/util/reloadapp/themes/default/reloadapp_warning.png
@@ -380,9 +384,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rsence-
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Pre-Release 2.2 version of RSence.
+summary: Pre-Release 2.3 version of RSence.
 test_files: []
-has_rdoc: