rsence 2.0.0.6.pre → 2.0.0.7.pre

data/lib/values/valuemanager.rb

@@ -15,143 +15,143 @@ require 'randgen'
 
 module RSence
 
-## ValueManager provides automagic, transparent syncronization of values between client and server.
-class ValueManager
+  ## ValueManager provides automagic, transparent syncronization of values between client and server.
+  class ValueManager
   
-  attr_accessor :randgen
+    attr_accessor :randgen
   
-  # Initializes the member value handler objects.
-  def initialize
+    # Initializes the member value handler objects.
+    def initialize
     
-    @config = ::RSence.config[:session_conf]
+      @config = ::RSence.config[:session_conf]
     
-    ## 'Unique' Random String generator for HValue keys (passed on to the client)
-    @randgen = RandGen.new( @config[:key_length] )
+      ## 'Unique' Random String generator for HValue keys (passed on to the client)
+      @randgen = RandGen.new( @config[:key_length] )
     
-  end
+    end
   
-  # Re-constructs all stored values and sends them to the client
-  def resend_session_values( msg )
+    # Re-constructs all stored values and sends them to the client
+    def resend_session_values( msg )
     
-    # with disposable keys enabled,
-    # sessions restored from cookie_key replace
-    # all val_id:s with new ones
-    if @config[:disposable_keys]
+      # with disposable keys enabled,
+      # sessions restored from cookie_key replace
+      # all val_id:s with new ones
+      if @config[:disposable_keys]
       
-      # get the session values
-      ses_values = msg.session[:values]
+        # get the session values
+        ses_values = msg.session[:values]
       
-      # loop through the value id:s
-      old_ids = ses_values[:by_id].keys
-      old_ids.each do |old_id|
+        # loop through the value id:s
+        old_ids = ses_values[:by_id].keys
+        old_ids.each do |old_id|
         
-        # make a new id
-        new_id = @randgen.gen
-        new_id = @randgen.gen while id_exists?( msg, new_id )
+          # make a new id
+          new_id = @randgen.gen
+          new_id = @randgen.gen while id_exists?( msg, new_id )
         
-        # get the hvalue
-        val_obj = ses_values[:by_id][old_id]
+          # get the hvalue
+          val_obj = ses_values[:by_id][old_id]
         
-        # replace the old id in the hvalue itself
-        val_obj.val_id = new_id
+          # replace the old id in the hvalue itself
+          val_obj.val_id = new_id
         
-        # re-associate the value with the new id
-        ses_values[:by_id][new_id] = val_obj
-        ses_values[:by_id].delete(old_id)
+          # re-associate the value with the new id
+          ses_values[:by_id][new_id] = val_obj
+          ses_values[:by_id].delete(old_id)
         
-        # replace the id in the unvalidated values (:check) array
-        if ses_values[:check].include?(old_id)
-          old_idx = ses_values[:check].index(old_id)
-          ses_values[:check][old_idx] = new_id
-        end
+          # replace the id in the unvalidated values (:check) array
+          if ses_values[:check].include?(old_id)
+            old_idx = ses_values[:check].index(old_id)
+            ses_values[:check][old_idx] = new_id
+          end
         
-        # replace the id in the unsynchronized values (:sync) array
-        if ses_values[:sync].include?(old_id)
-          old_idx = ses_values[:sync].index(old_id)
-          ses_values[:sync][old_idx] = new_id
-        end
+          # replace the id in the unsynchronized values (:sync) array
+          if ses_values[:sync].include?(old_id)
+            old_idx = ses_values[:sync].index(old_id)
+            ses_values[:sync][old_idx] = new_id
+          end
         
-        # tell the hvalue to send its client-side initialization
-        val_obj.restore( msg )
+          # tell the hvalue to send its client-side initialization
+          val_obj.restore( msg )
         
-      end
+        end
     
-    ## keeping the id:s between page reloads is faster, but less tamper-proof
-    else
-      msg.session[:values][:by_id].each_key do |val_id|
-        msg.session[:values][:by_id][val_id].restore( msg )
+      ## keeping the id:s between page reloads is faster, but less tamper-proof
+      else
+        msg.session[:values][:by_id].each_key do |val_id|
+          msg.session[:values][:by_id][val_id].restore( msg )
+        end
       end
