spqr 0.0.2 → 0.0.4

data/CHANGES

@@ -0,0 +1,26 @@
+version 0.0.4  (180897a77b55400b31d364a08cb9f81c423eb59f)
+
+*  Test suite is mainly stable (individual tests will sometimes hang
+   upon creating a QMF agent).
+*  This is probably the last version before I change the method call API.
+
+version 0.0.3  (060c7b5bcaa2711b3e3ce511c9c3ecaa59bf0de8)
+
+*  Agent-ready callback and parent-process notification (app.rb)
+*  The beginnings of an SPQR test suite
+
+version 0.0.2  (ecd94b141307c5f0f141833836ea686854cfda9c)
+
+*  First shaky pass at automated RPM packaging (see rpmspec and
+   srpm rake targets)
+*  Automatic find_all methods for Rhubarb persisting classes
+
+version 0.0.1  (0714a87f30469772fc302515e95576e329f7deb9)
+
+*  Gem support
+*  Codegen fixes
+
+version 0.0.0  (bbbc2e9d6983f773f6d093a821a0e635714ea869)
+
+*  Initial numbered release; corresponds roughly to the functionality
+   from the "Introducing SPQR" blog posts, but with an added Rakefile.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

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}
+      defaults = {:logfile=>STDERR, :loglevel=>Logger::WARN, :notifier=>nil}
       
       # convenient shorthands for log levels
       loglevels = {:debug => Logger::DEBUG, :info => Logger::INFO, :warn => Logger::WARN, :error => Logger::ERROR, :fatal => Logger::FATAL}
@@ -43,6 +43,9 @@ module SPQR
 
       @classes_by_name = {}
       @classes_by_id = {}
+      @pipe = options[:notifier]
+      @app_name = (options[:appname] or "SPQR application")
+
     end
 
     def register(*ks)
@@ -100,7 +103,7 @@ module SPQR
     end
 
     def get_query(context, query, user_id)
-      @log.debug "query: user=#{user_id} context=#{context} class=#{query.class_name} object_num=#{query.object_id.object_num_low if query.object_id} details=#{query}"
+      @log.debug "query: user=#{user_id} context=#{context} class=#{query.class_name} object_num=#{query.object_id.object_num_low if query.object_id} details=#{query} haveSelect=#{query.impl and query.impl.haveSelect} getSelect=#{query.impl and query.impl.getSelect} (#{query.impl and query.impl.getSelect and query.impl.getSelect.methods.inspect})"
 
       cmeta = @classes_by_name[query.class_name]
       objs = []
@@ -136,8 +139,9 @@ module SPQR
       
       @connection = Qmf::Connection.new(settings)
       @log.debug(" +-- @connection created:  #{@connection}")
+      @log.debug(" +-- app name is '#{@app_name}'")
 
-      @agent = Qmf::Agent.new(self)
+      @agent = Qmf::Agent.new(self, @app_name)
       @log.debug(" +-- @agent created:  #{@agent}")
 
       @agent.set_connection(@connection)
@@ -150,6 +154,7 @@ module SPQR
       end
       
       @log.debug("entering orbit....")
+
       sleep
     end
 

data/test/example-apps.rb

@@ -0,0 +1,126 @@
+class QmfClicker
+  include ::SPQR::Manageable
+  
+  def QmfClicker.find_by_id(oid)
+    @singleton ||= QmfClicker.new
+    @singleton
+  end
+  
+  def QmfClicker.find_all
+    @singleton ||= QmfClicker.new
+    [@singleton]
+  end
+  
+  def initialize
+    @clicks = 0
+  end
+  
+  def click(args)
+    @clicks = @clicks.succ
+  end
+  
+  spqr_expose :click do |args| 
+  end
+  
+  spqr_statistic :clicks, :int
+  
+  spqr_package :example
+  spqr_class :QmfClicker
+end
+
+class QmfHello
+  include ::SPQR::Manageable
+  
+  def QmfHello.find_by_id(oid)
+    @qmf_hellos ||= [QmfHello.new]
+    @qmf_hellos[0]
+  end
+  
+  def QmfHello.find_all
+    @qmf_hellos ||= [QmfHello.new]
+    @qmf_hellos
+  end
+
+  def hello(args)
+    args["result"] = "Hello, #{args['name']}!"
+  end
+
+  spqr_expose :hello do |args|
+    args.declare :name, :lstr, :in
+    args.declare :result, :lstr, :out
+  end
+  
+  spqr_package :example
+  spqr_class :QmfHello
+end
+
+class QmfDummyProp
+  include ::SPQR::Manageable
+
+  def QmfDummyProp.find_by_id(oid)
+    @qmf_dps ||= [QmfDummyProp.new]
+    @qmf_dps[0]
+  end
+  
+  def QmfDummyProp.find_all
+    @qmf_dps ||= [QmfDummyProp.new]
+    @qmf_dps
+  end
+  
+  def service_name
+    "DummyPropService"
+  end
+  
+  spqr_property :service_name, :lstr
+
+  spqr_class :QmfDummyProp
+  spqr_package :example
+end
+
+
+class QmfIntegerProp
+  include ::SPQR::Manageable 
+
+  SIZE = 12
+ 
+  def initialize(oid)
+    @int_id = oid
+  end
+
+  def spqr_object_id
+    @int_id
+  end
+  
+  def QmfIntegerProp.gen_objects(ct)
+    objs = []
+    ct.times do |x|
+      objs << (new(x))
+    end
+    objs
+  end
+
+  def QmfIntegerProp.find_by_id(oid)
+    @qmf_ips ||= gen_objects(SIZE)
+    @qmf_ips[oid]
+  end
+  
+  def QmfIntegerProp.find_all
+    @qmf_ips ||= gen_objects(SIZE)
+    @qmf_ips
+  end
+
+  def next(args)
+    args['result'] = QmfIntegerProp.find_by_id((@int_id + 1) % QmfIntegerProp::SIZE)
+  end
+  
+  spqr_expose :next do |args|
+    args.declare :result, :objId, :out
+  end
+
+  spqr_property :int_id, :int, :index=>true
+
+  spqr_class :QmfIntegerProp
+  spqr_package :example
+end
+
+

