runivedo 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71806ee2a3cdf9578589b2dd599392845787282
-  data.tar.gz: d9da99756c31119331f46466d38be49e96dd5574
+  metadata.gz: 337b18c990b0bd5e190370b93d146d430038e7a6
+  data.tar.gz: f3dfb2bfe9e898df3a66aa06a777348cb2f82843
 SHA512:
-  metadata.gz: 058d6edde1a2932451a6e382e2a38040a488f971bf528c4d2ebd6f03f412e60bb33032e0b13c93a39695ad01482759161ce281060a05c88065548dd709c511fc
-  data.tar.gz: 001e2323bbbc9c25383f160d6e5679cf5bdffd138ee936825f33dde3cd0a39aee473b9793a0917a31e2cef3e6060fdfa3a0fabf8b0f6bed9894ff3ea67ac0f25
+  metadata.gz: 64f70ae9bb3137faf86e7fce761f8e2be2e1d5ec8803803cba8a2b2d9f5ee8c3550b6cd2552e45c182b71ce88e5120b0f350919507888c55a77549406bcfe0d2
+  data.tar.gz: 6129ac6e393135adbe4d385ca0e6c81772f4503730b82708410de6e793b8a2e66716d78b20356a0c7affef1ba353ee5faacda9b496596cd70222327fc9362827

