rsence 2.1.11 → 2.2.0

data/js/menus/{minimenu/minimenuitem → minimenuitem}/themes/default/minimenuitem.css

@@ -3,7 +3,7 @@
 .minimenuitem_label,
 .minimenuitem_state {
   position: absolute;
-  top: 0px; height: 15px;
+  top: 0px; height: 16px;
 }
 
 .minimenuitem_control {
@@ -27,7 +27,7 @@
 
 .minimenuitem_label {
   left: 14px; right: 11px; top: 0px;
-  height: 15px; line-height: 15px;
+  height: 15px; line-height: 14px;
   text-align: left;
   text-overflow: ellipsis;
   overflow: hidden;

data/js/menus/popupmenu/popupmenu.js

@@ -0,0 +1,14 @@
+var
+HPopupMenu = HMiniMenu.extend({
+  componentName: 'popupmenu',
+  subComponentHeight: 24,
+  createComponent: function( i, _label ){
+    return HMenuItem.nu(
+      [ 0, (i*24), null, 24, 0, null ],
+      this.menuItemView, {
+        label: _label
+      }
+    );
+  }
+});
+var HPopUpMenu = HPopupMenu;

data/js/menus/popupmenu/themes/default/popupmenu.css

@@ -0,0 +1,65 @@
+
+.popupmenu_control,
+.popupmenu_edge_left,
+.popupmenu_center,
+.popupmenu_edge_right,
+.popupmenu_label,
+.popupmenu_antiselect {
+  position: absolute;
+  top: 0px; height: 23px;
+}
+
+.popupmenu_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.disabled .popupmenu_control {
+  cursor: default;
+}
+
+.popupmenu_edge_left,
+.popupmenu_center,
+.popupmenu_edge_right {
+  background-image: #{this.getCssFilePath('popupmenu.png')};
+}
+
+.popupmenu_edge_left {
+  left: 0px; width: 9px;
+  background-position: 0px 0px;
+  background-repeat: no-repeat;
+}
+
+.popupmenu_edge_right {
+  right: 0px; width: 17px;
+  background-position: -9px 0px;
+  background-repeat: no-repeat;
+}
+
+.popupmenu_center {
+  left: 9px; right: 17px;
+  background-position: 0px -23px;
+  background-repeat: repeat-x;
+}
+
+.popupmenu_label {
+  left: 13px; right: 11px; top: 0px;
+  height: 22px; line-height: #{(BROWSER_TYPE.ie7||BROWSER_TYPE.ie6)?'20':'22'}px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 12px;
+  color: #333;
+}
+.popupmenu_control:hover > .popupmenu_label {
+  color: #000;
+}
+.disabled .popupmenu_control {
+  opacity: 0.6;
+}
+
+.popupmenu_antiselect {
+  left: 0px; right: 0px;
+}

data/js/menus/popupmenu/themes/default/popupmenu.html

@@ -0,0 +1,7 @@
+<div class="popupmenu_control" id="control#{_ID}">
+  <div class="popupmenu_edge_left"></div>
+  <div class="popupmenu_center"></div>
+  <div class="popupmenu_edge_right"></div>
+  <div class="popupmenu_label" id="label#{_ID}">#{this.label}</div>
+  <div class="popupmenu_antiselect"></div>
+</div>

data/js/no_pkg/no_pkg.js

@@ -0,0 +1,2 @@
+
+// Empty file for empty packages

data/js/util/reloadapp/reloadapp.js

@@ -101,7 +101,7 @@ ReloadApp = HApplication.extend({
         ELEM.setCSS(_alertIcon,'position:absolute;left:8px;top:8px;width:48px;height:48px;background-image:url('+_iconUrl+');');
         ELEM.setCSS(_alertTitle,'position:absolute;left:64px;top:8px;width:300px;height:24px;line-height:24px;vertical-align:middle;text-align:center;font-weight:bold;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;');
         ELEM.setHTML(_alertTitle,_this.app._title);
-        ELEM.setCSS(_alertMessage,'position:absolute;left:64px;top:42px;width:332px;height:186px;border-bottom:1px dotted #999;line-height:17px;vertical-align:middle;overflow:auto;');
+        ELEM.setCSS(_alertMessage,'position:absolute;left:64px;top:42px;width:332px;height:186px;border-bottom:1px dotted #999;line-height:18px;vertical-align:middle;overflow:auto;');
         ELEM.setHTML(_alertMessage,_this.app._message);
         HButton.extend({
           click: this.app.reload

data/js/views/scrollview/scrollview.js

@@ -17,6 +17,12 @@ HScrollView = HControl.extend({
     scrollY: true
   }),
   drawSubviews: function(){
+    if(this.options.scrollX === 'auto' || this.options.scrollY === 'auto'){
+      this.setStyle('overflow','auto');
+    }
+    else if(this.options.scrollX || this.options.scrollY){
+      this.setStyle('overflow','scroll');
+    }
     if(!this.options.scrollX){
       this.setStyle('overflow-x','hidden');
     }

data/lib/rsence.rb

@@ -25,8 +25,141 @@
 # 
 # Most other classes are inner workings of RSence itself and are subject to change without further notice.
 module RSence
-end
+  
+  # @private  Returns true, if platform fully supports POSIX standard signals.
+  def self.pid_support?
+    # true for non-windows
+    return (not ['i386-mingw32','x86-mingw32'].include?(RUBY_PLATFORM))
+  end
+  
+  # @private  Returns true, if platform is linux
+  def self.linux?
+    return RUBY_PLATFORM.end_with?('-linux')
+  end
+  
+  # @private  Returns true, if platform is Mac OS X
+  def self.darwin?
+    return RUBY_PLATFORM.include?('-darwin')
+  end
+  
+  # @private  Returns signal name that resembles INFO or PWR (extra signal to poll for server status)
+  def self.info_signal_name
+    if self.linux?
+      return 'PWR'
+    else
+      return 'INFO'
+    end
+  end
+  
+  # @private  This accessor enables RSence.argv method, which returns the ARGVParser instance
+  def self.argv;    @@argv_parser;    end
+  
+  # @private  This accessor enables RSence.cmd method, which returns the command the process was started with.
+  def self.cmd;     @@argv_parser.cmd;     end
+  
+  # Command line options parsed
+  # @return [Hash] Parsed command-line options:
+  # *Key* (Symbol):: *Value*
+  # +:env_path+:: (String) The directory of the environment.
+  # +:conf_files+:: (Array of Strings) Additional configuration files given with the +--conf+ command-line option. Default is +[]+.
+  # +:debug+:: (true or false) True, if the +-d+ or +--debug+ command-line option was given. Default is false.
+  # +:verbose+:: (true or false) True, if the +-v+ or +--verbose+ command-line option was given. Default is false.
+  # +:log_fg+:: (true or false) True, if the +-f+ or +--log-fg+ command-line option was given. Default is false.
+  # +:trace_js+:: (true or false) True, if the +--trace-js+ command-line option was given. Default is false.
+  # +:trace_delegate+:: (true or false) True, if the +--trace-delegate+ command-line option was given. Default is false.
+  # +:port+:: (String or nil) The TCP port number given with the +--port+ command-line option. Default is nil.
+  # +:addr+:: (String or nil) The TCP bind address given with the +--addr+ command-line option. Default is nil.
+  # +:server+:: (String or nil) The Rack http server handler given with the +--server+ command-line option. Default is nil.
+  # +:reset_ses+:: (true or false) True, if the +-r+ or +--reset-sessions+ command-line option was given. Default is false.
+  # +:autoupdate+:: (true or false) True, if the +-a+ or +--auto-update+ command-line option was given. Default is false.
+  # +:latency+:: (Number) Amount of milliseconds to sleep in each request given with the +--latency+ command-line option. Default is 0.
+  # +:say+:: (true or false) True, if the +-S+ or +--say+ command-line option was given. Default is false.
+  def self.args; @@argv_parser.args; end
+
+  def self.env_path; @@argv_parser.args[:env_path]; end
+  
+  # @private  This accessor enables RSence.startable? method, which returns true if a start-type command was given.
+  def self.startable?; @@argv_parser.startable?; end
+  
+  # @return [String] The version of RSence
+  def self.version; @@argv_parser.version; end
+  
+  # @private  This accessor enables RSence.startup method, which starts RSence.
+  def self.startup
+    puts "Loading configuration..." if self.args[:verbose]
+    # Use the default configuration:
+    require 'rsence/default_config'
+    @@config = Configuration.new(self.args).config
+    
+    # RSence runtime configuration data
+    # @return [Hash] the active configuration structure as defined by the {file:default_conf default configuration} and overridden by local configuration files.
+    def self.config
+      @@config
+    end
+    
+    def self.transporter
+      @@transporter
+    end
+    def self.transporter=(transporter)
+      if class_variable_defined?(:'@@transporter')
+        warn "WARN: Transporter already set."
+        return
+      else
+        @@transporter = transporter
+      end
+    end
+    
+    def self.plugin_manager
+      @@plugin_manager
+    end
+    def self.plugin_manager=(plugin_manager)
+      if class_variable_defined?(:'@@plugin_manager')
+        warn "WARN: @@plugin_manager already set."
+        return
+      else
+        @@plugin_manager = plugin_manager
+      end
+    end
+    
+    def self.value_manager
+      @@value_manager
+    end
+    def self.value_manager=(value_manager)
+      if class_variable_defined?(:'@@value_manager')
+        warn "WARN: @@value_manager already set."
+        return
+      else
+        @@value_manager = value_manager
+      end
+    end
+    
+    def self.session_manager
+      @@session_manager
+    end
+    def self.session_manager=(session_manager)
+      if class_variable_defined?(:'@@session_manager')
+        warn "WARN: @@session_manager already set."
+        return
+      else
+        @@session_manager = session_manager
+      end
+    end
+    
+    ## Riassence Daemon controls
+    require 'rsence/daemon'
+    puts "Starting RSence..." if self.args[:verbose]
+    daemon = HTTPDaemon.new
+    daemon.daemonize!
+  end
+
+  
+  # Includes the Signal Communication utility.
+  # Used to respond via special PID files in the run directory of the environment
+  require 'rsence/sigcomm'
 
-# Requires the ARGVParser that functions as the command-line user interface.
-require 'conf/argv'
+
+  # Requires the ARGVParser that functions as the command-line user interface.
+  require 'rsence/argv'
+  
+end
 

data/lib/rsence/argv.rb

@@ -0,0 +1,218 @@
+##   RSence
+ #   Copyright 2010 Riassence Inc.
+ #   http://riassence.com/
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #   with this software package. If not, contact licensing@riassence.com
+ ##
+
+
+module RSence
+
+  require 'erb'
+  require 'yaml'
+
+  # @private  ARGVParser is the "user interface" as a command-line argument parser.
+  #           It parses the command-line arguments and sets up things accordingly.
+  class ARGVParser
+
+    # Returns true if one of the 'start' -type commands were supplied
+    # and the environment seems valid.
+    def startable?; @startable; end
+    
+    # Parses an argument of the 'help' command
+    def parse_help_argv
+      if @argv.length >= 2
+        help_cmd = @argv[1].to_sym
+      else
+        help_cmd = :help_main
+      end
+      help( help_cmd )
+      exit
+    end
+    
+    # Creates the default and initial @args hash.
+    def init_args
+      @args = {
+        :env_path       => Dir.pwd,
+        :conf_files     => [ ], # --conf
+        :debug          => false, # -d --debug
+        :verbose        => false, # -v --verbose
+        :log_fg         => false, # -f --log-fg
+        :trace_js       => false, # --trace-js
+        :trace_delegate => false, # --trace-delegate
+        :port           => nil,   # --port
+        :addr           => nil,   # --addr --bind
+        :server         => nil,   # --server
+        :reset_ses      => false, # -r --reset-sessions
+        :autoupdate     => false, # -a --auto-update
+        :latency        => 0,     # --latency
+        :say            => false, # -S --say
+        :http_delayed_start => nil, # --http-delayed-start
+      
+        # client_pkg (not supported yet)
+        :client_pkg_no_gzip               => false, # --disable-gzip
+        :client_pkg_no_obfuscation        => false, # --disable-obfuscation
+        :client_pkg_no_whitespace_removal => false, # --disable-jsmin
+        :suppress_build_messages          => true,  # --build-report
+      
+      }
+    end
+    
+    # Sets various debug-related options on.
+    def set_debug
+      @args[:debug]      = true
+      @args[:verbose]    = true
+      @args[:autoupdate] = true
+      @args[:client_pkg_no_obfuscation] = true
+      @args[:client_pkg_no_whitespace_removal] = true
+      @args[:suppress_build_messages] = false
+    end
+    
+    # Set the verbose argument on
+    def set_verbose
+      @args[:verbose]    = true
+    end
+    
+    # Set the foreground logging argument on
+    def set_log_fg
+      @args[:log_fg]     = true
+    end
+    
+    # Sets the session reset argument on
+    def set_reset_ses
+      @args[:reset_ses]  = true
+    end
+    
+    # Sets the auto-update argument on
+    def set_autoupdate
+      @args[:autoupdate] = true
+    end
+    
+    # Sets the speech synthesis argument on
+    def set_say
+      @args[:say] = true
+    end
+    
+    # Error message when an invalid environment is encountered, exits.
+    def invalid_env( env_path=false )
+      env_path = @args[:env_path] unless env_path
+      puts ERB.new( @strs[:messages][:invalid_environment] ).result( binding )
+      exit
+    end
+    
+    # Error message when an invalid option is encountered, exits.
+    def invalid_option(arg,chr=false)
+      if chr
+        puts ERB.new( @strs[:messages][:invalid_option_chr] ).result( binding )
+      else
+        puts ERB.new( @strs[:messages][:invalid_option] ).result( binding )
+      end
+      exit
+    end
+    
+    require 'rsence/argv/startup_argv'
+    require 'rsence/argv/status_argv'
+    require 'rsence/argv/save_argv'
+    require 'rsence/argv/initenv_argv'
+    require 'rsence/argv/help_argv'
+    require 'rsence/argv/env_check'
+    require 'rsence/argv/test_port'
+    include ArgvUtil
+    
+    # Returns the version of RSence
+    def version; @version; end
+    
+    # Returns the command the process was started with.
+    def cmd; @cmd; end
+    
+    # Returns the parsed optional arguments
+    def args; @args; end
+    
+    # Top-level argument parser, checks for command and calls sub-parser, if valid command.
+    def parse_argv
+      if @argv.empty?
+        puts @strs[:help][:help_help]
+        exit
+      else
+        cmd = @argv[0].to_sym
+        cmd = :help if [:h, :'-h', :'--help', :'-help'].include? cmd
+      end
+      if @cmds.include?(cmd)
+        @cmd = cmd
+        unless [:help, :version].include?( cmd )
+          puts "RSence #{@version} -- Ruby #{RUBY_VERSION}"
+        end
+        if cmd == :help
+          parse_help_argv
+        elsif cmd == :version
+          puts version
+          exit
+        elsif [:run,:start,:stop,:restart].include? cmd
+          parse_startup_argv
+        elsif cmd == :status
+          parse_status_argv
+        elsif cmd == :save
+          parse_save_argv
+        elsif cmd == :initenv or cmd == :init
+          parse_initenv_argv
+        end
+      else
+        puts @strs[:help][:unknown] + cmd.to_s.inspect
+        puts @strs[:help][:help_help]
+        exit
+      end
+    end
+    
+    # The constructor sets the @startable flag as false. Use the #parse method with ARGV as the argument to start parsing the ARGV.
+    def initialize
+      @startable = false
+
+      # The RSence version string, read from the VERSION file in
+      # the root directory of RSence.
+      @version = File.read( File.join( SERVER_PATH, 'VERSION' ) ).strip
+      
+      # Makes various commands available depending on the platform.
+      # The status/start/stop/restart/save -commands depend on an operating
+      # system that fully implements POSIX standard signals.
+      # These are necessary to send signals to the background process.
+      if not RSence.pid_support?
+        @cmds = [ :run, :init, :initenv, :version, :help ]
+      else
+        @cmds = [ :run, :status, :start, :stop, :restart, :save,
+                  :init, :initenv, :version, :help ]
+      end
+      
+      help_avail_cmds = @cmds.map{|cmd|cmd.to_s}.join("\n       ")
+      
+      # Load the strings from the strings file.
+      strs_path = File.join( SERVER_PATH, 'conf', 
+                             'rsence_command_strings.yaml' )
+      strs_data = File.read( strs_path )
+      
+      strs_data = ERB.new( strs_data ).result( binding )
+      
+      @strs = YAML.load( strs_data )
+      
+      @strs[:help][:run] += @strs[:help][:path]+@strs[:help][:options]
+      @strs[:help][:start] += @strs[:help][:path]+@strs[:help][:options]
+      @strs[:help][:stop] += @strs[:help][:path]+@strs[:help][:options]
+      @strs[:help][:restart] += @strs[:help][:path]+@strs[:help][:options]
+      @strs[:help][:status] += @strs[:help][:path]
+      @strs[:help][:save] += @strs[:help][:path]
+    end
+
+    # Entry point for ARGV parsing
+    def parse( argv )
+      @argv = argv
+      parse_argv
+    end
+  
+  end
+  
+  # @private  The ARGVParser instance and its startup
+  @@argv_parser = ARGVParser.new
+  @@argv_parser.parse( ARGV )
+
+end
+