slow_blink 0.0.6 → 0.0.7

data/test/tc_model_string.rb

@@ -0,0 +1,29 @@
+require "test/unit"
+require 'slow_blink'
+
+class TestModelString < Test::Unit::TestCase
+
+    include SlowBlink
+
+    def setup
+        schema = Schema.new(SchemaBuffer.new("Test/0 -> string Field"))
+        @model = Message::Model.new(schema)        
+    end
+
+    def test_init
+        assert_equal("hello", @model.group("Test").new("Field" => "hello")["Field"])            
+    end
+
+    def test_encode_compact
+        output = @model.group("Test").new("Field" => "hello").encode_compact.force_encoding("ASCII-8BIT")
+        expected = "\x07\x00\x05hello".force_encoding("ASCII-8BIT")
+        assert_equal(expected, output)
+    end
+
+    def test_decode_compact
+        input = "\x07\x00\x05hello".force_encoding("ASCII-8BIT")
+        expected = "hello"
+        assert_equal(expected, @model.decode_compact(input)["Field"])    
+    end
+    
+end

data/test/tc_schema_new.rb

@@ -0,0 +1,212 @@
+require "test/unit"
+require 'slow_blink'
+
+class TestTypes < Test::Unit::TestCase
+
+    include SlowBlink
+
+    def test_empty_group
+        input = "test"
+        Schema.new(SchemaBuffer.new(input))        
+    end
+
+    def test_empty_super_group
+        input = <<-eos
+            super
+            empty : super
+        eos
+        Schema.new(SchemaBuffer.new(input))
+    end
+
+    def test_undefined_super_group
+        input = "empty : super"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_group_is_super_group
+        input = "empty : empty"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_group_is_super_group_by_intermediate
+        input = <<-eos
+            intermediate = empty
+            empty : intermediate
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_super_group_is_dynamic
+        input = <<-eos
+            super
+            intermediate = super*
+            empty : intermediate
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_super_group_is_sequence
+        input = <<-eos
+            super
+            intermediate = super []
+            empty : intermediate
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_greeting
+        input = "Message/0 -> string Greeting"
+        Schema.new(SchemaBuffer.new(input))    
+    end
+
+    def test_namespace_empty_group
+        input = "namespace test empty"
+        Schema.new(SchemaBuffer.new(input))    
+    end
+
+    def test_enum_single
+        input = "test = | lonely"
+        Schema.new(SchemaBuffer.new(input))    
+    end
+
+    def test_circular_type_reference
+        input = <<-eos
+            test = testTwo
+            testTwo = test
+        eos
+        
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_duplicate_type_reference
+        input = <<-eos
+            test = u8
+            test = u16
+        eos
+                
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_duplicate_type_group_definition
+        input = <<-eos
+            test = u8
+            test -> u16 field
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_duplicate_group_definition
+        input = <<-eos
+            test -> u8 field
+            test -> u16 field
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_duplicate_enum_definition
+        input = <<-eos
+            test = | bla
+            test = | bla
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_duplicate_enum_field
+        input = "test = bla | bla"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_ambiguous_enum_value
+        input = "Month = Jan/1 | Feb | Mar/2"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_enum_value_upper_limit
+        input = "Month = | Jan/2147483648"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end        
+    end
+
+    def test_enum_value_lower_limit
+        input = "Month = | Jan/-2147483649"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end        
+    end
+
+    def test_duplicate_group_field
+        input = "test -> u8 bla, u8 bla"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_super_group_shadow_field
+        input = <<-eos
+            super -> u8 field
+            test : super -> u16 field
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_super_super_group_shadow_field
+        input = <<-eos
+            superSuper -> u8 field
+            super : superSuper -> u8 different
+            test : super -> u16 field
+        eos
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_incomplete_body
+        input = "test -> u8 field,"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_incomplete_enum
+        input = "test = one |"
+        assert_raise ParseError do
+            Schema.new(SchemaBuffer.new(input))
+        end
+    end
+
+    def test_definition_annotes
+        input = <<-eos
+            @test='hello world'
+            enum = | something
+        eos
+        Schema.new(SchemaBuffer.new(input))        
+    end
+    
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slow_blink
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Cameron Harper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -61,55 +61,52 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".yardopts"
-- ext/slow_blink/ext_schema_parser/common.h
 - ext/slow_blink/ext_schema_parser/extconf.rb
 - ext/slow_blink/ext_schema_parser/lexer.c
 - ext/slow_blink/ext_schema_parser/lexer.h
 - ext/slow_blink/ext_schema_parser/parser.c
 - ext/slow_blink/ext_schema_parser/parser.h
