expressir 0.2.21 → 1.0.0

data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA syntax_schema 'version';
+SCHEMA syntax_schema '{ISO standard 10303 part(41) object(1) version(8)}';
 
 USE FROM contract_schema;
 USE FROM contract_schema

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +176,7 @@ files:
 - docs/development.md
 - exe/expressir
 - exe/format
+- exe/format-test
 - exe/generate-parser
 - expressir.gemspec
 - ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt
@@ -539,42 +526,14 @@ files:
 - lib/expressir/cli.rb
 - lib/expressir/cli/ui.rb
 - lib/expressir/config.rb
-- lib/expressir/express.rb
-- lib/expressir/express/aggregate_dimension.rb
-- lib/expressir/express/attribute.rb
-- lib/expressir/express/comment.rb
-- lib/expressir/express/defined_type.rb
-- lib/expressir/express/derived.rb
-- lib/expressir/express/derived_aggregate.rb
-- lib/expressir/express/entity.rb
-- lib/expressir/express/explicit.rb
-- lib/expressir/express/explicit_aggregate.rb
-- lib/expressir/express/explicit_or_derived.rb
-- lib/expressir/express/global_rule.rb
-- lib/expressir/express/interface_specification.rb
-- lib/expressir/express/interfaced_item.rb
-- lib/expressir/express/inverse.rb
-- lib/expressir/express/inverse_aggregate.rb
-- lib/expressir/express/model_element.rb
-- lib/expressir/express/named_type.rb
-- lib/expressir/express/remark.rb
-- lib/expressir/express/repository.rb
-- lib/expressir/express/schema_definition.rb
-- lib/expressir/express/subtype_constraint.rb
-- lib/expressir/express/type.rb
-- lib/expressir/express/type_aggregate.rb
-- lib/expressir/express/type_enum.rb
-- lib/expressir/express/type_parser.rb
-- lib/expressir/express/type_select.rb
-- lib/expressir/express/unique_rule.rb
-- lib/expressir/express/where_rule.rb
-- lib/expressir/express_exp/cache.rb
-- lib/expressir/express_exp/formatter.rb
-- lib/expressir/express_exp/hyperlink_formatter.rb
-- lib/expressir/express_exp/parser.rb
-- lib/expressir/express_exp/schema_head_formatter.rb
-- lib/expressir/express_exp/visitor.rb
-- lib/expressir/express_parser.rb
+- lib/expressir/express/cache.rb
+- lib/expressir/express/formatter.rb
+- lib/expressir/express/hyperlink_formatter.rb
+- lib/expressir/express/model_visitor.rb
+- lib/expressir/express/parser.rb
+- lib/expressir/express/resolve_references_model_visitor.rb
+- lib/expressir/express/schema_head_formatter.rb
+- lib/expressir/express/visitor.rb
 - lib/expressir/model.rb
 - lib/expressir/model/attribute.rb
 - lib/expressir/model/cache.rb
@@ -595,7 +554,6 @@ files:
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/function.rb
 - lib/expressir/model/identifier.rb
-- lib/expressir/model/informal_proposition.rb
 - lib/expressir/model/interface.rb
 - lib/expressir/model/interface_item.rb
 - lib/expressir/model/interfaced_item.rb
@@ -607,9 +565,12 @@ files:
 - lib/expressir/model/model_element.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
+- lib/expressir/model/remark_item.rb
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.rb
+- lib/expressir/model/schema_version.rb
+- lib/expressir/model/schema_version_item.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/call.rb
@@ -640,11 +601,9 @@ files:
 - lib/expressir/model/types/select.rb
 - lib/expressir/model/types/set.rb
 - lib/expressir/model/types/string.rb
-- lib/expressir/model/unique.rb
+- lib/expressir/model/unique_rule.rb
 - lib/expressir/model/variable.rb
-- lib/expressir/model/where.rb
-- lib/expressir/parser.rb
-- lib/expressir/parser/owl_parser.rb
+- lib/expressir/model/where_rule.rb
 - lib/expressir/version.rb
 - original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.exp
 - original/examples/ap233/ap233e1_arm_lf_stepmod-2010-11-12.owl