data/test/helper.rb

@@ -1,11 +1,76 @@
 require 'rubygems'
 require 'test/unit'
+require 'qmf'
+require 'timeout'
+require 'thread'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'spqr/spqr'
 require 'spqr/app'
 require 'rhubarb/rhubarb'
 
+module QmfTestHelpers
+  DEBUG = false
+  
+  class AgentNotifyHandler < Qmf::ConsoleHandler
+    def initialize
+      @q = Queue.new
+    end
+    
+    def queue
+      @q
+    end
+
+    def agent_added(agent)
+      puts "GOT AN AGENT:  #{agent}" if DEBUG
+      @q << agent
+    end
+  end
+
+  def app_setup(*classes)
+    unless $broker
+      $notify_handler = AgentNotifyHandler.new
+      $connection = Qmf::Connection.new(Qmf::ConnectionSettings.new)
+      $console = Qmf::Console.new($notify_handler)
+      $broker = $console.add_connection($connection)
+    end
+      
+    @app = SPQR::App.new(:loglevel => (DEBUG ? :debug : :fatal))
+    @app.register *classes
+    @child_pid = fork do 
+      unless DEBUG
+        # replace stdin/stdout/stderr
+        $stdin.reopen("/dev/null", "r")
+        $stdout.reopen("/dev/null", "w")
+        $stderr.reopen("/dev/null", "w")
+      end
+
+      @app.main
+    end
+    
+    $broker.wait_for_stable
+
+    Timeout.timeout(5) do
+      k = ""
+      begin
+        @ag = $notify_handler.queue.pop
+        k = @ag.key
+        puts "GOT A KEY:  #{k}" if DEBUG
+      end until k != "1.0"
+
+      # XXX
+      sleep 0.45
+      puts "ESCAPING FROM TIMEOUT" if DEBUG
+    end
+
+  end
+
+  def teardown
+    Process.kill(9, @child_pid) if @child_pid
+  end
+end
+
 class Test::Unit::TestCase
 end

data/test/test_spqr_clicker.rb

@@ -0,0 +1,58 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestSpqrClicker < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_no_param_method
+    app_setup QmfClicker
+
+    assert_nothing_raised do
+      obj = $console.objects(:class=>"QmfClicker", :agent=>@ag)[0]
+      
+      obj.click({})
+    end
+  end
+
+  def test_statistics_empty
+    app_setup QmfClicker
+
+    obj = $console.objects(:class=>"QmfClicker", :agent=>@ag)[0]
+    assert_equal "clicks", obj.statistics[0][0].name
+    assert_equal 0, obj[:clicks]
+  end
+
+  def test_statistics_postquery
+    app_setup QmfClicker
+
+    x = 0
+    
+    9.times do
+      obj = $console.objects(:class=>"QmfClicker", :agent=>@ag)[0]
+      assert_equal x, obj[:clicks]
+      
+      obj.click({})
+      x = x.succ
+    end
+  end
+
+  def test_statistics_postupdate
+    app_setup QmfClicker
+
+    x = 0
+    obj = $console.objects(:class=>"QmfClicker", :agent=>@ag)[0]
+    
+    9.times do
+      obj.update
+      assert_equal x, obj[:clicks]
+      
+      obj.click({})
+      x = x.succ
+    end
+  end
+end

