slow_blink 0.0.4 → 0.0.5

data/lib/slow_blink/message/time_of_day.rb

@@ -21,35 +21,36 @@ module SlowBlink::Message
 
     class TIME_OF_DAY_MILLI
 
-        def self.from_compact!(input)
-            self.new(input.get32!)
+        def self.from_compact!(input, stack)
+            value = input.getU32!
+            if value
+                self.new(value)
+            else
+                value
+            end
         end
     
-        def set(value)
-            if value
-                if value.kind_of? Integer
-                    if value < 86400000
-                        @value = value                            
-                    else
-                        raise Error.new "input out of range"
-                    end
-                elsif value.kind_of? Time
-                    @value = value.to_i
+        def set(value)            
+            if value.kind_of? Integer
+                if value < 86400000
+                    @value = value                            
                 else
-                    raise "what is this?"                        
-                end         
-            elsif self.class.opt?
-                @value = nil
+                    raise RangeError
+                end
+            elsif value.kind_of? Time
+                @value = value.to_i
             else
-                raise
-            end
+                raise TypeError
+            end                     
         end
 
         def get
             @value
         end
 
+        # @note calls {#set}(value)
         def initialize(value)
+            @opt = self.class.opt?
             if value
                 set(value)
             else
@@ -60,60 +61,49 @@ module SlowBlink::Message
         # @private
         def to_compact(out)
             out.putU32(@value)
-            
-        
-   
         end        
     
-        
-    
     end
 
     class TIME_OF_DAY_NANO
                     
-        def self.from_compact!(input)
-            self.new(input.getU64!)
+        def self.from_compact!(input, stack)
+            value = input.getU64!
+            if value
+                self.new(value)
+            else
+                value
+            end
         end
     
-        def set(value)
-            if value
-                if value.kind_of? Integer
-                    if value < 86400000000000
-                        @value = value                            
-                    else
-                        raise Error.new "input out of range"
-                    end
-                elsif value.kind_of? Time
-                    @value = value.to_i
+        def set(value)        
+            if value.kind_of? Integer
+                if value < 86400000000000
+                    @value = value                            
                 else
-                    raise "what is this?"                        
-                end         
-            elsif self.class.opt?
-                @value = nil
+                    raise RangeError
+                end
+            elsif value.kind_of? Time
+                @value = value.to_i
             else
-                raise
-            end
+                raise TypeError                        
+            end                     
         end
 
         def get
             @value
         end
-    
+
+        # @note calls {#set}(value)
         def initialize(value)
-            if value
-                set(value)
-            else
-                @value = nil
-            end
+            set(value)            
         end
 
         # @private
         def to_compact(out)
-            out.putU64(@value) 
+            out.putU64(@value)            
         end        
     
-    
-        
     end
 
 end

data/lib/slow_blink/schema.rb

@@ -47,13 +47,13 @@ module SlowBlink
             end
         end
 
-        # Tagged groups are able to be serialised as dynamic groups
-        #
-        # - These groups are of interest to message code generators
+        # @api user
         #
-        # @return [Hash<Group>]
-        attr_reader :tagged
+        # @return [Hash<Group>] groups indexed by qualified name
+        attr_reader :groups
 
+        attr_reader :tagged
+        
         # @return [Array<Namespace>]
         attr_reader :ns
 
@@ -120,6 +120,18 @@ module SlowBlink
                 end
             end
 
+            # create list of all groups with qualified names
+            @groups = {}
+            @ns.each do |name, ns|
+                ns.groups.each do |g|
+                    if name
+                        @groups[g.nameWithID.name.prepend "#{name}:"] = g
+                    else
+                        @groups[g.nameWithID.name] = g
+                    end                
+                end
+            end
+
             if error
                 raise
             end
@@ -147,7 +159,6 @@ require 'slow_blink/schema_buffer'
 require 'slow_blink/annotatable'
 require 'slow_blink/namespace'
 require 'slow_blink/error'
-require 'slow_blink/ext_compact_encoder'
 require 'slow_blink/version'
 require 'slow_blink/annotation'
 require 'slow_blink/incremental_annotation'

data/lib/slow_blink/version.rb

@@ -18,5 +18,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module SlowBlink
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
 end

data/rakefile