-    end
     
-  end
+    end
   
-  # Verifies an 
-  def id_exists?( msg, new_id )
-    return msg.session[:values][:by_id].has_key?(new_id)
-  end
+    # Verifies an 
+    def id_exists?( msg, new_id )
+      return msg.session[:values][:by_id].has_key?(new_id)
+    end
   
-  # Parses the json from the client and passes it on to associated values
-  def xhr( msg, syncdata_str )
-    
-    # parses the json data sent by the client
-    syncdata = JSON.parse( syncdata_str )
-    
-    session_values = msg.session[:values][:by_id]
-    syncdata.each do |value_key, value_data|
-      if session_values.has_key?( value_key )
-        value_obj = session_values[ value_key ]
-        value_obj.from_client( msg, value_data )
-      else
-        raise "HValue; unassigned value id! (#{val_id.inspect})"
+    # Parses the json from the client and passes it on to associated values
+    def xhr( msg, syncdata_str )
+    
+      # parses the json data sent by the client
+      syncdata = JSON.parse( syncdata_str )
+    
+      session_values = msg.session[:values][:by_id]
+      syncdata.each do |value_key, value_data|
+        if session_values.has_key?( value_key )
+          value_obj = session_values[ value_key ]
+          value_obj.from_client( msg, value_data )
+        else
+          raise "HValue; unassigned value id! (#{val_id.inspect})"
+        end
       end
     end
-  end
   
-  # Sets a value by id
-  def set( msg, val_id, val_data )
+    # Sets a value by id
+    def set( msg, val_id, val_data )
     
-    # get the session data of this session
-    session_values = msg.session[:values][:by_id]
+      # get the session data of this session
+      session_values = msg.session[:values][:by_id]
     
-    # tell the value of that id that it has new data
-    val_obj = session_values[ val_id ]
-    val_obj.set( msg, val_data )
-  end
+      # tell the value of that id that it has new data
+      val_obj = session_values[ val_id ]
+      val_obj.set( msg, val_data )
+    end
   
-  # Validates the new data of all client-side-modified session-bound values
-  def validate( msg )
+    # Validates the new data of all client-side-modified session-bound values
+    def validate( msg )
     
-    # get the session data of this session
-    session_values = msg.session[:values]
+      # get the session data of this session
+      session_values = msg.session[:values]
     
-    # loop through un-validated values and validate them
-    check_ids = session_values[:check]
-    check_ids.each do |check_id|
-      session_values[:by_id][check_id].tell( msg )
-    end
+      # loop through un-validated values and validate them
+      check_ids = session_values[:check]
+      check_ids.each do |check_id|
+        session_values[:by_id][check_id].tell( msg )
+      end
     
-  end
+    end
   
-  # Sends the new data of all server-side-modified session-bound values to the client
-  def sync_client( msg )
+    # Sends the new data of all server-side-modified session-bound values to the client
+    def sync_client( msg )
     
-    # get the session data of this session
-    session_values = msg.session[:values]
+      # get the session data of this session
+      session_values = msg.session[:values]
     
-    # go through the currently un-synced values
-    session_values[:sync].size.times do |count_num|
+      # go through the currently un-synced values
+      session_values[:sync].size.times do |count_num|
       
-      # the sync-array will return the value id
-      val_id = session_values[:sync].shift
+        # the sync-array will return the value id
+        val_id = session_values[:sync].shift
       
-      # tell the value of that id to report its state to the client
-      session_values[:by_id][val_id].to_client( msg )
+        # tell the value of that id to report its state to the client
+        session_values[:by_id][val_id].to_client( msg )
       
-    end
+      end
     
-  end
+    end
   
-end
+  end
 
 
 end

data/plugins/index_html/index_html.rb

@@ -6,11 +6,7 @@
  #   with this software package. If not, contact licensing@riassence.com
  ##
 
