wabur 0.6.2 → 0.7.0

data/test/test_impl.rb

@@ -37,3 +37,5 @@ require 'test_data'
 require 'test_expr'
 require 'test_init'
 require 'test_model'
+
+require 'test_client'

data/test/test_runner.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 require_relative 'helper'
 
@@ -13,12 +12,15 @@ require 'wab/io'
 # This is to verify that WAB-Runners behave as expected.
 #
 # Requirements:
-#   - The Runner (e.g. OpO daemon) should be started with the MirrorController
-#     class.
-#   - The host and port must be the last argument on the command line when
-#     invoking the test.
+#   - A Runner such as wabur or opo-rub.
+#   - The Runner should be started with the MirrorController class in
+#     mirror_controller.rb
+#   - The configuration files for the wabur and opo-rub Runners are in the
+#     runner directory.
 #
-# Example usage:
+# Start the runner using local code (in a separate terminal):
+#    ../bin/wabur -I ../lib -I . -c runner/wabur.conf
+# Run the test:
 #    runner_test.rb localhost:6363
 # -----------------------------------------------------------------------------
 
@@ -29,60 +31,198 @@ $port = $port.to_i
 
 class TestRunner < Minitest::Test
 
+  def setup
+    @client = WAB::Client.new($host, $port)
+    # Delete all records to start with a clean database
+    clear_records(@client)
+  end
+
+  def test_runner_static
+    puts "\n  --- static content" if $VERBOSE
+    uri = URI("http://#{$host}:#{$port}/hello.txt")
+    req = Net::HTTP::Get.new(uri)
+    req['Connection'] = 'Close'
+    resp = Net::HTTP.start(uri.hostname, uri.port) { |h|
+      h.request(req)
+    }
+    assert_equal(Net::HTTPOK, resp.class)
+    assert_equal("Hello\n", resp.body)
+  end
+
+  def test_runner_export
+    puts "\n  --- export" if $VERBOSE
+    uri = URI("http://#{$host}:#{$port}/index.html")
+    req = Net::HTTP::Get.new(uri)
+    req['Connection'] = 'Close'
+    resp = Net::HTTP.start(uri.hostname, uri.port) { |h|
+      h.request(req)
+    }
+    assert_equal(Net::HTTPOK, resp.class)
+  end
+
   # The Runner or rather it's storage is stateful so all steps in the test
   # must be made in order to keep the test self contained. Each step is a
   # separate function though.
-  def test_runner_basics
-    http = Net::HTTP.new($host, $port)
+  def test_runner_using_refs
+    ref = create_records(@client)
+    get_record(@client, ref)
+    update_record(@client, ref)
+    delete_record(@client, ref)
+  end
 
-    # Delete all records to start with a clean database
-    clear_records(http)
-    ref = create_record(http)
-    read_record(http, ref)
-    list_records(http, ref)
+  def test_runner_using_queries
+    ref = create_records(@client)
 
-    ref = update_record(http, ref)
-    read_after_update(http, ref)
+    read_record(@client, ref)
+    list_records(@client)
+    query_records(@client)
+    update_query(@client)
+    delete_query(@client)
+  end
+
+  def test_runner_missing
+    create_records(@client)
 
-    delete_record(http, ref)
-    read_after_delete(http, ref)
+    puts "  --- read missing" if $VERBOSE
+    result = @client.read('Article', {title: 'Missing'})
+    check_result_code(result)
+    assert_equal(0, result[:results].length, 'read results should be empty')
+
+    puts "  --- update missing" if $VERBOSE
+    result = @client.update('Article', {kind: 'Article'}, {title: 'Missing'})
+    check_result_code(result)
+    assert_equal(0, result[:updated].length, 'updated should be empty')
+    
+    puts "  --- delete missing" if $VERBOSE
+    result = @client.delete('Article', {title: 'Missing'})
+    check_result_code(result)
+    assert_equal(0, result[:deleted].length, 'deleted should be empty')
   end
 
-  def clear_records(http)
-    resp = http.send_request('DELETE', '/v1/Article')
-    # Response should be an OK with a JSON body.
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
+  def test_runner_duplicate
+    create_records(@client)
+
+    assert_raises('should fail to create an unsupported kind') {
+      @client.create({
+                      kind: 'Article',
+                      title: 'Sample',
+                      text: 'Different.'}, {title: 'Sample'})
+    }
   end
 
-  # Returns the reference of the created record.
-  def create_record(http)
-    json = %|{
-    "kind": "Article",
-    "title": "Sample",
-    "text": "Just some random text."
-}|
-    resp = http.send_request('PUT', '/v1/Article', json, { 'Content-Type' => 'application/json' })
-    # Response should be an OK with a JSON body.
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
+  def test_runner_multi_match
+    # create records twice so there are duplicates
+    create_records(@client)
+    create_records(@client)
+
+    puts "  --- delete multi" if $VERBOSE
+    result = @client.delete('Article', {title: 'Second'})
+    check_result_code(result)
+    assert_equal(2, result[:deleted].length, 'delete reply.deleted should contain exactly two member')
+
+    result = @client.read('Article')
+    check_result_code(result)
+    assert_equal(4, result[:results].length, 'read reply.results should contain all member')
+  end
+
+  def test_runner_query
+    10.times { |i|
+      @client.create({kind: 'Article', title: "Article-#{i}", num: i})
+    }
+
+    check_query(@client, {where: ['EQ', 'num', 3], select: 'title'}, ['Article-3'])
+    check_query(@client, {where: ['EQ', 'title', 'Article-4'], select: 'title'}, ['Article-4'])
+
+    check_query(@client, {where: ['LT', 'num', 3], select: 'title'}, ['Article-0','Article-1','Article-2'])
+    check_query(@client, {where: ['LTE', 'num', 2], select: 'title'}, ['Article-0','Article-1','Article-2'])
+
+    check_query(@client, {where: ['GT', 'num', 7], select: 'title'}, ['Article-8','Article-9'])
+    check_query(@client, {where: ['GTE', 'num', 7], select: 'title'}, ['Article-7','Article-8','Article-9'])
+
+    check_query(@client, {where: ['BETWEEN', 'num', 5, 7], select: 'title'}, ['Article-5','Article-6','Article-7'])
+    check_query(@client, {where: ['BETWEEN', 'num', 5, 7, false, false], select: 'title'}, ['Article-6'])
+    check_query(@client, {where: ['BETWEEN', 'num', 5, 7, false, true], select: 'title'}, ['Article-6','Article-7'])
+    check_query(@client, {where: ['BETWEEN', 'num', 5, 7, true, false], select: 'title'}, ['Article-5','Article-6'])
+
+    check_query(@client, {where: ['IN', 'num', 1, 3, 5, 7], select: 'title'}, ['Article-1','Article-3','Article-5','Article-7'])
+
+    check_query(@client, {where: ['OR', ['LT', 'num', 2], ['GT', 'num', 7]], select: 'title'}, ['Article-0','Article-1','Article-8','Article-9'])
+    check_query(@client, {where: ['EQ', 'kind', 'Article'], filter: ['NOT', ['BETWEEN', 'num', 2, 7]], select: 'num'}, [0, 1, 8, 9])
+
+    check_query(@client, {where: ['eq', 'kind', 'Article'], filter: ['eq', 'title', 'Article-3'], select: 'num'}, [3])
+    check_query(@client, {where: ['eq', 'kind', 'Article'], filter: ['regex', 'title', 'A.*-[3,4,5]'], select: 'num'}, [3, 4, 5])
+
+    check_query(@client, {where: ['and', ['LT', 'num', 5], ['GT', 'num', 2]], select: 'num'}, [3, 4])
+
+    check_query(@client, {where: ['and', ['LT', 'num', 5], ['or', ['eq', 'num', 0], ['GT', 'num', 2]]], select: 'num'}, [0, 3, 4])
+  end
+
+  def test_runner_rack
+    puts "\n  --- calling rack" if $VERBOSE
+    uri = URI("http://#{$host}:#{$port}/rack/hello")
+    req = Net::HTTP::Post.new(uri)
+    req['Accept-Encoding'] = '*'
+    req['Accept'] = 'application/json'
+    req['User-Agent'] = 'Ruby'
+    req['Connection'] = 'Close'
+    req.body = 'hello'
+    resp = Net::HTTP.start(uri.hostname, uri.port) { |h|
+      h.request(req)
+    }
+    assert_equal(Net::HTTPOK, resp.class)
+    assert_equal('A WABuR Rack Application', resp.body)
+  end
+
+  def check_query(client, query, expect)
+    puts "  --- query #{query}" if $VERBOSE
+    result = client.find(query)
+    check_result_code(result)
+    assert_equal(expect, result[:results].sort, 'result mistmatch')
+  end
+
+  def check_result_code(result)
+    assert_equal(0, result[:code], 'result.code should be 0 meaning no error')
+  end
 
