slow_blink 0.0.3 → 0.0.4

data/lib/slow_blink/message/string.rb

@@ -19,76 +19,69 @@
 
 module SlowBlink::Message
 
-    module STRING
+    class STRING
 
-        module CLASS
-
-            def name
-                @name
-            end
+        def self.name
+            @name
+        end
 
-            def opt?
-                @opt
-            end
+        def self.opt?
+            @opt
+        end
 
-            def from_compact!(input)
-                value = input.getString!
-                if value
-                    if !@type.size or value.size <= @type.size
-                        self.new(value)
-                    else
-                        raise Error.new "W7: String value exceeds maximum size"
-                    end
-                elsif @opt
-                    self.new(nil)
+        def self.from_compact!(input)
+            value = input.getString!
+            if value
+                if !@type.size or value.size <= @type.size
+                    self.new(value)
                 else
-                    raise Error.new "W5: Value cannot be null"
+                    raise Error.new "W7: String value exceeds maximum size"
                 end
+            elsif @opt
+                self.new(nil)
+            else
+                raise Error.new "W5: Value cannot be null"
             end
-
-            def size
-                @type.size
-            end
-
         end
 
-        module INSTANCE
+        def self.size
+            @type.size
+        end
 
-            def get
-                @value
-            end
+        def get
+            @value
+        end
 
-            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
+        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 "expecting a string type"
+                        raise Error.new "string cannot be larger than #{self.class.size} bytes"
                     end
-                elsif self.class.opt?
-                    @value = nil
-                else
-                    raise Error.new "string cannot be null"
-                end
-            end
-
-            def initialize(value)
-                if value
-                    set(value)
                 else
-                    @value = nil
+                    raise Error.new "expecting a string type"
                 end
+            elsif self.class.opt?
+                @value = nil
+            else
+                raise Error.new "string cannot be null"
             end
+        end
 
-            def to_compact(out)
-                out.putString(@value)
+        def initialize(value)
+            @value = nil
+            if value
+                set(value)
             end
+        end
 
+        def to_compact(out)
+            out.putString(@value)
         end
+
+        
         
     end
 

data/lib/slow_blink/message/time.rb

@@ -19,60 +19,45 @@
 
 module SlowBlink::Message
 
-    module MILLI_TIME
 
-        module CLASS
-
-            def from_compact!(input)
-                self.new(input.getI64!)
-            end
+    class MILLI_TIME
 
+        def self.from_compact!(input)
+            self.new(input.getI64!)
         end
 
-        module INSTANCE
-
-            def set(value)
-                if value
-                    raise
-                elsif self.class.opt?
-                    @value = nil
-                else
-                    raise 
-                end
-            end
-
-            def get
-                @value
+        def set(value)
+            if value
+                raise
+            elsif self.class.opt?
+                @value = nil
+            else
+                raise 
             end
+        end
 
-            def initialize(value)
-                if value
-                    set(value)
-                else
-                    @value = nil
-                end
-            end
+        def get
+            @value
+        end
 
-            def to_compact(out)
-                out.putI64(@value)
+        def initialize(value)
+            if value
+                set(value)
+            else
+                @value = nil
             end
+        end
 
+        def to_compact(out)
+            out.putI64(@value)
         end
+
     
     end
 
-    module NANO_TIME
+    class NANO_TIME < MILLI_TIME
+        
         
-        module CLASS
-            
-            include SlowBlink::Message::MILLI_TIME::CLASS
-        end
-
-        module INSTANCE
-            
-            include SlowBlink::Message::MILLI_TIME::INSTANCE
-        end
-    
     end
 
 end

data/lib/slow_blink/message/time_of_day.rb

@@ -19,113 +19,100 @@
 
 module SlowBlink::Message
 
-    module TIME_OF_DAY_MILLI
+    class TIME_OF_DAY_MILLI
 
-        module CLASS
-
-            def from_compact!(input)
-                self.new(input.get32!)
-            end
-        
+        def self.from_compact!(input)
+            self.new(input.get32!)
         end
-
-        module INSTANCE
-
-            def set(value)
-                if value
-                    if value.kind_of? Integer
-                        if value < 86400000
-                            @value = value                            
-                        else
-                            raise Error.new "input out of range"
-                        end
-                    elsif value.kind_of? Time
-                        @value = value.to_i
+    
+        def set(value)
+            if value
+                if value.kind_of? Integer
+                    if value < 86400000
+                        @value = value                            
                     else
-                        raise "what is this?"                        
-                    end         
-                elsif self.class.opt?
-                    @value = nil
+                        raise Error.new "input out of range"
+                    end
+                elsif value.kind_of? Time
+                    @value = value.to_i
                 else
-                    raise
-                end
+                    raise "what is this?"                        
+                end         
+            elsif self.class.opt?
+                @value = nil
+            else
+                raise
             end
+        end
 
-            def get
-                @value
-            end
+        def get
+            @value
+        end
 
-            def initialize(value)
-                if value
-                    set(value)
-                else
-                    @value = nil
-                end
+        def initialize(value)
+            if value
+                set(value)
+            else
+                @value = nil
             end
+        end
 
-            # @private
-            def to_compact(out)
-                out.putU32(@value)
-                
+        # @private
+        def to_compact(out)
+            out.putU32(@value)
             
-       
-            end        
         
-        end
+   
+        end        
+    
+        
     
     end
 
-    module TIME_OF_DAY_NANO
-    
-        module CLASS
-            
-            def from_compact!(input)
-                self.new(input.getU64!)
-            end
-            
+    class TIME_OF_DAY_NANO
+                    
+        def self.from_compact!(input)
+            self.new(input.getU64!)
         end
-
-        module INSTANCE
-
-        
-            def set(value)
-                if value
-                    if value.kind_of? Integer
-                        if value < 86400000000000
-                            @value = value                            
-                        else
-                            raise Error.new "input out of range"
-                        end
-                    elsif value.kind_of? Time
-                        @value = value.to_i
+    
+        def set(value)
+            if value
+                if value.kind_of? Integer
+                    if value < 86400000000000
+                        @value = value                            
                     else
-                        raise "what is this?"                        
-                    end         
-                elsif self.class.opt?
-                    @value = nil
+                        raise Error.new "input out of range"
+                    end
+                elsif value.kind_of? Time
+                    @value = value.to_i
                 else
-                    raise
-                end
+                    raise "what is this?"                        
+                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
-                end
+        def get
+            @value
+        end
+    
+        def initialize(value)
+            if value
+                set(value)
+            else
+                @value = nil
             end
-
-            # @private
-            def to_compact(out)
-                out.putU64(@value) 
-            end        
-        
         end
+
+        # @private
+        def to_compact(out)
+            out.putU64(@value) 
+        end        
+    
+    
         
     end
 

data/lib/slow_blink/name_with_id.rb

@@ -25,12 +25,9 @@ module SlowBlink
         # @return [String]
         attr_reader :name
 
-        # @return [Integer]
-        # @return [nil]
+        # @return [Integer,nil]
         attr_reader :id
 
-        # @private
-        #
         # @param name [String]
         # @param id [nil,Integer]
         def initialize(name, id)
@@ -39,8 +36,7 @@ module SlowBlink
             @id = id            
         end
 
-        # @private
-        #
+        # @api private
         # @param value [Integer]        
         def id=(value)
             @id = id

data/lib/slow_blink/namespace.rb

@@ -37,13 +37,13 @@ module SlowBlink
 
         # @!method self.parse(input, **opts)
         #
+        #   @api private
+        #
         #   @param input [String] Blink Schema
         #   @param opts [Hash] options
         #   @option opts [String] :fileName filename to append to error message strings
         #   @return [Namespace]
 
-        # @private
-        #
         # @param filename [nil,String]
         # @param name [nil,String]
         # @param defs [Array<Definition,Group>]
@@ -57,7 +57,7 @@ module SlowBlink
             @name = name
             @schema = nil
             
-            errors = 0
+            error = false
             
             # populate table of definitions
             # gather list of groups and incrAnnotations
@@ -67,8 +67,8 @@ module SlowBlink
                     @incrAnnotations << d
                 else
                     if @definitions[d.nameWithID.name]
-                        puts "#{d.location}: error: duplicate definition name '#{d.nameWithID.name}' (first defined at #{definitions[d.nameWithID.name].location})"
-                        errors += 1
+                        Log.error "#{d.location}: error: definitions must have unique names ('#{d.nameWithID.name}' first appears at #{definitions[d.nameWithID.name].location})"
+                        error = true
                     else
                         @definitions[d.nameWithID.name] = d
                         if d.is_a? Group
@@ -79,47 +79,45 @@ module SlowBlink
                 end
             end
 
-            if errors > 0
+            if error
                 raise
             end
             
         end
 
+        # @api private
+        #
         # @param namespace [Namespace]
         def merge!(namespace)
-            if namespace.name == @name
-                @incrAnnotations.concat(namespace.incrAnnotations)
-                namespace.definitions.each do |d|
-                    if @definitions[d.nameWithID.name]
-                        puts "#{d.location}: error: duplicate definition name '#{d.nameWithID.name}' (first defined at #{definitions[d.nameWithID.name].location})"
-                        errors += 1
-                    else
-                        @definitions[d.nameWithID.name] = d
-                        if d.is_a? Group
-                            @groups << d
-                        end                        
-                    end                    
-                end
-            else
-                raise "error: cannot merge different namespaces"
-            end
+            @incrAnnotations.concat(namespace.incrAnnotations)
+            namespace.definitions.each do |d|
+                if @definitions[d.nameWithID.name]
+                    Log.error "#{d.location}: error: definitions must have unique names ('#{d.nameWithID.name}' first appears at #{definitions[d.nameWithID.name].location})"
+                    raise
+                else
+                    @definitions[d.nameWithID.name] = d
+                    if d.is_a? Group
+                        @groups << d
+                    end                        
+                end                    
+            end                
         end
 
-        # @param schema [Schema] common schema
-        # @param stack [Array] used to detect cycles
-        def link(schema, stack=[])
-            if @schema.nil?
-                errors = 0
-                @definitions.each do |name, d|
-                    if !d.link(schema, stack.dup << self)
-                        errors += 1
-                    end                    
-                end
-                if errors == 0
-                    @schema = schema
-                end
+        # @api private
+        #
+        # Resolve references, enforce constraints, and detect cycles
+        #
+        # @param schema [Schema] schema this definition belongs to
+        # @param stack [nil, Array] objects that depend on this object
+        # @return [true,false] linked?
+        def link(schema, stack=[])            
+            errors = 0
+            @definitions.each do |name, d|
+                if !d.link(schema, stack.dup << self)
+                    errors += 1
+                end                    
             end
-            @schema
+            errors == 0    
         end
 
         # @param name [String] unqualified name
@@ -128,6 +126,8 @@ module SlowBlink
             @definitions[name]
         end
 
+        # @param name [String]
+        # @return [Group,nil]
         def group(name)
             @groups.detect{|g|g.nameWithID.name == name}
         end

data/lib/slow_blink/ref.rb

@@ -30,11 +30,16 @@ module SlowBlink
             @dynamic
         end
 
+        # Either this reference is dynamic or an intermediate reference is dynamic
+        #
+        # @return [true,false]
+        def dynamic_reference?
+            @dynamic or @dynamic_reference                           
+        end
+
         # @return [String]
         attr_reader :qname
 
-        # @private
-        #
         # @param qname [String] 
         # @param dynamic [true,false]
         # @param location [String]    
@@ -49,12 +54,18 @@ module SlowBlink
             end
             @dynamic = dynamic
             @ref = nil
+            @dynamic_reference = false
             super(location)
         end
 
-        # @private
-        # 
-        # @macro common_link
+        # @api private
+        #
+        # Resolve references, enforce constraints, and detect cycles
+        #
+        # @param schema [Schema] schema this definition belongs to
+        # @param ns [Namespace] namespace this definition belongs to
+        # @param stack [nil, Array] objects that depend on this object
+        # @return [true,false] linked?
         def link(schema, ns, stack=[])
             if @schema.nil?
                 if @namespace
@@ -63,25 +74,30 @@ module SlowBlink
                     ref = ns.resolve(@name) or schema.resolve(@namespace, @name)
                 end
                 if ref and ref.link(schema, stack << self)
-                    # follow reference to get type
+                    # follow reference
                     loop do
-                        if ref.kind_of? Definition and ref.type.kind_of? REF
-                            ref = ref.type.ref
-                        else
-                            if !ref.kind_of? Group
+                        if ref.kind_of? Definition
+                            if ref.type.kind_of? REF
+                                if ref.type.dynamic?
+                                    @dynamic_reference = true
+                                end
+                                ref = ref.type.ref                                
+                                next
+                            else
                                 ref = ref.type
                             end
-                            break
                         end
+                        break
                     end
+                                
                     if @dynamic and !ref.kind_of? Group
-                        puts "#{@location}: error: '#{@qname}' must resolve to a group with an ID"
+                        Log.error "#{@location}: error: a dynamic reference must resolve to a group that has an identifier"
                     else
                         @ref = ref
                         @schema = schema
                     end
                 else                    
-                    puts "#{@location}: error: '#{@qname}' is not defined in schema"
+                    Log.error "#{@location}: error: unresolved reference ('#{@qname}' is not defined as a group, type, or enum)"
                 end                
             end
             @schema