expressir 0.2.5-x64-mingw32 → 0.2.7-x64-mingw32

data/lib/expressir/express/schema_definition.rb

@@ -1,96 +1,96 @@
-require "expressir/express/entity"
-require "expressir/express/type_parser"
-require "expressir/express/global_rule"
-
-module Expressir
-  module Express
-    class SchemaDefinition < ModelElement
-      attr_accessor :contents, :name, :identification, :all_schema_array
-
-      def initialize(document = {})
-        @document = document
-        @all_schema_array = []
-
-        extract_attributes(@document)
-      end
-
-      # @todo Existing Code
-      #
-      # Please revisit this soon, and check if this is necessary
-      # after our recent restrucutre, if not then delegate this
-      # behavior to the respective instanace.
-      #
-      def find_namedtype_by_name(typename)
-        ## search current schema and interfaced item aliases
-        nt = contents.detect do |t|
-          t.is_a?(Express::NamedType) && t.name == typename
-        end
-
-        if nt != nil
-          return nt
-        end
-
-        for schema in self.all_schema_array
-          ## search all interfaced schemas
-          nt = schema.contents.detect do |t|
-            t.is_a?(Express::NamedType) && t.name == typename
-          end
-
-          if nt != nil
-            return nt
-          end
-        end
-
-        Expressir.ui.info("*** NOT HERE " + typename + " IN " + self.name)
-        Expressir.ui.info("*** SEARCHED " + all_schema_array.size.to_s + " SCHEMAS:")
-
-        all_schema_array.each do |schema|
-          Expressir.ui.info("  - " + schema.name)
-        end
-
-        nil
-      end
-
-      private
-
-      def extract_attributes(document)
-        @name = document.attributes["name"].to_s
-
-        contents = extract_interfaces(document)
-        contents += extract_entities(document)
-        contents += extract_types(document)
-        contents += extract_rules(document)
-
-        @contents = contents.flatten
-      end
-
-      # todo: current version does not contain any interface, so we need
-      # a solid example to test out this funcitonaality. But keeping it
-      # pending for now, let's revisit soon.
-      #
-      def extract_interfaces(document)
-        document.xpath("interface").map do |interface|
-          InterfaceSpecification.parse(interface, name)
-        end
-      end
-
-      def extract_entities(document)
-        document.xpath("//entity").map do |entity|
-          Express::Entity.parse(entity, name)
-        end
-      end
-
-      def extract_types(document)
-        document.xpath("type").map do |type_document|
-          Express::TypeParser.parse(type_document, name)
-        end
-      end
-
-      def extract_rules(document)
-        document.xpath("rule").map do |rule|
-          Express::GlobalRule.parse(rule, name)
-        end
-      end
-    end
-  end
-end
+require "expressir/express/entity"
+require "expressir/express/type_parser"
+require "expressir/express/global_rule"
+
+module Expressir
+  module Express
+    class SchemaDefinition < ModelElement
+      attr_accessor :contents, :name, :identification, :all_schema_array
+
+      def initialize(document = {})
+        @document = document
+        @all_schema_array = []
+
+        extract_attributes(@document)
+      end
+
+      # @todo Existing Code
+      #
+      # Please revisit this soon, and check if this is necessary
+      # after our recent restrucutre, if not then delegate this
+      # behavior to the respective instanace.
+      #
+      def find_namedtype_by_name(typename)
+        ## search current schema and interfaced item aliases
+        nt = contents.detect do |t|
+          t.is_a?(Express::NamedType) && t.name == typename
+        end
+
+        if nt != nil
+          return nt
+        end
+
+        for schema in self.all_schema_array
+          ## search all interfaced schemas
+          nt = schema.contents.detect do |t|
+            t.is_a?(Express::NamedType) && t.name == typename
+          end
+
+          if nt != nil
+            return nt
+          end
+        end
+
+        Expressir.ui.info("*** NOT HERE " + typename + " IN " + self.name)
+        Expressir.ui.info("*** SEARCHED " + all_schema_array.size.to_s + " SCHEMAS:")
+
+        all_schema_array.each do |schema|
+          Expressir.ui.info("  - " + schema.name)
+        end
+
+        nil
+      end
+
+      private
+
+      def extract_attributes(document)
+        @name = document.attributes["name"].to_s
+
+        contents = extract_interfaces(document)
+        contents += extract_entities(document)
+        contents += extract_types(document)
+        contents += extract_rules(document)
+
+        @contents = contents.flatten
+      end
+
+      # todo: current version does not contain any interface, so we need
+      # a solid example to test out this funcitonaality. But keeping it
+      # pending for now, let's revisit soon.
+      #
+      def extract_interfaces(document)
+        document.xpath("interface").map do |interface|
+          InterfaceSpecification.parse(interface, name)
+        end
+      end
+
+      def extract_entities(document)
+        document.xpath("//entity").map do |entity|
+          Express::Entity.parse(entity, name)
+        end
+      end
+
+      def extract_types(document)
+        document.xpath("type").map do |type_document|
+          Express::TypeParser.parse(type_document, name)
+        end
+      end
+
+      def extract_rules(document)
+        document.xpath("rule").map do |rule|
+          Express::GlobalRule.parse(rule, name)
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express/subtype_constraint.rb

