rsence 2.0.0.5.pre → 2.0.0.6.pre

data/lib/session/msg.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2006 Riassence Inc.
  #   http://riassence.com/
  #

data/lib/session/sessionmanager.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2006 Riassence Inc.
  #   http://riassence.com/
  #

data/lib/session/sessionstorage.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2006 Riassence Inc.
  #   http://riassence.com/
  #
@@ -83,7 +83,7 @@ class SessionStorage
     rescue => e
       if RSence.args[:debug]
         err_msg = [
-          "ERROR: SssionStorage couldn't open database",
+          "ERROR: SessionStorage couldn't open database",
           "#{e.class.to_s}, #{e.message}",
           "Backtrace:",
           "\t"+e.backtrace.join("\n\t")

data/lib/transporter/transporter.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #
@@ -61,7 +61,6 @@ class Transporter
   end
   
   def servlet( request_type, request, response )
-    
     broker_urls = ::RSence.config[:broker_urls]
     uri = request.fullpath
     

data/lib/values/hvalue.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2006 Riassence Inc.
  #   http://riassence.com/
  #
@@ -47,10 +47,14 @@ class HValue
   
   # +HValue+ constructor. Binds HValue automatically to the +Message+ instance
   # given as parameter. Data given as second parameter. 
-  def initialize( msg, data )
+  def initialize( msg, data, meta = { :name => nil } )
     
     ## Get an unique integer id for the value
-    @val_id   = msg.valuemanager.randgen.gen
+    if RSence.args[:debug] and meta[:name] and not msg.valuemanager.id_exists?( msg, meta[:name] )
+      @val_id   = meta[:name]
+    else
+      @val_id   = msg.valuemanager.randgen.gen
+    end
     
     ## set the data of the hvalue
     set( msg, data, true )

data/lib/values/valuemanager.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2006 Riassence Inc.
  #   http://riassence.com/
  #
@@ -47,6 +47,7 @@ class ValueManager
         
         # 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]
@@ -84,6 +85,11 @@ class ValueManager
     
   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 )
     

data/plugins/client_pkg/client_pkg.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2007 Riassence Inc.
  #   http://riassence.com/
  #
@@ -6,56 +6,24 @@
  #   with this software package. If not, contact licensing@riassence.com
  ##
 
-# puts "Module.nesting: #{Module.nesting.inspect}"
-# puts "Options: #{Options.inspect}"
-# def method_missing( *foo )
-#   puts "variable missing: #{foo.inspect}"
-# end
-# BUNDLE_PATH = self.bundle_path
-# puts "singleton_methods: #{singleton_methods.inspect}"
+# the library path of this plugin
+lib_path = File.join( bundle_path, 'lib' )
 
+# The ClientPkgCache class:
+require File.join( lib_path, 'client_pkg_cache' )
+
+# The ClientPkgServe module:
+require File.join( lib_path, 'client_pkg_serve' )
+
+# The ClientPkgBuild class:
+require File.join( lib_path, 'client_pkg_build' )
+
+
+## The ClientPkg plugin builds and serves the client packages.
 class ClientPkg < Servlet
   
-  # def accessor( *args )
-  #   puts "accessor args: #{args.inspect}"
-  # end
-  
-  # puts "----"
-  # puts bundle_path
-  # 
-  # puts self.methods.inspect
-  # 
-  # def class_variable_get( *foo )
-  #   puts "*"
-  #   puts foo.inspect
-  # end
-  # puts "="
-  # 
-  # def self.method_missing( method_name, *args, &block )
-  #   if method_name == :bundle_path
-  #     return Module.nesting[1].bundle_path
-  #   elsif method_name == :bundle_name
-  #     return Module.nesting[1].bundle_name
-  #   elsif method_name == :bundle_info
-  #     return Module.nesting[1].bundle_info
-  #   elsif method_name == :plugin_manager
-  #     return Module.nesting[1].plugin_manager
-  #   end
-  # end
-  
-  # the library path of this plugin
-  lib_path = File.join( @@bundle_path, 'lib' )
-  
-  # The ClientPkgCache class:
-  require File.join(lib_path,'client_pkg_cache')
-  
-  # The ClientPkgServe module:
-  require File.join(lib_path,'client_pkg_serve')
   include ClientPkgServe
   
-  # The ClientPkgBuild class:
-  require File.join(lib_path,'client_pkg_build')
-  
   class BuildLogger
     def initialize( log_path )
       @last_time = Time.now
