rsence-pre 2.3.0.11 → 2.3.0.12

data/VERSION

@@ -1 +1 @@
-2.3.0.11.pre
+2.3.0.12.pre

data/js/core/class/class.js

@@ -85,9 +85,18 @@ HClass.prototype = {
           var _previous = this.base;
           // copies previous this.base from the direction from HClass
           this.base = _ancestor;
-          // current class's method is called
-          // now inside the function when called this.base points to parent method
-          _returnValue = _method.apply(this, arguments);
+
+          // The current class's method is called with an exception handler to
+          // ignore the common mistake of calling super, while being in the class
+          // declaring the method; has no super.
+          try{
+            // now inside the function when called this.base points to parent method
+            _returnValue = _method.apply(this, arguments);
+          }
+          catch(e){
+            !this.isProduction && console.warn("An exception occurred while calling base: ",e);
+            _returnValue = null;
+          }
           // then because event this function can be called from child method
           // resets the base to as is was before calling this function
           this.base = _previous;
@@ -102,7 +111,8 @@ HClass.prototype = {
       }
       return this[_source] = _value;
     // this is called when called by HClass.extend
-    } else if (_source) {
+    }
+    else if (_source) {
       _prototype = {toSource: null};
       _protected = ["toString", "valueOf"];
       // we want default constructor function

data/js/foundation/view/view.js

@@ -738,7 +738,16 @@ HView = HClass.extend({
       if(this.options.html){
         this.setHTML(this.options.html);
       }
-      this.drawSubviews();
+      // Extended draw for components to define/extend.
+      // This is preferred over drawSubviews, when defining
+      // parts of a complex component.
+      if(typeof this.extDraw === 'function'){
+        this.extDraw();
+      }
+      // Extended draw for the purpose of drawing subviews.
+      if(typeof this.drawSubviews === 'function'){
+        this.drawSubviews();
+      }
       // if options contain a subviews function, call it with the namespace of self
       if(this.options.subviews && typeof this.options.subviews == 'function'){
         this.options.subviews.call( this );

data/lib/rsence/argv/initenv_argv.rb

@@ -159,7 +159,7 @@ module ArgvUtil
         config[:http_server][:port] = ask(str_http_port) do |q|
           q.default = config[:http_server][:port].to_s
         end
-      
+
         say @strs[:initenv][:enter_tcp_ip]
         str_tcp_ip = @strs[:initenv][:tcp_ip]
         config[:http_server][:bind_address] = ask(str_tcp_ip) do |q|
@@ -171,6 +171,13 @@ module ArgvUtil
         config[:base_url] = ask(str_root_dir) do |q|
           q.default = config[:base_url]
         end
+
+        # possible workaround for highline on some systems:
+        config[:index_html][:title] = config[:index_html][:title].to_s
+        config[:database][:ses_db] = config[:database][:ses_db].to_s
+        config[:http_server][:port] = config[:http_server][:port].to_s.to_i
+        config[:http_server][:bind_address] = config[:http_server][:bind_address].to_s
+        config[:base_url] = config[:base_url].to_s
       
         test_url = "http://#{config[:http_server][:bind_address]}:#{config[:http_server][:port]}#{config[:base_url]}"
         say ERB.new( @strs[:initenv][:config_summary] ).result( binding )
@@ -210,7 +217,11 @@ module ArgvUtil
     readme_file = File.join( env_dir, 'README' )
     File.open( readme_file, 'w' ) {|f| f.write( ERB.new( @strs[:initenv][:readme] ).result( binding ) ) }
     version_file = File.join( env_dir, 'VERSION' )
-    File.open( version_file, 'w' ) {|f| f.write( "RSence Environment Version #{version.to_f}" ) }
+    File.open( version_file, 'w' ) {|f| f.write( "RSence Environment Version #{version.to_f}\n" ) }
+    [ db_dir, log_dir, run_dir ].each do |ign_prefix|
+      gitignore_file = File.join( ign_prefix, '.gitignore' )
+      File.open( gitignore_file, 'w' ) {|f| f.write("*\n") }
+    end
     puts ERB.new( @strs[:initenv][:congratulations] ).result( binding )
     exit
   end

data/lib/rsence/plugins/gui_plugin.rb

@@ -85,21 +85,106 @@ module RSence
           warn "install_client_pkgs: called with @client_pkgs defined (#{@client_pkgs.inspect}); returning" if RSence.args[:debug]
           return
         end
-        @client_pkgs = yaml_read( 'client_pkgs.yaml' )
-        if @client_pkgs
-          if @client_pkgs.has_key?(:src_dirs)
-            @client_pkgs[:src_dirs].each do |src_dir|
-              src_dir = bundle_path( src_dir[2..-1] ) if src_dir.start_with?('./')
+        client_pkgs = yaml_read( 'client_pkgs.yaml' )
+        if client_pkgs
+
+          sleep 0.1 until client_pkg.ready?
+          
+          if client_pkgs.has_key?('src_dir')
+            src_dirs = [ client_pkgs['src_dir'] ]
+          elsif client_pkgs.has_key?('src_dirs')
+            src_dirs = client_pkgs['src_dirs']
+          elsif client_pkgs.has_key?(:src_dirs)
+            src_dirs = client_pkgs[:src_dirs]
+          else
+            src_dirs = false
+          end
+
+          @client_pkgs = {}
+          if src_dirs
+            src_dirs.each do |src_dir|
+              if src_dir.start_with?('./')
+                src_dir = bundle_path( src_dir[2..-1] )
+              end
               client_pkg.add_src_dir( src_dir )
             end
+            @client_pkgs[:src_dirs] = src_dirs
           end
-          sleep 0.1 until client_pkg.ready?
-          client_pkg.add_packages(       @client_pkgs[:packages      ] ) if @client_pkgs.has_key?(:packages      )
-          client_pkg.add_compounds(      @client_pkgs[:compound_packages] ) if @client_pkgs.has_key?(:compound_packages)
-          client_pkg.add_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
-          client_pkg.add_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
-          client_pkg.add_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
+          
+          if client_pkgs.has_key?('packages')
+            packages = client_pkgs['packages']
+          elsif client_pkgs.has_key?(:packages)
+            packages = client_pkgs[:packages]
+          else
+            packages = false
+          end
+
+          if packages
+            client_pkg.add_packages( packages )
+            @client_pkgs[:packages] = packages
+          end
+
+          
+          if client_pkgs.has_key?('compounds')
+            compounds = client_pkgs['compounds']
+          elsif client_pkgs.has_key?('compound_packages')
+            compounds = client_pkgs['compound_packages']
+          elsif client_pkgs.has_key?(:compound_packages)
+            compounds = client_pkgs[:compound_packages]
+          else
+            compounds = false
+          end
+
+          if compounds
+            client_pkg.add_compounds( compounds )
+            @client_pkgs[:compound_packages] = compounds
+          end
+
+          
+          if client_pkgs.has_key?('themes')
+            theme_names = client_pkgs['themes']
+          elsif client_pkgs.has_key?('theme_names')
+            theme_names = client_pkgs['theme_names']
+          elsif client_pkgs.has_key?(:theme_names)
+            theme_names = client_pkgs[:theme_names]
+          else
+            theme_names = false
+          end
+
+          if theme_names
+            client_pkg.add_themes( theme_names )
+            @client_pkgs[:theme_names] = theme_names
+          end
+
+
+          if client_pkgs.has_key?('gfx_formats')
+            gfx_formats = client_pkgs['gfx_formats']
+          elsif client_pkgs.has_key?(:gfx_formats)
+            gfx_formats = client_pkgs[:gfx_formats]
+          else
+            gfx_formats = false
+          end
+
+          if gfx_formats
+            client_pkg.add_gfx_formats( gfx_formats )
+            @client_pkgs[:gfx_formats] = gfx_formats
+          end
+
+          if client_pkgs.has_key?('reserved_names')
+            reserved_names = client_pkgs['reserved_names']
+          elsif client_pkgs.has_key?(:reserved_names)
+            reserved_names = client_pkgs[:reserved_names]
+          else
+            reserved_names = false
+          end
+
+          if reserved_names
+            client_pkg.add_reserved_names( reserved_names )
+            @client_pkgs[:reserved_names] = reserved_names
+          end
+
           client_pkg.rebuild_client
+          
         end
       end
       

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -241,7 +241,7 @@ class ClientPkgBuild
         @src_cache[:orig_size][src_path] = js_size
       end
     else
-      js_data = %{console.log( "ERROR: CoffeeScript not suuported and no JS source available for #{bundle_path}" );}
+      js_data = %{console.log( "ERROR: CoffeeScript not supported and no JS source available for #{bundle_path}" );}
       js_size = js_data.bytesize
       min_size = js_size
       src_timestamp = 0

data/setup/welcome/client_pkgs.yaml

@@ -0,0 +1,19 @@
+
+### This file defines how to build custom client-side code.
+
+# The source directory './' is a special prefix meaning the path of this plugin.
+src_dir: ./js
+# If you have several source directories, you can specify them in plural, like this:
+# src_dirs:
+# - ./js
+# - /opt/src/examples/coffeescript
+# - ~/proj/demo
+
+# The packages of found bundles in the source directory are
+# combined into packages.
+packages:
+  # The following is the name of the package:
+  welcome_pkg:
+    # These are the bundles to include in the package:
+    - welcome_scrollcontainer
+    - welcome_view

data/setup/welcome/gui.yaml

@@ -0,0 +1,53 @@
+---
+
+# RSence user interfaces can be defined as YAML files.
+# The structure is converted to JSON for the client and "special"
+# variables are processed by the server.
+# The server tries to find a match in its gui_params for all values
+# that begin with a colon (they are parsed as symbols on ruby).
+
+# Read more about YAML on http://yaml.org/
+
+
+# GUITree is used as the type identifier for
+# user interface definition structures.
+type: GUITree
+
+# The version defines what version of the structure is used.
+version: 1.0
+
+# List of javascript packages the user interface needs.
+# These are automatically loaded once per session.
+dependencies:
+  - welcome_pkg # See client_pkgs.yaml
+
+# The root level class for user interfaces must be an instance of
+# HApplication (RSence.GUIApp is extended from the HApplication class).
+class: RSence.GUIApp
+
+# Each class takes a number of options for its constructor.
+options:
+  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.
+  # HSheet is an component that dims the background and shows a dialog sheet
+  # while its value is 0.
+  - WelcomeView:
+      
+      # For this rect, the rect defines the inner dialog
+      # size and position relave to the center position.
+      rect: [ 0, 0, 600, 500 ]
+
+      # Values are bound to their component responders using the bind -option.
+      bind: :values.close
+
+      options:
+        # Passes on the rest of the value id's as a reference to be used
+        # in the code. See js/welcome_view for details.
+        values: :values
+
+        # See the js/welcome_scrollcontainer for client-side usage of this:
+        welcomeText: :text.welcome 

data/setup/welcome/info.yaml

@@ -3,7 +3,7 @@
 title: Welcome message
 
 # The human-readable version of the package
-version: 1.0.2
+version: 1.1
 
 # A brief description of the package (rdoc formatting supported)
 description: |

data/setup/welcome/js/welcome_scrollcontainer/welcome_scrollcontainer.coffee

@@ -0,0 +1,37 @@
+###
+This custom HScrollView contains a number of subviews that are inside
+its scrollbars (if the inner content area is bigger than the outer
+dimensions of HScrollView itself). ###
+WelcomeScrollContainer = HScrollView.extend
+
+  ###
+  Subviews of the HScrollView; items inside are displayed
+  inside the scrollbars. ###
+  drawSubviews: ->
+    @base()
+    ###
+    The HInlineView is a simple HTML container, designed
+    to contain "flowing layout" html. ###
+    HInlineView.new( [ 0, 0, null, null, 0, 0 ], @,
+      ###
+      See the gui_params method of welcome.rb to understand how the
+      contents of the text/welcome.html files is linked like this. ###
+      html: @parent.options.welcomeText
+      style:
+        fontFamily: 'Helvetica, Arial, sans-serif'
+        fontSize: '16px'
+        lineHeight: '20px'
+    )
+
+    # The RSence logo image:
+    HImageView.extend(
+      click: ->
+        console.log 'clicked'
+        location.href="http://rsence.org/"
+    ).new( [ 20, 10, 559, 110 ], @,
+      # Images use the value as the URL of the image.
+      value: 'http://rsence.org/rsence_org_logo.gif'
+      scaleToFit: false
+      events:
+        click: true
+    )

data/setup/welcome/js/welcome_view/welcome_view.coffee

@@ -0,0 +1,55 @@
+###
+The sheet is used as the main visual container for the gui in this app.
+HSheet is an component that dims the background and shows a dialog sheet
+while its value is 0. ###
+WelcomeView = HSheet.extend
+  
+  ###
+  The extended refreshValue method that terminates its application,
+  including all the subviews. It's triggered when the value becomes 1,
+  as a result of the "Close" -button being clicked. ###
+  refreshValue: ->
+    @base()
+    @app.die() if @value == 1
+
+  ###
+  The drawSubviews is a method to extend, if you want to draw items,
+  when construction is completed. ###
+  drawSubviews: ->
+    @base()
+    ###
+    The values hash is set in the gui.yaml file for value id references
+    of the session-specific plugin values. ###
+    _values = @options.values
+
+    ###
+    A button in the lower right corner of the HSheet that triggers
+    destruction of this application (see WelcomeView#refreshValue) ###
+    HClickButton.new( [ null, null, 60, 24, 8, 8 ], @,
+      bind: _values.close
+      label: 'Close'
+    )
+
+    ###
+    A Check Box in the lower right corner of the HSheet that triggers
+    an server action to disable the whole plugin when combined with
+    the close button's value. ###
+    HCheckbox.new( [ null, null, 130, 24, 74, 8 ], @,
+      bind: _values.dont_show_again
+      label: "Don't show again"
+    )
+
+    ###
+    See welcome_scrollcontainer.coffee for details of this one.
+    The rectangle stretches the component to contain all of the parent's
+    space except the bottom-most 42 pixels and the minimum size
+    of 550 by 300 pixels. ###
+    WelcomeScrollContainer.new( [ 0, 0, 550, 300, 0, 42 ], @,
+      scrollX: false  # Disables horizontal scroll bars.
+      scrollY: 'auto' # Makes vertical scroll bars appear
+                      # automatically, when needed.
+      # Custom additional styling using style properties:
+      style:
+        backgroundColor: 'white'
+        borderBottom: '1px solid black'
+    )

data/setup/welcome/text/welcome.html

@@ -2,7 +2,6 @@
 <div style="margin-left:40px;margin-top:140px;margin-right:20px">
 <h1>Congratulations!</h1>
 <p>This message is served to you by RSence running in your new environment.</p>
-<p>The next time you create an RSence environment, use the <code>--blank</code> option of the <code>rsence&nbsp;init</code> command to avoid this message.</p>
 <p>Use the <code>rsence help</code> command to learn more about the <code>rsence</code> command-line tool and its various commands and options.</p>
 <p>You may want to install or write some software to run in your new RSence environment next.</p>
 <p>Go to <a href="http://rsence.org/">rsence.org</a> to learn more about RSence.</p>

data/setup/welcome/values.yaml

@@ -1,9 +1,9 @@
 # Value for the checkbox. When true combined with 1 of the close value, disables the plugin. See welcome.rb
-:dont_show_again:
-  :value: false
+dont_show_again:
+  data: false
 
 # Value for the close button.
-:close:
-  :value: 0
-  :responders: # See the 'close_button' method of welcome.rb to see what a responder is.
-  - :method: close_button
+close:
+  value: 0
+  # See the 'close_button' method of welcome.rb to see what a responder is.
+  responder: close_button

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.11
+  version: 2.3.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -112,8 +112,11 @@ files:
 - lib/rsence/value.rb
 - lib/rsence/valuemanager.rb
 - lib/rsence.rb
-- setup/welcome/gui/welcome.yaml
+- setup/welcome/client_pkgs.yaml
+- setup/welcome/gui.yaml
 - setup/welcome/info.yaml
+- setup/welcome/js/welcome_scrollcontainer/welcome_scrollcontainer.coffee
+- setup/welcome/js/welcome_view/welcome_view.coffee
 - setup/welcome/text/welcome.html
 - setup/welcome/values.yaml
 - setup/welcome/welcome.rb

data/setup/welcome/gui/welcome.yaml

@@ -1,92 +0,0 @@
-# RSence user interfaces can be defined as YAML files.
-# The structure is converted to JSON for the client and "special" variables are processed by the server.
-# The server tries to find a match in its gui_params for all values that begin with a colon (they are parsed as symbols on ruby).
-
-# Read more about YAML on http://yaml.org/
-
-# GUITree is used as the type identifier for user interface definition structures.
-type: GUITree
-# The version defines what version of the structure is used. New features are added constantly, each incrementing the version by 0.1
-version: 0.6
-
-# List of javascript packages the user interface needs. These are automatically loaded once per session.
-dependencies:
-  - default_theme # The default_theme package contains all the theme resources needed when using the default theme.
-  - controls      # The controls package contains the basic set of widget components.
-
-# The root level class for user interfaces must be an instance of HApplication (RSence.GUIApp is extended from the HApplication class).
-class: RSence.GUIApp
-# Each class takes a number of options for its constructor.
-options:
-  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.
-  # HSheet is an component that dims the background and shows a dialog sheet while its value is 0.
-  - class: HSheet
-    rect: [ 0, 0, 600, 500 ] # For HSheet, the rect defines the inner dialog size (it's always centered).
-    bind: :values.close      # Values are bound to their component responders using the bind keyword.
-    extend:                  # The extend keyword takes a dictionary of properties to extend the class with.
-      # Extending refreshValue with a javascript function that terminates its application,
-      # including all the subviews. It's triggered when the value becomes 1, when the Close button is clicked.
-      refreshValue: |
-        function(){
-          this.base();
-          if ( this.value==1 ) {
-            this.app.die();
-          }
-        }
-    # Subviews of the HSheet, nested visual-logical structure.
-    subviews:
-      # A button in the lower right corner of the HSheet that triggers destruction of this GUITree (see the extension of HSheet above)
-      - class: HClickButton
-        rect: [ null, null, 60, 24, 8, 8 ]
-        bind: :values.close
-        options:
-          label: Close
-      # A checkbox in the lower right corner of the HSheet that triggers an server action to disable the whole plugin when combined with the close button's value.
-      - class: HCheckbox
-        rect: [ null, null, 130, 24, 74, 8 ]
-        bind: :values.dont_show_again
-        options:
-          label: Don't show again
-      # The HScrollView contains a number of subviews that are inside its scrollbars (if the inner content area is bigger than the outer dimensions of HScrollView itself).
-      - class: HScrollView
-        rect: [ 0, 0, 550, 300, 0, 42 ] # This rectangle stretches the component to contain all of the parent's space except the bottom-most 42 pixels.
-        options:
-          scrollX: false # Disables horizontal scroll bars.
-          scrollY: auto  # Makes vertical scroll bars appear automatically when needed.
-          style: # Custom styling using style properties. There are several ways to display nested arrays. This is one:
-            - [ 'background-color', 'white' ]
-            - [ 'border-bottom', '1px solid black' ]
-        # Subviews of the HScrollView; items inside are displayed inside the scrollbars.
-        subviews:
-          # The RSence logo image:
-          - class: HImageView
-            rect: [ 18, 10, 559, 110 ]
-            options:
-              # Images use the value as the URL of the image.
-              value: http://rsence.org/rsence_org_logo.gif
-          # A plain view containing a hyperlink, positioned in the right bottom corner of the logo image.
-          - class: HView
-            rect: [ null, 95, 310, 25, 35, null ]
-            options:
-              html: |
-                <i style="font-family:Helvetica,Arial,sans-serif;font-size:16px;">
-                  <a style="color:#28c;font-weight:bold" href="http://rsence.org/">http://www.rsence.org/</a>
-                </i>
-              style: # Another way to define nested arrays for the style:
-                - - text-align
-                  - right
-          # The HInlineView is a simple HTML container, designed to contain "flowing layout" html.
-          - class: HInlineView
-            rect: [ 0, 0, null, null, 0, 0 ]
-            options:
-              html: :text.welcome # See the gui_params method of welcome.rb to understand how the contents of the text/welcome.html files is linked like this.
-              style:
-                - - font-family
-                  - 'Helvetica, Arial, sans-serif'
-                - - font-size
-                  - 16px
-                - - line-height
-                  - 20px