@@ -12,28 +12,33 @@ end
 
 Rake::ExtensionTask.new  do |ext|
     ext.name = "ext_compact_encoder"
-    ext.ext_dir = "ext/slow_blink/ext_compact_encoder"
-    ext.lib_dir = "lib/slow_blink"
+    ext.ext_dir = "ext/slow_blink/message/ext_compact_encoder"
+    ext.lib_dir = "lib/slow_blink/message"
 end
 
-desc "parser tests"
+desc "run contents of test folder"
 Rake::TestTask.new do |t|
     t.name = :test
     t.libs << "lib"
     t.test_files = FileList["test/**/tc_*.rb"]    
 end
 
-desc "run flex-bison"
+desc "run flex-bison to build new parser source"
 task :flexbison do    
     system "flex --outfile=#{DIR_SRC}/lexer.c --header-file=#{DIR_SRC}/lexer.h #{DIR_ETC}/parser.l"
     system "bison -d #{DIR_ETC}/parser.y --output=#{DIR_SRC}/parser.c --report=all --report-file=#{DIR_SRC}/report.txt"    
 end
 
-task :local => [:flexbison, :compile, :test] do    
+desc "run the think_blink benchmark"
+task :benchmark do
+    system "ruby -Ilib -- bench/tutorial_example.rb"
 end
 
-task :benchmark do
-    system "ruby -Ilib -- bench/think_blink_example.rb"
+desc "run code in examples folder"
+task :run_examples do
+    Dir.glob("examples/**/*.rb").each do |f|
+        system "ruby -Ilib -Cexamples -- #{f.sub("examples/", "")}"
+    end
 end
 
 task :default => :test

data/test/tc_incr_annote.rb

@@ -24,4 +24,20 @@ class TestIncrAnnote < Test::Unit::TestCase
 
     include SlowBlink
 
+    def test_schema
+
+        raw =  <<-eos
+            Thing
+            AnotherThing ->
+                string Greeting
+
+            schema <- @test="test"
+        eos
+
+        schema = Schema.new(SchemaBuffer.new(raw))
+
+        assert_equal(schema.annotes
+    
+    end
+
 end

data/test/tc_inputs.rb

@@ -25,8 +25,8 @@ testClass = Class.new(Test::Unit::TestCase) do
             # run and intercept stderr output
             err = capture_stderr do
 
-                SlowBlink::Schema.new(SlowBlink::SchemaBuffer.new(inputs[__method__][:buffer], filename: inputs[__method__][:fileName]))
-            
+                schema = SlowBlink::Schema.new(SlowBlink::SchemaBuffer.new(inputs[__method__][:buffer], filename: inputs[__method__][:fileName]))
+
             end
 
             # there should have been no messages to stderr

data/test/tc_model_dynamic_group.rb

@@ -0,0 +1,105 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require "test/unit"
+require 'slow_blink'
+
+class TestModelDynamicGroup < Test::Unit::TestCase
+
+    include SlowBlink
+
+    def setup
+
+        rawSchema = <<-eos
+        DynamicGroup/0x01 ->
+            string one,
+            u8 two,
+            u8 three
+            
+        Test/0x00 ->
+            string one,
+            u8 two,
+            u8 three,
+            DynamicGroup * four            
+        eos
+
+        schema = Schema.new(SchemaBuffer.new(rawSchema))
+        @model = Message::Model.new(schema)
+        
+    end 
+
+    def test_init
+
+        message = @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => @model.group("DynamicGroup").new( 
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            )
+        )
+
+        assert_equal("hello", message["one"])
+        assert_equal(42, message["two"])
+        assert_equal(42, message["three"])
+        assert_equal("world", message["four"]["one"])
+        assert_equal(42, message["four"]["two"])        
+        assert_equal(42, message["four"]["three"])        
+
+    end
+
+    def test_encode_compact
+
+        message = @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => @model.group("DynamicGroup").new( 
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            )
+        )
+
+        output = message.encode_compact
+        
+        expected = "\x13\x00\x05hello\x2a\x2a\x09\x01\x05world\x2a\x2a"
+
+        assert_equal(expected, output)
+    
+    end
+
+    def test_decode_compact
+
+        input = "\x13\x00\x05hello\x2a\x2a\x09\x01\x05world\x2a\x2a"
+
+        message = @model.decode_compact(input)
+
+        assert_equal("hello", message["one"])
+        assert_equal(42, message["two"])
+        assert_equal(42, message["three"])
+        assert_equal("world", message["four"]["one"])
+        assert_equal(42, message["four"]["two"])        
+        assert_equal(42, message["four"]["three"])  
+    
+    end
+    
+end