@@ -675,22 +634,6 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.owl
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xmi
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml
-- original/examples/syntax/multiple.exp
-- original/examples/syntax/multiple.yaml
-- original/examples/syntax/multiple_formatted.exp
-- original/examples/syntax/multiple_hyperlink_formatted.exp
-- original/examples/syntax/multiple_schema_head_hyperlink_formatted.exp
-- original/examples/syntax/remark.exp
-- original/examples/syntax/remark.yaml
-- original/examples/syntax/remark_formatted.exp
-- original/examples/syntax/single.exp
-- original/examples/syntax/single.yaml
-- original/examples/syntax/single_formatted.exp
-- original/examples/syntax/single_formatted.yaml
-- original/examples/syntax/syntax.exp
-- original/examples/syntax/syntax.yaml
-- original/examples/syntax/syntax_formatted.exp
-- original/examples/syntax/syntax_schema_head_formatted.exp
 - original/exp2ruby.rb
 - original/expsm.rb
 - original/mapping_owl.rb
@@ -699,16 +642,31 @@ files:
 - original/mapping_uml2_eclipse.rb
 - original/reeper.rb
 - rakelib/cross-ruby.rake
-- spec/acceptance/express_to_owl_spec.rb
 - spec/acceptance/version_spec.rb
-- spec/expressir/express/repository_spec.rb
-- spec/expressir/express_exp/cache_spec.rb
-- spec/expressir/express_exp/formatter_spec.rb
-- spec/expressir/express_exp/parser_spec.rb
+- spec/expressir/express/cache_spec.rb
+- spec/expressir/express/formatter_spec.rb
+- spec/expressir/express/parser_spec.rb
 - spec/expressir/model/model_element_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb
+- spec/syntax/multiple.exp
+- spec/syntax/multiple.yaml
+- spec/syntax/multiple_formatted.exp
+- spec/syntax/multiple_hyperlink_formatted.exp
+- spec/syntax/multiple_schema_head_hyperlink_formatted.exp
+- spec/syntax/remark.exp
+- spec/syntax/remark.yaml
+- spec/syntax/remark_formatted.exp
+- spec/syntax/single.exp
+- spec/syntax/single.yaml
+- spec/syntax/single_formatted.exp
+- spec/syntax/single_formatted.yaml
+- spec/syntax/syntax.exp
+- spec/syntax/syntax.yaml
+- spec/syntax/syntax_formatted.exp
+- spec/syntax/syntax_hyperlink_formatted.exp
+- spec/syntax/syntax_schema_head_formatted.exp
 homepage: https://github.com/lutaml/expressir
 licenses:
 - MIT
@@ -716,7 +674,7 @@ metadata:
   homepage_uri: https://github.com/lutaml/expressir
   source_code_uri: https://github.com/lutaml/expressir
   changelog_uri: https://github.com/lutaml/expressir/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -731,8 +689,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.
 test_files: []

data/lib/expressir/express.rb

@@ -1,11 +0,0 @@
-require "nokogiri"
-require "expressir/express/repository"
-require "expressir/express/schema_definition"
-
-module Expressir
-  module Express
-    def self.from_xml(file)
-      Expressir::Express::Repository.from_xml(file)
-    end
-  end
-end

data/lib/expressir/express/aggregate_dimension.rb

@@ -1,38 +0,0 @@
-module Expressir
-  module Express
-    class AggregateDimension
-      attr_accessor :aggrtype, :lower, :upper, :isUnique, :isOptionalArray
-
-      def initialize(options = {})
-        @aggrtype = "SET"
-        @lower = "0"
-        @upper = "?"
-        @isUnique = false
-        @isOptionalArray = false
-
-        @options = options
-      end
-
-      def parse
-        document = @options.fetch(:document, nil)
-        extract_attributes(document) if document
-
-        self
-      end
-
-      def self.parse(document)
-        new(document: document).parse
-      end
-
-      private
-
-      def extract_attributes(document)
-        @aggrtype = document.attributes["type"]
-        @lower = document.attributes["lower"]
-        @upper = document.attributes["upper"]
-        @isUnique = document.attributes["unique"] == "YES"
-        @isOptionalArray = document.attributes["optional"] == "YES"
-      end
-    end
-  end
-end

data/lib/expressir/express/attribute.rb

@@ -1,15 +0,0 @@
-require "expressir/express/model_element"
-
-module Expressir
-  module Express
-    class Attribute < ModelElement
-      attr_accessor :name, :entity, :domain, :redeclare_entity,
-        :redeclare_oldname
-
-      def initialize
-        @redeclare_entity = nil
-        @redeclare_oldname = nil
-      end
-    end
-  end
-end

data/lib/expressir/express/comment.rb

@@ -1,7 +0,0 @@
-module Expressir
-  module Express
-    class Comment
-      attr_accessor :comment, :ModelElement
-    end
-  end
-end

data/lib/expressir/express/defined_type.rb

@@ -1,36 +0,0 @@
-require "expressir/express/named_type"
-
-module Expressir
-  module Express
-    class DefinedType < NamedType
-      def initialize(options = {})
-        @options = options
-        @schema = options.fetch(:schema)
-      end
-
-      def parse
-        document = @options.fetch(:document)
-        extract_type_attributes(document)
-
-        self
-      end
-
-      def self.parse(document, schema)
-        new(document: document, schema: schema).parse
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        @name = document.attributes["name"].to_s
-        @wheres = extract_where_rules(document)
-      end
-
-      def extract_where_rules(document)
-        document.xpath("where").map do |where|
-          Express::WhereRule.parse(where)
-        end
-      end
-    end
-  end
-end

data/lib/expressir/express/derived.rb

@@ -1,65 +0,0 @@
-module Expressir
-  module Express
-    class Derived < ExplicitOrDerived
-      attr_accessor :expression
-
-      def initialize(options = {})
-        @options = options
-        @entity = options.fetch(:entity, nil)
-      end
-
-      def parse
-        document = @options.fetch(:document, nil)
-        extract_common_attributes(document)
-        extract_type_specific_attributes(document)
-
-        self
-      end
-
-      def self.parse(document, entity)
-        new(document: document, entity: entity).parse
-      end
-
-      private
-
-      def extract_type_specific_attributes(document); end
-
-      def extract_common_attributes(document)
-        @name = document.attributes["name"].to_s
-        @expression = document.attributes["expression"].to_s
-        @domain = extract_domain_name(document.xpath("typename"))
-
-        extract_builtintype_attributes(document)
-        extract_redeclaration_attributes(document)
-      end
-
-      def extract_domain_name(typename)
-        unless typename.empty?
-          typename.first.attributes["name"].to_s
-        end
-      end
-
-      def extract_redeclaration_attributes(document)
-        redeclaration = document.xpath("redeclaration").first
-
-        if redeclaration
-          @redeclare_entity = redeclaration.attributes["entity-ref"].to_s
-          old_name = redeclaration.attributes["old_name"]
-          @redeclare_oldname = old_name.to_s if old_name
-        end
-      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/derived_aggregate.rb

@@ -1,43 +0,0 @@
-module Expressir
-  module Express
-    class DerivedAggregate < Derived
-      attr_accessor :rank, :dimensions
-
-      def initialize(options = {})
-        @rank = 0
-        @dimensions = []
-
-        super(options)
-      end
-
-      private
-
-      def extract_type_specific_attributes(document)
-        @dimensions = document.xpath("aggregate").map do |aggregate|
-          Express::AggregateDimension.parse(aggregate)
-        end
-
-        @rank = @dimensions.size
-        extract_inverse_aggregate(document)
-      end
-
-      # @todo: Non existance attributes
-      #
-      # In the codebase, they are trying to add couple of aggregate
-      # dimensions related attributes that was never a part of the
-      # Explict class, but for consistency we are keeping those as
-      # it is for now. let's revist those later and fix it.
-      #
-      def extract_inverse_aggregate(document)
-        aggregates = document.xpath("inverse.aggregate")
-
-        if !aggregates.empty?
-          dimension = Express::AggregateDimension.parse(aggregates.first)
-          @aggrtype = dimension.aggrtype
-          @lower = dimension.lower
-          @upper = dimension.upper
-        end
-      end
-    end
-  end
-end