data/Test Perspective.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uts date="2014-10-02 20:50:44 +0000" generator="uspec" version="1.0">
+  <specification>
+    <tables>
+      <table name="Tables" description="Atomic table objects in the Univedo data model." uuid="af4ffbee-0bfa-4211-9e6b-726b921df081">
+        <fields>
+          <field name="name" description="" type="char" length="50" uuid="607b39d7-b959-4ccf-8a65-94f6c5e1d9e5"/>
+          <field name="uuid" description="" type="uuid" uuid="1c3fdf6a-c86a-4bc7-86d3-0bcb177b4e86"/>
+          <field name="selective" description="" type="bool" uuid="01ab22c1-e78e-4323-b635-5f9748597c1f"/>
+          <field name="description" description="" type="text" uuid="ebc42780-12bd-4844-a712-f5feda39ac38"/>
+        </fields>
+      </table>
+      <table name="Fields" description="Columns in utoms or tables in the Univedo data model." uuid="76231b4f-0c1a-453f-9cf4-f299bd043436">
+        <fields>
+          <field name="name" description="" type="char" length="50" uuid="00397067-f1b1-44b7-8637-769e0f86e6fd"/>
+          <field name="uuid" description="" type="uuid" uuid="d23f4669-2ab7-42ac-98e2-467ef332b47d"/>
+          <field name="type" description="" type="char" length="20" uuid="7dbe9ebb-5178-4aa5-91bb-096fb1ffb894"/>
+          <field name="foreign_key" description="" type="id" uuid="cd380935-5915-4b65-ade0-a5fa1144ee2e"/>
+          <field name="foreign_table" description="" type="id" uuid="ec74db31-3bc6-409c-ae2e-9a6b8d1f2a6c"/>
+          <field name="foreign_inverse" description="" type="bool" uuid="90634fbe-9818-490d-951b-1b81ffe9cf8e"/>
+          <field name="description" description="" type="text" uuid="9b1014e1-ec8e-4231-8746-36b0e8c2379f"/>
+        </fields>
+      </table>
+      <table name="Dummy" description="Dummy utom for test purposes.&#13;&#10;&#13;&#10;Apps can use this utom for testing but should not make any assumptions on data." uuid="195f5ecf-7da9-46c7-af09-3e6c0aaaf782">
+        <fields>
+          <field name="dummy_int8" description="" type="integer" length="1" uuid="43afa38a-28c0-46fc-bd0e-4e302e8583ae"/>
+          <field name="dummy_bool" description="" type="bool" uuid="6666c7a8-ae19-470a-88c3-5410f0ef6cbd"/>
+          <field name="dummy_blob" description="" type="blob" uuid="9ddabd19-4af4-499a-b579-32e4aa369df5"/>
+          <field name="dummy_char" description="" type="char" length="10" uuid="cadd88cc-0d52-46c5-9daf-975085a50b8e"/>
+          <field name="dummy_int16" description="" type="integer" length="2" uuid="ca7f8ef6-abbb-49da-9165-e97b6d1062cc"/>
+          <field name="dummy_int32" description="" type="integer" length="4" uuid="c9f62a3d-84af-4552-848f-7fc35124021a"/>
+          <field name="dummy_int64" description="" type="integer" length="8" uuid="cc69b4db-017e-4a57-837a-9e916ab40728"/>
+          <field name="dummy_float" description="" type="float" length="4" uuid="29d3812a-82c2-4022-9e88-4b1edd980432"/>
+          <field name="dummy_double" description="" type="float" length="8" uuid="23319e53-4f4e-48ad-b6df-93d4d432ed33"/>
+          <field name="dummy_text" description="" type="text" uuid="76df4e6a-785e-4615-b112-19b764e61c05"/>
+          <field name="dummy_datetime" description="" type="datetime" uuid="74860bb5-21eb-4eaf-b213-904587839d37"/>
+          <field name="dummy_uuid" description="" type="uuid" uuid="8d506bbb-9e41-4f51-a522-3646977d0bb5"/>
+          <field name="dummy_id" description="" type="id" uuid="9e593d3f-15fe-42ba-b9f2-6248dc6d16df"/>
+        </fields>
+      </table>
+    </tables>
+    <keys>
+      <key name="Owner" description="" uuid="f39d26c0-1e62-4133-b08f-10bb3855c223"/>
+    </keys>
+    <events>
+      <event name="inserted" description="" uuid="12b3e063-7aa8-44e7-bc8c-4a1b1a238454"/>
+      <event name="deleted" description="" uuid="9507ee43-ea4b-4ba7-88b2-9391ca59dc8a"/>
+    </events>
+  </specification>
+  <apps>
+    <app uuid="cefb4ed2-4ce3-4825-8550-b68a3c142f0a" name="Test Perspective" description="Sample perspective used for testing.">
+      <tables>
+        <table name="dummy" description="" specification="195f5ecf-7da9-46c7-af09-3e6c0aaaf782" selective="true">
+          <fields>
+            <field name="dummy_int8" description="" specification="43afa38a-28c0-46fc-bd0e-4e302e8583ae"/>
+            <field name="dummy_bool" description="" specification="6666c7a8-ae19-470a-88c3-5410f0ef6cbd"/>
+            <field name="dummy_blob" description="" specification="9ddabd19-4af4-499a-b579-32e4aa369df5"/>
+            <field name="dummy_char" description="" specification="cadd88cc-0d52-46c5-9daf-975085a50b8e"/>
+            <field name="dummy_int16" description="" specification="ca7f8ef6-abbb-49da-9165-e97b6d1062cc"/>
+            <field name="dummy_int32" description="" specification="c9f62a3d-84af-4552-848f-7fc35124021a"/>
+            <field name="dummy_int64" description="" specification="cc69b4db-017e-4a57-837a-9e916ab40728"/>
+            <field name="dummy_float" description="" specification="29d3812a-82c2-4022-9e88-4b1edd980432"/>
+            <field name="dummy_double" description="" specification="23319e53-4f4e-48ad-b6df-93d4d432ed33"/>
+            <field name="dummy_text" description="" specification="76df4e6a-785e-4615-b112-19b764e61c05"/>
+            <field name="dummy_datetime" description="" specification="74860bb5-21eb-4eaf-b213-904587839d37"/>
+            <field name="dummy_uuid" description="" specification="8d506bbb-9e41-4f51-a522-3646977d0bb5"/>
+            <field name="dummy_id" description="" specification="9e593d3f-15fe-42ba-b9f2-6248dc6d16df"/>
+            <field name="foreign_key_id" description="" type="foreign_key" foreign_table="dummy" foreign_key="key" foreign_inverse="false"/>
+            <field name="id" description="" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+            <field name="created_at" description="" specification="b749da4b-3c27-4e11-8be2-6cc5c9cdc7c7"/>
+            <field name="updated_at" description="" specification="b34d7140-9005-4362-aa5d-1e091f5772df"/>
+            <field name="human_readable" description="" specification="4cf63bae-c2a9-4958-8809-087d67ff782a"/>
+            <field name="card" description="" specification="2a8ea640-4311-498f-9190-db0442f785c3"/>
+            <field name="foreign_key1_id" description="" type="foreign_key" foreign_table="dummy" foreign_key="key1" foreign_inverse="false"/>
+          </fields>
+        </table>
+        <table name="virt" description="">
+          <fields>
+            <field name="dummy_id" description="" type="foreign_key" foreign_table="dummy" foreign_key="key" foreign_inverse="false"/>
+            <field name="self" description="" type="foreign_key" foreign_table="virt" foreign_key="key" foreign_inverse="false"/>
+            <field name="inverse" description="" type="foreign_key" foreign_table="dummy" foreign_key="key" foreign_inverse="true"/>
+            <field name="dummy_id1" description="" type="foreign_key" foreign_table="dummy" foreign_key="key" foreign_inverse="false"/>
+            <field name="dummy_id2" description="" type="foreign_key" foreign_table="dummy" foreign_key="key1" foreign_inverse="false"/>
+            <field name="dummy2_id" description="" type="foreign_key" foreign_table="dummy_2" foreign_key="key1" foreign_inverse="false"/>
+            <field name="id" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+          </fields>
+        </table>
+        <table name="fields_selective" description="" specification="76231b4f-0c1a-453f-9cf4-f299bd043436" selective="true">
+          <fields>
+            <field name="id" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+          </fields>
+        </table>
+        <table name="fields_inclusive" description="" specification="76231b4f-0c1a-453f-9cf4-f299bd043436" selective="false">
+          <fields>
+            <field name="id" description="" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+            <field name="table_id" description="" type="foreign_key" foreign_table="tables_inclusive" foreign_key="owner" foreign_inverse="false"/>
+          </fields>
+        </table>
+        <table name="dummy_child" description="" parent="dummy" selective="false">
+          <fields>
+          </fields>
+        </table>
+        <table name="dummy_2" description="" specification="195f5ecf-7da9-46c7-af09-3e6c0aaaf782" selective="false">
+          <fields>
+            <field name="id" description="" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+            <field name="dummy_char" specification="cadd88cc-0d52-46c5-9daf-975085a50b8e"/>
+          </fields>
+        </table>
+        <table name="dummy_renamed" description="Dummy with renamed fields." specification="195f5ecf-7da9-46c7-af09-3e6c0aaaf782" selective="false">
+          <fields>
+            <field name="bool_dummy" specification="6666c7a8-ae19-470a-88c3-5410f0ef6cbd"/>
+          </fields>
+        </table>
+        <table name="tables_inclusive" description="" specification="af4ffbee-0bfa-4211-9e6b-726b921df081" selective="false">
+          <fields>
+            <field name="id" specification="c36ce2f6-c4f9-4133-841d-3da4f45f62ca"/>
+          </fields>
+        </table>
+      </tables>
+      <join_tables>
+        <join_table name="test_join" description="" key="key" table_left="dummy" table_right="dummy_2" column_name_left="dummy_id" column_name_right="dummy2_id"/>
+        <join_table name="test_join2" description="" key="key1" table_left="dummy" table_right="dummy_2" column_name_left="dummy_id" column_name_right="dummy2_id"/>
+        <join_table name="test_virt_join" description="" key="key" table_left="dummy" table_right="virt" column_name_left="dummy_id" column_name_right="virt_id"/>
+        <join_table name="test_virt_join2" description="" key="key1" table_left="dummy" table_right="virt" column_name_left="dummy_id" column_name_right="virt_id"/>
+      </join_tables>
+      <keys>
+        <key name="key" description=""/>
+        <key name="key1" description=""/>
+        <key name="owner" description="" specification="f39d26c0-1e62-4133-b08f-10bb3855c223"/>
+      </keys>
+      <events>
+        <event name="inserted" description="" specification="12b3e063-7aa8-44e7-bc8c-4a1b1a238454"/>
+        <event name="deleted" description="" specification="9507ee43-ea4b-4ba7-88b2-9391ca59dc8a"/>
+      </events>
+      <states>
+        <state name="dummy" description="">
+          <instance name="dummy" table="dummy">
+          </instance>
+        </state>
+        <state name="test_state_1" description="">
+          <instance name="dummy" table="dummy">
+            <instance name="dummy_2" table="dummy_2" key="key" join_invert="false" optional="false">
+            </instance>
+          </instance>
+        </state>
+      </states>
+      <listeners>
+        <listener name="test_listener_1_inserted" description="" persistent="true" state="test_state_1" event="inserted"/>
+      </listeners>
+    </app>
+  </apps>
+</uts>

data/lib/runivedo/{session.rb → connection.rb}

@@ -17,10 +17,10 @@ module Runivedo
     @@ro_classes
   end
 
-  class Session
+  class Connection
     attr_reader :error
 
-    def initialize(url, args = {})
+    def initialize(url)
       @remote_objects = {}
       @ws = RfcWebSocket::WebSocket.new(url)
       # Use TCP_NODELAY, since usually SQL queries are pretty small packets.
@@ -29,23 +29,10 @@ module Runivedo
       Thread.new { handle_ws }
       @urologin = RemoteObject.new(self, 0)
       @remote_objects[0] = @urologin
-      @session_remote = @urologin.call_rom('getSession', args)
     end
 
-    def ping(v)
-      @session_remote.ping(v)
-    end
-
-    def get_perspective(name, &block)
-      @session_remote.get_perspective name, &block
-    end
-
-    def apply_uts(uts)
-      @session_remote.apply_uts uts
-    end
-
-    def get_server_version
-      @session_remote.get_server_version
+    def get_session(bucket, auth)
+      @urologin.call_rom('getSession', bucket, auth)
     end
 
     def close
@@ -68,7 +55,6 @@ module Runivedo
         # Read message to an array
         io = StringIO.new(msg)
         data = []
-        session = self
         data << CBOR.load(io, 27 => method(:receive_ro)) while !io.eof?
 
         # Find remote object

data/lib/runivedo/remote_object.rb

@@ -16,8 +16,8 @@ module Runivedo
       end
     end
 
-    def initialize(session, id)
-      @session = session
+    def initialize(connection, id)
+      @connection = connection
       @open = true
       @id = id
       @call_id = 0
@@ -29,7 +29,7 @@ module Runivedo
     def send_notification(name, *args)
       @mutex.synchronize do
         check_open
-        @session.send :send_message, [@id, OPERATION_NOTIFY, name.to_s, args]
+        @connection.send :send_message, [@id, OPERATION_NOTIFY, name.to_s, args]
       end
     end
 
@@ -39,7 +39,7 @@ module Runivedo
         check_open
         call_result = Future.new
         @calls[@call_id] = call_result
-        @session.send :send_message, [@id, OPERATION_CALL_ROM, @call_id, name, args]
+        @connection.send :send_message, [@id, OPERATION_CALL_ROM, @call_id, name, args]
         @call_id += 1
       end
       result = call_result.get
@@ -63,9 +63,9 @@ module Runivedo
     end
 
     def close
-      @session.send :delete_ro, @id
+      @connection.send :delete_ro, @id
       onclose(Runivedo::ConnectionError.new("remote object closed"))
-      @session.send :send_message, [@id, OPERATION_DELETE]
+      @connection.send :send_message, [@id, OPERATION_DELETE]
     end
 
     private

data/lib/runivedo/version.rb

@@ -1,3 +1,3 @@
 module Runivedo
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/runivedo.rb

@@ -2,5 +2,5 @@ require "runivedo/version"
 require "runivedo/error"
 require "runivedo/future"
 require "runivedo/remote_object"
-require "runivedo/session"
+require "runivedo/connection"
 require "runivedo/sql"

data/test/remote_object_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class MockSession
+class MockConnection
   attr_accessor :msg, :onmsg
 
   def send_message(msg)
@@ -13,43 +13,43 @@ end
 
 class RemoteObjectTest < MiniTest::Test
   def test_sending_notifications
-    session = MockSession.new
-    ro = Runivedo::RemoteObject.new(session, 23)
+    connection = MockConnection.new
+    ro = Runivedo::RemoteObject.new(connection, 23)
     ro.send_notification "foo", 1, "2", 3
-    assert_equal [23, 3, "foo", [1, "2", 3]], session.msg
+    assert_equal [23, 3, "foo", [1, "2", 3]], connection.msg
   end
 
   def test_receiving_notifications
     res = nil
-    session = MockSession.new
-    ro = Runivedo::RemoteObject.new(session, 23)
+    connection = MockConnection.new
+    ro = Runivedo::RemoteObject.new(connection, 23)
     ro.on("foo") {|a, b, c| res = [a, b, c]}
     ro.send :receive, [3, "foo", [1, "2", 3]]
     assert_equal [1, "2", 3], res
   end
 
   def test_rom_calls