@@ -1,14 +1,14 @@
-require "expressir/express/model_element"
-
-module Expressir
-  module Express
-    class SubtypeConstraint < ModelElement
-      attr_accessor :name, :entity, :isAbs, :totalover, :expression
-
-      def initialize
-        @isAbs = false
-        @totalover = nil
-      end
-    end
-  end
-end
+require "expressir/express/model_element"
+
+module Expressir
+  module Express
+    class SubtypeConstraint < ModelElement
+      attr_accessor :name, :entity, :isAbs, :totalover, :expression
+
+      def initialize
+        @isAbs = false
+        @totalover = nil
+      end
+    end
+  end
+end

data/lib/expressir/express/type.rb

@@ -1,26 +1,26 @@
-require "expressir/express/defined_type"
-
-module Expressir
-  module Express
-    class Type < DefinedType
-      attr_accessor :isBuiltin, :domain, :isFixed, :width, :precision
-
-      def initialize(options = {})
-        @isBuiltin = false
-        @isFixed = false
-        @width = nil
-        @precision = nil
-        @wheres = []
-        @selectedBy = []
-
-        super(options)
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        super(document)
-      end
-    end
-  end
-end
+require "expressir/express/defined_type"
+
+module Expressir
+  module Express
+    class Type < DefinedType
+      attr_accessor :isBuiltin, :domain, :isFixed, :width, :precision
+
+      def initialize(options = {})
+        @isBuiltin = false
+        @isFixed = false
+        @width = nil
+        @precision = nil
+        @wheres = []
+        @selectedBy = []
+
+        super(options)
+      end
+
+      private
+
+      def extract_type_attributes(document)
+        super(document)
+      end
+    end
+  end
+end

data/lib/expressir/express/type_aggregate.rb

@@ -1,42 +1,42 @@
-require "expressir/express/type"
-
-module Expressir
-  module Express
-    class TypeAggregate < Type
-      attr_accessor :rank, :dimensions
-      def initialize(options = {})
-        @rank = 0
-        @dimensions = []
-        @wheres = []
-        @selectedBy = []
-
-        super(options)
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        @name = document.first.attributes["name"].to_s
-        @dimensions = document.map do |aggregate|
-          Express::AggregateDimension.parse(aggregate)
-        end
-
-        @rank = @dimensions.size
-        extract_builtintype_attributes(document)
-      end
-
-      def extract_builtintype_attributes(document)
-        builtin_type = document.xpath("builtintype").first
-
-        if builtin_type
-          @isBuiltin = true
-          @domain = builtin_type.attributes["type"].to_s
-          @width = builtin_type.attributes["width"].to_s
-          @fixed = builtin_type.attributes["fixed"] == "YES"
-          @precision = builtin_type.attributes["precision"].to_s
-        end
-      end
-    end
-  end
-end
-
+require "expressir/express/type"
+
+module Expressir
+  module Express
+    class TypeAggregate < Type
+      attr_accessor :rank, :dimensions
+      def initialize(options = {})
+        @rank = 0
+        @dimensions = []
+        @wheres = []
+        @selectedBy = []
+
+        super(options)
+      end
+
+      private
+
+      def extract_type_attributes(document)
+        @name = document.first.attributes["name"].to_s
+        @dimensions = document.map do |aggregate|
+          Express::AggregateDimension.parse(aggregate)
+        end
+
+        @rank = @dimensions.size
+        extract_builtintype_attributes(document)
+      end
+
+      def extract_builtintype_attributes(document)
+        builtin_type = document.xpath("builtintype").first
+
+        if builtin_type
+          @isBuiltin = true
+          @domain = builtin_type.attributes["type"].to_s
+          @width = builtin_type.attributes["width"].to_s
+          @fixed = builtin_type.attributes["fixed"] == "YES"
+          @precision = builtin_type.attributes["precision"].to_s
+        end
+      end
+    end
+  end
+end
+

data/lib/expressir/express/type_enum.rb

@@ -1,29 +1,29 @@
-require "expressir/express/defined_type"
-
-module Expressir
-  module Express
-    class TypeEnum < DefinedType
-      attr_accessor :items_array, :items, :extends, :extends_item,
-        :isExtensible, :allitems, :isBuiltin
-
-      def initialize(options = {})
-        @isBuiltin = false
-        @selectedBy = []
-
-        super(options)
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        if document.class == Nokogiri::XML::NodeSet
-          document = document.first
-        end
-
-        @items = document.attributes["items"]
-        @items_array = items.to_s.scan(/\w+/)
-        super(document)
-      end
-    end
-  end
-end
+require "expressir/express/defined_type"
+
+module Expressir
+  module Express
+    class TypeEnum < DefinedType
+      attr_accessor :items_array, :items, :extends, :extends_item,
+        :isExtensible, :allitems, :isBuiltin
+
+      def initialize(options = {})
+        @isBuiltin = false
+        @selectedBy = []
+
+        super(options)
+      end
+
+      private
+
+      def extract_type_attributes(document)
+        if document.class == Nokogiri::XML::NodeSet
+          document = document.first
+        end
+
+        @items = document.attributes["items"]
+        @items_array = items.to_s.scan(/\w+/)
+        super(document)
+      end
+    end
+  end
+end

data/lib/expressir/express/type_parser.rb

@@ -1,45 +1,45 @@
-require "expressir/express/type_enum"
-require "expressir/express/type_select"
-require "expressir/express/type_aggregate"
-
-module Expressir
-  module Express
-    class TypeParser
-      def initialize(options = {})
-        @options = options
-        @schema = options.fetch(:schema, nil)
-      end
-
-      def parse
-        document = @options.fetch(:document, nil)
-        extract_attributes(document) if document
-      end
-
-      def self.parse(document, schema)
-        new(document: document, schema: schema).parse
-      end
-
-      private
-
-      def extract_attributes(document)
-        document_with_klass = document_with_klass(document)
-        document_with_klass[:cls].parse(document_with_klass[:document], @schema)
-      end
-
-      def document_with_klass(document)
-        if !document.xpath("select").empty?
-          { document: document.xpath("select"), cls: Express::TypeSelect }
-
-        elsif !document.xpath("enumeration").empty?
-          { document: document.xpath("enumeration"), cls: Express::TypeEnum }
-
-        elsif !document.xpath("aggregate").empty?
-          { document: document.xpath("aggregate"), cls: Express::TypeAggregate }
-
-        else
-          { document: document, cls: Express::Type }
-        end
-      end
-    end
-  end
-end
+require "expressir/express/type_enum"
+require "expressir/express/type_select"
+require "expressir/express/type_aggregate"
+
+module Expressir
+  module Express
+    class TypeParser
+      def initialize(options = {})
+        @options = options
+        @schema = options.fetch(:schema, nil)
+      end
+
+      def parse
+        document = @options.fetch(:document, nil)
+        extract_attributes(document) if document
+      end
+
+      def self.parse(document, schema)
+        new(document: document, schema: schema).parse
+      end
+
+      private
+
+      def extract_attributes(document)
+        document_with_klass = document_with_klass(document)
+        document_with_klass[:cls].parse(document_with_klass[:document], @schema)
+      end
+
+      def document_with_klass(document)
+        if !document.xpath("select").empty?
+          { document: document.xpath("select"), cls: Express::TypeSelect }
+
+        elsif !document.xpath("enumeration").empty?
+          { document: document.xpath("enumeration"), cls: Express::TypeEnum }
+
+        elsif !document.xpath("aggregate").empty?
+          { document: document.xpath("aggregate"), cls: Express::TypeAggregate }
+
+        else
+          { document: document, cls: Express::Type }
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express/type_select.rb

@@ -1,82 +1,82 @@
-require "expressir/express/defined_type"
-
-module Expressir
-  module Express
-    class TypeSelect < DefinedType
-      attr_accessor :selectitems_array, :selectitems, :extends, :extends_item,
-        :isExtensible, :selectitems_all, :isGenericEntity, :isBuiltin,
-        :cleaned_select_items
-
-      def initialize(options = {})
-        @isBuiltin = false
-        @isExtensible = false
-        @isGenericEntity = false
-        @selectitems = nil
-        @selectitems_array = []
-        @cleaned_select_items = nil
-        @wheres = []
-        @selectedBy = []
-
-        super(options)
-      end
-
-      ##
-      # set cleaned_select_items = process select removing unnecessary
-      # entity types (i.e. if supertype is there)
-      #
-      def clean_select_items
-        @cleaned_select_items = ""
-
-        if selectitems != nil
-          itemname_list = selectitems.scan(/\w+/)
-          dupitem_list = []
-          for itemname in itemname_list
-            itemptr = schema.find_namedtype_by_name( itemname )
-
-            if itemptr.kind_of? EXPSM::Entity
-
-              for itemname2 in itemname_list
-                thetype = schema.find_namedtype_by_name( itemname2 )
-
-                if thetype != nil
-                  if itemptr.supertypes_all != nil &&
-                      itemptr.supertypes_all.include?(thetype.name)
-
-                    dupitem_list.push itemname
-                  end
-                end
-              end
-            end
-          end
-
-          itemname_list.each do |itemname|
-            if !dupitem_list.include? itemname
-              @cleaned_select_items = @cleaned_select_items + " " + itemname
-            end
-          end
-
-          @cleaned_select_items = @cleaned_select_items.lstrip
-        end
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        if document.class == Nokogiri::XML::NodeSet
-          document = document.first
-        end
-
-        @selectitems = document.attributes["selectitems"]
-        @extends = document.attributes["basedon"]
-        @isExtensible = document.attributes["extensible"] == "YES"
-        @isGenericEntity = document.attributes["genericentity"] == "YES"
-
-        if isExtensible
-          @selectitems_all = selectitems
-        end
-
-        super(document)
-      end
-    end
-  end
-end
+require "expressir/express/defined_type"
+
+module Expressir
+  module Express
+    class TypeSelect < DefinedType
+      attr_accessor :selectitems_array, :selectitems, :extends, :extends_item,
+        :isExtensible, :selectitems_all, :isGenericEntity, :isBuiltin,
+        :cleaned_select_items
+
+      def initialize(options = {})
+        @isBuiltin = false
+        @isExtensible = false
+        @isGenericEntity = false
+        @selectitems = nil
+        @selectitems_array = []
+        @cleaned_select_items = nil
+        @wheres = []
+        @selectedBy = []
+
+        super(options)
+      end
+
+      ##
+      # set cleaned_select_items = process select removing unnecessary
+      # entity types (i.e. if supertype is there)
+      #
+      def clean_select_items
+        @cleaned_select_items = ""
+
+        if selectitems != nil
+          itemname_list = selectitems.scan(/\w+/)
+          dupitem_list = []
+          for itemname in itemname_list
+            itemptr = schema.find_namedtype_by_name( itemname )
+
+            if itemptr.kind_of? EXPSM::Entity
+
+              for itemname2 in itemname_list
+                thetype = schema.find_namedtype_by_name( itemname2 )
+
+                if thetype != nil
+                  if itemptr.supertypes_all != nil &&
+                      itemptr.supertypes_all.include?(thetype.name)
+
+                    dupitem_list.push itemname
+                  end
+                end
+              end
+            end
+          end
+
+          itemname_list.each do |itemname|
+            if !dupitem_list.include? itemname
+              @cleaned_select_items = @cleaned_select_items + " " + itemname
+            end
+          end
+
+          @cleaned_select_items = @cleaned_select_items.lstrip
+        end
+      end
+
+      private
+
+      def extract_type_attributes(document)
+        if document.class == Nokogiri::XML::NodeSet
+          document = document.first
+        end
+
+        @selectitems = document.attributes["selectitems"]
+        @extends = document.attributes["basedon"]
+        @isExtensible = document.attributes["extensible"] == "YES"
+        @isGenericEntity = document.attributes["genericentity"] == "YES"
+
+        if isExtensible
+          @selectitems_all = selectitems
+        end
+
+        super(document)
+      end
+    end
+  end
+end