expressir 0.2.27 → 1.0.0

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

@@ -747,19 +747,19 @@ PROCEDURE types;
   END_TYPE;
   TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT;
   END_TYPE;
-  TYPE select_list_type = SELECT
+  TYPE select_item_type = SELECT
     (empty_type);
   END_TYPE;
-  TYPE select_list_multiple_type = SELECT
+  TYPE select_multiple_item_type = SELECT
     (empty_type,
      empty_type);
   END_TYPE;
-  TYPE select_extension_type_ref_type = SELECT BASED_ON select_type;
+  TYPE select_based_on_type = SELECT BASED_ON select_type;
   END_TYPE;
-  TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH
+  TYPE select_based_on_item_type = SELECT BASED_ON select_type WITH
     (empty_type);
   END_TYPE;
-  TYPE select_extension_type_ref_list_multiple_type = SELECT BASED_ON select_type WITH
+  TYPE select_based_on_multiple_item_type = SELECT BASED_ON select_type WITH
     (empty_type,
      empty_type);
   END_TYPE;
@@ -767,19 +767,19 @@ PROCEDURE types;
   END_TYPE;
   TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION;
   END_TYPE;
-  TYPE enumeration_list_type = ENUMERATION OF
+  TYPE enumeration_item_type = ENUMERATION OF
     (test);
   END_TYPE;
-  TYPE enumeration_list_multiple_type = ENUMERATION OF
+  TYPE enumeration_multiple_item_type = ENUMERATION OF
     (test,
      test2);
   END_TYPE;
-  TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type;
+  TYPE enumeration_based_on_type = ENUMERATION BASED_ON enumeration_type;
   END_TYPE;
-  TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH
+  TYPE enumeration_based_on_item_type = ENUMERATION BASED_ON enumeration_type WITH
     (test);
   END_TYPE;
-  TYPE enumeration_extension_type_ref_list_multiple_type = ENUMERATION BASED_ON enumeration_type WITH
+  TYPE enumeration_based_on_multiple_item_type = ENUMERATION BASED_ON enumeration_type WITH
     (test,
      test2);
   END_TYPE;

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

@@ -747,19 +747,19 @@ PROCEDURE types;
   END_TYPE;
   TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT;
   END_TYPE;
-  TYPE select_list_type = SELECT
+  TYPE select_item_type = SELECT
     ({{{<<express:syntax_schema.empty_type,empty_type>>}}});
   END_TYPE;
-  TYPE select_list_multiple_type = SELECT
+  TYPE select_multiple_item_type = SELECT
     ({{{<<express:syntax_schema.empty_type,empty_type>>}}},
      {{{<<express:syntax_schema.empty_type,empty_type>>}}});
   END_TYPE;
-  TYPE select_extension_type_ref_type = SELECT BASED_ON select_type;
+  TYPE select_based_on_type = SELECT BASED_ON select_type;
   END_TYPE;
-  TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH
+  TYPE select_based_on_item_type = SELECT BASED_ON select_type WITH
     ({{{<<express:syntax_schema.empty_type,empty_type>>}}});
   END_TYPE;
-  TYPE select_extension_type_ref_list_multiple_type = SELECT BASED_ON select_type WITH
+  TYPE select_based_on_multiple_item_type = SELECT BASED_ON select_type WITH
     ({{{<<express:syntax_schema.empty_type,empty_type>>}}},
      {{{<<express:syntax_schema.empty_type,empty_type>>}}});
   END_TYPE;
@@ -767,19 +767,19 @@ PROCEDURE types;
   END_TYPE;
   TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION;
   END_TYPE;
-  TYPE enumeration_list_type = ENUMERATION OF
+  TYPE enumeration_item_type = ENUMERATION OF
     (test);
   END_TYPE;
-  TYPE enumeration_list_multiple_type = ENUMERATION OF
+  TYPE enumeration_multiple_item_type = ENUMERATION OF
     (test,
      test2);
   END_TYPE;
-  TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type;
+  TYPE enumeration_based_on_type = ENUMERATION BASED_ON enumeration_type;
   END_TYPE;
-  TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH
+  TYPE enumeration_based_on_item_type = ENUMERATION BASED_ON enumeration_type WITH
     (test);
   END_TYPE;
-  TYPE enumeration_extension_type_ref_list_multiple_type = ENUMERATION BASED_ON enumeration_type WITH
+  TYPE enumeration_based_on_multiple_item_type = ENUMERATION BASED_ON enumeration_type WITH
     (test,
      test2);
   END_TYPE;

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-30 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
@@ -540,44 +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/model_visitor.rb
-- lib/expressir/express_exp/parser.rb
-- lib/expressir/express_exp/resolve_references_model_visitor.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
@@ -645,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
@@ -680,23 +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_hyperlink_formatted.exp
-- original/examples/syntax/syntax_schema_head_formatted.exp
 - original/exp2ruby.rb
 - original/expsm.rb
 - original/mapping_owl.rb
@@ -705,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
@@ -737,7 +689,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

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