twb 1.9.1 → 2.2.1

data/lib/twb/dbfield.rb

@@ -0,0 +1,70 @@
+#  Copyright (C) 2014, 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'nokogiri'
+
+module Twb
+
+  class DbField
+
+    include Comparable
+
+    attr_reader :node       
+    attr_reader :properties
+    attr_reader :name,       :uiname
+    attr_reader :dbname,     :dbtable
+
+    def initialize dataSource, node, nodeType, table=nil
+      @node     = node
+      @nodeType = nodeType
+      case @nodeType
+        when :map
+          @uiname  = @node.attribute('key').text.gsub(/^\[|\]$/,'')
+          @name    = @uiname
+          fldRef   = @node.attribute('value').text.gsub(/^\[|\]$/,'')
+          parts    = fldRef.split('].[')
+          @dbtable = parts[0]
+          @dbname  = parts[1]
+        when :tableColumn
+          @uiname  = @node.attribute('name').text
+          @name    = @uiname
+          @dbtable = table
+        else
+          raise ArgumentError.new("ERROR in DbField creation: invalid Node type, is #{nodeType} \n ")
+      end      
+      @id      = "#{dataSource}::#{dbname}::#{dbtable}::#{uiname}"
+    end
+
+    def properties
+      @properties ||= loadProperties
+    end
+
+    def loadProperties
+      @properties = {:name=>@name,:uiname=>@uiname, :dbtable=>@dbtable}
+      @properties[:dbname] = @dbname if :map == @nodeType
+      return @properties
+    end
+
+    def to_s
+      @id
+    end
+
+    def <=>(other)
+      @id <=> other.id
+    end
+
+  end  # class ColumnField
+
+end

data/lib/twb/fieldcalculation.rb

@@ -27,7 +27,7 @@ module Twb
     attr_reader :formulaResolved
     attr_reader :formulaFlat 
     attr_reader :formulaFlatResolved
-    attr_reader :formulaLines 
+    attr_reader :formulaLines, :formulaResolvedLines 
     attr_reader :is_tableCalc
     attr_reader :is_lod,  :lodCodePos
     attr_reader :class,   :scopeIsolation
@@ -121,7 +121,7 @@ module Twb
           stripBck = stripFrt.gsub( /\][^\]]+$/      , ']'      )
           stripMid = stripBck.gsub( /\][^\]]{2,}\[/  , ']]..[[' )
           stripCom = stripMid.gsub( /\][ ]*,[ ]*\[/  , ']]..[[' )
-          stripFns = stripMid.gsub( /\][ ]*[\*\/+\-,=][ ]*\[/  , ']]..[[' )
+          stripFns = stripMid.gsub( /\][ ]*[\*\/+\-><,=][ ]*\[/  , ']]..[[' )
           fields   = stripFns.split(']..[')
           fields.each { |field| @fields.add field.gsub(/^\[|\]$/, '')}
           fields.each do |field| 
@@ -149,6 +149,13 @@ module Twb
       return formula
     end
 
+    def formulaResolvedLines
+      formulaResolved.split(/\n|\r\n/)
+    end
+
+    def enlineResolvedFormula
+    end 
+
     def formulaFlatResolved
       @formulaFlatResolved ||= flattenResolvedFormula
     end

data/lib/twb/localfield.rb

@@ -21,20 +21,21 @@ module Twb
 
   class LocalField
 
-    attr_reader :node, :type, :datatype, :name, :ordinal
+    attr_reader :node, :type, :datatype, :name, :uiname, :hidden, :ordinal, :properties
 
     def initialize fieldNode
-      puts "lf:: #{fieldNode}"
       @node        = fieldNode
       @type        = 'local'
       @datatype    = @node.attr('datatype')
       @name        = @node.attr('name')
+      @uiname      = @name
       @ordinal     = @node.attr('ordinal')
+      # @properties  = @node.attributes
       # @dbname      = @node.attr('name').gsub(/^\[/,'').gsub(/\]$/,'')
       # @datatype    = @node.attr('datatype')
       # @role        = @node.attr('role')
       # @type        = @node.attr('type')
-      # @hidden      = @node.attr('hidden')
+      @hidden      = @node.attr('hidden')
       # @caption     = @node.attr('caption')
       # @aggregation = @node.attr('aggregation')
       # @calculation = getCalculation
@@ -43,26 +44,19 @@ module Twb
       # return self
     end
 
-    # def getCalculation
-    #   calcNode = @node.at_xpath("./calculation")
-    #   FieldCalculation.new(calcNode) unless calcNode.nil?
-    # end
-
-    # def getComments
-    #   comments = ''
-    #   runs = node.xpath('./desc/formatted-text/run')
-    #   runs.each do |run|
-    #     unless run.nil?
-    #       comments += run.text
-    #     end
-    #   end
-    #   return comments
-    # end
+    def properties
+      @properties ||= loadProperties
+    end
 
-    # def remove_attribute attribute
-    #   @node.remove_attribute(attribute)
-    # end
+    def loadProperties
+      @properties= {}
+      @node.attributes.each do |name,attr|
+        @properties[name] = attr.value
+      end
+      @properties[:uiname] = @name
+      return @properties
+    end
 
-  end
+  end # class LocalField
 
-end
+end # module twb

data/lib/twb/mappedfield.rb

@@ -0,0 +1,62 @@
+#  Copyright (C) 2014, 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'nokogiri'
+
+module Twb
+
+  class DbField
+
+    include Comparable
+
+    attr_reader :node,       
+    attr_reader :properties
+    attr_reader :name,       :uiname,        :dbname
+    attr_reader :dbtable
+
+    def initialize dataSource, fieldNode
+      @node    = fieldNode
+      @uiname  = @node.attribute('key').text.gsub(/^\[|\]$/,'')
+      @name    = @uiname
+      fldRef   = @node.attribute('value').text.gsub(/^\[|\]$/,'')
+      parts    = fldRef.split('].[')
+      @dbtable = parts[0]
+      @dbname  = parts[1]
+      @id      = "#{dataSource}::#{dbname}::#{dbtable}::#{uiname}"
+    end
+
+    def properties
+      @properties ||= loadProperties
+    end
+
+    def loadProperties
+      @properties= {}
+      @node.attributes.each do |attr|
+        @properties[attr.name] = attr.text
+      end
+      @properties[:uiname] = @name
+    end
+
+    def to_s
+      @id
+    end
+
+    def <=>(other)
+      @id <=> other.id
+    end
+
+  end  # class ColumnField
+
+end

data/lib/twb/metadatafield.rb

@@ -21,11 +21,13 @@ module Twb
 
     include Comparable
 
-    attr_reader     :node,         :class
+    attr_reader     :node,         :properties
+    attr_reader     :twbClass
     attr_accessor   :source
     attr_reader     :parentName,   :table        # parentName is the Db table
-    attr_reader     :name,         :caption,     :family
-    attr_reader     :localName,    :localType
+    attr_reader     :localName,    :name        
+    attr_reader     :caption,      :uiname
+    attr_reader     :localType,    :family
     attr_reader     :remoteName,   :remoteAlias  
     attr_reader     :remoteType,   :aggregation 
     attr_reader     :containsNull, :ordinal
@@ -54,8 +56,8 @@ module Twb
 
 
     def initialize fieldNode
-      @class             = fieldNode.attribute('class').text
       @node              = fieldNode
+      @twbClass          = @node.attribute('class').text
       @parentName        = load 'parent-name'
       @family            = load 'family'
       @table             = @family.nil? ? @parentName : @family
@@ -64,7 +66,8 @@ module Twb
       @remoteType        = load 'remote-type'
       @caption           = load 'caption'   
       @localName         = load 'local-name'
-      @name              = @caption.nil? ? @localName : @caption
+      @name              = @localName
+      @uiname            = @caption.nil? ? @localName : @caption
       @aggregation       = load 'aggregation'
       @containsNull      = load 'contains-null'
       @localType         = load 'local-type'
@@ -73,7 +76,23 @@ module Twb
       @scale             = load 'scale'
       @width             = load 'width'
       @id                = "'%s::%s' " % [@table,@remoteName]   
-      # return self
+    end
+
+    def properties
+      @properties ||= loadProperties
+    end
+
+    def loadProperties
+      @properties = {}
+      children = @node.xpath('child::node()')
+      children.each do |child|
+        @properties[child.name] = child.text unless 'attributes'.eql? child.name
+      end
+      @properties[:uiname] = @uiname
+      @node.attributes.each do |name,attr|
+        @properties[name] = attr.value
+      end
+      return @properties
     end
 
     def load nodeName

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Chris Gerrard
@@ -20,20 +20,24 @@ files:
 - LICENSE.md
 - LICENSE.txt
 - README.md
-- bin/twb.rb
 - lib/twb.rb
 - lib/twb/TwbTest.rb
 - lib/twb/action.rb
+- lib/twb/analysis/AnnotatedFieldsCSVEmitter.rb
 - lib/twb/analysis/CalculatedFields/CSVEmitter.rb
 - lib/twb/analysis/CalculatedFields/CalculatedFieldsAnalyzer.rb
 - lib/twb/analysis/CalculatedFields/MarkdownEmitter.rb
+- lib/twb/analysis/DataSources/DataSourceFieldsCSVEmitter.rb
 - lib/twb/analysis/DataSources/DataSourceTableFieldsCSVEmitter.rb
+- lib/twb/analysis/DocumentedFieldsCSVEmitter.rb
+- lib/twb/analysis/DocumentedFieldsMarkdownEmitter.rb
 - lib/twb/analysis/Sheets/WorksheetDataStructureCSVEmitter.rb
 - lib/twb/calculatedfield.rb
 - lib/twb/columnfield.rb
 - lib/twb/dashboard.rb
 - lib/twb/dashboard.txt
 - lib/twb/datasource.rb
+- lib/twb/dbfield.rb
 - lib/twb/docdashboard.rb
 - lib/twb/docdashboardimagevert.rb
 - lib/twb/docdashboardwebvert.rb
@@ -47,6 +51,7 @@ files:
 - lib/twb/htmllistcollapsible.rb
 - lib/twb/identifyFields.rb
 - lib/twb/localfield.rb
+- lib/twb/mappedfield.rb
 - lib/twb/metadatafield.rb
 - lib/twb/storyboard.rb
 - lib/twb/there.rb

data/bin/twb.rb

@@ -1 +0,0 @@
-puts "\n TWB gem here. \n"