rsence 2.0.0.5.pre → 2.0.0.6.pre

data/plugins/{ticketservices → ticket}/lib/favicon.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/{ticketservices → ticket}/lib/file.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/{ticketservices → ticket}/lib/img.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/{ticketservices → ticket}/lib/objblob.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/{ticketservices → ticket}/lib/rsrc.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #

data/plugins/{ticketservices → ticket}/lib/upload.rb

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #
@@ -74,27 +74,38 @@ module Upload
       else
         done_value = "2:::#{ticket_id}"
         ## Insert basic data about the upload and get its key
-        upload_id = @db[:rsence_uploads].insert(
-            :ses_id      => ses_id,
-            :ticket_id   => ticket_id,
-            :upload_date => Time.now.to_i,
-            :upload_done => false,
-            :file_name   => file_filename,
-            :file_size   => file_size,
-            :file_mime   => file_mimetype,
-            :file_data   => ''
-        )
+        insert_hash = {
+          :ses_id      => ses_id,
+          :ticket_id   => ticket_id,
+          :upload_date => Time.now.to_i,
+          :upload_done => false,
+          :file_name   => file_filename,
+          :file_size   => file_size,
+          :file_mime   => file_mimetype,
+          :file_data   => ''
+        }
+        if @db
+          upload_id = @db[:rsence_uploads].insert( insert_hash )
+        else
+          @upload_id += 1
+          upload_id = @upload_id
+          @upload_slots[:rsence_uploads] = {} unless @upload_slots.has_key?(:rsence_uploads)
+          @upload_slots[:rsence_uploads][upload_id] = insert_hash
+        end
         if not @upload_slots[:uploaded].has_key?(ticket_id)
           @upload_slots[:uploaded][ticket_id] = []
         end
         @upload_slots[:uploaded][ticket_id].push( upload_id )
         
-        ## Start a loop to read the tempfile as chunks of the upload into the
-        ## database (4k chunks, so mysql won't choke with its default settings)
-        @db[:rsence_uploads].filter(:id => upload_id).update(
+        update_hash = {
           :file_data   => file_data[:tempfile].read.to_sequel_blob,
           :upload_done => true
-        )
+        }
+        if @db
+          @db[:rsence_uploads].filter(:id => upload_id).update( update_hash )
+        else
+          @upload_slots[:rsence_uploads][upload_id].merge!( update_hash )
+        end
       end
     end
     
@@ -122,12 +133,16 @@ module Upload
     if @upload_slots[:uploaded].has_key?(ticket_id)
       @upload_slots[:uploaded][ticket_id].each do |row_id|
         if with_data
-          row_datas = @db[:rsence_uploads].select(
-            :upload_date, :upload_done, :file_name,
-            :file_size, :file_mime, :file_data
-          ).filter(
-            :id => row_id
-          )
+          if @db
+            row_datas = @db[:rsence_uploads].select(
+              :upload_date, :upload_done, :file_name,
+              :file_size, :file_mime, :file_data
+            ).filter(
+              :id => row_id
+            )
+          else
+            row_datas = @upload_slots[:rsence_uploads][row_id]
+          end
           if row_datas.size == 1
             row_data = row_datas.first
             row_hash = {
@@ -141,12 +156,16 @@ module Upload
             uploads.push(row_hash)
           end
         else
-          row_datas = @db[:rsence_uploads].select(
-            :upload_date, :upload_done, :file_name,
-            :file_size, :file_mime
-          ).filter(
-            :id => row_id
-          )
+          if @db
+            row_datas = @db[:rsence_uploads].select(
+              :upload_date, :upload_done, :file_name,
+              :file_size, :file_mime
+            ).filter(
+              :id => row_id
+            )
+          else
+            row_datas = @upload_slots[:rsence_uploads][row_id]
+          end
           if row_datas.size == 1
             row_data = row_datas.first
             row_hash = {
@@ -167,7 +186,11 @@ module Upload
   
   def del_upload( ticket_id, row_id )
     @upload_slots[:uploaded][ticket_id].delete(row_id)
-    @db[:rsence_uploads].filter( :id => row_id ).delete
+    if @db
+      @db[:rsence_uploads].filter( :id => row_id ).delete
+    else
+      @upload_slots[:rsence_uploads].delete(row_id)
+    end
   end
   
   # removes uploaded files
@@ -180,15 +203,21 @@ module Upload
     if @upload_slots[:uploaded].has_key?( ticket_id )
       @upload_slots[:uploaded][ticket_id].each do |row_id|
         @upload_slots[:uploaded][ticket_id].delete( row_id )
-        @db[:rsence_uploads].filter( :id => row_id ).delete
+        if @db
+          @db[:rsence_uploads].filter( :id => row_id ).delete
+        else
+          @upload_slots[:rsence_uploads].delete(row_id)
+        end
       end
       @upload_slots[:uploaded].delete( ticket_id )
     end
     if @upload_slots[:by_id].has_key?( ticket_id )
       @upload_slots[:by_id].delete( ticket_id )
     end
-    @db[:rsence_uploads].filter( :ticket_id => ticket_id ).delete
-    @db[:rsence_uploads].filter( :ses_id => ses_id ).delete
+    if @db
+      @db[:rsence_uploads].filter( :ticket_id => ticket_id ).delete
+      @db[:rsence_uploads].filter( :ses_id => ses_id ).delete
+    end
   end
   
   def upload_key(msg,value_key,max_size=1000000,mime_allow=/(.*?)\/(.*?)/,allow_multi=true)

data/plugins/{ticketservices/ticketservices.rb → ticket/ticket.rb}

@@ -1,5 +1,5 @@
 #--
-##   Riassence Framework
+##   RSence
  #   Copyright 2008 Riassence Inc.
  #   http://riassence.com/
  #
@@ -18,42 +18,45 @@ end
 
 require 'randgen'
 
+# the library path of this plugin
+lib_path = File.join( bundle_path, 'lib' )
+
+# common functionality
+require File.join(lib_path,'common')
+
+# rsrc-related functionality
+require File.join(lib_path,'rsrc')
+
+# file-related functionality
+require File.join(lib_path,'file')
+
+# upload-related functionality
+require File.join(lib_path,'upload')
+
+# img-related functionality
+require File.join(lib_path,'img')
+
+# favicon-related functionality
+require File.join(lib_path,'favicon')
+
+# smart object wrapper
+require File.join(lib_path,'objblob')
+
 ## TicketServe serves static and disposable data and images.
 ## It accepts Magick::Image objects too to render them only when really needed.
 ## Each serve-call returns an unique uri to pass to the client.
 ## It performs clean-ups based on session and request time-outs.
-class TicketServe < Servlet
-  
-  # the library path of this plugin
-  lib_path = File.join( @@bundle_path, 'lib' )
-  
-  # common functionality
-  require File.join(lib_path,'common')
-  include TicketService::Common
-  
-  # rsrc-related functionality
-  require File.join(lib_path,'rsrc')
-  include TicketService::Rsrc
-  
-  # file-related functionality
-  require File.join(lib_path,'file')
-  include TicketService::TicketFile
+class Ticket < Plugin
   
-  # upload-related functionality
-  require File.join(lib_path,'upload')
-  include TicketService::Upload
-  
-  # img-related functionality
-  require File.join(lib_path,'img')
-  include TicketService::Img
-  
-  # favicon-related functionality
-  require File.join(lib_path,'favicon')
-  include TicketService::Favicon
-  
-  # smart object wrapper
-  require File.join(lib_path,'objblob')
-  include TicketService::ObjBlob
+  class TicketServe
+    include TicketService::Common
+    include TicketService::Rsrc
+    include TicketService::TicketFile
+    include TicketService::Upload
+    include TicketService::Img
+    include TicketService::Favicon
+    include TicketService::ObjBlob
+  end
   
   def broker_urls
     ::RSence.config[:broker_urls]
@@ -80,22 +83,24 @@ class TicketServe < Servlet
     return false
   end
   
+  def score; 200; end
+  
   def get( req, res, ses )
     uri = req.fullpath
     if uri.match( /^#{broker_urls[:i]}/ )
       puts "/i: #{uri.inspect}" if RSence.args[:verbose]
-      get_ticket( req, res, :img )
+      @ticketserve.get_ticket( req, res, :img )
     elsif uri.match( /^#{broker_urls[:d]}/ )
       puts "/d: #{uri.inspect}" if RSence.args[:verbose]
-      get_ticket( req, res, :rsrc )
+      @ticketserve.get_ticket( req, res, :rsrc )
     elsif uri.match( /^#{broker_urls[:f]}/ )
       puts "/f: #{uri.inspect}" if RSence.args[:verbose]
-      get_ticket( req, res, :file )
+      @ticketserve.get_ticket( req, res, :file )
     elsif uri.match( /^#{broker_urls[:b]}/ )
       puts "/b: #{uri.inspect}" if RSence.args[:verbose]
-      get_ticket( req, res, :blobobj )
+      @ticketserve.get_ticket( req, res, :blobobj )
     elsif uri == broker_urls[:favicon]
-      favicon( req, res )
+      @ticketserve.favicon( req, res )
     elsif uri == broker_urls[:uploader_iframe]
       puts "/U/iframe_html: #{uri.inspect}" if RSence.args[:verbose]
       res.status = 200
@@ -110,87 +115,20 @@ class TicketServe < Servlet
     uri = req.fullpath
     if uri[0..2] == broker_urls[:u]
       puts "/U: #{uri.inspect}" if RSence.args[:verbose]
-      upload( req, res )
+      @ticketserve.upload( req, res )
     end
   end
   
   # Initializes storage.
   def init # :nodoc:
-    
-    # storage for tickets to be expired by expiry time
-    # as the key and an array of ids in array as the value
-    @expires = {}
-    @expire_files = {}
-    @expire_blobobj = {}
-    
-    # storage for disposable images
-    @imgs = {
-      
-      # id is used as the uri
-      :by_id   => {},
-      
-      # list of image ids by session id
-      :ses_ids => {}
-    }
-    
-    # storage for other disposable data
-    @files = {
-      
-      # id is used as the uri
-      :by_id   => {},
-      
-      # list of image ids by session id
-      :ses_ids => {}
-    }
-    
-    # an randgen instance used for generating ids (84B long)
-    @randgen = RandGen.new( 84 )
-    
-    # supported image content types
-    @content_types = {
-      'GIF' => 'image/gif',
-      'PNG' => 'image/png',
-      'JPG' => 'image/jpeg'
-    }
-    
-    # static data, initially for invalid/not found error-gif
-    # also all serve_rsrc items
-    @raw_uris = {
-      'invalid.gif' => ['image/gif','53',['749464839316700090000800000000004e7ebe129f400000000000c200000000700090000020c0c8f70a9c810e0229ea2da1a000b3'].pack('h*')],
-      'favicon.ico' => ['image/gif','371',['749464839316010001005d00005e5e3dd1d1a1ca7dbf983cfeb9dc5ff8f848db1effbd1fff27279609a600cacae9e0e0d0dcaeff8e8fff030303010101848424afffff0000007be7008c8c9bffffff878b9e0eba712fcfffb2b282e9c6000d5900020202bd3a70ababbaf8f834f9f9f9f8f8f887fafafafa49060606fefefe0707700707074e3bc2939353ce6cd50404007d7d6cfafafa8edb34dcfcfc0f0d97fbfbfb000000000000000000000000000000000000000000000000000000000000000000000000000000000000129f401000000000c20000000001000100006009040801058c8420e91a258ca41744380506934656846910140e04051092ca650688d282bc2072bb5303e0728c2330d6fbb15a78249291bbf0d0811102353410124677285190b2e524e110e0f208b890a13176a480b0725211c889b16227a44101f0027931b1d171a745a010b2caea82f15845c9627182e2a2e050f5007af0f1a203329bf52be032d2213ca4501021501400b3'].pack('h*')]
-    }
-    
-    @upload_slots = {
-      # upload slots
-      :by_id => {
-        # random key      mime    max_size session_id 
-        # 'test123'  => [ '*/*',  15000,   12         ]
-      },
-      # processed uploads
-      :uploaded => {
-        # same key as :by_id  rsence_uploads:id
-        # 'test123'  =>       [37483,37546,38759]
-      },
-      # upload ids by session id
-      :ses_ids => {
-        # 12 => ['test123']
-      }
-    }
-    
-    @blob_objs = {
-      :by_id   => {},
-      :ses_ids => {}
-    }
-    
-    @db = Sequel.connect( ::RSence.config[:database][:ses_db] )
-    
+    super
+    @ticketserve = TicketServe.new
+  end
+  
+  def shutdown
+    @ticketserve.shutdown
   end
   
-end
-ticketserve = TicketServe.new
-
-# Plugin API for ticket services
-class TicketAPI < Plugin
   class BlobObj
     def initialize(data,mime)
       @data = data
@@ -208,9 +146,7 @@ class TicketAPI < Plugin
     def close
     end
   end
-  def set_ticketserve( ticketserve )
-    @ticketserve = ticketserve
-  end
+  
   def serve( msg, content, format='PNG', type=:img )
     @ticketserve.serve( msg, content, format, type )
   end
@@ -261,8 +197,4 @@ class TicketAPI < Plugin
   end
 end
 
-ticket = TicketAPI.new
-ticket.register( 'ticket' )
-ticket.set_ticketserve( ticketserve )
-
 

data/{plugins → setup}/legacy/legacy.rb

@@ -1,4 +1,5 @@
 
+# This Plugin contains some namespace mappings of what used to exist in RSence 1.x
 class LegacyPlugin < Servlet
   def init
     super
@@ -13,3 +14,4 @@ module ::Riassence
     include RSence
   end
 end
+

data/setup/welcome/welcome.rb

@@ -1,4 +1,4 @@
-##   Riassence Framework
+##   RSence
  #   Copyright 2010 Riassence Inc.
  #   http://riassence.com/
  #

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
+  hash: 961916140
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - 5
+  - 6
   - pre
-  version: 2.0.0.5.pre
+  version: 2.0.0.6.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +03:00
+date: 2010-05-17 00:00:00 +03:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 1913
         segments: 
         - 957
         version: "957"
@@ -45,13 +48,13 @@ files:
 - bin/rsence
 - lib/conf/argv.rb
 - lib/conf/default.rb
-- lib/conf/wizard.rb
 - lib/daemon/daemon.rb
 - lib/daemon/sigcomm.rb
 - lib/http/broker.rb
 - lib/http/rackup.rb
 - lib/http/request.rb
 - lib/http/response.rb
+- lib/plugins/dependencies.rb
 - lib/plugins/gui_plugin.rb
 - lib/plugins/guiparser.rb
 - lib/plugins/plugin.rb
@@ -59,6 +62,7 @@ files:
 - lib/plugins/plugin_sqlite_db.rb
 - lib/plugins/plugin_util.rb
 - lib/plugins/pluginmanager.rb
+- lib/plugins/plugins.rb
 - lib/plugins/servlet.rb
 - lib/session/msg.rb
 - lib/session/sessionmanager.rb
@@ -67,43 +71,41 @@ files:
 - lib/util/gzstring.rb
 - lib/values/hvalue.rb
 - lib/values/valuemanager.rb
+- setup/legacy/info.yaml
+- setup/legacy/legacy.rb
 - setup/welcome/gui/welcome.yaml
 - setup/welcome/info.yaml
 - setup/welcome/text/welcome.html
 - setup/welcome/values.yaml
 - setup/welcome/welcome.rb
 - conf/config.ru
-- conf/config.yaml
 - conf/default_conf.yaml
 - conf/default_strings.yaml
-- conf/local_conf.yaml.devel
+- conf/rsence_command_strings.yaml
 - conf/unicorn.conf
 - plugins/client_pkg/client_pkg.rb
 - plugins/client_pkg/info.yaml
 - 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/client_pkg/log/build_log
 - 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/index_html/tmpl/startup_index.html
+- plugins/main/info.yaml
 - plugins/main/js/riassence_ns.js
 - plugins/main/main.rb
 - plugins/main/values.yaml
-- plugins/legacy/disabled
-- plugins/legacy/disabled-
-- plugins/legacy/info.yaml
-- plugins/legacy/legacy.rb
-- plugins/ticketservices/lib/common.rb
-- plugins/ticketservices/lib/favicon.rb
-- plugins/ticketservices/lib/file.rb
-- plugins/ticketservices/lib/img.rb
-- plugins/ticketservices/lib/objblob.rb
-- plugins/ticketservices/lib/rsrc.rb
-- plugins/ticketservices/lib/upload.rb
-- plugins/ticketservices/ticketservices.rb
+- plugins/ticket/lib/common.rb
+- plugins/ticket/lib/favicon.rb
+- plugins/ticket/lib/file.rb
+- plugins/ticket/lib/img.rb
+- plugins/ticket/lib/objblob.rb
+- plugins/ticket/lib/rsrc.rb
+- plugins/ticket/lib/upload.rb
+- plugins/ticket/ticket.rb
 - js/comm/comm/autosync/autosync.js
 - js/comm/comm/autosync/js.inc
 - js/comm/comm/comm.js
@@ -354,18 +356,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -374,9 +380,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Pre-Release 2.0 version of the RSence RIA GUI Framework. Don't use for production (yet).
+summary: Pre-Release 2.0 version of the RSence framework.
 test_files: []