rsence-pre 2.1.0.21 → 2.1.8.0

data/plugins/client_pkg/lib/client_pkg_serve.rb

@@ -21,195 +21,238 @@ module ClientPkgServe
     return time.gmtime.strftime('%a, %d %b %Y %H:%M:%S %Z')
   end
   
-  ## Responds to get-requests
-  def get( request, response, session )
-    
+  def build_busy_wait
+    while @build_busy
+      puts "-- build not finished, waiting.. --"
+      sleep 0.1
+    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])
-    
     else
       response['Cache-Control'] = 'no-cache'
     end
-    
-    support_gzip = (request.header.has_key?('accept-encoding') and request.header['accept-encoding'].include?('gzip'))
+  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]
-    if request.header.has_key?('user-agent')
-      ua = request.header['user-agent']
+    if request.header.has_key?('User-Agent')
+      ua = request.header['User-Agent']
       is_symbian = ua.include?("SymbianOS")
       is_safari  = ((not is_symbian) and ua.include?("WebKit"))
       is_msie = ((not ua.include?("Opera")) and ua.include?("MSIE"))
       is_msie6 = ((not ua.include?("Opera")) and ua.include?("MSIE 6.0"))
     end
-    
-    ## 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]
-    
-    if not ['js','themes'].include? req_type
-      req_rev = req_type
-      req_type = request_path[3]
-      request_path.delete_at(2)
+    if is_safari
+      version = ua.split( 'WebKit/' )[1].split('.')[0].to_i
+    else
+      version = 0 # not used for others
     end
+    return {
+      :symbian => is_symbian,
+      :safari  => is_safari,
+      :msie    => is_msie,
+      :msie6   => is_msie6,
+      :version => version
+    }
+  end
+  
+  def support_gzip?( ua )
+    doesnt_support = ( ua[:msie6] or ua[:symbian] or (ua[:safari] and ua[:version] < 533) )
+    return ( not doesnt_support )
+  end
+  
+  def serve_htc( request, response, request_path )
+    req_file = request_path[3]
     
-    ## Special rules for the special browser
-    if request.path.include?('.htc')
-      req_file = request_path[3]
+    # this file is a part of iefix, it injects calls to
+    # the ie rendering engine to override stupid behavior
+    # when changing element properties
+    if request_path.include?('ie_css_element.htc')
+      response.status = 200
+      response['Content-Type'] = 'text/x-component'
+      ## Usually, we don't need it, because the client framework does calls when needed
+      response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
       
-      # this file is a part of iefix, it injects calls to
-      # the ie rendering engine to override stupid behavior
-      # when changing element properties
-      if request_path.include?('ie_css_element.htc')
-        response.status = 200
-        response['Content-Type'] = 'text/x-component'
-        ## Usually, we don't need it, because the client framework does calls when needed
-        response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
-        
-        ## Enable it to call iefix automatically whenever element properties are changed
-        #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onpropertychange",iefix.htcElementEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+      ## Enable it to call iefix automatically whenever element properties are changed
+      #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onpropertychange",iefix.htcElementEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+    
+    # this file is a part of iefix, it injects calls to
+    # the ie rendering engine to override stupid behavior
+    # when changing style properties
+    elsif request_path.include?('ie_css_style.htc')
+      response.status = 200
+      response['Content-Type'] = 'text/x-component'
       
-      # this file is a part of iefix, it injects calls to
-      # the ie rendering engine to override stupid behavior
-      # when changing style properties
-      elsif request_path.include?('ie_css_style.htc')
-        response.status = 200
-        response['Content-Type'] = 'text/x-component'
-        
-        ## Usually, we don't need it, because the client framework does calls when needed
-        response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
-        
-        ## Enable it to call iefix automatically whenever element properties are changed
-        #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onreadystatechange",iefix.htcStyleEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+      ## Usually, we don't need it, because the client framework does calls when needed
+      response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
       
-      # Other htc requests are invalid
-      else
-        response.status = 503
-        response.body   = '503 - Invalid Request'
-      end
-      
-    ## Serve compiled client javascript component files:
-    elsif req_type == 'js'
+      ## Enable it to call iefix automatically whenever element properties are changed
+      #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onreadystatechange",iefix.htcStyleEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+    
+    # Other htc requests are invalid
+    else
+      response.status = 503
+      response.body   = '503 - Invalid Request'
+    end
+  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'
       
-      # the file-specific identifier ('core', 'basic' etc)
-      req_file = request_path[3][0..-4]
+      # these browsers have issues with gzipped js content
+      support_gzip = support_gzip?( ua )
       