-- ext/slow_blink/message/ext_compact_encoder/compact_encoder.c
-- ext/slow_blink/message/ext_compact_encoder/compact_encoder.h
+- ext/slow_blink/message/ext_compact_encoder/blink_compact.c
+- ext/slow_blink/message/ext_compact_encoder/blink_compact.h
+- ext/slow_blink/message/ext_compact_encoder/blink_debug.h
+- ext/slow_blink/message/ext_compact_encoder/blink_stream.c
+- ext/slow_blink/message/ext_compact_encoder/blink_stream.h
 - ext/slow_blink/message/ext_compact_encoder/ext_compact_encoder.c
 - ext/slow_blink/message/ext_compact_encoder/extconf.rb
 - lib/slow_blink.rb
-- lib/slow_blink/annotatable.rb
-- lib/slow_blink/annotation.rb
 - lib/slow_blink/binary.rb
 - lib/slow_blink/boolean.rb
 - lib/slow_blink/date.rb
 - lib/slow_blink/decimal.rb
 - lib/slow_blink/definition.rb
-- lib/slow_blink/enumeration.rb
+- lib/slow_blink/dynamic_group.rb
+- lib/slow_blink/enum.rb
 - lib/slow_blink/field.rb
 - lib/slow_blink/fixed.rb
 - lib/slow_blink/floating_point.rb
+- lib/slow_blink/generate_c/model.rb
 - lib/slow_blink/group.rb
-- lib/slow_blink/incremental_annotation.rb
 - lib/slow_blink/integer.rb
-- lib/slow_blink/log.rb
 - lib/slow_blink/message/binary.rb
 - lib/slow_blink/message/boolean.rb
 - lib/slow_blink/message/date.rb
 - lib/slow_blink/message/decimal.rb
-- lib/slow_blink/message/enumeration.rb
+- lib/slow_blink/message/enum.rb
 - lib/slow_blink/message/field.rb
 - lib/slow_blink/message/fixed.rb
 - lib/slow_blink/message/floating_point.rb
 - lib/slow_blink/message/group.rb
 - lib/slow_blink/message/integer.rb
 - lib/slow_blink/message/model.rb
-- lib/slow_blink/message/sequence.rb
 - lib/slow_blink/message/string.rb
 - lib/slow_blink/message/time.rb
 - lib/slow_blink/message/time_of_day.rb
-- lib/slow_blink/name_with_id.rb
-- lib/slow_blink/namespace.rb
 - lib/slow_blink/object.rb
 - lib/slow_blink/parse_error.rb
 - lib/slow_blink/ref.rb
 - lib/slow_blink/schema.rb
 - lib/slow_blink/schema_buffer.rb
-- lib/slow_blink/sequence.rb
+- lib/slow_blink/static_group.rb
 - lib/slow_blink/string.rb
 - lib/slow_blink/sym.rb
 - lib/slow_blink/time.rb
@@ -119,18 +116,15 @@ files:
 - rakefile
 - test/capture_stderr.rb
 - test/tc_compact_encoder.rb
-- test/tc_field.rb
-- test/tc_group.rb
-- test/tc_incr_annote.rb
 - test/tc_inputs.rb
 - test/tc_model_decimal.rb
 - test/tc_model_dynamic_group.rb
 - test/tc_model_extension.rb
 - test/tc_model_sequence_of_string.rb
 - test/tc_model_static_group.rb
+- test/tc_model_string.rb
 - test/tc_model_think_blink.rb
-- test/tc_namespace.rb
-- test/tc_types.rb
+- test/tc_schema_new.rb
 homepage: https://github.com/cjhdev/slow_blink
 licenses:
 - MIT
@@ -151,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Blink Protocol in Ruby
@@ -160,13 +154,10 @@ test_files:
 - test/tc_model_extension.rb
 - test/tc_model_decimal.rb
 - test/tc_compact_encoder.rb
-- test/tc_group.rb
 - test/tc_inputs.rb
-- test/tc_namespace.rb
+- test/tc_model_string.rb
 - test/tc_model_sequence_of_string.rb
-- test/tc_types.rb
 - test/capture_stderr.rb
 - test/tc_model_think_blink.rb
-- test/tc_field.rb
+- test/tc_schema_new.rb
 - test/tc_model_dynamic_group.rb
-- test/tc_incr_annote.rb

data/ext/slow_blink/ext_schema_parser/common.h

@@ -1,27 +0,0 @@
-#ifndef COMMON_H
-#define COMMON_H
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-#include <ruby.h>
-typedef VALUE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-    
-
-#endif

data/ext/slow_blink/message/ext_compact_encoder/compact_encoder.c

@@ -1,258 +0,0 @@
-/* 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.
- *
- * 
- * */
-
-/* includes ***********************************************************/
-
-#include "compact_encoder.h"
-
-/* functions **********************************************************/
-
-uint8_t BLINK_putNull(uint8_t *out, uint32_t outMax)
-{
-    uint8_t retval = 0U;
-
-    if(outMax > 0){
-
-        *out = 0xC0U;
-        retval = 1U;
-    }
-
-    return retval;
-}
-
-uint8_t BLINK_getSizeUnsigned(uint64_t value)
-{
-    uint8_t retval;
-
-    if(value <= 0x7fUL){
-        retval = 1U;
-    }
-    else if(value <= 0x3fffUL){
-        retval = 2U;            
-    }
-    else if(value <= 0xffffUL){
-        retval = 3U;
-    }
-    else if(value <= 0xffffffUL){
-        retval = 4U;
-    }
-    else if(value <= 0xffffffffUL){
-        retval = 5U;
-    }
-    else if(value <= 0xffffffffffUL){
-        retval = 6U;
-    }
-    else if(value <= 0xffffffffffffUL){
-        retval = 7U;
-    }
-    else if(value <= 0xffffffffffffffUL){
-        retval = 8U;
-    }
-    else{
-        retval = 9U;
-    }
-
-    return retval;
-}
-
-uint8_t BLINK_getSizeSigned(int64_t value)
-{
-    uint8_t retval;
-    uint8_t i;
-
-    if(value < 0){
-
-        if(value >= -64){
-
-            retval = 1U;
-        }
-        else if(value >= -8192){
-
-            retval = 2U;
-        }
-        else{
-
-            int64_t min = -32768;
-            retval = 3U;
-
-            for(i=0; i < 6; i++){
-
-                if((min << (i*8)) <= value){
-
-                    break;
-                }
-                else{
-
-                    retval++;
-                }
-            }
-        }
-    }
-    else{
-
-        if(value <= 0x3fL){
-            retval = 1U;
-        }
-        else if(value <= 0x1fffL){
-            retval = 2U;            
-        }
-        else if(value <= 0x7fffL){
-            retval = 3U;
-        }
-        else if(value <= 0x7fffffL){
-            retval = 4U;
-        }
-        else if(value <= 0x7fffffffL){
-            retval = 5U;
-        }
-        else if(value <= 0x7fffffffffL){
-            retval = 6U;
-        }
-        else if(value <= 0x7fffffffffffL){
-            retval = 7U;
-        }
-        else if(value <= 0x7fffffffffffffL){
-            retval = 8U;
-        }
-        else{
-            retval = 9U;
-        }
-    }
-
-    return retval;
-}
-
-uint8_t BLINK_putVLC(uint64_t in, bool isSigned, uint8_t *out, uint32_t outMax)
-{
-    uint8_t bytes = (isSigned) ? BLINK_getSizeSigned((int64_t)in) : BLINK_getSizeUnsigned(in);
-    uint8_t retval = 0U;
-    uint8_t i;
-
-    if(outMax >= bytes){
-
-        if(bytes == 1){
-
-            *out = (uint8_t)(in & 0x7f);
-        }
-        else if(bytes == 2){
-
-            out[0] = 0x80 | (uint8_t)(in & 0x3f);
-            out[1] = (uint8_t)(in >> 6);   
-        }
-        else{
-            
-            out[0] = 0xC0U | bytes-1;
-            for(i=1; i < bytes; i++){
-
-                out[i] = (uint8_t)(in >> ((i-1)*8));
-            }            
-        }
-        retval = bytes;
-    }
-
-    return retval;
-}
-
-uint8_t BLINK_getVLC(const uint8_t *in, uint32_t inLen, bool isSigned, uint64_t *out, bool *isNull)
-{
-    uint8_t retval = 0U;
-    uint8_t bytes;
-    uint8_t i;
-
-    *isNull = false;
-
-    if(inLen > 0){
-
-        if(*in < 0xc0){
-
-            if(*in < 0x80){
-
-                if(isSigned && ((*in & 0x40) == 0x40)){
-
-                    *out = 0xffffffffffffffc0;
-                }
-                else{
-                    
-                    *out = 0x0;
-                }
-                *out |= (uint64_t)(*in & 0x7f);
-                retval = 1U;  
-            }
-            else{
-
-                if(inLen >= 2){
-                    
-                    if(isSigned && ((in[1] & 0x80) == 0x80)){
-
-                        *out = 0xffffffffffffff00;            
-                    }
-                    else{
-                        
-                        *out = 0x0;
-                    }
-                    *out |= (uint64_t)in[1];
-                    *out <<= 6;
-                    *out |= (uint64_t)(in[0] & 0x3fU);
-                    retval = 2U;
-                }
-            }
-        }
-        else if(*in == 0xc0){
-
-            *isNull = true;
-            retval = 1U;
-        }
-        else{
-
-            bytes = *in & 0x3fU;
-
-            if(inLen >= (1U + bytes)){
-
-                if(bytes <= 8U){
-
-                    if(isSigned && ((in[bytes] & 0x80U) == 0x80U)){
-                        
-                        *out = 0xffffffffffff00U | in[bytes];
-                    }
-                    else{
-
-                        *out = in[bytes];
-                    }
-
-                    for(i=bytes-1; i != 0U; i--){
-
-                        *out <<= 8;
-                        *out |= in[i];                        
-                    }
-
-                    retval = bytes + 1U;                    
-                }
-            }
-        }
-    }
-
-    return retval;
-}
-
-
-
-