RubyGems - rsence - Versions diffs - 2.0.9.23 → 2.1.0 - Mend

rsence 2.0.9.23 → 2.1.0

Files changed (74) hide show

data/INSTALL.rdoc +61 -49
data/README.rdoc +20 -4
data/VERSION +1 -1
data/conf/default_conf.yaml +8 -0
data/conf/rsence_command_strings.yaml +31 -20
data/docs/ExampleGuiPlugin.rdoc +2 -2
data/js/comm/comm.js +27 -5
data/js/comm/transporter/transporter.js +1 -1
data/js/comm/values/values.js +12 -5
data/js/controls/button/button.js +12 -2
data/js/controls/dialogs/alert_sheet/alert_sheet.js +13 -1
data/js/controls/dialogs/confirm_sheet/confirm_sheet.js +13 -2
data/js/controls/dialogs/sheet/sheet.js +35 -28
data/js/controls/imageview/imageview.js +13 -13
data/js/controls/progress/progressindicator/progressindicator.js +5 -5
data/js/controls/sliders/slider/slider.js +4 -31
data/js/controls/stepper/stepper.js +12 -19
data/js/controls/textcontrol/textcontrol.js +0 -50
data/js/controls/textcontrol/themes/default/textcontrol.html +1 -1
data/js/controls/window/window.js +1 -1
data/js/core/elem/elem.js +146 -160
data/js/core/rsence_ns/rsence_ns.js +7 -0
data/js/foundation/control/eventresponder/eventresponder.js +8 -7
data/js/foundation/eventmanager/eventmanager.js +81 -48
data/js/foundation/geom/rect/rect.js +1 -1
data/js/foundation/json_renderer/json_renderer.js +4 -1
data/js/foundation/system/system.js +37 -34
data/js/foundation/view/morphanimation/morphanimation.js +53 -43
data/js/foundation/view/view.js +119 -118
data/js/lists/listitems/listitems.js +10 -10
data/js/lists/propertylist/js.inc +0 -0
data/js/lists/propertylist/propertylist.js +574 -0
data/js/lists/propertylist/propertylisteditor/js.inc +0 -0
data/js/lists/propertylist/propertylisteditor/propertylisteditor.js +233 -0
data/js/lists/radiobuttonlist/radiobuttonlist.js +15 -8
data/js/menus/minimenu/js.inc +0 -0
data/js/menus/minimenu/minimenu.js +139 -0
data/js/menus/minimenu/minimenuitem/js.inc +0 -0
data/js/menus/minimenu/minimenuitem/minimenuitem.js +33 -0
data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css +45 -0
data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html +4 -0
data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem_checkmark.png +0 -0
data/js/menus/minimenu/themes/default/minimenu.css +63 -0
data/js/menus/minimenu/themes/default/minimenu.html +7 -0
data/js/menus/minimenu/themes/default/minimenu.png +0 -0
data/js/util/reloadapp/reloadapp.js +1 -1
data/lib/conf/argv.rb +40 -11
data/lib/daemon/daemon.rb +63 -22
data/lib/plugins/gui_plugin.rb +28 -31
data/lib/plugins/guiparser.rb +37 -7
data/lib/plugins/plugin.rb +260 -28
data/lib/plugins/plugin_base.rb +14 -0
data/lib/plugins/plugin_plugins.rb +11 -1
data/lib/plugins/pluginmanager.rb +127 -44
data/lib/plugins/plugins.rb +10 -1
data/lib/session/msg.rb +25 -1
data/lib/session/sessionmanager.rb +11 -2
data/lib/session/sessionstorage.rb +14 -14
data/lib/transporter/transporter.rb +29 -13
data/lib/values/hvalue.rb +30 -0
data/plugins/client_pkg/info.yaml +2 -2
data/plugins/{index_html → main}/img/loading.gif +0 -0
data/plugins/{index_html → main}/img/riassence.gif +0 -0
data/plugins/main/info.yaml +5 -4
data/plugins/main/main.rb +180 -24
data/plugins/{index_html → main}/tmpl/index.html +4 -2
data/plugins/ticket/info.yaml +2 -2
data/plugins/ticket/lib/upload.rb +57 -5
data/plugins/ticket/ticket.rb +10 -4
data/setup/welcome/info.yaml +2 -2
data/setup/welcome/text/welcome.html +1 -1
metadata +22 -11
data/plugins/index_html/index_html.rb +0 -120
data/plugins/index_html/info.yaml +0 -18