-    session = MockSession.new
-    ro = Runivedo::RemoteObject.new(session, 23)
-    session.onmsg = -> {ro.send :receive, [2, 0, 0, 42]}
+    connection = MockConnection.new
+    ro = Runivedo::RemoteObject.new(connection, 23)
+    connection.onmsg = -> {ro.send :receive, [2, 0, 0, 42]}
     assert_equal 42, ro.call_rom("foo", 1, "2", 3)
-    assert_equal [23, 1, 0, "foo", [1, "2", 3]], session.msg
+    assert_equal [23, 1, 0, "foo", [1, "2", 3]], connection.msg
   end
 
   def test_rom_errors
     assert_raises Runivedo::SqlError do
-      session = MockSession.new
-      ro = Runivedo::RemoteObject.new(session, 23)
-      session.onmsg = -> {ro.send :receive, [2, 0, 1, "boom"]}
+      connection = MockConnection.new
+      ro = Runivedo::RemoteObject.new(connection, 23)
+      connection.onmsg = -> {ro.send :receive, [2, 0, 1, "boom"]}
       assert_equal 42, ro.call_rom("foo", 1, "2", 3)
-      assert_equal [23, 1, 0, "foo", [1, "2", 3]], session.msg
+      assert_equal [23, 1, 0, "foo", [1, "2", 3]], connection.msg
     end
   end
 
   def test_closes
-    session = MockSession.new
-    ro = Runivedo::RemoteObject.new(session, 23)
+    connection = MockConnection.new
+    ro = Runivedo::RemoteObject.new(connection, 23)
     ro.close
-    assert_equal [23, 4], session.msg
+    assert_equal [23, 4], connection.msg
   end
 end

data/test/session_test.rb

@@ -1,12 +1,13 @@
 require "test_helper"
 
-class SessionTest < MiniTest::Test
+class ConnectionTest < MiniTest::Test
   def setup
-    @session = Runivedo::Session.new TEST_URL, TEST_AUTH
+    @connection = Runivedo::Connection.new TEST_URL
+    @session = @connection.get_session TEST_BUCKET, TEST_AUTH
   end
 
   def teardown
-    @session.close unless @session.closed?
+    @connection.close unless @connection.closed?
   end
 
   def ping(v)
@@ -14,7 +15,7 @@ class SessionTest < MiniTest::Test
   end
 
   def test_connect
-    assert !@session.closed?
+    assert !@connection.closed?
   end
 
   def test_pings_null
@@ -30,12 +31,12 @@ class SessionTest < MiniTest::Test
   end
 
   def test_close
-    @session.close
-    assert @session.closed?
+    @connection.close
+    assert @connection.closed?
   end
 
   def test_error_closed
-    @session.close
+    @connection.close
     assert_raises Runivedo::ConnectionError do
       @session.ping("foo")
     end

data/test/sql_test.rb

@@ -2,12 +2,14 @@ require "test_helper"
 
 class SqlTest < MiniTest::Test
   def setup
-    @session = Runivedo::Session.new TEST_URL, TEST_AUTH
+    @connection = Runivedo::Connection.new TEST_URL
+    @session = @connection.get_session TEST_BUCKET, TEST_AUTH
+    @session.apply_uts IO.read("Test Perspective.xml")
     @perspective = @session.get_perspective "cefb4ed2-4ce3-4825-8550-b68a3c142f0a"
   end
 
   def teardown
-    @session.close
+    @connection.close
   end
 
   def test_connection

data/test/test_helper.rb

@@ -4,5 +4,6 @@ require "minitest/autorun"
 require "minitest/emoji"
 require "runivedo"
 
-TEST_URL = "ws://vagrant/f8018f09-fb75-4d3d-8e11-44b2dc796130"
-TEST_AUTH = {username: "marvin"}
+TEST_URL = "ws://localhost:9011/"
+TEST_BUCKET = "cbd79ca3-1dd4-4ddf-a964-618b593d5fdb"
+TEST_AUTH = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runivedo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Lucas Clemente
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rfc-ws-client
@@ -120,11 +120,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Test Perspective.xml
 - lib/runivedo.rb
+- lib/runivedo/connection.rb
 - lib/runivedo/error.rb
 - lib/runivedo/future.rb
 - lib/runivedo/remote_object.rb
-- lib/runivedo/session.rb
 - lib/runivedo/sql.rb
 - lib/runivedo/version.rb
 - runivedo.gemspec
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding for Univedo