slow_blink 0.0.7 → 0.0.8

data/lib/slow_blink/message/integer.rb

@@ -24,6 +24,10 @@ module SlowBlink::Message
     # @abstract
     class INTEGER
 
+        def self.type
+            @type
+        end
+
         # @param value [Integer]
         # @return [true,false] integer value is within permitted range
         def self.in_range?(value)
@@ -56,13 +60,17 @@ module SlowBlink::Message
             set(value)
         end
 
+        def to_tag
+            @value.to_s
+        end
+
     end
 
     # @abstract
     class U8 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU8
                 self.new(value)
             else
@@ -81,7 +89,7 @@ module SlowBlink::Message
     class U16 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU16
                 self.new(value)
             else
@@ -100,7 +108,7 @@ module SlowBlink::Message
     class U32 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU32
                 self.new(value)
             else
@@ -119,7 +127,7 @@ module SlowBlink::Message
     class U64 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU64
                 self.new(value)
             else
@@ -138,7 +146,7 @@ module SlowBlink::Message
     class I8 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getI8
                 self.new(value)
             else
@@ -157,7 +165,7 @@ module SlowBlink::Message
     class I16 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getI16
                 self.new(value)
             else
@@ -176,7 +184,7 @@ module SlowBlink::Message
     class I32 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getI32
                 self.new(value)
             else
@@ -195,7 +203,7 @@ module SlowBlink::Message
     class I64 < INTEGER
 
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getI64
                 self.new(value)
             else

data/lib/slow_blink/message/model.rb

@@ -96,6 +96,9 @@ module SlowBlink
             # @return [Integer]
             attr_reader :maxRecursion
 
+            # @return [SlowBlink::Schema]
+            attr_reader :schema
+
             # @api user
             #
             # Generate a Model from a {Schema}
@@ -111,27 +114,21 @@ module SlowBlink
                 @taggedGroups = {}
                 @groups = {}
                 @maxRecursion = opts[:maxRecursion]||DEFAULT_MAX_RECURSION
-                maxRecursion = @maxRecursion
 
                 # any of the groups
                 
                 taggedGroups = @taggedGroups
                 
                 @anyTaggedGroup = Class.new(DynamicGroup) do
-                    @maxRecursion = maxRecursion
                     @anyTaggedGroup = self
                     @taggedGroups = taggedGroups
                     @permittedID = schema.groups.map{|g|g.id}.select{|g|g}
                 end
-                    
-                anyTaggedGroup = @anyTaggedGroup
                 
                 # create an anon class for each group defined in schema                
                 schema.groups.each do |g|
                     fields = g.fields.map{|f| _model_field(f)}
-                    @groups[g.name] = Class.new(Group) do
-                        @maxRecursion = maxRecursion
-                        @anyTaggedGroup = anyTaggedGroup                        
+                    @groups[g.name] = Class.new(Group) do                        
                         @name = g.name
                         @id = g.id
                         @fields = fields
@@ -151,7 +148,13 @@ module SlowBlink
             # @raise [WeakError,StrongError]
             # @raise [RecursionLimit]
             def decode_compact(input)
-                @anyTaggedGroup.from_compact(input, []).get
+                depth = @maxRecursion
+                group = @anyTaggedGroup.from_compact(input, depth)
+                if group.nil?
+                    raise "top level group cannot be null"
+                else
+                    group.get
+                end
             end
 
             # @api user
@@ -192,27 +195,24 @@ module SlowBlink
                 # @param type [SlowBlink::Type] type definition
                 # @param opt  [true,false] parent definition may allow this type to be optional
                 def _model_type(type)
-                    anyTaggedGroup = @anyTaggedGroup
-                    maxRecursion = @maxRecursion
-
+                    
                     case type.class
                     when SlowBlink::OBJECT
                         @anyTaggedGroup                    
                     when SlowBlink::DynamicGroup
+                        anyTaggedGroup = @anyTaggedGroup
                         taggedGroups = @taggedGroups
                         Class.new(DynamicGroup) do
                             @anyTaggedGroup = anyTaggedGroup
-                            @maxRecursion = maxRecursion
                             @taggedGroups = taggedGroups
                             @permittedID = type.groups.map{|g|g.id}
+                            @type = type
                         end
                     when SlowBlink::StaticGroup
-                        fields = type.fields.map{|f| _model_field(f)}
+                        groups = @groups
                         Class.new(StaticGroup) do
-                            @maxRecursion = maxRecursion                 
-                            @name = type.name
-                            @id = type.id
-                            @fields = fields                          
+                            @groups = groups
+                            @type = type             
                         end                                                                           
                     else                    
                         Class.new(SlowBlink::Message.const_get(type.class.name.split('::').last)) do
@@ -238,8 +238,10 @@ require "slow_blink/message/boolean"
 require "slow_blink/message/enum"
 require "slow_blink/message/floating_point"
 require "slow_blink/message/group"
+require "slow_blink/message/static_group"
+require "slow_blink/message/dynamic_group"
 require "slow_blink/message/time"
 require "slow_blink/message/time_of_day"
 require "slow_blink/message/date"
 require "slow_blink/message/decimal"
-
+require "slow_blink/message/test_data"

data/lib/slow_blink/message/static_group.rb

@@ -0,0 +1,63 @@
+# @license
+#   
+#   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.
+
+module SlowBlink::Message
+
+    class StaticGroup
+
+        def self.group
+            @groups[@type.name]
+        end
+        
+        def self.from_compact(input, depth)
+            self.new(group.from_compact(input, depth))            
+        end
+
+        def initialize(value)
+            set(value)
+        end
+        
+        def set(value)
+            if value.is_a? self.class.group
+                @value = value
+            elsif value.is_a? Hash
+                @value = self.class.group.new(value)
+            else
+                raise
+            end
+        end
+
+        def get
+            @value
+        end
+        
+        # @private
+        def to_compact(out)
+            @value.to_compact(out)
+        end
+
+        def to_tag
+            "{#{@value.to_tag_value.sub("|","")}}"            
+        end
+
+    end
+
+end

data/lib/slow_blink/message/string.rb

@@ -24,8 +24,12 @@ module SlowBlink::Message
     # @abstract
     class STRING
 
+        def self.type
+            @type
+        end
+
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getString
                 if !@type.size or value.size <= @type.size
                     self.new(value)
@@ -73,6 +77,10 @@ module SlowBlink::Message
             out.putString(@value)
         end
 
+        def to_tag
+            @value
+        end
+
     end
 
 end

data/lib/slow_blink/message/test_data.rb

@@ -0,0 +1,126 @@
+# @license
+#   
+#   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.
+
+module SlowBlink::Message
+
+    class TestData
+
+        # generate test data for a particular model
+        def initialize(model)
+            @model = model
+        end
+
+        # create an instance of group (name) and initialise
+        # the fields
+        def set(name)
+            group = @model.group(name).new
+            @model.schema.groups.detect{|g|g.name == name}.fields.each do |f|
+
+                data = fieldData(f)
+
+                if !f.optional? and data.nil?
+                    raise "what the its #{f.type}"
+                end
+                
+                if f.type.sequence? and data
+                    group[f.name] = [data]
+                else
+                    group[f.name] = data
+                end                
+            end
+            group
+        end
+
+        # return a random valid test value for a given field type
+        #
+        # 
+        def fieldData(field, **opts)
+
+
+            if !field.is_a? SlowBlink::Field
+                ArgumentError.new "field argument must be an instance of SlowBlink::Field"
+            end
+
+            case field.type.class
+            when SlowBlink::FIXED
+                s = (0...field.type.size).map { (65 + rand(26)).chr }.join
+                
+                s
+                
+            when SlowBlink::BINARY, SlowBlink::STRING
+                if field.type.size
+                    s = (0...rand(field.type.size)).map { (65 + rand(26)).chr }.join
+                else
+                    s = (0...rand(50)).map { (65 + rand(26)).chr }.join
+                end
+                
+                s
+                
+            when SlowBlink::BOOLEAN
+                
+                [true, false].sample
+                
+            when SlowBlink::U8, SlowBlink::U16, SlowBlink::U32, SlowBlink::U64, SlowBlink::I8, SlowBlink::I16, SlowBlink::I32, SlowBlink::I64
+                
+                    rand(field.type.class::RANGE)
+                
+            when SlowBlink::FLOATING_POINT, SlowBlink::DECIMAL
+                
+                    rand(Float::MIN, Float::MAX)
+                
+            when SlowBlink::ENUM
+                
+                    field.type.symbols.sample.name
+                
+            when SlowBlink::MILLI_TIME, SlowBlink::NANO_TIME, SlowBlink::DATE
+
+                    0
+                
+            when SlowBlink::TIME_OF_DAY_MILLI, SlowBlink::TIME_OF_DAY_NANO
+                
+                    0
+                                    
+            when SlowBlink::StaticGroup
+
+                
+                set(field.type.name)
+                
+
+            when SlowBlink::DynamicGroup
+
+                set(field.type.groups.select{|g|g.id}.sample.name)
+                
+            else
+                raise "no support for #{field.type}"
+            end
+                
+        end
+
+        private
+
+            def time_rand(from=0.0, to=Time.now)
+                Time.at(from + rand * (to.to_f - from.to_f))
+            end
+
+    end
+
+
+end

data/lib/slow_blink/message/time.rb

@@ -26,8 +26,12 @@ module SlowBlink::Message
     # @abstract
     class MILLI_TIME
 
+        def self.type
+            @type
+        end
+
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getI64
                 self.new(value)
             else
@@ -70,6 +74,10 @@ module SlowBlink::Message
         def to_compact(out)
             out.putI64(@value.strftime('%Q').to_i)            
         end
+
+        def to_tag
+            @value.to_s
+        end
     
     end
 
@@ -100,7 +108,7 @@ module SlowBlink::Message
         # @private
         def to_compact(out)
             out.putI64(@value.strftime('%N').to_i)
-        end
+        end        
         
     end
 

data/lib/slow_blink/message/time_of_day.rb

@@ -24,8 +24,12 @@ module SlowBlink::Message
     # @abstract
     class TIME_OF_DAY_MILLI
 
+        def self.type
+            @type
+        end
+
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU32
                 self.new(value)
             else
@@ -60,14 +64,22 @@ module SlowBlink::Message
         def to_compact(out)
             out.putU32(@value)
         end        
+
+        def to_tag
+            @value.to_s
+        end
     
     end
 
     # @abstract
     class TIME_OF_DAY_NANO
 
+        def self.type
+            @type
+        end
+
         # @private
-        def self.from_compact(input, stack)
+        def self.from_compact(input, depth)
             if value = input.getU64
                 self.new(value)
             else
@@ -102,6 +114,10 @@ module SlowBlink::Message
         def to_compact(out)
             out.putU64(@value)            
         end        
+
+        def to_tag
+            @value.to_s
+        end
     
     end
 

data/lib/slow_blink/schema.rb

@@ -74,8 +74,8 @@ module SlowBlink
 
             if buffer.size > 0
                 buffer.each do |b|
-                    if buffer.kind_of? String
-                        namespace << SlowBlink.parse_file_buffer(buffer)
+                    if b.kind_of? String
+                        namespace << SlowBlink.parse_file_buffer(b)
                     else
                         namespace << SlowBlink.parse_file_buffer(b.buffer, filename: b.filename)
                     end

data/lib/slow_blink/type.rb

@@ -25,7 +25,7 @@ module SlowBlink
     class Type
 
         # @macro location
-        attr_reader :location
+        attr_reader :location   
 
         # @return [true] this type is sequence (repeating) type
         def sequence?
@@ -38,8 +38,8 @@ module SlowBlink
 
         # @private
         def initialize(attr)
-            @location = attr[:loc].freeze
-            @sequence = attr[:sequence]
+            @sequence = (attr[:sequence] ? true : false )
+            @location = attr[:loc].freeze            
             @ns = attr[:ns].freeze
         end
 