data/plugins/{index_html → main}/tmpl/index.html RENAMED Viewed

@@ -9,7 +9,9 @@ __SCRIPT_DEPS__
 <script>
-/** Runtime configuration: **/
-RSence.serverConf('__CLIENT_BASE__','__CLIENT_HELLO__');
+var RSenceInit = function(){
+  /** Runtime configuration: **/
+  RSence.serverConf('__CLIENT_BASE__','__CLIENT_HELLO__');
+};
 </script></head><body id="body"><noscript>__NOSCRIPT__</noscript></body></html>

data/plugins/ticket/info.yaml CHANGED Viewed

@@ -3,7 +3,7 @@
 title: Ticket services
 # The human-readable version of the package
-version: 2.0.0
+version: 2.1.0
 # A brief description of the package (rdoc formatting supported)
 description: |
@@ -13,7 +13,7 @@ description: |
 reloadable: false
 # System version requirement.
-sys_version: '>= 2.0.0'
+sys_version: '>= 2.1.0'
 category: :system

data/plugins/ticket/lib/upload.rb CHANGED Viewed

@@ -10,10 +10,62 @@
 require 'sequel'
-# @private Inner workings of Ticket
+# Inner workings of Ticket
 module TicketService
+=begin
+# Here is an example how to implement "simple" upload value management.
+#
+# Define the component in yaml like this:
+#
+# - class: HUploader
+#   rect: [ 10, 10, 200, 24 ]
+#   bind: :values.upload
+#   options:
+#     label: Upload
+#     events:
+#       click: true
+#
+#
+# Expects a value named :upload, it is defined like this in values.yaml:
+#
+# :upload:
+#   :responders:
+#     - :method: upload
+#
+#
+class UploadPlugin < GUIPlugin
+  def init_ses_values( msg )
+    super
+    upload_id( msg )
+  end
+  def restore_ses_values( msg )
+    super
+    upload_id( msg )
+  end
+  def upload_id( msg )
+    upload_ticket = ticket.upload_key( msg, get_ses( msg, :upload ).value_id )
+    get_ses( msg, :upload ).set( msg, upload_ticket )
+  end
+  def upload( msg, value )
+    if value.data.start_with?('2:::') # upload is completed
+      ticket_id = value.data.split(':::')[1]
+      ticket_data = ticket.get_uploads( ticket_id, true )
+      ticket_data.each do |ticket_item|
+        file_write( bundle_path( ticket_item[:name], 'uploaded' ), ticket_item[:data] )
+      end
+      ticket.del_uploads( msg, ticket_id )
+      value.set( msg, '3:::' + ticket_id ) # upload is processed
+    elsif value.data.start_with?('4:::')   # client wants a new id
+      upload_id( msg )
+    end
+    return true
+  end
+end
+=end
-# @private Inner workings of Ticket
 module Upload
 =begin
@@ -50,7 +102,7 @@ create table rsence_uploads (
 =end
   def upload(request,response)
-    ticket_id = req.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:u]}(.*)$/)[1]
+    ticket_id = request.unparsed_uri.match(/^#{::RSence.config[:broker_urls][:u]+'/'}(.*)$/)[1]
     value_id  = request.query['value_id']
     if not @upload_slots[:by_id].has_key?(ticket_id)
@@ -144,7 +196,7 @@ create table rsence_uploads (
           else
             row_datas = @upload_slots[:rsence_uploads][row_id]
           end
-          if row_datas.size == 1
+          if row_datas.count == 1
             row_data = row_datas.first
             row_hash = {
               :date => Time.at(row_data[:upload_date]),
@@ -167,7 +219,7 @@ create table rsence_uploads (
           else
             row_datas = @upload_slots[:rsence_uploads][row_id]
           end
-          if row_datas.size == 1
+          if row_datas.count == 1
             row_data = row_datas.first
             row_hash = {
               :date => Time.at(row_data[:upload_date]),

data/plugins/ticket/ticket.rb CHANGED Viewed

@@ -66,7 +66,8 @@ class TicketPlugin < Plugin
   # @private Implements this part of the {RSence::Plugins::Servlet__ Servlet} API on a plugin to match the {#broker_urls}
   def match( uri, request_type )
     if request_type == :post
-      return true if uri[0..2] == broker_urls[:u]
+      upload_match = uri.start_with?( broker_urls[:u] + '/')
+      return true if upload_match
     elsif request_type == :get
       if uri.match( /^#{broker_urls[:i]}/ )
         return true
@@ -118,7 +119,7 @@ class TicketPlugin < Plugin
   # @private Handles the upload request
   def post( req, res, ses )
     uri = req.fullpath
-    if uri[0..2] == broker_urls[:u]
+    if uri.start_with?( broker_urls[:u] + '/')
       puts "/U: #{uri.inspect}" if RSence.args[:verbose]
       @ticketserve.upload( req, res )
     end
@@ -178,9 +179,14 @@ class TicketPlugin < Plugin
     @ticketserve.serve( msg, content, format, type )
   end
-  # @private Removes data used by the session
+  # @private Removes data used by the session, takes session id
+  def expire_ses_id( ses_id )
+    @ticketserve.expire_ses( ses_id )
+  end
+  # @private Removes data used by the session, takes msg
   def expire_ses( msg )
-    @ticketserve.expire_ses( msg.ses_id )
+    expire_ses_id( msg.ses_id )
   end
   # Sets a custom favicon for RSence

data/setup/welcome/info.yaml CHANGED Viewed

@@ -3,11 +3,11 @@
 title: Welcome message
 # The human-readable version of the package
-version: 1.0.1
+version: 1.0.2
 # A brief description of the package (rdoc formatting supported)
 description: |
   This is a simple welcome message plugin. It's installed in new project
-  environments, when the rsence initenv in executed.
+  environments, when the rsence init in executed.
   You may safely remove this plugin bundle.

data/setup/welcome/text/welcome.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <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;initenv</code> command to avoid this message.</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>

metadata CHANGED Viewed

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rsence
 version: !ruby/object:Gem::Version
-  hash: 101
+  hash: 11
   prerelease: false
   segments:
   - 2
+  - 1
   - 0
-  - 9
-  - 23
-  version: 2.0.9.23
+  version: 2.1.0
 platform: ruby
 authors:
 - Riassence Inc.
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-28 00:00:00 +03:00
+date: 2010-12-01 00:00:00 +02:00
 default_executable: rsence
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -93,14 +92,12 @@ files:
 - plugins/client_pkg/lib/client_pkg_build.rb
 - plugins/client_pkg/lib/client_pkg_cache.rb
 - plugins/client_pkg/lib/client_pkg_serve.rb
-- plugins/index_html/img/loading.gif
-- plugins/index_html/img/riassence.gif
-- plugins/index_html/index_html.rb
-- plugins/index_html/info.yaml
-- plugins/index_html/tmpl/index.html
+- plugins/main/img/loading.gif
+- plugins/main/img/riassence.gif
 - plugins/main/info.yaml
 - plugins/main/js/main.js
 - plugins/main/main.rb
+- plugins/main/tmpl/index.html
 - plugins/main/values.yaml
 - plugins/ticket/info.yaml
 - plugins/ticket/lib/common.rb
@@ -337,8 +334,22 @@ files:
 - js/lists/checkboxlist/js.inc
 - js/lists/listitems/js.inc
 - js/lists/listitems/listitems.js
+- js/lists/propertylist/js.inc
+- js/lists/propertylist/propertylist.js
+- js/lists/propertylist/propertylisteditor/js.inc
+- js/lists/propertylist/propertylisteditor/propertylisteditor.js
 - js/lists/radiobuttonlist/js.inc
 - js/lists/radiobuttonlist/radiobuttonlist.js
+- js/menus/minimenu/js.inc
+- js/menus/minimenu/minimenu.js
+- js/menus/minimenu/minimenuitem/js.inc
+- js/menus/minimenu/minimenuitem/minimenuitem.js
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html
+- js/menus/minimenu/minimenuitem/themes/default/minimenuitem_checkmark.png
+- js/menus/minimenu/themes/default/minimenu.css
+- js/menus/minimenu/themes/default/minimenu.html
+- js/menus/minimenu/themes/default/minimenu.png
 - js/util/reloadapp/js.inc
 - js/util/reloadapp/reloadapp.js
 - js/util/reloadapp/themes/default/reloadapp_warning-ie6.gif
@@ -396,6 +407,6 @@ rubyforge_project: rsence-
 rubygems_version: 1.3.7
 signing_key:
 specification_version: 3
-summary: Release 2.0 version of the RSence framework.
+summary: Release 2.1 version of the RSence framework.
 test_files: []

data/plugins/index_html/index_html.rb DELETED Viewed

@@ -1,120 +0,0 @@
-##   RSence
- #   Copyright 2009 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
- ##
-# @private IndexHtmlPlugin is the servlet plugin that is responsible for initializing the "boot-strap page". It's not intended as a part of the public API at this time.
-class IndexHtmlPlugin < Servlet
-  def match( uri, method )
-    if uri == ::RSence.config[:index_html][:respond_address] and method == :get
-      return true
-    else
-      return false
-    end
-  end
-  def score
-    return 1000 # allows overriding with anything with a score below 1000
-  end
-  def init
-    @randgen = RandGen.new( 40 )
-    ::RSence.config[:index_html][:instance] = self
-  end
-  def open
-    @index_html_src = file_read( ::RSence.config[:index_html][:index_tmpl] )
-    render_index_html
-  end
-  def close
-    @plugins[:ticket].del_rsrc( @loading_gif_id )
-  end
-  def render_index_html
-    index_html = @index_html_src.clone
-    index_html.gsub!('__DEFAULT_TITLE__',::RSence.config[:index_html][:title])
-    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))
-    index_html.gsub!('__CLIENT_HELLO__',::RSence.config[:broker_urls][:hello])
-    index_html.gsub!('__NOSCRIPT__',::RSence.config[:index_html][:noscript])
-    deps_src = ''
-    ::RSence.config[:index_html][:deps].each do |dep|
-      deps_src += %{<script src="#{dep}" type="text/javascript"></script>}
-    end
-    index_html.gsub!('__SCRIPT_DEPS__',deps_src)
-    return index_html
-  end
-  def session_index_html( request, response )
-    ses_key = @randgen.gen
-    sha_key = ''
-    buffer = [
-      "var qP=function(cmd){COMM.Queue.push(cmd);};"
-    ]
-    req_num = 0
-    3.times do |req_num|
-      sha_key = Digest::SHA1.hexdigest( ses_key + sha_key )
-      msg = @plugins.transporter.xhr(
-        request, response, {
-          :servlet => true,
-          :cookie  => (req_num==0),
-          :query   => {
-            'ses_key' => "#{req_num}:.o.:#{sha_key}"
-          }
-        }
-      )
-      buffer += msg.value_buffer
-      msg.buffer.each do |buffer_item|
-        buffer.push( "qP(function(){#{buffer_item};});")
-      end
-      ses_key = msg.ses_key
-    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};" )
-    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 )
-    index_html = render_index_html
-    support_gzip = (request.header.has_key?('accept-encoding') and \
-                    request.header['accept-encoding'].include?('gzip')) \
-                    and not ::RSence.config[:no_gzip]
-    response.status = 200
-    response['Content-Type'] = 'text/html; charset=UTF-8'
-    response['Date'] = httime( Time.now )
-    response['Server'] = 'RSence'
-    response['Cache-Control'] = 'no-cache'
-    if support_gzip
-      index_gzip = GZString.new('')
-      gzwriter = Zlib::GzipWriter.new( index_gzip, 9 )
-      gzwriter.write( index_html )
-      gzwriter.close
-      response['Content-Length'] = index_gzip.length
-      response['Content-Encoding'] = 'gzip'
-      response.body = index_gzip
-    else
-      response['Content-Length'] = index_html.length
-      response.body = index_html
-    end
-  end
-end

data/plugins/index_html/info.yaml DELETED Viewed

@@ -1,18 +0,0 @@
-# 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.
-# System version requirement.
-sys_version: '>= 2.0.0'
-category: :system
-depends_on: :client_pkg