RubyGems - rsence-pre - Versions diffs - 2.1.0.21 → 2.1.8.0 - Mend

rsence-pre 2.1.0.21 → 2.1.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

data/INSTALL.rdoc +61 -46
data/README.rdoc +17 -1
data/VERSION +1 -1
data/conf/rsence_command_strings.yaml +16 -16
data/js/comm/sessionwatcher/sessionwatcher.js +5 -4
data/js/comm/transporter/transporter.js +62 -4
data/js/comm/values/values.js +62 -0
data/js/controls/button/themes/default/button.css +7 -7
data/js/controls/imageview/imageview.js +15 -6
data/js/controls/stringview/stringview.js +16 -2
data/js/controls/textcontrol/textcontrol.js +56 -3
data/js/core/elem/elem.js +38 -12
data/js/datetime/timesheet/timesheet.js +141 -32
data/js/datetime/timesheet_item/timesheet_item.js +82 -22
data/js/foundation/application/application.js +10 -4
data/js/foundation/control/control.js +5 -3
data/js/foundation/control/dyncontrol/dyncontrol.js +17 -3
data/js/foundation/control/eventresponder/eventresponder.js +31 -2
data/js/foundation/eventmanager/eventmanager.js +202 -74
data/js/foundation/json_renderer/json_renderer.js +5 -2
data/js/foundation/system/system.js +13 -11
data/js/foundation/view/morphanimation/morphanimation.js +9 -5
data/js/foundation/view/view.js +22 -10
data/js/lists/propertylist/propertylist.js +5 -0
data/js/menus/minimenu/minimenu.js +3 -8
data/lib/conf/default.rb +0 -3
data/lib/http/broker.rb +6 -5
data/lib/http/rackup.rb +3 -3
data/lib/http/response.rb +28 -2
data/lib/session/msg.rb +30 -18
data/lib/transporter/transporter.rb +4 -0
data/lib/values/hvalue.rb +4 -134
data/lib/values/valuemanager.rb +36 -22
data/plugins/client_pkg/lib/client_pkg_serve.rb +195 -152
data/plugins/main/main.rb +8 -10
data/plugins/ticket/lib/common.rb +4 -4
data/plugins/ticket/lib/favicon.rb +1 -1
data/plugins/ticket/lib/rsrc.rb +1 -1
data/plugins/ticket/lib/upload.rb +2 -2
data/plugins/ticket/ticket.rb +3 -3
data/setup/welcome/gui/welcome.yaml +1 -1
metadata +10 -11
data/lib/util/ruby19_fixes.rb +0 -18

data/lib/conf/default.rb CHANGED Viewed

@@ -13,9 +13,6 @@ require 'yaml'
-require 'util/ruby19_fixes' if RUBY_VERSION.to_f >= 1.9
 module RSence

data/lib/http/broker.rb CHANGED Viewed

@@ -24,7 +24,7 @@ class Broker
   # This method is called from Rack.
   # @param [Hash] env is the Rack environment.
-  # @return [Array(Number, Hash, String)] Rack-style response status, header, body
+  # @return [Array(Number, Hash, Array)] Rack-style response status, header, body
   def call( env )
     sleep @@ping_sim if @@ping_sim
     unless @@transporter.online?
@@ -35,7 +35,7 @@ class Broker
         'Refresh' => "2; #{env['REQUEST_URI']}",
         'Content-Length' => '4'
       }
-      return [ 503, headers, 'BUSY' ]
+      return [ 503, headers, ['BUSY'] ]
     end
     request  = Request.new(env)
     response = Response.new
@@ -43,8 +43,9 @@ class Broker
     dispatcher = dispatcher_class.new( request, response )
     dispatcher.send( request_method )
     content_type = dispatcher.content_type
-    response.header['Content-Length'] = response.body.length.to_s unless response.header.has_key?('Content-Length')
-    return [response.status, response.header, response.body]
+    response_body = response.body
+    response.header['Content-Length'] = response.body_bytes unless response.header.has_key?('Content-Length')
+    return [response.status, response.header, response_body]
   end
   # Returns a dynamically created "REST Dispatcher" kind of class that has