+  def clear_records(client)
+    puts "\n  --- deleting existing records" if $VERBOSE
+    result = client.delete('Article')
+    check_result_code(result)
+  end
+
+  # Returns the reference of the created record.
+  def create_records(client)
+    puts "  --- create records" if $VERBOSE
+    record = {
+      kind: 'Article',
+      title: 'Sample',
+      text: 'Just some random text.'
+    }
+    result = client.create(record)
     # Make sure the message has the correct fields and values.
-    assert_equal(0, reply[:code], 'create reply.code should be 0 meaning no error')
-    ref = reply[:ref]
+    check_result_code(result)
+    ref = result[:ref]
     refute_equal(nil, ref, 'create reply record reference can not be nil')
     refute_equal(0, ref, 'create reply record reference can not be 0')
+
+    # create a couple more records
+    client.create({
+                    kind: 'Article',
+                    title: 'Second',
+                    text: 'More random text.'})
+    client.create({
+                    kind: 'Article',
+                    title: 'Third',
+                    text: 'Even more random text.'})
     ref
   end
 
-  def read_record(http, ref)
-    resp = http.send_request('GET', "/v1/Article/#{ref}")
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
-
+  def get_record(client, ref)
+    puts "  --- get record" if $VERBOSE
+    result = client.read('Article', ref)
     # Make sure the message has the correct fields and values.
-    assert_equal(0, reply[:code], 'read reply.code should be 0 meaning no error')
-    results = reply[:results]
+    check_result_code(result)
+    results = result[:results]
     assert_equal(1, results.length, 'read reply.results should contain exactly one member')
     record = results[0]
     assert_equal(ref, record[:id], 'read reply.results[0].id should match the record reference')
@@ -91,14 +231,12 @@ class TestRunner < Minitest::Test
     assert_equal('Sample', obj[:title], 'read reply obj.title incorrect')
   end
 
-  def list_records(http, ref)
-    resp = http.send_request('GET', '/v1/Article')
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
-
+  def read_record(client, ref)
+    puts "  --- read record" if $VERBOSE
+    result = client.read('Article', {title: 'Sample'})
     # Make sure the message has the correct fields and values.
-    assert_equal(0, reply[:code], 'read reply.code should be 0 meaning no error')
-    results = reply[:results]
+    check_result_code(result)
+    results = result[:results]
     assert_equal(1, results.length, 'read reply.results should contain exactly one member')
     record = results[0]
     assert_equal(ref, record[:id], 'read reply.results[0].id should match the record reference')
@@ -107,71 +245,109 @@ class TestRunner < Minitest::Test
     assert_equal('Sample', obj[:title], 'read reply obj.title incorrect')
   end
 
+  def list_records(client)
+    puts "  --- list records" if $VERBOSE
+    result = client.read('Article')
+    # Make sure the message has the correct fields and values.
+    check_result_code(result)
+    results = result[:results]
+    assert_equal(3, results.length, 'read reply.results should contain all member')
+  end
+
   # Returns the reference of the updated record. There is no requirement that
   # the reference will not change.
-  def update_record(http, ref)
-    json = %|{
-    "kind": "Article",
-    "title": "Sample",
-    "text": "Updated text."
-}|
-    resp = http.send_request('POST', "/v1/Article/#{ref}", json, { 'Content-Type' => 'application/json' })
-    # Response should be an OK with a JSON body.
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
-
+  def update_record(client, ref)
+    puts "  --- update record" if $VERBOSE
+    record = {
+      kind: 'Article',
+      title: 'Sample',
+      text: 'Updated text.'
+    }
+    result = client.update('Article', record, ref)
     # Make sure the message has the correct fields and values.
