rsence-pre 2.1.0.13 → 2.1.0.14

data/VERSION

@@ -1 +1 @@
-2.1.0.13.pre
+2.1.0.14.pre

data/lib/session/sessionstorage.rb

@@ -317,6 +317,7 @@ module RSence
       if @db_avail
         db_open
         # Deletes the session's row from the database
+        @db[:rsence_uploads].filter(:ses_id => ses_id).delete
         @db[:rsence_session].filter(:id => ses_id).delete
         db_close
       end

data/plugins/ticket/lib/upload.rb

@@ -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

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - 13
-  version: 2.1.0.13
+  - 14
+  version: 2.1.0.14
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +02:00
+date: 2010-11-17 00:00:00 +02:00
 default_executable: rsence-pre
 dependencies: 
 - !ruby/object:Gem::Dependency