@@ -121,7 +122,7 @@ class Broker
     @response.status = 404
     err404 = '<html><head><title>404 - Page Not Found</title></head><body>404 - Page Not Found</body></html>'
     @response['Content-Type'] = 'text/html; charset=UTF-8'
-    @response['Content-Length'] = err404.length.to_s
+    @response['Content-Length'] = err404.bytesize.to_s
     @response.body = err404
   end

data/lib/http/rackup.rb CHANGED Viewed

@@ -74,7 +74,7 @@ module Broker
     else
       puts "unsupported method: #{request_method.inspect}"
     end
-    response.header['Content-Length'] = response.body.length.to_s unless response.header.has_key?('Content-Length')
+    response.header['Content-Length'] = response.body.bytesize.to_s unless response.header.has_key?('Content-Length')
     return [response.status, response.header, response.body]
   end
@@ -82,8 +82,8 @@ module Broker
     puts "/404: #{request.fullpath.inspect}" if $DEBUG_MODE
     response.status = 404
     err404 = '<html><head><title>404 - Page Not Found</title></head><body>404 - Page Not Found</body></html>'
-    response['content-type'] = 'text/html; charset=UTF-8'
-    response['content-length'] = err404.length.to_s
+    response['Content-Type'] = 'text/html; charset=UTF-8'
+    response['Content-Length'] = err404.bytesize.to_s
     response.body = err404
   end

data/lib/http/response.rb CHANGED Viewed

@@ -17,6 +17,21 @@ module RSence
     # Adds the + method "operator" to an extended Array.
     # Used for pushing http body data.
     class ResponseBody < Array
+      def push( body_data )
+        super( sanitize_body_data( body_data ) )
+      end
+      def sanitize_body_data( body_data )
+        if body_data.class == String or body_data.class == GZString
+          return body_data
+        elsif body_data.respond_to?(:to_s)
+          warn "WARNING: RSence::Response::ResponseBody -> body_data is not a string. It's a #{body_data.class}, with the following contents: #{body_data.inspect}" if RSence.args[:verbose]
+          return body_data.to_s
+        else
+          warn "Invalid response data: #{body_data.inspect[0..100]}"
+          return ''
+        end
+      end
       def +(body_data)
         self.push(body_data)
       end
@@ -33,10 +48,21 @@ module RSence
     end
     def body=(body_data)
       @body = ResponseBody.new(1)
-      @body[0] = body_data
+      @body[0] = @body.sanitize_body_data( body_data )
     end
     def body
-      @body.join
+      @body
+    end
+    def body_bytes
+      bytes = 0
+      @body.each do |part|
+        if part.respond_to?(:to_s)
+          bytes += part.to_s.bytesize
+        else
+          warn "body data part does not respond to to_s: #{part.inspect[0..100]}"
+        end
+      end
+      return bytes.to_s
     end
     def content_type=(new_content_type)
       @header['Content-Type'] = new_content_type

data/lib/session/msg.rb CHANGED Viewed

@@ -111,7 +111,11 @@ module RSence
       @options = options
       # Value response output.
-      @value_buffer = []
+      @value_buffer = {
+        :new => [],
+        :set => [],
+        :del => []
+      }
       # The session key placeholder.
       @ses_key = false
@@ -131,7 +135,7 @@ module RSence
       if options[:servlet]
         @do_gzip = false
       else
-        @response.content_type = 'text/javascript; charset=utf-8'
+        @response['Content-Type'] = 'text/javascript; charset=utf-8'
         @response['Cache-Control'] = 'no-cache'
         # gnu-zipped responses:
@@ -238,21 +242,22 @@ module RSence
       if not @response_success
         @response.status = 200
         #@response.status = 503
         buffer = [
-          "" # empty session key will stop the syncing
+          "", # empty session key will stop the syncing
+          {}, # no session values
         ] + @error_js
       else
         ## The response status should always be 200 (OK)
         @response.status = 200