data/lib/expressir/express/entity.rb

@@ -1,137 +0,0 @@
-require "expressir/express/explicit"
-require "expressir/express/inverse"
-require "expressir/express/derived"
-require "expressir/express/named_type"
-require "expressir/express/where_rule"
-require "expressir/express/unique_rule"
-
-require "expressir/express/explicit_aggregate"
-require "expressir/express/inverse_aggregate"
-require "expressir/express/derived_aggregate"
-
-module Expressir
-  module Express
-    class Entity < NamedType
-      attr_accessor :supertypes, :attributes, :isAbs, :superexpression,
-        :uniques, :subtypes_array, :supertypes_array, :attributes_all_array,
-        :supertypes_all
-
-      def initialize(document: nil, schema: nil, **options)
-        @isAbs = false
-        @attributes = []
-        @uniques = []
-        @wheres = []
-        @subtypes_array = []
-        @supertypes_array = []
-        @attributes_all_array = []
-        @supertypes = nil
-        @supertypes_all = nil
-        @superexpression = nil
-        @selectedBy = []
-
-        @schema = schema
-        @document = document
-        @options = options
-      end
-
-      def find_attr_by_name( attrname )
-        for attribute in attributes
-          if attrname == attribute.name
-            return attribute
-          end
-        end
-        return nil
-      end
-
-      def find_attr_by_name_full( attrname )
-        attr = find_attr_by_name( attrname )
-        if attr != nil
-          return attr
-        end
-        for supertype in supertypes_array
-          attr = supertype.find_attr_by_name_full (attrname)
-          if attr != nil
-            return attr
-          end
-        end
-      end
-
-      def parse
-        extract_attributes(@document, @schema)
-        self
-      end
-
-      def self.parse(document, schema)
-        new(document: document, schema: schema).parse
-      end
-
-      private
-
-      def extract_attributes(document, schema)
-        @name = document.attributes["name"].to_s
-        @supertypes = document.attributes["supertypes"]
-        @superexpression = document.attributes["super.expression"]
-
-        @wheres = extract_where_rules(document)
-        @uniques = extract_unique_rules(document)
-
-        @isAbs = document.attributes["supertypes"] == "YES" ||
-          document.attributes["abstract.entity"] == "YES"
-
-        @attributes = [
-          extract_eplicits(document),
-          extract_inverses(document),
-          extract_derivedes(document),
-        ].flatten
-      end
-
-      def extract_eplicits(document)
-        document.xpath("explicit").map do |explicit|
-          explicit_type = Express::Explicit
-
-          if !explicit.xpath("aggregate").empty?
-            explicit_type = Express::ExplicitAggregate
-          end
-
-          explicit_type.parse(explicit, self)
-        end
-      end
-
-      def extract_inverses(document)
-        document.xpath("inverse").map do |inverse|
-          inverse_type = Express::Inverse
-
-          if !inverse.xpath("inverse.aggregate").empty?
-            inverse_type = Express::InverseAggregate
-          end
-
-          inverse_type.parse(inverse, self)
-        end
-      end
-
-      def extract_derivedes(document)
-        document.xpath("derived").map do |derived|
-          derived_type = Express::Derived
-
-          if !derived.xpath("aggregate").empty?
-            derived_type = Express::DerivedAggregate
-          end
-
-          derived_type.parse(derived, self)
-        end
-      end
-
-      def extract_unique_rules(document)
-        document.xpath("unique").map do |unique|
-          Express::UniqueRule.parse(unique)
-        end
-      end
-
-      def extract_where_rules(document)
-        document.xpath("where").map do |where|
-          Express::WhereRule.parse(where)
-        end
-      end
-    end
-  end
-end