data/lib/slow_blink/version.rb

@@ -21,5 +21,5 @@
 
 
 module SlowBlink
-    VERSION = '0.0.7'.freeze
+    VERSION = '0.0.8'.freeze
 end

data/test/tc_inputs.rb

@@ -2,50 +2,59 @@ require_relative "capture_stderr"
 require "test/unit"
 require "slow_blink"
 
-inputs = {}
-root = "test/input"
+#inputs = {}
+#root = File.expand_path(__FILE__)  "test/input"
 
-testClass = Class.new(Test::Unit::TestCase) do
+root = File.expand_path(File.join(File.dirname(__FILE__), "input"))
 
-    class << self
-        attr_accessor :inputs
-    end
+Dir.foreach(root) do |filename|
 
-    Dir.foreach(root) do |filename|
+    next if filename == ".." or filename == "."
 
-        next if filename == ".." or filename == "."
+    testClass = Class.new(Test::Unit::TestCase) do
 
-        test_name = "test_#{filename.sub(".blink", "")}"
-        inputs[test_name.to_sym] = "#{root}/#{filename}"
+        class << self
+            attr_accessor :inputs
+        end
 
-        define_method( test_name ) do
+        test_name = "test_parse"
 
-            # run and intercept stderr output
-            err = capture_stderr do
+        test_name = "test_#{filename.sub(".blink", "")}"
+        
+        define_method( "test_parse" ) do
+            SlowBlink::Schema.read(File.join(root, filename))
+        end
 
-                SlowBlink::Schema.read(inputs[__method__])
+        define_method( "test_model" ) do
 
-            end
+            #puts "parsing #{filename}"
+            schema = SlowBlink::Schema.read(File.join(root, filename))
+            #puts "modeling #{filename}"
+            model = SlowBlink::Message::Model.new(schema)
+            #puts "gen test data"
+            testData = SlowBlink::Message::TestData.new(model)
 
-            # there should have been no messages to stderr
-            assert_equal("", err.string, "unexpected error messages")
+            # self test all serialisable groups
+            schema.groups.select{|g|g.id}.each do |g|
 
-            # if there were messages, forward them to stderr
-            if err.string != ""
+                # initialise a group with valid test data
+                message = testData.set(g.name)
 
-                STDERR.puts err.string
+                # serialise
+                msg = message.encode_compact
 
-            end
+                # decode
+                model.decode_compact(msg)
 
+            end
+            
         end
 
     end
 
+    Object.const_set("TestInputs_#{File.basename(filename, ".blink").gsub("-", "_")}", testClass)
+
 end
 
-# set inputs as a class variable
-testClass.inputs = inputs
 
-# name the dynamic test class
-Object.const_set("TestInputs", testClass)
 

data/test/tc_model_enum.rb

@@ -0,0 +1,47 @@
+require "test/unit"
+require 'slow_blink'
+
+class TestModelEnum < Test::Unit::TestCase
+
+    include SlowBlink
+
+    def setup
+
+        syntax = <<-eos
+        Singleton = | Lonely
+
+        Size = Small | Medium | Large
+
+        ExplicitSize = Small/38 | Medium/40 | Large/42
+
+        Colour = Red/0xff0000 | Green/0x00ff00 | Blue/0x0000ff
+
+        Message/0 ->
+            Singleton One,
+            Size Two,
+            ExplicitSize Three,
+            Colour Four    
+eos
+    
+        schema = Schema.new(syntax)
+        @model = Message::Model.new(schema)        
+    end
+
+    def test_init
+
+        message = @model.group("Message").new(
+            "One" => "Lonely",
+            "Two" => "Small",
+            "Three" => "Medium",
+            "Four" => "Blue"
+        )
+
+        assert_equal("Lonely", message["One"])
+        assert_equal("Small", message["Two"])
+        assert_equal("Medium", message["Three"])
+        assert_equal("Blue", message["Four"])
+
+    end
+    
+end
+