-        buffer = @value_buffer + @buffer
-        if @ses_key
-          buffer.unshift( @ses_key )
-        end
+        buffer = [
+          @ses_key,
+          @value_buffer,
+        ] + @buffer
       end
       # flush the output
       if @do_gzip
         outp = GZString.new('')
@@ -262,13 +267,13 @@ module RSence
       else
         outp = buf_json(buffer)
       end
-      @response['content-length'] = outp.size
+      @response['Content-Length'] = outp.bytesize.to_s
       @response.body = outp
       @response_sent = true
     end
     # Sends data to the client, usually javascript, but is valid for any data that responds to #to_json
     # @param [String<js>, #to_json] data Javascript source or object that responds to #to_json
     # @param [Boolean] dont_squeeze When true, doesn't `squeeze` the contents (jsmin + jscompress)
@@ -280,9 +285,16 @@ module RSence
     end
     # @private For value manager; insert changed values BEFORE other js.
-    def reply_value(data)
-      puts data if @config[:trace]
-      @value_buffer.push( data )
+    def reply_value( operation_type, value_id, data=nil )
+      if operation_type == :set
+        @value_buffer[:set].push( [ value_id, data ] )
+      elsif operation_type == :new
+        @value_buffer[:new].push( [ value_id, data ] )
+      elsif operation_type == :del
+        @value_buffer[:del].push( value_id )
+      else
+        throw "Invalid reply_value operation: operation_type: #{operation_type.inspect}, value_id: #{value_id.inspect}, data: #{data.inspect}"
+      end
     end
     # Sends data to the client's javascript console.

data/lib/transporter/transporter.rb CHANGED Viewed

@@ -229,6 +229,10 @@ module RSence
           end
         elsif msg.refresh_page?( @plugins.incr ) and @config[:client_autoreload]
+          while msg.refresh_page?( @plugins.incr )
+            msg.session[:plugin_incr] == @plugins.incr
+            sleep 0.5
+          end
           # Forces the client to reload, if plugins are incremented
           msg.reply("window.location.reload( true );")
         end

data/lib/values/hvalue.rb CHANGED Viewed

@@ -84,7 +84,7 @@ module RSence
       if RSence.args[:debug] and meta[:name] and not msg.valuemanager.id_exists?( msg, meta[:name] )
         @value_id   = meta[:name]
       else
-        @value_id   = msg.valuemanager.randgen.gen
+        @value_id = msg.valuemanager.ses_unique_id( msg )
       end
       @meta = meta
@@ -245,12 +245,11 @@ module RSence
     def to_client( msg )
       if @is_new_to_client
         ## Initialize a new client value
-        init_str = "COMM.Values.create(#{@value_id.to_json},#{@data.to_json});"
-        msg.reply_value( init_str )
+        msg.reply_value( :new, @value_id, @data )
         @is_new_to_client = false
       else
         ## Sets the client value
-        msg.reply_value "HVM.s(#{@value_id.to_json},#{@data.to_json});"
+        msg.reply_value( :set, @value_id, @data )
       end
     end
@@ -267,142 +266,13 @@ module RSence
       session_values.delete( @value_id )
       if msg and not @is_new_to_client
-        msg.reply_value("HVM.del(#{@value_id.to_json});")
+        msg.reply_value( :del, @value_id )
       end
     end
     alias die die!
   end
