rsence-pre 2.2.0.13 → 2.2.0.14

data/VERSION

@@ -1 +1 @@
-2.2.0.13.pre
+2.2.0.14.pre

data/conf/default_conf.yaml

@@ -26,6 +26,12 @@
     #
     # A list of javascript dependencies to include in the html
     :deps: [ ]
+    #
+    # Boot library:
+    :boot_lib: core
+    #
+    # Default additional libraries to use:
+    :default_libs: []
   #
   # The settings for the main plugin
   :main_plugin:
@@ -315,14 +321,23 @@
       graphics:
         - svgcontrol
     
-    # Special packages that include other packages (not used currently)
+    # Special packages that include other packages
     :compound_packages:
-      allinone:
+      rsence:
         - core
         - default_theme
         - controls
         - lists
         - datetime
+        - graphics
+        - servermessage
+      std_widgets:
+        - default_theme
+        - controls
+        - lists
+        - datetime
+        - graphics
+        - servermessage
 
     # List of variables and other names beginning
     # with a underscore that should not be obfuscated

data/js/comm/autosync/autosync.js

@@ -7,11 +7,11 @@
  */
 
 // Starts the synchronization upon page load.
-LOAD(
-  function(){
+COMM.AutoSyncStarter = {
+  start: function(){
     COMM.urlResponder=COMM.URLResponder.nu();
     COMM.Transporter.url=COMM.Transporter.HelloUrl;
     COMM.Transporter.stop=false;
     COMM.Transporter.sync();
   }
-);
+};

data/js/comm/jsloader/jsloader.js

@@ -35,6 +35,18 @@ COMM.JSLoader = HClass.extend({
     console.log("failed to load js: "+_resp.url);
   },
   
+  _formatUrl: function( _jsName ){
+    var
+    _this = this,
+    _isFullUrl = _jsName.slice(0,7) === 'http://' || _jsName.slice(0,8) === 'https://',
+    _url = _isFullUrl?_jsName:_this.uri+_jsName+'.js';
+    return _url;
+  },
+  loaded: function(_jsName){
+    var _url = this._formatUrl( _jsName );
+    this._loadedJS.push( _url );
+  },
+
 /** = Description
   * Loads a js package using the name.
   *
@@ -51,12 +63,13 @@ COMM.JSLoader = HClass.extend({
   *
   **/
   load: function(_jsName){
-    var _this = this,
-        _isFullUrl = _jsName.slice(0,7) === 'http://' || _jsName.slice(0,8) === 'https://',
-        _url = _isFullUrl?_jsName:_this.uri+_jsName+'.js';
+    var
+    _this = this,
+    _url = _this._formatUrl( _jsName );
     if((_this._loadedJS.indexOf(_url)!==-1)) {
       return;
     }
+    // console.log('jsLoader load:',_url);
     COMM.Queue.pause();
     _this._loadedJS.push(_url);
     if(BROWSER_TYPE.symbian && _isFullUrl){

data/js/core/rsence_ns/rsence_ns.js

@@ -18,6 +18,8 @@ var RSence = {
     COMM.ClientPrefix=_clientPrefix;
     COMM.Transporter.HelloUrl=_helloUrl;
     HThemeManager.themePath=_clientPrefix+'/themes';
+    HThemeManager._start();
+    COMM.AutoSyncStarter.start();
   },
   
   // Structure reserved for JSONRenderer instances remotely populated by the server

data/js/foundation/thememanager/thememanager.js

@@ -388,6 +388,27 @@ HThemeManager = HClass.extend({
       _cssTmpl = _cssTmpl.replace(  this._variable_match, eval( RegExp.$1 )  );
     }
     return _cssTmpl;
+  },
+
+  _initFns: [],
+  _pushStarted: false,
+  _pushStart: function( _fn ){
+    if(this._pushStarted){
+      _fn();
+    }
+    else{
+      this._initFns.push( _fn );
+    }
+  },
+  _start: function(){
+    var
+    _this = this,
+    i = 0;
+    _this._pushStarted = true;
+    for( ; i<_this._initFns.length; i++){
+      _this._initFns[i]();
+    }
+    _this._initFns = [];
   }
   
 });

data/lib/plugins/plugin.rb

@@ -283,6 +283,12 @@ module RSence
         # Check the required dependencies until everything is loaded.
         dependencies.each do |dependency|
           unless ses[:deps].include?( dependency )
+            if RSence.config[:client_pkg][:compound_packages].include?( dependency )
+              RSence.config[:client_pkg][:compound_packages][dependency].each do |pkg_name|
+                ses[:deps].push( pkg_name )
+                msg.reply(%{jsLoader.loaded("#{pkg_name}");})
+              end
+            end
             ses[:deps].push( dependency )
             msg.reply(%{jsLoader.load("#{dependency}");})
           end

data/lib/session/msg.rb

@@ -251,6 +251,9 @@ module RSence
         ## The response status should always be 200 (OK)
         @response.status = 200
         
+        @value_buffer.delete( :new ) if @value_buffer[:new].empty?
+        @value_buffer.delete( :set ) if @value_buffer[:set].empty?
+        @value_buffer.delete( :del ) if @value_buffer[:del].empty?
         buffer = [
           @ses_key,
           @value_buffer,

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -10,6 +10,11 @@
 require 'jsmin_c'
 require 'jscompress'
 require 'html_min'
+begin
+  require 'coffee-script'
+rescue LoadError
+  warn "CoffeeScript not installed. Install the 'coffee-script' gem to enable."
+end
 
 
 class ClientPkgBuild
@@ -99,7 +104,7 @@ class ClientPkgBuild
             :gzip => gz_css
           }
           @theme_sizes[   theme_name ][:css][0] += File.stat( src_file_css ).size
-          @theme_sizes[   theme_name ][:css][1] += css_data.size
+          @theme_sizes[   theme_name ][:css][1] += css_data.bytesize
           @css_by_theme[  theme_name ][ bundle_name ] = css_data
         end
       end
@@ -113,17 +118,18 @@ class ClientPkgBuild
             :gzip => gz_html
           }
           @theme_sizes[   theme_name ][:html][0] += File.stat( src_file_html ).size
-          @theme_sizes[   theme_name ][:html][1] += html_data.size
+          @theme_sizes[   theme_name ][:html][1] += html_data.bytesize
           @html_by_theme[ theme_name ][ bundle_name ] = html_data
         end
       end
       tgt_hash_gfx = tgt_hash_theme[:gfx]
       gfx_size = read_gfx( src_path_theme, tgt_hash_gfx )
+      puts "gfx size of #{bundle_name}: #{gfx_size.inspect}"
       @theme_sizes[   theme_name ][:gfx] += gfx_size
     end
   end
   
-  def add_bundle( bundle_name, bundle_path, entries )
+  def add_bundle( bundle_name, bundle_path, entries, has_coffee=false )
     has_themes = entries.include?( 'themes' ) and File.directory?( File.join( bundle_path, 'themes' ) )
     if @bundles_found.has_key?( bundle_name )
       @logger.log( "JSBuilder ERROR: duplicate bundles with the name #{bundle_name.inspect} found." )
@@ -136,11 +142,15 @@ class ClientPkgBuild
       warn "JSBuilder WARNING: bundle name #{bundle_name.inspect} does not belong to any package, skipping.." if ARGV.include?('-d')
       return true
     end
-    js_data = read_file( File.join( bundle_path, bundle_name+'.js' ) )
+    if has_coffee
+      js_data = CoffeeScript.compile( read_file( File.join( bundle_path, bundle_name+'.js' ) ) )
+    else
+      js_data = read_file( File.join( bundle_path, bundle_name+'.js' ) )
+    end
     @bundles_found[ bundle_name ] = {
       :path => bundle_path,
       :js_data => js_data,
-      :js_size => js_data.size,
+      :js_size => js_data.bytesize,
       :has_themes => has_themes
     }
     if has_themes
@@ -157,10 +167,13 @@ class ClientPkgBuild
       # the name of src_dir (src_dir itself is a full path)
       dir_name    = File.split( src_dir )[1]
       # bundles are defined as directories with a js file of the same name plus the 'js.inc' tagfile
-      is_bundle   = ( not dir_entries.include?( 'disabled' ) ) and ( dir_entries.include?( dir_name+'.js' ) or dir_entries.include?( 'main.js' ) )
+      not_disabled = ( not dir_entries.include?( 'disabled' ) )
+      has_js = dir_entries.include?( dir_name+'.js' ) #or dir_entries.include?( 'main.js' )
+      has_coffee = dir_entries.include?( dir_name+'.coffee' ) #or dir_entries.include?( 'main.coffee' )
+      is_bundle   = not_disabled and ( has_js or has_coffee )
       # if src_dir is detected as a bundle, handle it in add_bundle
       if is_bundle
-        add_bundle( dir_name, src_dir, dir_entries )
+        add_bundle( dir_name, src_dir, dir_entries, has_coffee )
       end
       # descend into the sub-directory:
       dir_entries.each do | dir_entry |
@@ -193,27 +206,19 @@ class ClientPkgBuild
       @logger.log(  "                              :           |             |" )
     end
     @destination_files.each_key do | package_name |
-      jsc_data = @destination_files[package_name]
-      unless @debug
-        unless @no_whitespace_removal
-          jsc_data = @jsmin.minimize( jsc_data ) #.strip
-        end
-        unless @no_obfuscation
-          jsc_data = pre_convert( jsc_data )
-        end
-      end
-      @js[package_name] = jsc_data.strip
+      jsc_data = process_js( @destination_files[package_name] )
+      @js[package_name] = jsc_data
       unless @no_gzip
-        gz_data = gzip_string( @js[package_name] )
+        gz_data = gzip_string( jsc_data )
         @gz[package_name] = gz_data
       end
       unless @quiet
-        js_size  = @destination_files[ package_name ].size
-        jsc_size = jsc_data.size
+        js_size  = @destination_files[ package_name ].bytesize
+        jsc_size = jsc_data.bytesize
         if @no_gzip
           gz_size  = -1
         else
-          gz_size  = gz_data.size
+          gz_size  = gz_data.bytesize
         end
         print_stat( package_name, js_size, jsc_size, gz_size )
       end
@@ -234,6 +239,17 @@ class ClientPkgBuild
     end
     return js.strip
   end
+
+  def process_js( src_in )
+    if @debug
+      return src_in
+    else
+      src_out = src_in
+      src_out = @jsmin.minimize( src_out ) unless @no_whitespace_removal
+      src_out = pre_convert( src_out ) unless @no_obfuscation
+      return src_out.strip
+    end
+  end
   
   def build_themes
     unless @quiet
@@ -250,24 +266,21 @@ class ClientPkgBuild
       theme_html_js_arr.push "HThemeManager._tmplCache[#{theme_name.to_json}]=#{html_templates.to_json}; "
       theme_html_js_arr.push "HNoComponentCSS.push(#{theme_name.to_json});"
       theme_html_js_arr.push "HNoCommonCSS.push(#{theme_name.to_json});"
-      theme_html_js_arr.push "HThemeManager._cssUrl( #{theme_name.to_json}, #{(theme_name+'_theme').to_json}, HThemeManager.themePath, null );"
-      theme_html_js_arr.push "HThemeManager.useCSS(#{theme_css_template_data.to_json}); "
-      theme_html_js = theme_html_js_arr.join('')
-      unless @debug
-        unless @no_whitespace_removal
-          theme_html_js = @jsmin.minimize( theme_html_js ) #.strip
-        end
-        unless @no_obfuscation
-          theme_html_js = pre_convert( theme_html_js )
-        end
-      end
-      @js[theme_name+'_theme'] = theme_html_js.strip
+      theme_html_js_arr.push %{
+        HThemeManager._pushStart( function(){
+          var _this = HThemeManager;
+          _this._cssUrl( #{theme_name.to_json}, #{(theme_name+'_theme').to_json}, _this.themePath, null );
+          _this.useCSS(#{theme_css_template_data.to_json});
+        } );
+      }
+      theme_html_js = process_js( theme_html_js_arr.join('') )
+      @js[theme_name+'_theme'] = theme_html_js
       unless @no_gzip
         theme_html_gz = gzip_string( @js[theme_name+'_theme'] )
         @gz[theme_name+'_theme'] = theme_html_gz
       end
       unless @quiet
-        print_stat( "#{theme_name}/html", @theme_sizes[theme_name][:html][0], @theme_sizes[theme_name][:html][1], theme_html_gz.size )
+        print_stat( "#{theme_name}/html", @theme_sizes[theme_name][:html][0], @theme_sizes[theme_name][:html][1], theme_html_gz.bytesize )
       end
       @themes[theme_name][:css][theme_name+'_theme'] = {
         :data => theme_css_template_data,
@@ -278,13 +291,43 @@ class ClientPkgBuild
         @themes[theme_name][:css][theme_name+'_theme'][:gzip] = theme_css_template_data_gz
       end
       unless @quiet
-        print_stat( "#{theme_name}/css", @theme_sizes[theme_name][:css][0], @theme_sizes[theme_name][:css][1], theme_css_template_data_gz.size )
+        print_stat( "#{theme_name}/css", @theme_sizes[theme_name][:css][0], @theme_sizes[theme_name][:css][1], theme_css_template_data_gz.bytesize )
         print_stat( "#{theme_name}/gfx", @theme_sizes[theme_name][:gfx], -1, -1 )
         @logger.log( '' )
       end
     end
   end
   
+  def build_compound_packages
+    unless @quiet
+      @logger.log(  '' )
+      @logger.log(  "Compound package..............:  Original |   Minimized |  Compressed" )
+      @logger.log(  "                              :           |             |" )
+    end
+    @compound_config.each do |pkg_name, js_order|
+      pkg_parts = []
+      js_order.each do |js_pkg|
+        pkg_part = @js[ js_pkg ]
+        pkg_parts.push( pkg_part )
+      end
+      js_src = pkg_parts.join('')
+      @js[ pkg_name ] = js_src
+      unless @no_gzip
+        gz_data = gzip_string( js_src )
+        @gz[ pkg_name ] = gz_data
+      end
+      unless @quiet
+        js_size  = js_src.bytesize
+        if @no_gzip
+          gz_size  = -1
+        else
+          gz_size  = gz_data.bytesize
+        end
+        print_stat( pkg_name, js_size, -1, gz_size )
+      end
+    end
+  end
+
   def run
     
     time_start = Time.now.to_f*10000
@@ -326,8 +369,9 @@ class ClientPkgBuild
     end
     
     build_indexes
-    minimize_data
     build_themes
+    minimize_data
+    build_compound_packages
     
     ms_taken = ((Time.now.to_f*10000)-time_start).to_i/10.0
     @logger.log( "Time taken:  #{ms_taken}ms\n\n" )
@@ -505,6 +549,7 @@ class ClientPkgBuild
     @no_whitespace_removal = config[:no_whitespace_removal]
     @debug = RSence.args[:debug]
     @quiet = (not RSence.args[:verbose])
+    @compound_config = config[:compound_packages]
   end
   
   def find_newer( src_dir, newer_than )

data/plugins/main/main.rb

@@ -69,14 +69,18 @@ class MainPlugin < Plugin
     @conf[:deps].each do |dep|
       deps_src += %{<script src="#{dep}" type="text/javascript"></script>}
     end
+    deps_src += %{<script src="__CLIENT_BASE__/js/#{@conf[:boot_lib]}.js"></script>}
+    @conf[:default_libs].each do |dep|
+      deps_src += %{<script src="__CLIENT_BASE__/js/#{dep}.js"></script>}
+    end
     client_base = File.join(@bconf[:h],client_rev)
     
+    index_html.gsub!( '__SCRIPT_DEPS__',   deps_src          )
     index_html.gsub!( '__CLIENT_BASE__',   client_base       )
     index_html.gsub!( '__DEFAULT_TITLE__', @conf[:title]     )
     index_html.gsub!( '__CLIENT_REV__',    client_rev        )
     index_html.gsub!( '__CLIENT_HELLO__',  @bconf[:hello]    )
     index_html.gsub!( '__NOSCRIPT__',      @conf[:noscript]  )
-    index_html.gsub!( '__SCRIPT_DEPS__',   deps_src          )
     
     return index_html
   end
@@ -234,10 +238,46 @@ class MainPlugin < Plugin
     restore_ses( msg )
   end
   
+  def index_deps_setup( msg )
+    ses = msg.session
+    if not ses.has_key?( :deps )
+      # make an array of dependencies for this session, if not already done
+      ses[:deps] = []
+    end
+    compound_pkgs = RSence.config[:client_pkg][:compound_packages]
+    boot_dep = @conf[:boot_lib]
+    unless ses[:deps].include?( boot_dep )
+      if compound_pkgs.include?( boot_dep )
+        compound_pkgs[ boot_dep ].each do |pkg_name|
+          ses[:deps].push( pkg_name )
+          msg.reply(%{jsLoader.loaded("#{pkg_name}");})
+        end
+      end
+      ses[:deps].push( boot_dep )
+      msg.reply(%{jsLoader.loaded("#{boot_dep}");})
+      if boot_dep == 'rsence'
+        ses[:deps].push( 'std_widgets' )
+        msg.reply(%{jsLoader.loaded("std_widgets");})
+      end
+    end
+    @conf[:default_libs].each do |dep_lib|
+      unless ses[:deps].include?( dep_lib )
+        if compound_pkgs.include?( dep_lib )
+          compound_pkgs[ dep_lib ].each do |pkg_name|
+            ses[:deps].push( pkg_name )
+            msg.reply(%{jsLoader.loaded("#{pkg_name}");})
+          end
+        end
+        ses[:deps].push( dep_lib )
+        msg.reply(%{jsLoader.loaded("#{dep_lib}");})
+      end
+    end
+  end
   
   # Called once when a session is restored or cloned using the cookie's ses_key
   def restore_ses( msg )
     super
+    index_deps_setup( msg )
     ## Resets session data to defaults
     ses = get_ses( msg )
     ses[:boot] = 0

data/plugins/main/tmpl/index.html

@@ -4,7 +4,6 @@
 <title>__DEFAULT_TITLE__</title>
 <style type="text/css">body{margin:0;padding:0;background-color:#ddd;font-family:Arial,sans-serif;}</style>
 __SCRIPT_DEPS__
-<script src="__CLIENT_BASE__/js/core.js"></script>
 <!--[if lt IE 7]><script src="__CLIENT_BASE__/js/iefix.js"></script><![endif]-->
 
 <script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 99
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 13
-  version: 2.2.0.13
+  - 14
+  version: 2.2.0.14
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 Z
+date: 2011-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps