slow_blink 0.0.6 → 0.0.7

data/lib/slow_blink/message/boolean.rb

@@ -25,12 +25,11 @@ module SlowBlink::Message
     class BOOLEAN
 
         # @private
-        def self.from_compact!(input, stack)
-            value = input.getBool!
-            if value
+        def self.from_compact(input, stack)
+            if value = input.getBool
                 self.new(value)
             else
-                value
+                nil
             end
         end
 

data/lib/slow_blink/message/date.rb

@@ -25,12 +25,11 @@ module SlowBlink::Message
     class DATE
 
         # @private
-        def self.from_compact!(input, stack)
-            value = input.getI32!
-            if value
+        def self.from_compact(input, stack)
+            if value = input.getI32
                 self.new(value)
             else
-                value
+                nil
             end
         end
 

data/lib/slow_blink/message/decimal.rb

@@ -27,11 +27,9 @@ module SlowBlink::Message
     class DECIMAL
 
         # @private
-        def self.from_compact!(input, stack)
-            e = input.getI8!
-            if e
-                m = input.getI64!
-                if m
+        def self.from_compact(input, stack)
+            if e = input.getI8
+                if m = input.getI64
                     self.new("#{m}E#{e}")                    
                 else
                     raise NullMantissa

data/lib/slow_blink/message/{enumeration.rb → enum.rb}

@@ -22,25 +22,22 @@
 module SlowBlink::Message
 
     # @abstract
-    class ENUMERATION
+    class ENUM
 
-        # @return [Hash] symbol => value table
-        def self.symbols
-            @symbols
+        def self.type
+            @type             
         end
 
         # @private
-        def self.from_compact!(input, stack)
-            value = input.getI32!
-            if value
-                symbol = @symbols.key(value)
-                if symbol
-                    self.new(symbol)
+        def self.from_compact(input, stack)
+            if value = input.getI32
+                if symbol = type.symbol(value)
+                    self.new(symbol.name)
                 else
                     raise WeakError10.new "W10: value '#{value}' does not correspond to any symbol in enumeration"
                 end
             else
-                value
+                nil
             end            
         end
 
@@ -53,22 +50,25 @@ module SlowBlink::Message
         # @param value [String] symbol in enumeration
         # @raise [RangeError] value is not valid symbol
         def set(value)
-            if @symbols[value]
-                @value = value.to_s
+            if value.kind_of? String
+                if self.class.type.symbol(value)
+                    @value = value.to_s
+                else
+                    raise RangeError.new "symbol '#{value}' not defined in enumeration"
+                end
             else
-                raise RangeError.new "symbol '#{value}' not defined in enumeration"
-            end                    
+                raise TypeError.new "value must be a String"
+            end              
         end        
 
         # @note calls {#set}(value)
         def initialize(value)
-            @symbols = self.class.symbols
             set(value)
         end
 
         # @private
         def to_compact(out)
-            out.putI32(@symbols[@value])
+            out.putI32(self.class.type.symbol(@value).value)
         end
     
     end

data/lib/slow_blink/message/field.rb

@@ -25,13 +25,13 @@ module SlowBlink::Message
     class Field
         
         # @return [true,false] field is optional?
-        def self.opt?
-            @opt
+        def self.optional?
+            @optional
         end
 
         # @return [String] field name
         def self.name
-            @name
+            @name.to_s
         end
 
         # @return [Integer,nil] field ID
@@ -44,66 +44,116 @@ module SlowBlink::Message
             @type
         end
 
+        # @return [true,false] true if this field contains a sequence type
+        def self.sequence?
+            @sequence
+        end
+
         # @private
         # @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))
+        def self.from_compact(input, stack)
+            if sequence?
+                if size = input.getU32
+                    value = []
+                    while value.size < size do
+                        value << @type.from_compact(input, stack).get
+                    end
+                    self.new(value)
+                else
+                    nil
+                end
+            elsif optional? and (type.kind_of? StaticGroup or type.kind_of? FIXED)
+                if input.get_present(input)
+                    self.new(@type.from_compact(input, stack).get)
+                else
+                    nil
+                end
+            else
+                self.new(@type.from_compact(input, stack).get)
+            end
         end
 
         # @note calls {#set}(value)
         def initialize(value)
-            @opt = self.class.opt?
+
+            @optional = self.class.optional?
+            @sequence = self.class.sequence?
             @type = self.class.type
-            if value.is_a? self.class.type
-                @value = value
-            elsif value
-                @value = self.class.type.new(value)
+
+            if value
+                set(value)
             else
                 @value = nil
             end
+                        
         end
-
         
         def set(value)
-            if value
-                if value.is_a? self.class.type
-                    @value = value                    
-                elsif @value                
-                    @value.set(value)
+            if value.nil?
+                if optional?
+                    @value = nil
+                else
+                    raise ArgumentError.new "field is not optional, value cannot be nil"
+                end                
+            elsif self.class.sequence?                
+                if value.kind_of? Array
+                    @value = []
+                    value.each do |v|
+                        @value << @type.new(v)
+                    end
                 else
-                    @value = self.class.type.new(value)                
+                    raise ArgumentError.new "field value must be an array of type"
                 end
-            elsif @opt
-                @value = nil
             else
-                raise TypeError.new "field can not be set to null"
-            end            
+                @value = @type.new(value)
+            end
         end
 
         # @return field value or nil
         def get
             if @value
-                @value.get
+                if self.class.sequence?
+                    @value.map{|v|v.get}                
+                else
+                    @value.get
+                end
             else
                 nil
             end
         end
 
         # @private
-        # @param out [String] output appended to this string
-        # @return [String]
+        # @param out [StringIO]
+        # @return [StringIO]
         def to_compact(out)
             if @value
-                @value.to_compact(out)
-            elsif @opt
+                if self.class.sequence?
+                    out.putU32(@value.size)
+                    @value.each do |v|
+                        v.to_compact(out)
+                    end
+                else
+                    if self.class.optional? and (self.type.kind_of? StaticGroup or self.type.kind_of? FIXED)
+                        out.putPresent
+                    end
+                    @value.to_compact(out)
+                end
+            elsif @optional
                 out.putNull
             else
-                raise IncompleteGroup.new "field '#{self.name}' must not be null"
+                raise IncompleteGroup.new "'#{self.name}' must not be null"
             end
         end
 
+        private
+
+            def sequenceOfSameType(value)
+                value.each do ||
+                end
+            end
+
     end
 
 end

data/lib/slow_blink/message/fixed.rb

@@ -24,27 +24,16 @@ module SlowBlink::Message
     # @abstract
     class FIXED
 
-        # @note optionality affects how instances of this type are encoded
-        # @return [true,false] is optional
-        def self.opt?
-            @opt
-        end
-
         # @private
-        def self.from_compact!(input, stack)
-            if @opt
-                value = input.getFixedOptional!
-            else
-                value = input.getFixed!
-            end
-            if value
+        def self.from_compact(input, stack)
+            if value = input.getFixed(size)
                 self.new(value)
             else                    
-                value
+                nil
             end
         end
 
-        # @return [Integer,nil] size of fixed type in bytes
+        # @return [Integer] size of fixed type in bytes
         def self.size
             @type.size
         end
@@ -72,17 +61,12 @@ module SlowBlink::Message
 
         # @note calls {#set}(value)
         def initialize(value)
-            @opt = self.class.opt?
             set(value)                
         end
 
         # @private
         def to_compact(out)
-            if @opt
-                out.putFixedOptional(@value)
-            else
-                out.putFixed(@value)
-            end
+            out.putFixed(@value)
         end
 
     end

data/lib/slow_blink/message/floating_point.rb

@@ -25,12 +25,11 @@ module SlowBlink::Message
     class FLOATING_POINT
 
         # @private
-        def self.from_compact!(input, stack)
-            value = input.getF64!
-            if value
+        def self.from_compact(input, stack)
+            if value = input.getF64
                 self.new(value)
             else
-                value
+                nil
             end
         end