expressir 0.2.24 → 1.1.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,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rice
+  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
+        version: 2.0.13
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.0.13
 - !ruby/object:Gem::Dependency
   name: antlr4-native
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.26
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.
 email:
 - open.source@ribose.com'
@@ -180,6 +208,7 @@ files:
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
+- ".yardopts"
 - Gemfile
 - README.adoc
 - Rakefile
@@ -190,6 +219,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,112 +569,93 @@ 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
-- lib/expressir/model/constant.rb
-- lib/expressir/model/entity.rb
-- lib/expressir/model/enumeration_item.rb
+- lib/expressir/model/data_type.rb
+- lib/expressir/model/data_types/aggregate.rb
+- lib/expressir/model/data_types/array.rb
+- lib/expressir/model/data_types/bag.rb
+- lib/expressir/model/data_types/binary.rb
+- lib/expressir/model/data_types/boolean.rb
+- lib/expressir/model/data_types/enumeration.rb
+- lib/expressir/model/data_types/enumeration_item.rb
+- lib/expressir/model/data_types/generic.rb
+- lib/expressir/model/data_types/generic_entity.rb
+- lib/expressir/model/data_types/integer.rb
+- lib/expressir/model/data_types/list.rb
+- lib/expressir/model/data_types/logical.rb
+- lib/expressir/model/data_types/number.rb
+- lib/expressir/model/data_types/real.rb
+- lib/expressir/model/data_types/select.rb
+- lib/expressir/model/data_types/set.rb
+- lib/expressir/model/data_types/string.rb
+- lib/expressir/model/declaration.rb
+- lib/expressir/model/declarations/attribute.rb
+- lib/expressir/model/declarations/constant.rb
+- lib/expressir/model/declarations/entity.rb
+- lib/expressir/model/declarations/function.rb
+- lib/expressir/model/declarations/interface.rb
+- lib/expressir/model/declarations/interface_item.rb
+- lib/expressir/model/declarations/interfaced_item.rb
+- lib/expressir/model/declarations/parameter.rb
+- lib/expressir/model/declarations/procedure.rb
+- lib/expressir/model/declarations/remark_item.rb
+- lib/expressir/model/declarations/rule.rb
+- lib/expressir/model/declarations/schema.rb
+- lib/expressir/model/declarations/schema_version.rb
+- lib/expressir/model/declarations/schema_version_item.rb
+- lib/expressir/model/declarations/subtype_constraint.rb
+- lib/expressir/model/declarations/type.rb
+- lib/expressir/model/declarations/unique_rule.rb
+- lib/expressir/model/declarations/variable.rb
+- lib/expressir/model/declarations/where_rule.rb
+- lib/expressir/model/expression.rb
 - lib/expressir/model/expressions/aggregate_initializer.rb
-- lib/expressir/model/expressions/aggregate_item.rb
-- lib/expressir/model/expressions/attribute_reference.rb
+- lib/expressir/model/expressions/aggregate_initializer_item.rb
 - lib/expressir/model/expressions/binary_expression.rb
-- lib/expressir/model/expressions/call.rb
 - lib/expressir/model/expressions/entity_constructor.rb
-- lib/expressir/model/expressions/group_reference.rb
-- lib/expressir/model/expressions/index_reference.rb
+- lib/expressir/model/expressions/function_call.rb
 - lib/expressir/model/expressions/interval.rb
 - lib/expressir/model/expressions/query_expression.rb
-- lib/expressir/model/expressions/simple_reference.rb
 - lib/expressir/model/expressions/unary_expression.rb
-- lib/expressir/model/function.rb
 - lib/expressir/model/identifier.rb
-- lib/expressir/model/interface.rb
-- lib/expressir/model/interface_item.rb
-- lib/expressir/model/interfaced_item.rb
+- lib/expressir/model/literal.rb
 - lib/expressir/model/literals/binary.rb
 - lib/expressir/model/literals/integer.rb
 - lib/expressir/model/literals/logical.rb
 - lib/expressir/model/literals/real.rb
 - lib/expressir/model/literals/string.rb
 - 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/reference.rb
+- lib/expressir/model/references/attribute_reference.rb
+- lib/expressir/model/references/group_reference.rb
+- lib/expressir/model/references/index_reference.rb
+- lib/expressir/model/references/simple_reference.rb
 - lib/expressir/model/repository.rb
-- lib/expressir/model/rule.rb
-- lib/expressir/model/schema.rb
+- lib/expressir/model/statement.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
-- lib/expressir/model/statements/call.rb
 - lib/expressir/model/statements/case.rb
 - lib/expressir/model/statements/case_action.rb
 - lib/expressir/model/statements/compound.rb
 - lib/expressir/model/statements/escape.rb
 - lib/expressir/model/statements/if.rb
 - lib/expressir/model/statements/null.rb
+- lib/expressir/model/statements/procedure_call.rb
 - lib/expressir/model/statements/repeat.rb
 - lib/expressir/model/statements/return.rb
 - lib/expressir/model/statements/skip.rb
-- lib/expressir/model/subtype_constraint.rb
-- lib/expressir/model/type.rb
-- lib/expressir/model/types/aggregate.rb
-- lib/expressir/model/types/array.rb
-- lib/expressir/model/types/bag.rb
-- lib/expressir/model/types/binary.rb
-- lib/expressir/model/types/boolean.rb
-- lib/expressir/model/types/enumeration.rb
-- lib/expressir/model/types/generic.rb
-- lib/expressir/model/types/generic_entity.rb
-- lib/expressir/model/types/integer.rb
-- lib/expressir/model/types/list.rb
-- lib/expressir/model/types/logical.rb
-- lib/expressir/model/types/number.rb
-- lib/expressir/model/types/real.rb
-- 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/variable.rb
-- lib/expressir/model/where.rb
-- lib/expressir/parser.rb
-- lib/expressir/parser/owl_parser.rb
+- lib/expressir/model/supertype_expression.rb
+- lib/expressir/model/supertype_expressions/binary_supertype_expression.rb
+- lib/expressir/model/supertype_expressions/oneof_supertype_expression.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 +686,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 +694,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
@@ -731,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.

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