data/test/test_spqr_dummyprop.rb

@@ -0,0 +1,18 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestSpqrDummyProp < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_property_basic
+    app_setup QmfDummyProp
+
+    obj = $console.objects(:class=>"QmfDummyProp", :agent=>@ag)[0]
+    assert_equal "DummyPropService", obj[:service_name]
+  end
+end

data/test/test_spqr_hello.rb

@@ -0,0 +1,30 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestSpqrHello < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_hello_objects
+    app_setup QmfHello
+    objs = $console.objects(:class=>"QmfHello", :agent=>@ag)
+    assert objs.size > 0
+  end
+
+  def test_hello_call
+    app_setup QmfHello
+    obj = $console.objects(:class=>"QmfHello", :agent=>@ag)[0]
+    
+    val = obj.hello("ruby").result
+    args = { 'name' => 'ruby' }
+    QmfHello.find_by_id(0).hello(args)
+
+    expected = args['result']
+
+    assert_equal expected, val
+  end
+end

data/test/test_spqr_integerprop.rb

@@ -0,0 +1,51 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestSpqrIntegerProp < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_reference_returning_method
+    app_setup QmfIntegerProp
+    
+    objs = $console.objects(:class=>"QmfIntegerProp", :agent=>@ag)
+    
+    objs.size.times do |x|
+      expected = objs[(x + 1) % QmfIntegerProp::SIZE]
+      actual = $console.object(:object_id=>objs[x].next.result)
+      assert_equal expected.int_id, actual.int_id
+    end
+  end
+
+  def test_property_identities
+    app_setup QmfIntegerProp
+
+    objs = $console.objects(:class=>"QmfIntegerProp", :agent=>@ag)
+    ids = Set.new
+
+    objs.each do |obj| 
+      ids << obj[:int_id] 
+    end
+
+    assert_equal objs.size, ids.size
+    
+    objs.size.times do |x|
+      assert ids.include?(x), "ids should include #{x}, which is less than #{objs.size}"
+    end
+  end
+
+  def test_find_objs_by_props
+    app_setup QmfIntegerProp
+
+    sz = QmfIntegerProp::SIZE
+
+    sz.times do |x|
+      obj = $console.objects(:class=>"QmfIntegerProp", 'int_id'=>x, :agent=>@ag)[0]
+      assert_equal x, obj[:int_id]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spqr
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -06:00
+date: 2009-12-08 00:00:00 -06:00
 default_executable: spqr-gen.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGES
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -55,9 +56,13 @@ files:
 - spec/spec_helper.rb
 - spec/spqr_spec.rb
 - spqr.spec.in
+- test/example-apps.rb
 - test/helper.rb
 - test/test_rhubarb.rb
-- test/test_spqr.rb
+- test/test_spqr_clicker.rb
+- test/test_spqr_dummyprop.rb
+- test/test_spqr_hello.rb
+- test/test_spqr_integerprop.rb
 has_rdoc: true
 homepage: http://git.fedorahosted.org/git/grid/spqr.git
 licenses: []
@@ -89,9 +94,12 @@ summary: "SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in
 test_files: 
 - spec/spqr_spec.rb
 - spec/spec_helper.rb
+- test/example-apps.rb
+- test/test_spqr_dummyprop.rb
 - test/helper.rb
+- test/test_spqr_clicker.rb
+- test/test_spqr_integerprop.rb
 - test/test_rhubarb.rb
-- test/test_spqr.rb
+- test/test_spqr_hello.rb
 - examples/hello.rb
-- examples/codegen/EchoAgent.rb
 - examples/logservice.rb

data/examples/codegen/EchoAgent.rb

@@ -1,33 +0,0 @@
-module Examples
-  module Codegen
-    class EchoAgent
-      include SPQR::Manageable
-      
-      spqr_package 'examples.codegen'
-      spqr_class 'EchoAgent'
-      # Find method (NB:  you must implement this)
-      def EchoAgent.find_by_id(objid)
-        EchoAgent.new
-      end
-      # Find-all method (NB:  you must implement this)
-      def EchoAgent.find_all
-        [EchoAgent.new]
-      end
-      ### Schema method declarations
-      
-      # echo returns its argument
-      # * arg (lstr/IO)
-      # 
-      def echo(args)
-        # Print values of in/out parameters
-        log.debug "arg => #{args["arg"]}" # 
-        # Assign values to in/out parameters
-        args["arg"] = args["arg"]
-      end
-      
-      spqr_expose :echo do |args|
-        args.declare :arg, :lstr, :inout, {}
-      end
-    end
-  end
-end

data/test/test_spqr.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSpqr < Test::Unit::TestCase
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end