-=begin
- IndexHtmlPlugin is the servlet plugin that is responsible for initializing the "boot-strap page".
- 
- It just loads, caches and sends the page for now.
-=end
+# IndexHtmlPlugin is the servlet plugin that is responsible for initializing the "boot-strap page".
 class IndexHtmlPlugin < Servlet
   
   def match( uri, method )
@@ -31,17 +27,11 @@ class IndexHtmlPlugin < Servlet
   end
   
   def open
-    #@deps = []
     @index_html_src = file_read( ::RSence.config[:index_html][:index_tmpl] )
-    # loading_gif = File.read( File.join( @path, 'img/loading.gif' ) )
-    # @loading_gif_id = @plugins[:ticketservices].serve_rsrc( loading_gif, 'image/gif' )
-    # riassence_gif = File.read( File.join( @path, 'img/riassence.gif' ) )
-    # @riassence_gif_id = $TICKETSERVE.serve_rsrc( riassence_gif, 'image/gif' )
     render_index_html
   end
   
   def close
-    # $TICKETSERVE.del_rsrc( @riassence_gif_id )
     @plugins[:ticket].del_rsrc( @loading_gif_id )
   end
   
@@ -50,8 +40,6 @@ class IndexHtmlPlugin < Servlet
     index_html = @index_html_src.clone
     
     index_html.gsub!('__DEFAULT_TITLE__',::RSence.config[:index_html][:title])
-    # @index_html.gsub!('__LOADING_GIF_ID__',@loading_gif_id)
-    # @index_html.gsub!('__RIASSENCE_GIF_ID__',@riassence_gif_id)
     client_rev = @plugins[:client_pkg].client_cache.client_rev
     index_html.gsub!('__CLIENT_REV__',client_rev)
     index_html.gsub!('__CLIENT_BASE__',File.join(::RSence.config[:broker_urls][:h],client_rev))
@@ -64,16 +52,6 @@ class IndexHtmlPlugin < Servlet
     end
     index_html.gsub!('__SCRIPT_DEPS__',deps_src)
     
-    # @index_gzip = GZString.new('')
-    # gzwriter = Zlib::GzipWriter.new( @index_gzip, Zlib::BEST_SPEED )
-    # gzwriter.write( @index_html )
-    # gzwriter.close
-    
-    # @content_size = @index_html.size
-    # @content_size_gzip = @index_gzip.size
-    
-    # @index_date = httime( Time.now )
-    
     return index_html
   end
   
@@ -97,29 +75,20 @@ class IndexHtmlPlugin < Servlet
       )
       buffer += msg.value_buffer
       msg.buffer.each do |buffer_item|
-        # if ::RSence.config[:]
-        # buffer.push( "qP(function(){#{buffer_item};console.log(#{buffer_item.to_json});});")
         buffer.push( "qP(function(){#{buffer_item};});")
       end
       ses_key = msg.ses_key
-      # buffer = [ msg.ses_key, msg.value_buffer, msg.buffer ]
     end
     buffer.unshift( "COMM.Session.newKey(#{ses_key.to_json});" )
     buffer.unshift( "COMM.Session.sha_key=#{sha_key.to_json};" )
     buffer.unshift( "COMM.Session.req_num=#{req_num};" )
-    # buffer.each {|b|puts b}
-    # require 'pp'; pp buffer
     index_html = render_index_html
     return index_html.gsub('__STARTUP_SEQUENCE__', buffer.join("\n") )
   end
   
   ## Outputs a static web page.
   def get( request, response, ses )
-    # puts "index_html"
-    # index_html = session_index_html( request, response )
     index_html = render_index_html
-    # index_html = index_html.encode(Encoding::BINARY)
-    
     support_gzip = (request.header.has_key?('accept-encoding') and \
                     request.header['accept-encoding'].include?('gzip')) \
                     and not ::RSence.config[:no_gzip]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 961916140
+  hash: 961916136
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - 6
+  - 7
   - pre
-  version: 2.0.0.6.pre
+  version: 2.0.0.7.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +03:00
+date: 2010-05-18 00:00:00 +03:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency