slow_blink 0.0.3 → 0.0.4

data/lib/slow_blink/message/group.rb

@@ -19,242 +19,227 @@
 
 module SlowBlink::Message
 
-    TYPE_KEY = "$type".freeze
-
-    module StaticGroup
-
-        module CLASS
+    class StaticGroup
+        
+        def self.implements
+            @implements
+        end
 
-            def fields
-                @fields
-            end
+        def self.fields
+            @fields
+        end
 
-            def opt?
-                @opt
-            end
+        def self.opt?
+            @opt
+        end
 
-            def id
-                @id
-            end
+        def self.id
+            @id
+        end
 
-            def name
-                @name
-            end
+        def self.name
+            @name
+        end
 
-            def from_compact!(input)
-                if @opt
-                    if input.getPresent!
-                        fields = {}
-                        @fields.each do |f|                    
-                            fields[f.name] = f.from_compact!(input)                            
-                        end
-                        self.new(fields)
-                    else
-                        self.new(nil)
-                    end
-                else
+        def self.from_compact!(input)
+            if @opt
+                if input.getPresent!
                     fields = {}
-                    @fields.each do |f|
-                        fields[f.name] = f.from_compact!(input)                        
-                    end                
+                    @fields.each do |f|                    
+                        fields[f.name] = f.from_compact!(input)                            
+                    end
                     self.new(fields)
-                end            
-            end
-
+                else
+                    self.new(nil)
+                end
+            else
+                fields = {}
+                @fields.each do |f|
+                    fields[f.name] = f.from_compact!(input)                        
+                end                
+                self.new(fields)
+            end            
         end
 
-        module INSTANCE
-
-            def []=(name, value)
-                if @value[name]
-                    @value[name].set(value)
-                else
-                    raise "field #{name} is not defined in this group"
-                end                    
-            end
+        def []=(name, value)
+            if @value[name]
+                @value[name].set(value)
+            else
+                raise "field #{name} is not defined in this group"
+            end                    
+        end
 
-            def [](name)
-                if @value[name]
-                    @value[name].get
-                else
-                    raise "field #{name} is not defined in this group"
-                end
+        def [](name)
+            if @value[name]
+                @value[name].get
+            else
+                raise "field #{name} is not defined in this group"
             end
+        end
 
-            def set(value)            
-                if value
-                    @value = {}
-                    self.class.fields.each do |f|
-                        @value[f.name] = value[f.name]
-                    end                    
-                elsif self.class.opt?                
-                    @value = nil
-                else
-                    raise "this group cannot be NULL"
-                end
+        def set(value)            
+            if value
+                self.class.fields.each do |f|
+                    @value[f.name].set(value[f.name])
+                    @empty = false
+                end                    
+            elsif self.class.opt?                
+                @empty = true
+            else
+                raise "this group cannot be NULL"
             end
+        end
 
-            def get
-                @value
-            end
+        def get
+            @value
+        end
 
-            def initialize(fields)
-                if fields
-                    set(fields)            
-                else
-                    @value = {}
-                    self.class.fields.each do |f|                        
-                        @value[f.name] = f.new(nil)
-                    end                
-                end                
+        def initialize(fields)
+            empty = false
+            @value = self.class.fields.inject({}) do |value, f|                        
+                value[f.name] = f.new(nil)
+            end                            
+            if fields
+                set(fields.to_h)            
             end
+        end
 
-            def fields
-                @value
-            end
+        def fields
+            @value
+        end
 
-            def to_compact(out)
-                if @value
-                    if self.class.opt?
-                        out.putPresent
-                        self.class.fields.each do |f|
-                            @value[f.name].to_compact(out)
-                        end
-                        out                    
-                    else
-                        self.class.fields.each do |f|
-                            @value[f.name].to_compact(out)
-                        end
-                        out                                        
+        def to_compact(out)
+            if @value
+                if self.class.opt?
+                    out.putPresent
+                    self.class.fields.each do |f|
+                        @value[f.name].to_compact(out)
                     end
+                    out                    
                 else
-                    out.putPresent(false)
+                    self.class.fields.each do |f|
+                        @value[f.name].to_compact(out)
+                    end
+                    out                                        
                 end
+            else
+                out.putPresent(false)
             end
+        end
 
+        def to_h
+            @value
         end
 
     end
 
-    module DynamicGroup
-
-        module CLASS
-
-            def groups
-                @groups
-            end
+    class DynamicGroup
+    
+        def self.groups
+            @groups
+        end
 
-            def permitted
-                @permitted
-            end
+        def self.permitted
+            @permitted
+        end
 
-            def opt?
-                @opt
-            end
+        def self.opt?
+            @opt
+        end
 
-            def from_compact!(input)
-                buf = input.getBinary!
-                if buf.size > 0
-                    id = buf.getU64!
-                    group = @groups[id]
-                    if group
-                        if @permitted.include? group.id
-                            self.new(group.from_compact!(buf))
-                        else
-                            raise Error.new "W15: Group is known but unexpected"
-                        end
+        def self.from_compact!(input)
+            buf = input.getBinary!
+            if buf.size > 0
+                id = buf.getU64!
+                group = @groups[id]
+                if group
+                    if @permitted.include? group.id
+                        self.new(group.from_compact!(buf))
                     else
-                        raise Error.new "W2: Group id #{group.id} is unknown"
+                        raise Error.new "W15: Group is known but unexpected"
                     end
                 else
-                    if self == ModelInstance
-                        raise Error.new "W1: Top level group cannot be null"
-                    elsif @opt
-                        self.new(nil)
-                    else
-                        raise Error.new "W5: Value cannot be null"
-                    end                
+                    raise Error.new "W2: Group id #{group.id} is unknown"
                 end
-            end
-
-        end
-
-        module INSTANCE
-
-            def []=(name, value)
-                if @value
-                    @value[name] = value
+            else
+                if self == ModelInstance
+                    raise Error.new "W1: Top level group cannot be null"
+                elsif @opt
+                    self.new(nil)
                 else
-                    raise "undefined dynamic group"
-                end
+                    raise Error.new "W5: Value cannot be null"
+                end                
             end
+        end
 
-            def [](name)
-                if @value
-                    @value[name]
-                else
-                    raise "undefined dynamic group"
-                end
+        def []=(name, value)
+            if @value
+                @value[name] = value
+            else
+                raise "undefined dynamic group"
             end
+        end
 
-            def extension(&group)
-                # define extension
-                # this is an array of OBJECTs
-                # extension do
-                #   group "name" do |g|
-                #       g["field"] = "value"
-                #   end
-                #   group "name" do |g|
-                #       g["field"] = "value"
-                #   end
-                #   ...
-                # end
-                #
-                raise                
+        def [](name)
+            if @value
+                @value[name]
+            else
+                raise "undefined dynamic group"
             end
+        end
 
-            def set(value)
-                if value
-                    if self.class.groups.values.include? value.class
-                        if self.class.permitted.include? value.class.id
-                            @value = value
-                        else
-                            raise "group is not a permitted group"
-                        end
+        def set(value)
+            if value
+                if self.class.groups.values.include? value.class
+                    if self.class.permitted.include? value.class.id
+                        @value = value
                     else
-                        raise "value is not a group instance"
+                        raise "group is not a permitted group"
                     end
-                elsif self.class.opt?
-                    @value = nil
-                else
-                    raise
-                end        
-            end
-
-            def get
-                @value
-            end
-
-            def initialize(value)
-                if value
-                    set(value)
                 else
-                    @value = nil
+                    raise "value is not a group instance"
                 end
-            end               
+            elsif self.class.opt?
+                @value = nil
+            else
+                raise
+            end        
+        end
 
-            def to_compact(out="")
-                if @value
-                    group = @value.to_compact("".putU64(@value.class.id))
-                    out.putU32(group.size)
-                    out << group                    
-                else
-                    out.putU32(nil)
-                end
-            end            
+        def get
+            @value
+        end
 
+        def initialize(value)
+            if value
+                set(value)
+            else
+                @value = nil
+            end
+        end               
+
+        def to_compact(out="")
+            if @value
+                group = @value.to_compact("".putU64(@value.class.id))
+                out.putU32(group.size)
+                out << group                    
+            else
+                out.putU32(nil)
+            end
         end
 
+        # @api user
+        #
+        # Encode {Group} as Blink compact form
+        #
+        # @return [String]
+        #
+        def encode_compact
+            to_compact
+        end        
+
     end
 
+    
+
 end