@@ -155,7 +123,7 @@ class ClientPkg < Servlet
   
   def close
     if @thr
-      @thr.kill!
+      @thr.kill
       @thr = false
     end
     @client_build.flush
@@ -185,5 +153,4 @@ class ClientPkg < Servlet
   
 end
 
-ClientPkg.new
 

data/plugins/client_pkg/info.yaml

@@ -18,7 +18,7 @@ reloadable: false
 
 # A flag (when false) enables automatic construction
 # of the Plugin and Servlet classes contained.
-inits_self: true
+inits_self: false
 
 # System version requirement.
 sys_version: '>= 2.0.0'

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2009 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/client_pkg/lib/client_pkg_cache.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2007 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/index_html/index_html.rb

@@ -1,4 +1,4 @@
-  ##   Riassence Framework
+##   RSence
  #   Copyright 2009 Riassence Inc.
  #   http://riassence.com/
  #
@@ -11,7 +11,7 @@
  
  It just loads, caches and sends the page for now.
 =end
-class IndexHtmlPlugin < ServletPlugin
+class IndexHtmlPlugin < Servlet
   
   def match( uri, method )
     if uri == ::RSence.config[:index_html][:respond_address] and method == :get
@@ -42,7 +42,7 @@ class IndexHtmlPlugin < ServletPlugin
   
   def close
     # $TICKETSERVE.del_rsrc( @riassence_gif_id )
-    @plugins[:ticketservices].del_rsrc( @loading_gif_id )
+    @plugins[:ticket].del_rsrc( @loading_gif_id )
   end
   
   def render_index_html
@@ -118,6 +118,7 @@ class IndexHtmlPlugin < ServletPlugin
     # 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')) \
@@ -127,7 +128,7 @@ class IndexHtmlPlugin < ServletPlugin
     
     response['Content-Type'] = 'text/html; charset=UTF-8'
     response['Date'] = httime( Time.now )
-    response['Server'] = 'Riassence Framework'
+    response['Server'] = 'RSence'
     response['Cache-Control'] = 'no-cache'
     
     if support_gzip
@@ -146,5 +147,3 @@ class IndexHtmlPlugin < ServletPlugin
   
 end
 
-index_html = IndexHtmlPlugin.new
-

data/plugins/index_html/info.yaml

@@ -0,0 +1,21 @@
+
+# The human-readable product name of the package
+title: Index HTML Page
+
+# The human-readable version of the package
+version: 2.0.0
+
+# A brief description of the package (rdoc formatting supported)
+description: |
+  This plugin serves the initial html page.
+
+# A flag (when false) prevents the plugin from automatically reload when changed.
+reloadable: true
+
+# A flag (when false) enables automatic construction
+# of the Plugin and Servlet classes contained.
+inits_self: false
+
+# System version requirement.
+sys_version: '>= 2.0.0'
+

data/plugins/index_html/tmpl/index.html

@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" version="-//W3C//DTD XHTML 1.1//EN" xml:lang="en">
 <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- This page is served to you by Riassence Framework - http://riassence.com/ -->
+<!-- This page is served to you by RSence - http://rsence.org/ -->
 <title>__DEFAULT_TITLE__</title>
 <style type="text/css">body{margin:0;padding:0;background-color:#ddd;font-family:Arial,sans-serif;}</style>
 __SCRIPT_DEPS__

data/plugins/index_html/tmpl/startup_index.html

@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" version="-//W3C//DTD XHTML 1.1//EN" xml:lang="en">
 <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<!-- This page is served to you by Riassence Framework - http://riassence.com/ -->
+<!-- This page is served to you by RSence - http://riassence.com/ -->
 <title>__DEFAULT_TITLE__</title>
 <style type="text/css">body{margin:0;padding:0;background-color:#ddd;font-family:Arial,sans-serif;}</style>
 __SCRIPT_DEPS__

data/plugins/main/info.yaml

@@ -0,0 +1,21 @@
+
+# The human-readable product name of the package
+title: Main Plugin
+
+# The human-readable version of the package
+version: 2.0.0
+
+# A brief description of the package (rdoc formatting supported)
+description: |
+  This manages communication between client and server.
+
+# A flag (when false) prevents the plugin from automatically reload when changed.
+reloadable: true
+
+# A flag (when false) enables automatic construction
+# of the Plugin and Servlet classes contained.
+inits_self: false
+
+# System version requirement.
+sys_version: '>= 2.0.0'
+

data/plugins/main/main.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #
@@ -227,8 +227,4 @@ class Main < Plugin
   
 end
 
-## Initialize and register the plugin.
-main = Main.new.register( :main )
-
-
 

data/plugins/{ticketservices → ticket}/lib/common.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #
@@ -11,6 +11,96 @@
 module TicketService
 module Common
   
+  def initialize
+    # storage for tickets to be expired by expiry time
+    # as the key and an array of ids in array as the value
+    @expires = {}
+    @expire_files = {}
+    @expire_blobobj = {}
+    
+    # storage for disposable images
+    @imgs = {
+      
+      # id is used as the uri
+      :by_id   => {},
+      
+      # list of image ids by session id
+      :ses_ids => {}
+    }
+    
+    # storage for other disposable data
+    @files = {
+      
+      # id is used as the uri
+      :by_id   => {},
+      
+      # list of image ids by session id
+      :ses_ids => {}
+    }
+    
+    # an randgen instance used for generating ids (84B long)
+    @randgen = RandGen.new( 84 )
+    
+    # supported image content types
+    @content_types = {
+      'GIF' => 'image/gif',
+      'PNG' => 'image/png',
+      'JPG' => 'image/jpeg'
+    }
+    
+    # static data, initially for invalid/not found error-gif
+    # also all serve_rsrc items
+    @raw_uris = {
+      'invalid.gif' => ['image/gif','53',['749464839316700090000800000000004e7ebe129f400000000000c200000000700090000020c0c8f70a9c810e0229ea2da1a000b3'].pack('h*')],
+      'favicon.ico' => ['image/gif','371',['749464839316010001005d00005e5e3dd1d1a1ca7dbf983cfeb9dc5ff8f848db1effbd1fff27279609a600cacae9e0e0d0dcaeff8e8fff030303010101848424afffff0000007be7008c8c9bffffff878b9e0eba712fcfffb2b282e9c6000d5900020202bd3a70ababbaf8f834f9f9f9f8f8f887fafafafa49060606fefefe0707700707074e3bc2939353ce6cd50404007d7d6cfafafa8edb34dcfcfc0f0d97fbfbfb000000000000000000000000000000000000000000000000000000000000000000000000000000000000129f401000000000c20000000001000100006009040801058c8420e91a258ca41744380506934656846910140e04051092ca650688d282bc2072bb5303e0728c2330d6fbb15a78249291bbf0d0811102353410124677285190b2e524e110e0f208b890a13176a480b0725211c889b16227a44101f0027931b1d171a745a010b2caea82f15845c9627182e2a2e050f5007af0f1a203329bf52be032d2213ca4501021501400b3'].pack('h*')]
+    }
+    
+    @upload_slots = {
+      # upload slots
+      :by_id => {
+        # random key      mime    max_size session_id 
+        # 'test123'  => [ '*/*',  15000,   12         ]
+      },
+      # processed uploads
+      :uploaded => {
+        # same key as :by_id  rsence_uploads:id
+        # 'test123'  =>       [37483,37546,38759]
+      },
+      # upload ids by session id
+      :ses_ids => {
+        # 12 => ['test123']
+      }
+    }
+    
+    @blob_objs = {
+      :by_id   => {},
+      :ses_ids => {}
+    }
+    
+    begin
+      db_uri = ::RSence.config[:database][:ses_db]
+      if db_uri.start_with?('sqlite://')
+        @db = Sequel.sqlite( db_uri.split('sqlite://')[1] )
+      else
+        @db = Sequel.connect( db_uri )
+      end
+    rescue => e
+      if RSence.args[:debug]
+        err_msg = [
+          "ERROR: TicketServices couldn't open database",
+          "#{e.class.to_s}, #{e.message}",
+          "Backtrace:",
+          "\t"+e.backtrace.join("\n\t")
+        ].join("\n")+"\n"
+        $stderr.write( err_msg )
+      elsif RSence.args[:verbose]
+        puts "Failed to open database '#{@db_uri}'."
+        puts "Run RSence in debug mode for full error output."
+      end
+      @upload_id = 0
+      @db = false
+    end
+  end
 
   attr_accessor :raw_uris # :nodoc:
   attr_accessor :imgs # :nodoc:
@@ -23,7 +113,7 @@ module Common
   
   # Disconnects connection to the database.
   def shutdown # :nodoc:
-    @db.disconnect
+    @db.disconnect if @db
   end
   
   # Serves files and images by returning an URI. Content is given as second