omf_oml 0.9.6 → 0.9.7

data/lib/omf_oml/indexed_table.rb

@@ -6,12 +6,12 @@ require 'omf_oml/schema'
 
 
 module OMF::OML
-          
+
   # This table maintains the most recently added
-  # row with a unique entry in the +index+ column. 
+  # row with a unique entry in the +index+ column.
   #
   class OmlIndexedTable < OmlTable
-    
+
     # Shadow an existing table and maintain an index on 'index_col'.
     #
     # source_table - Table to shadow
@@ -25,10 +25,10 @@ module OMF::OML
       end
       ix_table
     end
-    
+
     attr_reader :index_col
-    
-    # 
+
+    #
     # index_col - Name of column to index
     # schema - Table schema
     #
@@ -36,9 +36,9 @@ module OMF::OML
       super name, schema, {}, &on_before_row_added
       @index_col = index_col
       @index2row = {} # each row is associated with an instance of the index
-      @index = schema.index_for_col(index_col)
-    end      
-      
+      @index = @schema.index_for_col(index_col)
+    end
+
     def _add_row_finally(row)
       key = row[@index]
       row_id = @index2row[key]
@@ -48,13 +48,13 @@ module OMF::OML
       end
       current_row = @rows[row_id]
       return nil if current_row == row
-      
-      if current_row 
+
+      if current_row
         _notify_content_changed(:removed, [current_row])
       end
       @rows[row_id] = row
       return row
-    end    
+    end
 
   end # class
 

data/lib/omf_oml/network.rb

@@ -7,32 +7,32 @@ require 'omf_oml'
 
 
 module OMF::OML
-  
-  class OmlNetworkAlreadyExistException < Exception; end  
+
+  class OmlNetworkAlreadyExistException < Exception; end
   class OmlNodeAlreadyExistException < Exception; end
-  class OmlLinkAlreadyExistException < Exception; end  
+  class OmlLinkAlreadyExistException < Exception; end
 
   class UnknownOmlNodeException < Exception; end
-  
-  class SameNameOnUpdateException < Exception; end  
-          
+
+  class SameNameOnUpdateException < Exception; end
+
   # This class represents a network consisting of nodes and links with their respective
   # attributes.
   #
   class OmlNetwork < OMF::Common::LObject
     include MonitorMixin
-    
+
     @@name2network = {}
-    
+
     # Return a named network
     #
     def self.[](name)
       @@name2network[name]
     end
-    
+
     attr_reader :name
 
-    # 
+    #
     # name - Name of table
     # opts -
     #
@@ -42,7 +42,7 @@ module OMF::OML
       @attributes = attributes
       @nodes = {}
       @name2node = {}
-      @links = {}   
+      @links = {}
       @name2link = {}
       @epoch = 0 # increment whenever an element is being updated
       @updateListeners = {}
@@ -53,13 +53,13 @@ module OMF::OML
           end
           @@name2network[name] = self
         end
-      end      
+      end
     end
-    
+
     def nodes()
       @nodes.values
     end
-    
+
     # Return the node named +name+. If the node doesn't exist and
     # +new_opts+ is a Hash, create a new one and return that.
     #
@@ -75,7 +75,7 @@ module OMF::OML
     def links()
       @links.values
     end
-    
+
     # Return the link named +name+. If the link doesn't exist and
     # +new_opts+ is a Hash, create a new one and return that.
     #
@@ -88,7 +88,7 @@ module OMF::OML
       link
     end
 
-  
+
     # Register a callback to be called every time network elements change
     # The callback is provided with an arrach of changed elements.
     #
@@ -102,7 +102,7 @@ module OMF::OML
         @updateListeners.delete(name)
       end
     end
-    
+
     # NOTE: May need a monitor if used in multi-threaded environments
     #
     def create_node(name = nil, attributes = {})
@@ -117,18 +117,18 @@ module OMF::OML
         node
       end
     end
-    
+
     #
     # opts
     #   :from - fromNode if +fromNode+ is nil
     #   :to - toNode if +toNode+ is nil
     #   ...  - rest of options passed on to +NetworkLink+ constructor
-    #    
+    #
     def create_link(name = nil, fromNode = nil, toNode = nil, attributes = {})
       name = name.to_sym if name
       fromNode = attributes.delete(:from) unless fromNode
       toNode = attributes.delete(:to) unless toNode
-            
+
       synchronize do
         if name && @name2link[name]
           raise OmlLinkAlreadyExistException.new(name)
@@ -145,11 +145,11 @@ module OMF::OML
         link
       end
     end
-    
+
     # To have the update listeners only called once when multiple elements are changed at once, perform the
     # changes within a +transaction+ block. The listeners are then called once with an array containing
     # all updated elements.