data/test/tc_model_extension.rb

@@ -0,0 +1,143 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require "test/unit"
+require 'slow_blink'
+
+class TestModelExtension < Test::Unit::TestCase
+
+    include SlowBlink
+
+    def setup
+
+        rawSchema = <<-eos
+        StaticGroup ->
+            string one,
+            u8 two,
+            u8 three
+            
+        Test/0x00 ->
+            string one,
+            u8 two,
+            u8 three,
+            StaticGroup four            
+        eos
+
+        schema = Schema.new(SchemaBuffer.new(rawSchema))
+        @model = Message::Model.new(schema)
+        
+    end
+
+    def test_init
+
+        message = @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => {
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            }
+        )
+
+        message.extension << @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => {
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            }
+        )
+            
+        assert_equal("hello", message["one"])
+        assert_equal(42, message["two"])
+        assert_equal(42, message["three"])
+        assert_equal("world", message["four"]["one"])
+        assert_equal(42, message["four"]["two"])        
+        assert_equal(42, message["four"]["three"])
+
+        assert_equal(1, message.extension.size)
+        assert_equal("hello", message.extension.first["one"])
+        assert_equal(42, message.extension.first["two"])
+        assert_equal(42, message.extension.first["three"])
+        assert_equal("world", message.extension.first["four"]["one"])
+        assert_equal(42, message.extension.first["four"]["two"])        
+        assert_equal(42, message.extension.first["four"]["three"])
+          
+    end
+
+    def test_encode_compact
+
+        message = @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => {
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            }
+        )
+
+        message.extension << @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => {
+                "one" => "world",
+                "two" => 42,
+                "three" => 42
+            }
+        )
+
+        output = message.encode_compact
+        
+        expected = "\x24\x00\x05hello\x2a\x2a\x05world\x2a\x2a\x01\x11\x00\x05hello\x2a\x2a\x05world\x2a\x2a"
+
+        assert_equal(expected, output)
+        
+    end
+
+    def test_decode_compact
+
+        input = "\x24\x00\x05hello\x2a\x2a\x05world\x2a\x2a\x01\x11\x00\x05hello\x2a\x2a\x05world\x2a\x2a"
+
+        message = @model.decode_compact(input)
+
+        assert_equal("hello", message["one"])
+        assert_equal(42, message["two"])
+        assert_equal(42, message["three"])
+        assert_equal("world", message["four"]["one"])
+        assert_equal(42, message["four"]["two"])        
+        assert_equal(42, message["four"]["three"])
+
+        assert_equal(1, message.extension.size)
+        assert_equal("hello", message.extension.first["one"])
+        assert_equal(42, message.extension.first["two"])
+        assert_equal(42, message.extension.first["three"])
+        assert_equal("world", message.extension.first["four"]["one"])
+        assert_equal(42, message.extension.first["four"]["two"])        
+        assert_equal(42, message.extension.first["four"]["three"])
+    
+    end
+
+end

data/test/tc_model_static_group.rb

@@ -44,39 +44,19 @@ class TestModelStaticGroup < Test::Unit::TestCase
         
     end
 
-    def test_init_individual
-
-        message = @model.group "Test" do |g|
-            g["one"] = "hello"
-            g["two"] = 42
-            g["three"] = 42
-            g["four"]["one"] = "world"
-            g["four"]["two"] = 42
-            g["four"]["three"] = 42
-        end
-        
-        assert_equal("hello", message["one"])
-        assert_equal(42, message["two"])
-        assert_equal(42, message["three"])
-        assert_equal("world", message["four"]["one"])
-        assert_equal(42, message["four"]["two"])        
-        assert_equal(42, message["four"]["three"])        
+    def test_init
 