-      if not @client_cache.js_cache.has_key?( req_file )
-        response.status = 404
-        response.body   = '/* 404 - Not Found */'
+      if support_gzip
+        #response['Transfer-Encoding'] = 'chunked,gzip'
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.gz_cache[ req_file ]+"\r\n\r\n"
+        response['Content-Length'] = body.bytesize.to_s
+        response['Content-Encoding'] = 'gzip'
+        response.body   = body
       else
         
-        response.status = 200
-        response.content_type = 'text/javascript; charset=utf-8'
-        
-        # these browsers have issues with gzipped js content
-        support_gzip = false if (is_safari or is_msie or is_symbian)
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.js_cache[ req_file ]
+        response['Content-Length'] = body.bytesize.to_s
+        response.body = body
         
-        if support_gzip
-          #response['Transfer-Encoding'] = 'chunked,gzip'
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.gz_cache[ req_file ]+"\r\n\r\n"
-          response['Content-Length'] = body.length.to_s
-          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.length.to_s
-          response.body = body
-          
-        end
       end
+    end
+  end
+  
+  def serve_theme( request, response, request_path, ua )
+    # Get the name of the theme
+    theme_name = request_path[3]
     
-    ## Serve client theme files
-    elsif req_type == 'themes'
-      
-      # 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)
-      has_theme_part = has_theme and @client_cache.theme_cache[theme_name].has_key?( theme_part )
-      
+    # 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)
+    has_theme_part = ( has_theme and @client_cache.theme_cache[theme_name].has_key?( theme_part ) )
+    
+    # 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_file and req_file == 'common.css'
+      response.status = 200
+      response['Content-Type'] = 'text/css'
+      response.body = ''
+    end
+    
+    if not has_theme
+      response.status = 404
+      response.body   = '404 - Theme Not Found'
+      puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if RSence.args[:verbose]
+    elsif not has_theme_part
+      response.status = 503
+      response.body   = '503 - Invalid Theme Part Request'
+    elsif not has_theme_file
+      response.status = 404
+      response.body   = '404 - Theme Resource Not Found'
+      puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
+    else
       
-      # puts "has_theme_part: #{@client_cache.theme_cache[theme_name][theme_part.to_sym].inspect}"
-      # checks for theme file
-      has_theme_file = has_theme_part and @client_cache.theme_cache[theme_name][theme_part].has_key?( req_file )
+      response.status = 200
       
+      file_ext = req_file.split('.')[-1]
+      response['Content-Type'] = {
+        'html' => 'text/html; charset=utf-8',
+        'css'  => 'text/css; charset=utf-8',
+        'png'  => 'image/png',
+        'jpg'  => 'image/jpeg',
+        'gif'  => 'image/gif',
+        'swf'  => 'application/x-shockwave-flash'
+      }[file_ext]
       
-      if not has_theme_file and req_file == 'common.css'
-        response.status = 200
-        response.content_type = 'text/css'
-        response.body = ''
+      if theme_part == :gfx
+        support_gzip = false
+      else
+        support_gzip = support_gzip?( ua )
       end
       
-      if not has_theme
-        response.status = 404
-        response.body   = '404 - Theme Not Found'
-        puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if RSence.args[:verbose]
-      elsif not has_theme_part
-        response.status = 503
-        response.body   = '503 - Invalid Theme Part Request'
-      elsif not has_theme_file
-        response.status = 404
-        response.body   = '404 - Theme Resource Not Found'
-        puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
+      if support_gzip
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.theme_cache[theme_name][theme_part][ req_file+'.gz' ]
+        response['Content-Length'] = body.bytesize.to_s
+        response['Content-Encoding'] = 'gzip'
+        response.body   = body
       else
         
-        response.status = 200
-        
-        file_ext = req_file.split('.')[-1]
-        response.content_type = {
-          'html' => 'text/html; charset=utf-8',
-          'css'  => 'text/css; charset=utf-8',
-          'png'  => 'image/png',
-          'jpg'  => 'image/jpeg',
-          'gif'  => 'image/gif',
-          'swf'  => 'application/x-shockwave-flash'
-        }[file_ext]
-        
-        support_gzip = false if theme_part == :gfx
-        support_gzip = false if (is_safari or is_msie or is_symbian)
-        
-        if support_gzip
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.theme_cache[theme_name][theme_part][ req_file+'.gz' ]
-          response['Content-Length'] = body.length.to_s
-          response['Content-Encoding'] = 'gzip'
-          response.body   = body
-        else
-          
-          # Special IE6 condition to serve gifs instead of png's, because it works much better
-          # than using the ActiveX alpha filter hack
-          if is_msie6 and req_file[-4..-1] == '.png'
-            ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
-            req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
-          end
-        
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.theme_cache[theme_name][theme_part][ req_file ]
-          response['Content-Length'] = body.length.to_s
-          response.body = body
-          
+        # Special IE6 condition to serve gifs instead of png's, because it works much better
+        # than using the ActiveX alpha filter hack
+        if ua[:msie6] and req_file[-4..-1] == '.png'
+          ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
+          req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
         end
-      end
       
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.theme_cache[theme_name][theme_part][ req_file ]
+        if body.nil?
+          warn "ClientPkgServe#get: empty body for #{request.path}"
+          body = ''
+        end
+        response['Content-Length'] = body.bytesize.to_s
+        response.body = body
+        
+      end
+    end
+  end
+  
+  ## Responds to get-requests
+  def get( request, response, session )
+    
+    build_busy_wait
+    
+    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
+    
+    ## Special rules for the special browser
+    if request.path.end_with?('.htc')
+      serve_htc( request, response, request_path )
+    ## Serve compiled client javascript component files:
+    elsif req_type == 'js'
+      serve_js( request, response, request_path, ua )
+    ## Serve client theme files
+    elsif req_type == 'themes'
+      serve_theme( request, response, request_path, ua )
     end
     
   end

data/plugins/main/main.rb

@@ -154,11 +154,11 @@ class MainPlugin < Plugin
       gzwriter = Zlib::GzipWriter.new( index_gzip, 9 )
       gzwriter.write( index_html )
       gzwriter.close
-      response['Content-Length'] = index_gzip.length
+      response['Content-Length'] = index_gzip.bytesize.to_s
       response['Content-Encoding'] = 'gzip'
       response.body = index_gzip
     else
-      response['Content-Length'] = index_html.length
+      response['Content-Length'] = index_html.bytesize.to_s
       response.body = index_html
     end
   end
@@ -229,14 +229,14 @@ class MainPlugin < Plugin
   
   
   # New session initialization, called just once per session.
-  def init_ses(msg)
+  def init_ses( msg )
     super
     restore_ses( msg )
   end
   
   
   # Called once when a session is restored or cloned using the cookie's ses_key
-  def restore_ses(msg)
+  def restore_ses( msg )
     super
     ## Resets session data to defaults
     ses = get_ses( msg )
@@ -282,16 +282,15 @@ class MainPlugin < Plugin
     ## url_responder is bound in the client-space
     ## to tell the server its status by updating its value
     location_href_id = ses[:location_href].val_id.to_json
-    msg.reply "COMM.Values.values[#{location_href_id}].bind(COMM.urlResponder);"
+    msg.reply "try{COMM.Values.values[#{location_href_id}].bind(COMM.urlResponder);}catch(e){console.log('urlResponder failed, reason:',e);}"
     
-    ## This enables SesWatcher that changes :client_time every 60 seconds.
-    ## It makes the client to poll the server on regular intervals, when polling mode
-    ## is disabled.
+    ## This enables SesWatcher that changes :client_time every n seconds, which depends on the server_poll_interval configuration setting.
+    ## It makes the client to poll the server on regular intervals, when polling mode is disabled.
     # 5000ms = 5secs
     
     client_time_id = ses[:client_time].val_id.to_json
     poll_interval = ::RSence.config[:main_plugin][:server_poll_interval]
-    msg.reply "sesWatcher = COMM.SessionWatcher.nu(#{poll_interval},#{client_time_id});"
+    msg.reply "try{window.sesWatcher=COMM.SessionWatcher.nu(#{poll_interval},#{client_time_id});}catch(e){console.log('sesWatcher failed, reason:',e);}"
     
   end
   
@@ -392,7 +391,6 @@ class MainPlugin < Plugin
   def idle(msg)
     
     ses = get_ses( msg )
-    
     if ses[:boot] == 0
       boot0( msg, ses )
     elsif ses[:boot] == 1

data/plugins/ticket/lib/common.rb

@@ -156,7 +156,7 @@ module Common
       (content_type, filename) = format
       
       # content size for the header
-      content_size = content.size.to_s
+      content_size = content.bytesize.to_s
       
       storage_hash = @files
       storage_arr = [content_type,content_size,content,msg.ses_id,filename]
@@ -270,7 +270,7 @@ module Common
         }
       
         # content size for the header
-        content_size = content.size.to_s
+        content_size = content.bytesize.to_s
       
         # content type for the header
         content_type = @content_types[format]
@@ -335,12 +335,12 @@ module Common
       end
       if @raw_uris.include?(blobobj_id)
         content_type = @raw_uris[blobobj_id].mime
-        content_size = @raw_uris[blobobj_id].size
+        content_size = @raw_uris[blobobj_id].bytesize
         content      = @raw_uris[blobobj_id].data
       elsif @blob_objs[:by_id].include?(blobobj_id)
         (ses_id, blobobj) = @blob_objs[:by_id][blobobj_id]
         content_type = blobobj.mime
-        content_size = blobobj.size
+        content_size = blobobj.bytesize
         content      = blobobj.data
         if req.header.has_key?('keep-alive') and req.header['keep-alive'].size > 0
           keep_alive = req.header['keep-alive'][0].to_i

data/plugins/ticket/lib/favicon.rb

@@ -30,7 +30,7 @@ module Favicon
   # Sets favicon. First parameter is favicon data and the second one is content type which defaults to false.
   def set_favicon( ico_data, content_type=false )
     @raw_uris['favicon.ico'][0] = content_type if content_type
-    @raw_uris['favicon.ico'][1] = ico_data.size.to_s
+    @raw_uris['favicon.ico'][1] = ico_data.bytesize.to_s
     @raw_uris['favicon.ico'][2] = ico_data
     
   end

data/plugins/ticket/lib/rsrc.rb

@@ -23,7 +23,7 @@ module Rsrc
     rsrc_id = @randgen.gen
     #puts "rsrc_id: #{rsrc_id.inspect}"
     
-    content_size = content.size.to_s
+    content_size = content.bytesize.to_s
     
     @raw_uris[rsrc_id] = [content_type,content_size,content]
     

data/plugins/ticket/lib/upload.rb

@@ -176,8 +176,8 @@ create table rsence_uploads (
     }
     
     response.status = 200
-    response['content-type'] = 'text/html; charset=UTF-8'
-    response['content-length'] = response_body.size.to_s
+    response['Content-Type'] = 'text/html; charset=UTF-8'
+    response['Content-Length'] = response_body.bytesize.to_s
     response.body = response_body
   end
   

data/plugins/ticket/ticket.rb

@@ -110,8 +110,8 @@ class TicketPlugin < Plugin
       puts "/U/iframe_html: #{uri.inspect}" if RSence.args[:verbose]
       res.status = 200
       http_body = '<html><head><title>Empty Iframe for Uploading</title></head><body></body></html>'
-      res['content-type'] = 'text/html; charset=UTF-8'
-      res['content-length'] = http_body.size.to_s
+      res['Content-Type'] = 'text/html; charset=UTF-8'
+      res['Content-Length'] = http_body.bytesize.to_s
       res.body = http_body
     end
   end
@@ -158,7 +158,7 @@ class TicketPlugin < Plugin
     
     # @return [Number] The size (in bytes) of the data
     def size
-      return @data.size
+      return @data.bytesize
     end
     
     # Implement, if you need to do cleanup before destructing

data/setup/welcome/gui/welcome.yaml

@@ -18,7 +18,7 @@ dependencies:
 class: RSence.GUIApp
 # Each class takes a number of options for its constructor.
 options:
-  title: Welcome App
+  label: Welcome App
 # The subviews use the class defined above as their parent component.
 subviews:
   # The sheet is used as the main visual container for the gui in this app.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 77
-  prerelease: false
+  hash: 71
+  prerelease: 
   segments: 
   - 2
   - 1
+  - 8
   - 0
-  - 21
-  version: 2.1.0.21
+  version: 2.1.8.0
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +02:00
+date: 2011-01-18 00:00:00 +02:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,14 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1919
+        hash: 1925
         segments: 
-        - 958
-        version: "958"
+        - 963
+        version: "963"
   type: :runtime
   version_requirements: *id001
 description: |
-  RSence is a RIA framework designed for responsive GUI applications on the web.
+  RSence is a RIA ("HTML5" or "Ajax" if you like those terms better) framework designed for responsive GUI applications on the web.
   
   RSence is a flexible and high-performance RIA framework aimed on building responsive, scalable and over-all as high-performance GUI Applications as possible with the chosen technologies.
   
@@ -77,7 +77,6 @@ files:
 - lib/session/sessionstorage.rb
 - lib/transporter/transporter.rb
 - lib/util/gzstring.rb
-- lib/util/ruby19_fixes.rb
 - lib/values/hvalue.rb
 - lib/values/valuemanager.rb
 - setup/welcome/gui/welcome.yaml
@@ -408,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rsence-
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Pre-Release 2.1 version of the RSence framework.

data/lib/util/ruby19_fixes.rb

@@ -1,18 +0,0 @@
-
-# NOTE: Ruby 1.9 isn't fully supported yet.
-# There are some encoding handlers and some of the dependencies are not fully working yet.
-# One should wait for Ruby 2.0 for production use anyway.
-
-# Ruby 1.9 encoding defaults.
-# This is clearly not enough but a good start for fixing the encoding madness.
-Encoding.default_external = Encoding::BINARY
-Encoding.default_internal = Encoding::BINARY
-
-# Ruby 1.9 doesn't have String#each anymore.
-# This is a backwards-compatible work-around.
-class String
-  def each 
-    self.split($/).each { |e| yield e } 
-  end 
-end
-