-    # 
+    #
     def transaction(&block)
       updated = UpdateSet.new
       synchronize do
@@ -157,7 +157,7 @@ module OMF::OML
 
         @in_transaction = true
         block.call
-        @in_transaction = true        
+        @in_transaction = true
       end
       unless updated.empty?
         @updateListeners.values.each do |l|
@@ -165,7 +165,7 @@ module OMF::OML
         end
       end
     end
-    
+
     def node_schema(schema = nil)
       if schema
         @node_schema = OmlSchema.create(schema)
@@ -174,7 +174,7 @@ module OMF::OML
       end
       @node_schema
     end
-      
+
     def link_schema(schema = nil)
       if schema
         @link_schema = OmlSchema.create(schema)
@@ -186,15 +186,15 @@ module OMF::OML
       @link_schema
     end
 
-    
+
     def describe
       nh = {}
       @nodes.each do |id, node| nh[id] = node.describe end
       lh = {}
       @links.each do |id, link| lh[id] = link.describe end
-      {:nodes => nh, :links => lh}        
+      {:nodes => nh, :links => lh}
     end
-    
+
     # Creates two tables, one capturing the link state and one for the node state.
     # Returns the two tables in a hash with keys 'nodes' and 'links'.
     #
@@ -203,12 +203,12 @@ module OMF::OML
       # @nodes.each do |id, n|
         # node_table.add_row @node_schema.hash_to_row(n.attributes)
       # end
-# 
+#
       # link_table = OmlTable.new 'links', @link_schema, table_opts
       # @links.each do |id, l|
         # link_table.add_row @link_schema.hash_to_row(l.attributes)
       # end
-#       
+#
       # on_update "__to_tables_#{node_table.object_id}" do |a|
         # a.each do |e|
           # if e.kind_of? NetworkNode
@@ -221,16 +221,17 @@ module OMF::OML
       # {:nodes => node_table, :links => link_table}
       # #{:nodes => to_table(:nodes, table_opts), :links => to_table(:links, table_opts)}
     # end
-    
-    # Create a table to track an aspect of this network. 
+
+    # Create a table to track an aspect of this network.
     #
-    # aspect - Either :nodes or :links 
+    # aspect - Either :nodes or :links
     #
     def to_table(aspect, table_opts = {})
       aspect = aspect.to_sym
       case aspect
       when :nodes
         table = OmlTable.create @name + '/nodes', @node_schema, table_opts
+        #puts "TABLE SCHEME >>>> #{table.schema}"
         table.add_rows(@nodes.map do |id, n|
           @node_schema.hash_to_row(n.attributes)
         end)
@@ -239,27 +240,34 @@ module OMF::OML
             e.kind_of?(NetworkNode) ? @node_schema.hash_to_row(e.attributes) : nil
           end.compact
           table.add_rows(nodes) unless nodes.empty?
-        end          
-        
+        end
+
       when :links
         table = OmlTable.create @name + '/links', @link_schema, table_opts
         # @links.each do |id, l|
           # table.add_row @link_schema.hash_to_row(l.attributes)
         # end
         table.add_rows(@links.map do |id, n|
+          # puts @link_schema.hash_to_row(n.attributes).inspect
+          # puts table.schema
+          # table.add_row @link_schema.hash_to_row(n.attributes)
+          # puts table.rows.inspect
+          # exit
+
           @link_schema.hash_to_row(n.attributes)
         end)
+        #puts table.rows.inspect
         on_update "__to_tables_links_#{table.object_id}" do |a|
           links = a.map do |e|
             e.kind_of?(NetworkLink) ? @link_schema.hash_to_row(e.attributes) : nil
           end.compact
           table.add_rows(links) unless links.empty?
-        end         
-        
+        end
+
       else
         raise "Unknown aspect '#{aspect}'. Should be either 'nodes' or 'links'."
       end
-      
+
       # on_update "__to_tables_#{table.object_id}" do |a|
         # a.each do |e|
           # if aspect == :nodes && e.kind_of?(NetworkNode)
@@ -270,22 +278,22 @@ module OMF::OML
           # end
         # end
       # end
-      
+
       table
     end
-    
-    
+
+
     def to_json
       describe.to_json
     end
-    
-    
-    
+
+
+
     def updated(element)
       synchronize do
         if @in_transaction
           @updated << element
-          return        
+          return
         end
       end
       uset = UpdateSet.new
@@ -296,10 +304,10 @@ module OMF::OML
     end
 
   end # OMLNetwork
-  
-  class NetworkElementAttributeException < Exception; end  
 
-  
+  class NetworkElementAttributeException < Exception; end
+
+
   # This class represents an abstract network element and shouldn't be used directly.
   #
   class NetworkElement < OMF::Common::LObject
@@ -307,7 +315,7 @@ module OMF::OML
     attr_reader :name
     attr_reader :el_id
     attr_reader :attributes
-    
+
     def initialize(name, attributes, network)
       super name
       @attributes = attributes.dup
@@ -322,15 +330,15 @@ module OMF::OML
 
       @network = network
     end
-    
+
     def [](name)
       @attributes[name]
     end
-    
+
     def []=(name, value)
       @attributes[name] = _set(value, @attributes[name])
     end
-    
+
     # Update the element's attributes. The +attributes+ argument
     # is expected to be a hash with the key identifying the attribute
     # name and the value being the new value to set that attribute to.
@@ -340,54 +348,54 @@ module OMF::OML
         self[name] = value
       end
     end
-    
+
     # Return the current state of the network element as hash
     #
     def describe
-      @attributes        
+      @attributes
     end
-    
+
     def node?
       false
     end
-    
+
     def link?
       false
     end
-    
+
     protected
-    
+
     def _set(value, old_value)
       if value != old_value
         @network.updated(self)
       end
       value
     end
-    
-  end # NetworkElement 
-  
+
+  end # NetworkElement
+
   # This class represents a network node. Should NOT be created directly, but only through
   # +OmlNetwork#create_node+ method
   #
   class NetworkNode < NetworkElement
-    
+
     def initialize(name, attributes, network)
       super
     end
-    
+
     def node?
       true
     end
-  end # NetworkNode  
+  end # NetworkNode
 
-  # This class represents a network link between two nodes. 
+  # This class represents a network link between two nodes.
   # Should NOT be created directly, but only through
   # +OmlNetwork#create_node+ method
   #
   class NetworkLink < NetworkElement
     attr_reader :from  # node
     attr_reader :to    # node
-    
+
     def initialize(name, fromNode, toNode, attributes, network)
       super name, attributes, network
       if fromNode
@@ -395,26 +403,26 @@ module OMF::OML
         #puts ">>>> NODE: #{fromNode.inspect}"
         @attributes[:from_id] = fromNode.el_id
       end
-      if toNode 
+      if toNode
         @toNode = toNode
         @attributes[:to_id] = toNode.el_id
       end
     end
-    
+
     def from=(node)
-      @attributes[:from_id] = node.el_id if node  
+      @attributes[:from_id] = node.el_id if node
       @fromNode = _set(node, @fromNode)
     end
 
     def to=(node)
-      @attributes[:to_id] = node.el_id if node        
+      @attributes[:to_id] = node.el_id if node
       @toNode = _set(node, @toNode)
     end
-    
+
     def link?
       true
     end
-  end # NetworkLink  
+  end # NetworkLink
 
   # This set may hold a set of nodes and links which have been
   # updated during a transaction. It supports the +describe+
@@ -425,16 +433,16 @@ module OMF::OML
     def describe()
       nh = {}
       lh = {}
-      
-      self.each do |el| 
+
+      self.each do |el|
         d = el.describe
         if el.kind_of? NetworkNode
           nh[el.el_id] = d
         else
           lh[el.el_id] = d
-        end 
+        end
       end
-      {:nodes => nh, :links => lh}        
+      {:nodes => nh, :links => lh}
     end
   end
 end
@@ -442,26 +450,26 @@ end
 if $0 == __FILE__
   require 'json'
   include OMF::Common::OML
-  
+
   nw = OmlNetwork.new
-  
+
   cnt = 3
-  cnt.times do |i| 
+  cnt.times do |i|
     nw.create_node "n#{i}", :x => i
   end
-  cnt.times do |i| 
+  cnt.times do |i|
     nw.create_link "l#{i}", "n#{i}", "n#{(i + 1) % cnt}", :y => i
   end
-  
+
   puts nw.describe.to_json
-  
+
   nw.on_update do |els|
     puts "UPDATED: #{els}"
   end
   nw.nodes.first[:x] = 20
-  
-  nw.transaction do 
+
+  nw.transaction do
     nw.nodes.first[:x] = 30
-    nw.links.first[:y] = 20    
+    nw.links.first[:y] = 20
   end
-end 
+end

data/lib/omf_oml/table.rb

@@ -8,28 +8,28 @@ require 'omf_oml/schema'
 
 
 module OMF::OML
-          
+
   # This class represents a database like table holding a sequence of OML measurements (rows) according
   # a common schema.
   #
   class OmlTable < OMF::Common::LObject
-    
+
     def self.create(tname, schema, opts = {}, &on_before_row_added)
       if (index = opts.delete(:index))
         require 'omf_oml/indexed_table'
-        OmlIndexedTable.new(tname, index, schema, &on_before_row_added)        
+        OmlIndexedTable.new(tname, index, schema, &on_before_row_added)
       else
         OmlTable.new(tname, schema, opts, &on_before_row_added)
       end
     end
     include MonitorMixin
-    
+
     attr_reader :name
     attr_accessor :max_size
     attr_reader :schema
     attr_reader :offset
-    
-    # 
+
+    #
     # tname - Name of table
     # schema - OmlSchema or Array containing [name, type*] for every column in table
     #   Table adds a '__id__' column at the beginning which keeps track of the rows unique id
@@ -39,7 +39,6 @@ module OMF::OML
     #
     def initialize(tname, schema, opts = {}, &on_before_row_added)
       super tname
-      
       #@endpoint = endpoint
       @name = tname
       @schema = OmlSchema.create(schema)
@@ -61,12 +60,12 @@ module OMF::OML
       @max_size = opts[:max_size]
       @on_content_changed = {}
     end
-    
+
     def rows
       #@indexed_rows ? @indexed_rows.values : @rows
       @rows
     end
-    
+
     # Register +callback+ to be called to process any newly
     # offered row before it being added to internal storage.
     # The callback's argument is the new row (TODO: in what form)
@@ -76,12 +75,12 @@ module OMF::OML
     def on_before_row_added(&callback)
       @on_before_row_added = callback
     end
-    
+
     # Register callback for when the content of the table is changes. The key
     # allows for the callback to be removed by calling this method
-    # without a block. . If the 
+    # without a block. . If the
     # optional 'offset' value is set to zero or a positive value,
-    # then the currently stored values starting at this index are being 
+    # then the currently stored values starting at this index are being
     # immediately sent to 'proc'. The 'proc' is expected to receive two
     # parameters, an 'action' and the content changed. The 'action' is either
     # ':added', or ':removed' and the content is an array of rows.
@@ -101,7 +100,7 @@ module OMF::OML
         @on_content_changed.delete key
       end
     end
-    
+
     def on_row_added(key, &block)
       on_content_changed(key) do |action, rows|
         if action == :added
@@ -109,8 +108,8 @@ module OMF::OML
         end
       end
     end
-    
-    # NOTE: +on_row_added+ callbacks are done within the monitor. 
+
+    # NOTE: +on_row_added+ callbacks are done within the monitor.
     #
     def add_row(row, needs_casting = false)
       synchronize do
@@ -119,13 +118,13 @@ module OMF::OML
         end
       end
     end
-    
+
     def <<(row)
       add_row(row)
     end
-    
+
     # Return a new table which shadows this table but only contains
-    # rows with unique values in the column 'col_name' and of these the 
+    # rows with unique values in the column 'col_name' and of these the
     # latest added rows to this table.
     #
     # col_name - Name of column to use for indexing
@@ -134,7 +133,7 @@ module OMF::OML
       require 'omf_oml/indexed_table'
       OmlIndexedTable.shadow(self, col_name)
     end
-    
+
     # Add an array of rows to this table
     #
     def add_rows(rows, needs_casting = false)
@@ -146,7 +145,7 @@ module OMF::OML
         end
       end
     end
-    
+
     # Return a new table which only contains the rows of this
     # table whose value in column 'col_name' is equal to 'col_value'
     #
@@ -177,23 +176,23 @@ module OMF::OML
       debug "Created sliced table from '#{@name}' (rows: #{st.rows.length}-#{@rows.length})"
       st
     end
-    
+
     # Return table as an array of rows
     #
     def to_a
       @rows.dup
     end
-    
+
     def describe()
       rows
     end
-    
+
     def data_sources
       self
     end
-    
+
     private
-    
+
     # NOT synchronized
     #
     def _add_row(row, needs_casting = false)
@@ -205,12 +204,12 @@ module OMF::OML
       if @on_before_row_added
         row = @on_before_row_added.call(row)
       end
-      return nil unless row 
+      return nil unless row
 
       row.insert(0, @row_id += 1) if @add_index
       _add_row_finally(row)
     end
-    
+
     # Finally add 'row' to internal storage. This would be the method to
     # override in sub classes as this is thread safe and all other pre-storage
     # test have been performed. Should return the row added, or nil if nothing
@@ -221,7 +220,7 @@ module OMF::OML
         # @indexed_rows[row[@index_col]] = row
         # return
       # end
-      
+
       @rows << row
       if @max_size && @max_size > 0 && (s = @rows.size) > @max_size
         if (removed_row = @rows.shift) # not necessarily fool proof, but fast
@@ -231,7 +230,7 @@ module OMF::OML
       end
       row
     end
-    
+
     def _notify_content_changed(action, rows)
       @on_content_changed.each_value do |proc|
         #puts "call: #{proc.inspect}"

data/lib/omf_oml/version.rb

@@ -1,6 +1,6 @@
 
 module OMF
   module OML
-    VERSION = '0.9.6'
+    VERSION = '0.9.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_oml
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel