slow_blink 0.0.4 → 0.0.5

data/ext/slow_blink/ext_schema_parser/parser.h

@@ -67,18 +67,17 @@ extern int yydebug;
     TOK_TYPE = 277,
     TOK_SCHEMA = 278,
     TOK_BINARY = 279,
-    TOK_NUMBER = 280,
-    TOK_FIXED = 281,
-    TOK_LEFT_ARROW = 282,
-    TOK_RIGHT_ARROW = 283,
-    TOK_HEX = 284,
-    TOK_UINT = 285,
-    TOK_INT = 286,
-    TOK_NAME = 287,
-    TOK_NC_NAME = 288,
-    TOK_ESCAPED_NC_NAME = 289,
-    TOK_C_NAME = 290,
-    TOK_LITERAL = 291
+    TOK_FIXED = 280,
+    TOK_LEFT_ARROW = 281,
+    TOK_RIGHT_ARROW = 282,
+    TOK_HEX = 283,
+    TOK_UINT = 284,
+    TOK_INT = 285,
+    TOK_NAME = 286,
+    TOK_NC_NAME = 287,
+    TOK_ESCAPED_NC_NAME = 288,
+    TOK_C_NAME = 289,
+    TOK_LITERAL = 290
   };
 #endif
 

data/ext/slow_blink/{ext_compact_encoder → message/ext_compact_encoder}/ext_compact_encoder.c

@@ -97,8 +97,10 @@ void Init_ext_compact_encoder(void)
 {
     VALUE cSlowBlink;
 
+    rb_require("slow_blink/message/model.rb");
+
     cSlowBlink = rb_define_module("SlowBlink");
-    cError = rb_const_get(cSlowBlink, rb_intern("Error"));
+    cError = rb_const_get(rb_define_module_under(cSlowBlink, "Message"), rb_intern("Error"));
     
     rb_define_method(rb_cString, "putNull", putNull, 0);
     rb_define_method(rb_cString, "putPresent", putPresent, 0);

data/ext/slow_blink/message/ext_compact_encoder/extconf.rb

@@ -0,0 +1,4 @@
+require 'mkmf'
+$CFLAGS += " -std=c99"
+create_makefile('slow_blink/message/ext_compact_encoder')
+

data/lib/slow_blink/error.rb

@@ -18,6 +18,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module SlowBlink
-    class Error < Exception
+    class Error < StandardError
     end
 end

data/lib/slow_blink/message/binary.rb

@@ -21,11 +21,7 @@ module SlowBlink::Message
 
     class BINARY
 
-        def self.opt?
-            @opt
-        end
-
-        def self.from_compact!(input)
+        def self.from_compact!(input, stack)
             value = input.getBinary!
             if value
                 if !@size or value.size <= @size
@@ -33,39 +29,38 @@ module SlowBlink::Message
                 else
                     raise Error.new "W8: Binary value exceeds maximum size"
                 end
-            elsif @opt
-                self.new(nil)
             else
-                raise Error.new "W5: Value cannot be null"
-            end
+                value
+            end               
         end
 
+        # @return [Integer,nil] maximum size of string in bytes
         def self.size
             @type.size
         end
 
+        # @return [String]
+        def get
+            @value
+        end
+
+        # Set a binary value
+        # @param value [String]
+        # @raise [TypeError]
+        # @raise [RangeError] value is larger than {::size}
         def set(value)
-            if value
-                if value.kind_of? String
-                    if !self.class.size or value.size <= self.class.size
-                        @value = value
-                    else
-                        raise Error.new "string cannot be larger than #{self.class.size} bytes"
-                    end
+            if value.kind_of? String
+                if !self.class.size or value.size <= self.class.size
+                    @value = value.to_s
                 else
-                    raise Error.new "expecting a string type"
+                    raise RangeError.new "String instance cannot be larger than #{self.class.size} bytes"
                 end
-            elsif self.class.opt?
-                @value = nil
             else
-                raise Error.new "string cannot be null"
+                raise TypeError.new "expecting a String instance"
             end
         end
 
-        def get
-            @value
-        end
-
+        # @note calls {#set}(value)
         def initialize(value)
             set(value)                
         end
@@ -74,8 +69,6 @@ module SlowBlink::Message
             out.putBinary(@value)
         end
 
-        
-        
     end
 
 end

data/lib/slow_blink/message/boolean.rb

@@ -21,36 +21,36 @@ module SlowBlink::Message
 
     class BOOLEAN
 
-        def self.from_compact!(input)
-            self.new(input.getBool!)
-        end
-
-        def set(value)
+        def self.from_compact!(input, stack)
+            value = input.getBool!
             if value
-                if value.kind_of? TrueClass or value.kind_of? FalseClass
-                    @value = value
-                else
-                    raise "expecting true/false"
-                end
-            elsif self.class.opt?
-                @value = nil
+                self.new(value)
             else
-                raise Error.new "value unacceptable"
+                value
             end
         end
 
+        # @return [TrueClass,FalseClass]
         def get
             @value
         end
 
-        def initialize(value)
-            if value
-                set(value)
+        # Set a boolean value
+        # @param value [TrueClass,FalseClass]
+        # @raise [TypeError] value must be literally TrueClass or FalseClass
+        def set(value)
+            if value.kind_of? TrueClass or value.kind_of? FalseClass
+                @value = value
             else
-                @value = nil
+                raise TypeError.new "expecting true/false"
             end
         end
 
+        # @note calls {#set}(value)
+        def initialize(value)
+            set(value)                
+        end
+
         def to_compact(out)
             out.putBool(@value)
         end

data/lib/slow_blink/message/date.rb

@@ -21,6 +21,30 @@ module SlowBlink::Message
 
     class DATE
 
+        def self.from_compact!(input, stack)
+            value = input.getI32!
+            if value
+                self.new(value)
+            else
+                value
+            end
+        end
+
+        def get
+            @value
+        end
+
+        def set(value)
+            raise Error.new "type not supported"
+        end
+
+        def initialize(value)
+            set(value)            
+        end
+
+        def to_compact(out)
+            out.putI32(@value.strftime('%Q'))            
+        end
         
     end
 

data/lib/slow_blink/message/decimal.rb

@@ -17,9 +17,43 @@
 # 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 'bigdecimal'
+
 module SlowBlink::Message
 
     class DECIMAL
+
+        def self.from_compact!(input, stack)
+            e = input.getI8!
+            if e
+                m = input.getI64!
+                if m
+                    self.new("#{m}E#{e}")
+                else
+                    raise "a null mantissa is not defined"
+                end
+            else
+                nil
+            end                
+        end
+
+        def initialize(value)
+            set(value)
+        end
+
+        def get
+            @value
+        end
+
+        def set(value)
+            @value = BigDecimal.new(value.to_s)            
+        end
+
+        def to_compact(out)
+            out.putI8(@value.exponent)
+            out.putI64(0)
+        end
+    
     end
 
 end

data/lib/slow_blink/message/enumeration.rb

@@ -21,43 +21,44 @@ module SlowBlink::Message
 
     class ENUMERATION
 
-        
-
-        def self.from_compact!(input)
-            self.new(input.getU32!)
+        # @return [Hash] symbol => value table
+        def self.symbols
+            @symbols
         end
 
-    
-
-        # @param v [String]
-        def set(value)
+        def self.from_compact!(input, stack)
+            value = input.getU32!
             if value
-                if self.symbols[value]
-                    @value = self.class.symbols[value]
-                else
-                    raise Error.new "symbol '#{value}' not defined in enumeration"
-                end                    
-            elsif self.class.opt?
-                @value = nil
+                self.new(value)
             else
-                raise Error.new "field may not be null"
-            end
+                value
+            end            
         end
 
+        # @return [String]
         def get
             @value
         end
 
-        def initialize(value)
-            if value
-                set(value)
+        # Set a symbol
+        # @param value [String] symbol in enumeration
+        # @raise [RangeError] value is not valid symbol
+        def set(value)
+            if @symbols[value]
+                @value = value.to_s
             else
-                @value = nil
-            end
+                raise RangeError.new "symbol '#{value}' not defined in enumeration"
+            end                    
+        end        
+
+        # @note calls {#set}(value)
+        def initialize(value)
+            @symbols = self.class.symbols
+            set(value)
         end
         
         def to_compact(out)
-            out.putU32(@value ? self.class.symbols[@value] : nil)
+            out.putU32(@symbols[@value])
         end
     
     end

data/lib/slow_blink/message/field.rb

@@ -36,28 +36,67 @@ module SlowBlink::Message
             @id
         end
 
+        # @return [Object] type contained by field
         def self.type
             @type
         end
 
-        def self.from_compact!(input)
-            @type.from_compact!(input)
+        # @param input [String] Blink compact form
+        # @param stack [Array]
+        # @return [Field] instance of anonymous subclass of Field
+        def self.from_compact!(input, stack)        
+            self.new(@type.from_compact!(input, stack))
         end
 
+        # @note calls {#set}(value)
         def initialize(value)
-            @value = self.class.type.new(value)            
+            @opt = self.class.opt?
+            @type = self.class.type
+            if value.is_a? self.class.type
+                @value = value
+            elsif value
+                @value = self.class.type.new(value)
+            else
+                @value = nil
+            end
         end
 
+        
         def set(value)
-            @value.set(value)            
+            if value
+                if value.is_a? self.class.type
+                    @value = value                    
+                elsif @value                
+                    @value.set(value)
+                else
+                    @value = self.class.type.new(value)                
+                end
+            elsif @opt
+                @value = nil
+            else
+                raise TypeError.new "field can not be set to null"
+            end            
         end
 
+        # @return field value or nil
         def get
-            @value.get
+            if @value
+                @value.get
+            else
+                nil
+            end
         end
 
+        # @param out [String] output appended to this string
+        # @return [String]
         def to_compact(out)
-            @value.to_compact(out)
+            if @value
+                @value.to_compact(out)
+            elsif @opt
+                out.putNull
+            else
+                raise Error.new "field '#{self.name}' must not be null"
+            end
         end
 
     end

data/lib/slow_blink/message/fixed.rb

@@ -20,51 +20,61 @@
 module SlowBlink::Message
 
     class FIXED
+
+        # @note optionality affects how instances of this type are encoded
+        #
+        # @return [true,false] is optional
+        def self.opt?
+            @opt
+        end
         
-        def self.from_compact!(input)
-            if opt?
-                self.new(input.getFixedOptional!)
+        def self.from_compact!(input, stack)
+            if @opt
+                value = input.getFixedOptional!
+            else
+                value = input.getFixed!
+            end
+            if value
+                self.new(value)
             else                    
-                self.new(input.getFixed!)
+                value
             end
         end
 
+        # @return [Integer,nil] size of fixed type in bytes
         def self.size
             @type.size
         end
 
+        # @return [String]
+        def get
+            @value
+        end
+
+        # Set a fixed size type
+        # @param value [String]
+        # @raise [RangeError]
+        # @raise [TypeError]
         def set(value)
-            if value
-                if value.kind_of? String
-                    if value.size == self.class.size
-                        @value = value
-                    else
-                        raise Error.new "must be #{@size} bytes"
-                    end
+            if value.kind_of? String
+                if value.size == self.class.size
+                    @value = value.to_s
                 else
-                    raise "expecting string"
+                    raise RangeError.new "String instance must have size of #{@size} bytes"
                 end
-            elsif self.class.opt?
-                @value = nil
             else
-                raise Error.new "value unacceptable"
+                raise TypeError.new "expecting a String instance"
             end
         end
 
-        def get
-            @value
-        end
-
+        # @note calls {#set}(value)
         def initialize(value)
-            if value
-                set(value)
-            else
-                @value = nil
-            end
+            @opt = self.class.opt?
+            set(value)                
         end
 
         def to_compact(out)
-            if self.opt?
+            if @opt
                 out.putFixedOptional(@value)
             else
                 out.putFixed(@value)

data/lib/slow_blink/message/floating_point.rb

@@ -21,36 +21,35 @@ module SlowBlink::Message
 
     class FLOATING_POINT
 
-        def self.from_compact!(input)
-            self.new(input.getF64!)
-        end
-
-        def set(value)
+        def self.from_compact!(input, stack)
+            value = input.getF64!
             if value
-                if value.kind_of? Numeric
-                    @value = value
-                else
-                    raise "expecting float"
-                end
-            elsif self.class.opt?
-                @value = nil
+                self.new(value)
             else
-                raise Error.new "value unacceptable"
+                value
             end
         end
 
+        # @return [Numeric]
         def get
             @value
         end
 
-        def initialize(value)
-            if value
-                set(value)
+        # @param value [Numeric]
+        # @raise [TypeError]
+        def set(value)
+            if value.kind_of? Numeric
+                @value = value.to_f
             else
-                @value = nil
+                raise TypeError.new "expecting an instance of Numeric"
             end
         end
 
+        # @note calls {#set}(value)
+        def initialize(value)
+            set(value)
+        end
+
         def to_compact(out)
             out.putF64(@value)
         end