-=begin
-  class UploadValue < HValue
-    @state_responders = {
-      :ready   => [], # id == 0
-      :started => [], # id == 1
-      :process => [], # id == 2 ; also uses bind
-      3 => [], # id == 3
-      4 => [], # id == 4
-      :error => [] # id < 0
-    }
-    @upload_state = 0
-    @upload_key = ''
-    @uploads = []
-    # the data should contain both state and key in the value
-    def from_client( msg, data )
-      ## change the valid state, because the value was set by the client!
-      @is_valid = data.include?(':::')
-      # the state and key are separated by the ':::' delimiter string
-      if @is_valid
-        # split state and key using the delimiter
-        (upload_state, upload_key) = data.split(':::')
-        # the state is a number
-        upload_state = upload_state.to_i
-        @upload_state = upload_state
-        @upload_key = upload_key
-        # negative states are errors
-        if upload_state < 0
-          # "upload error: #{upload_state}"
-          # (parse the error)
-          unless @state_responders[:error].empty?
-            @state_responders[:error].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-        # the default state, 0 means the UI is ready to send an
-        # upload and ticketserve is ready to receive it
-        elsif upload_state == 0
-          # "upload state: ready to upload."
-          # (do nothing)
-          unless @state_responders[:ready].empty?
-            @state_responders[:ready].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-        # this state means the upload's transfer is started and progressing
-        elsif upload_state == 1
-          # "upload state: upload started."
-          # (show progress bar)
-          unless @state_responders[:started].empty?
-            @state_responders[:started].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-        # this state means the upload's transfer is complete,
-        # but the uploaded data hasn't been handled yet.
-        elsif upload_state == 2
-          # "upload state: waiting to process."
-          uploads = msg.plugins[:ticketservices].get_uploads(upload_key,true)
-          if uploads.size == 1
-            uploaded_data = uploads[0]
-            # only process changes, if different from the one already stored.
-            if uploaded_data != @data
-              @data = uploaded_data
-              ## add the id to the values to be checked
-              check_ids = msg.session[:values][:check]
-              unless check_ids.include?( @value_id )
-                check_ids.push( @value_id )
-              end
-            end
-            msg.plugins[:ticketservices].del_uploads(upload_key,msg.ses_id)
-          else
-            # "upload, amount of uploads: #{uploads.size}"
-          end
-          #
-          hvalue.set(msg,"3:::#{upload_key}")
-          msg.console( "upload state: set to ack" )
-        elsif upload_state == 3
-          # "upload state: waiting for user ack."
-          # (do nothing)
-          msg.console( "upload state: waiting user ack" )
-        elsif upload_state == 4
-          # "upload state: user wants to upload again."
-          # (set a new upload key, )
-          msg.console( "upload state: ack, getting new key" )
-          setup_upload( msg, hvalue )
-        else
-          # "upload unknown state: #{upload_state.inspect}"
-        end
-      end
-      return true
-    end
-    def setup_upload(msg,hvalue,size_bytes=500*1024,accept_mime=/image\/(.*?)/,allow_multi=false)
-      upload_key = msg.plugins[:ticketservices].upload_key(msg,hvalue.val_id,size_bytes,accept_mime,allow_multi)
-      hvalue.set( msg, upload_key )
-    end
-  end
-=end
 end

data/lib/values/valuemanager.rb CHANGED Viewed

@@ -35,6 +35,40 @@ module RSence
     end
+    # @private Returns a session-unique random string
+    def ses_unique_id( msg )
+      new_id = randgen.gen while id_exists?( msg, new_id )
+      return new_id
+    end
+    # @private Regenerate a value id
+    def reshuffle_id( msg, ses_values, val_obj, old_id )
+      new_id = ses_unique_id( msg )
+      # 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)
+      # 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
+    end
     # @private Re-constructs all stored values and sends them to the client.
     #          Used for restoring and cloning session values.
     def resend_session_values( msg )
@@ -56,28 +90,7 @@ module RSence
           # make a new id
           unless RSence.args[:debug] and val_obj.meta[:name]
-            new_id = @randgen.gen
-            new_id = @randgen.gen while id_exists?( msg, 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)
-            # 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
+            reshuffle_id( msg, ses_values, val_obj, old_id )
           end
           # tell the hvalue to send its client-side initialization
@@ -96,6 +109,7 @@ module RSence
     # @private Verifies new_id is unique.
     def id_exists?( msg, new_id )
+      return true unless new_id.class == String
       return msg.session[:values][:by_id].has_key?(new_id)
     end