-    end
-    
-    def test_init_part_bulk
-
-        message = @model.group "Test" do |g|
-            g["one"] = "hello"
-            g["two"] = 42
-            g["three"] = 42
-            g["four"] = {
+        message = @model.group("Test").new(
+            "one" => "hello",
+            "two" => 42,
+            "three" => 42,
+            "four" => {
                 "one" => "world",
                 "two" => 42,
                 "three" => 42
             }
-        end
-        
+        )
+
         assert_equal("hello", message["one"])
         assert_equal(42, message["two"])
         assert_equal(42, message["three"])
@@ -86,9 +66,9 @@ class TestModelStaticGroup < Test::Unit::TestCase
 
     end
 
-    def test_init_bulk
+    def test_encode_compact
 
-        message = @model.group "Test", {                
+        message = @model.group("Test").new(
             "one" => "hello",
             "two" => 42,
             "three" => 42,
@@ -97,18 +77,29 @@ class TestModelStaticGroup < Test::Unit::TestCase
                 "two" => 42,
                 "three" => 42
             }
-        }
+        )
+
+        output = message.encode_compact
+        
+        expected = "\x11\x00\x05hello\x2a\x2a\x05world\x2a\x2a"
+
+        assert_equal(expected, output)
         
+    end
+
+    def test_decode_compact
+
+        input = "\x11\x00\x05hello\x2a\x2a\x05world\x2a\x2a"
+
+        message = @model.decode_compact(input)
+
         assert_equal("hello", message["one"])
         assert_equal(42, message["two"])
         assert_equal(42, message["three"])
         assert_equal("world", message["four"]["one"])
         assert_equal(42, message["four"]["two"])        
-        assert_equal(42, message["four"]["three"])        
-
+        assert_equal(42, message["four"]["three"])  
+        
     end
 
-
-    
-
 end

data/test/tc_model_think_blink.rb

@@ -37,35 +37,16 @@ class TestModelThinkBlink < Test::Unit::TestCase
         @model = Message::Model.new(schema)
     end
 
-    def test_set_individual
+    def test_set
 
-        message = @model.group "OrderExecuted" do |g|
-            g["Symbol"] = "hey"
-            g["OrderId"] = 42 
-            g["Price"] = 42 
-            g["Qty"] = 42 
-            g["MatchId"] = 42                
-        end            
-        
-        assert_equal("hey", message["Symbol"])
-        assert_equal(42, message["OrderId"])
-        assert_equal(42, message["Price"])
-        assert_equal(42, message["Qty"])
-        assert_equal(42, message["MatchId"])        
-    
-    end
-
-    def test_set_bulk
-
-        message = @model.group "OrderExecuted", {
+        message = @model.group("OrderExecuted").new(        
             "Symbol" => "hey",
-            "OrderId" => 42, 
-            "Price" => 42, 
-            "Qty" => 42, 
-            "MatchId" => 42                
-        }   
+            "OrderId" => 42,
+            "Price" => 42,
+            "Qty" => 42,
+            "MatchId" => 42
+        )
         
-
         assert_equal("hey", message["Symbol"])
         assert_equal(42, message["OrderId"])
         assert_equal(42, message["Price"])
@@ -76,15 +57,15 @@ class TestModelThinkBlink < Test::Unit::TestCase
 
     def test_encode_compact
         
-        message = @model.group "OrderExecuted" do |g|
-            g["Symbol"] = "hey"
-            g["OrderId"] = 42 
-            g["Price"] = 42 
-            g["Qty"] = 42 
-            g["MatchId"] = 42                
-        end            
+        message = @model.group("OrderExecuted").new(        
+            "Symbol" => "hey",
+            "OrderId" => 42,
+            "Price" => 42,
+            "Qty" => 42,
+            "MatchId" => 42
+        )
 
-        output = message.to_compact
+        output = message.encode_compact
         
         expected = "\x09\x4c\x03hey\x2a\x2a\x2a\x2a"
 
@@ -102,7 +83,9 @@ class TestModelThinkBlink < Test::Unit::TestCase
         assert_equal(0, message["OrderId"])
         assert_equal(1, message["Price"])
         assert_equal(2, message["Qty"])
-        assert_equal(3, message["MatchId"])        
+        assert_equal(3, message["MatchId"])
+        
     end
 
+
 end