spqr 0.1.1 → 0.1.2

data/CHANGES

@@ -1,4 +1,10 @@
-version 0.1.1
+*  Enhancements to SPQR/Rhubarb interoperability.  (Rhubarb row_ids are
+   now used for half of the QMF object ID).
+
+*  Enhancements to app skeleton class: now allows specifying username,
+   password, hostname, and port in the constructor to SPQR::App.
+
+version 0.1.1 (85c87b1239f730374d47e2d8baf795c8c69050f4)
 
 *  Other minor Rhubarb fixes.
 

data/TODO

@@ -6,6 +6,7 @@ To do, overall:
 To do for spqr:
 
 ! Event support
+* Support for map-, array-, and list-valued parameters and properties (QMF on Ruby itself does not support these at the moment)
 * Broader query support (partially done)
 * Documentation
 * Test suite (partially done)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rhubarb/rhubarb.rb

@@ -130,6 +130,8 @@ module PersistingClassMixins
     return self.new(tup) if tup
     nil
   end
+  
+  alias find_by_id find
 
   def find_by(arg_hash)
     arg_hash = arg_hash.dup
@@ -418,7 +420,7 @@ module Persisting
     other.class_eval do
       attr_reader :row_id
       attr_reader :created
-      attr_reader :updated    
+      attr_reader :updated
     end
   end
   

data/lib/spqr/app.rb

@@ -21,7 +21,7 @@ module SPQR
     class ClassMeta < Struct.new(:object_class, :schema_class) ; end
 
     def initialize(options=nil)
-      defaults = {:logfile=>STDERR, :loglevel=>Logger::WARN, :notifier=>nil}
+      defaults = {:logfile=>STDERR, :loglevel=>Logger::WARN, :notifier=>nil, :server=>"localhost", :port=>5672}
       
       # convenient shorthands for log levels
       loglevels = {:debug => Logger::DEBUG, :info => Logger::INFO, :warn => Logger::WARN, :error => Logger::ERROR, :fatal => Logger::FATAL}
@@ -45,7 +45,16 @@ module SPQR
       @classes_by_id = {}
       @pipe = options[:notifier]
       @app_name = (options[:appname] or "SPQR application")
-
+      @qmf_host = options[:server]
+      @qmf_port = options[:port]
+      @qmf_sendUserId = if options.has_key?(:send_user_id)
+                          options[:send_user_id]
+                        else
+                          (options.has_key?(:user) or options.has_key?(:password))
+                        end
+      
+      @qmf_user = options[:user]
+      @qmf_password = options[:password]
     end
 
     def register(*ks)
@@ -82,18 +91,20 @@ module SPQR
         raise RuntimeError.new("#{managed_object.class} does not have #{name} exposed as a manageable method; has #{managed_object.class.spqr_meta.mmethods.inspect}") unless managed_method
 
         # Extract actual parameters from the Qmf::Arguments structure into a proper ruby list
-
-        # XXX: consider adding appropriate impl method to Manageable
-        # to avoid this little dance
+        @log.debug("actual params are: #{args.instance_variable_get(:@by_hash).inspect}") rescue nil
         actuals_in = managed_method.formals_in.inject([]) {|acc,nm| acc << args[nm]}
-        actuals_in = actuals_in[0] if actuals_in.size == 1
+        actual_count = actuals_in.size
 
         @log.debug("managed_object.respond_to? #{managed_method.name.to_sym} ==> #{managed_object.respond_to? managed_method.name.to_sym}")
         @log.debug("managed_object.class.spqr_meta.mmethods.include? #{name.to_sym} ==> #{managed_object.class.spqr_meta.mmethods.include? name.to_sym}")
         @log.debug("formals:  #{managed_method.formals_in.inspect}")
         @log.debug("actuals:  #{actuals_in.inspect}")
 
-        actuals_out = actuals_in.size > 0 ? managed_object.send(name.to_sym, actuals_in) : managed_object.send(name.to_sym)
+        actuals_out = case actual_count
+          when 0 then managed_object.send(name.to_sym)
+          when 1 then managed_object.send(name.to_sym, actuals_in[0])
+          else managed_object.send(name.to_sym, *actuals_in)
+        end
 
         raise RuntimeError.new("#{managed_object.class} did not return the appropriate number of return values; got '#{actuals_out.inspect}', but expected #{managed_method.types_out.inspect}") unless result_valid(actuals_out, managed_method)
         
@@ -157,7 +168,12 @@ module SPQR
       @log.debug("starting SPQR::App.main...")
       
       settings = Qmf::ConnectionSettings.new
-      settings.host = 'localhost'
+      settings.host = @qmf_host
+      settings.port = @qmf_port
+      settings.sendUserId = @qmf_sendUserId
+      
+      settings.username = @qmf_user if @qmf_sendUserId
+      settings.password = @qmf_password if @qmf_sendUserId
       
       @connection = Qmf::Connection.new(settings)
       @log.debug(" +-- @connection created:  #{@connection}")
@@ -201,7 +217,9 @@ module SPQR
 
     def find_object(ctx, c_id, obj_id)
       # XXX:  context is currently ignored
+      @log.debug("in find_object; class ID is #{c_id}, object ID is #{obj_id}...")
       klass = @classes_by_id[c_id]
+      @log.debug("found class #{klass.inspect}")
       klass.find_by_id(obj_id) if klass
     end
     

data/lib/spqr/manageable.rb

@@ -207,6 +207,8 @@ module SPQR
       result = 0
       if self.respond_to? :spqr_object_id 
         result = spqr_object_id
+      elsif self.respond_to? :row_id
+        result = row_id
       else
         result = object_id
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spqr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -06:00
+date: 2009-12-21 00:00:00 -06:00
 default_executable: spqr-gen.rb
 dependencies: 
 - !ruby/object:Gem::Dependency