-    assert_equal(0, reply[:code], 'update reply.code should be 0 meaning no error')
-    updated = reply[:updated]
+    check_result_code(result)
+    updated = result[:updated]
     assert_equal(1, updated.length, 'update reply.updated should contain exactly one member')
     ref = updated[0]
     refute_equal(nil, ref, 'update reply record reference can not be nil')
     refute_equal(0, ref, 'update reply record reference can not be 0')
-    ref
-  end
-
-  def read_after_update(http, ref)
-    resp = http.send_request('GET', "/v1/Article/#{ref}")
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
-
-    assert_equal(0, reply[:code], 'read after update reply.code should be 0 meaning no error')
-    results = reply[:results]
+    # verify
+    result = client.read('Article', ref)
+    check_result_code(result)
+    results = result[:results]
     assert_equal(1, results.length, 'read after update reply.results should contain exactly one member')
     record = results[0]
     assert_equal(ref, record[:id], 'read after update reply.results[0].id should match the record reference')
     obj = record[:data]
     assert_equal('Updated text.', obj[:text], 'read after update reply obj.text incorrect')
+    ref
   end
 
-  def delete_record(http, ref)
-    resp = http.send_request('DELETE', "/v1/Article/#{ref}")
-    # Response should be an OK with a JSON body.
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
-
+  def delete_record(client, ref)
+    puts "  --- delete record" if $VERBOSE
+    result = client.delete('Article', ref)
     # Make sure the message has the correct fields and values.
-    assert_equal(0, reply[:code], 'delete reply.code should be 0 meaning no error')
-    deleted = reply[:deleted]
+    check_result_code(result)
+    deleted = result[:deleted]
     assert_equal(1, deleted.length, 'delete reply.deleted should contain exactly one member')
     ref = deleted[0]
     refute_equal(nil, ref, 'delete reply record reference can not be nil')
     refute_equal(0, ref, 'delete reply record reference can not be 0')
+    # verify
+    result = client.read('Article', ref)
+    check_result_code(result)
+    results = result[:results]
+    assert_equal(0, results.length, 'read after delete reply.results should contain no members')
   end
 
-  def read_after_delete(http, ref)
-    resp = http.send_request('GET', "/v1/Article/#{ref}")
-    assert_equal(Net::HTTPOK, resp.class, 'response not an OK')
-    reply = Oj.strict_load(resp.body, symbol_keys: true)
+  def query_records(client)
+    puts "  --- query records" if $VERBOSE
+    result = client.read('Article', {title: 'Second'})
+    check_result_code(result)
+    results = result[:results]
+    assert_equal(1, results.length, 'read reply.results should contain matching members')
+    assert_equal({kind: 'Article', title: 'Second', text: 'More random text.'}, results[0][:data], 'first result should match the inserted')
+  end
 
-    assert_equal(0, reply[:code], 'read after delete reply.code should be 0 meaning no error')
-    results = reply[:results]
-    assert_equal(0, results.length, 'read after delete reply.results should contain no members')
+  def update_query(client)
+    puts "  --- update query" if $VERBOSE
+    record = {
+      kind: 'Article',
+      title: 'Sample',
+      text: 'Updated text.'
+    }
+    result = client.update('Article', record, {title: 'Sample'})
+    # Make sure the message has the correct fields and values.
+    check_result_code(result)
+    updated = result[:updated]
+    assert_equal(1, updated.length, 'update reply.updated should contain exactly one member')
+    ref = updated[0]
+    refute_equal(nil, ref, 'update reply record reference can not be nil')
+    refute_equal(0, ref, 'update reply record reference can not be 0')
+    # verify
+    result = client.read('Article', {title: 'Sample'})
+    check_result_code(result)
+    results = result[:results]
+    assert_equal(1, results.length, 'read after update reply.results should contain exactly one member')
+    record = results[0]
+    assert_equal(ref, record[:id], 'read after update reply.results[0].id should match the record reference')
+    obj = record[:data]
+    assert_equal('Updated text.', obj[:text], 'read after update reply obj.text incorrect')
   end
 
-  # TBD test failure modes as well
-  # TBD test multiple matches on update and delete
-  # TBD test no matches on update and delete
-  # TBD test queries
+  def delete_query(client)
+    puts "  --- delete query" if $VERBOSE
+    result = client.delete('Article', {title: 'Second'})
+    check_result_code(result)
+    deleted = result[:deleted]
+    assert_equal(1, deleted.length, 'delete reply.deleted should contain exactly one member')
+    ref = deleted[0]
+    refute_equal(nil, ref, 'delete reply record reference can not be nil')
+    refute_equal(0, ref, 'delete reply record reference can not be 0')
+    # verify
+    result = client.read('Article', {title: 'Second'})
+    check_result_code(result)
+    assert_equal(0, result[:results].length, 'read after delete reply.results should contain no members')
+  end
 
 end # TestRunner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wabur
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -163,14 +163,20 @@ files:
 - export/assets/js/wab.js
 - export/index.html
 - lib/wab.rb
+- lib/wab/client.rb
 - lib/wab/controller.rb
 - lib/wab/data.rb
 - lib/wab/errors.rb
 - lib/wab/impl.rb
+- lib/wab/impl/agoo.rb
+- lib/wab/impl/agoo/export_proxy.rb
+- lib/wab/impl/agoo/handler.rb
+- lib/wab/impl/agoo/sender.rb
+- lib/wab/impl/agoo/server.rb
+- lib/wab/impl/agoo/tql_handler.rb
 - lib/wab/impl/bool_expr.rb
 - lib/wab/impl/configuration.rb
 - lib/wab/impl/data.rb
-- lib/wab/impl/export_proxy.rb
 - lib/wab/impl/expr.rb
 - lib/wab/impl/expr_parser.rb
 - lib/wab/impl/exprs/and.rb
@@ -185,22 +191,36 @@ files:
 - lib/wab/impl/exprs/not.rb
 - lib/wab/impl/exprs/or.rb
 - lib/wab/impl/exprs/regex.rb
-- lib/wab/impl/handler.rb
 - lib/wab/impl/init.rb
 - lib/wab/impl/model.rb
 - lib/wab/impl/path_expr.rb
+- lib/wab/impl/rack_error.rb
+- lib/wab/impl/rack_handler.rb
 - lib/wab/impl/shell.rb
+- lib/wab/impl/sinatra.rb
+- lib/wab/impl/sinatra/export_proxy.rb
+- lib/wab/impl/sinatra/handler.rb
+- lib/wab/impl/sinatra/sender.rb
+- lib/wab/impl/sinatra/server.rb
+- lib/wab/impl/sinatra/tql_handler.rb
 - lib/wab/impl/templates/opo-rub.conf.template
 - lib/wab/impl/templates/opo.conf.template
 - lib/wab/impl/templates/spawn.rb.template
 - lib/wab/impl/templates/ui_controller.rb.template
 - lib/wab/impl/templates/wabur.conf.template
 - lib/wab/impl/utils.rb
+- lib/wab/impl/webrick.rb
+- lib/wab/impl/webrick/export_proxy.rb
+- lib/wab/impl/webrick/handler.rb
+- lib/wab/impl/webrick/sender.rb
+- lib/wab/impl/webrick/server.rb
+- lib/wab/impl/webrick/tql_handler.rb
 - lib/wab/io.rb
 - lib/wab/io/call.rb
 - lib/wab/io/engine.rb
 - lib/wab/io/shell.rb
 - lib/wab/open_controller.rb
+- lib/wab/racker.rb
 - lib/wab/shell.rb
 - lib/wab/shell_logger.rb
 - lib/wab/ui.rb
@@ -220,6 +240,7 @@ files:
 - test/bench_io_shell.rb
 - test/helper.rb
 - test/mirror_controller.rb
+- test/test_client.rb
 - test/test_configuration.rb
 - test/test_data.rb
 - test/test_expr.rb
@@ -268,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wabur
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Web Application Builder
@@ -290,6 +311,7 @@ test_files:
 - test/test_expr_lt.rb
 - test/test_expr_gte.rb
 - test/test_expr_gt.rb
+- test/test_client.rb
 - test/helper.rb
 - test/bench_io_shell.rb
 - test/test_expr_eq.rb