expressir 0.2.11 → 0.2.12

data/spec/expressir/express_exp/schema_head_formatter_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+require "expressir/express_exp/schema_head_formatter"
+
+RSpec.describe Expressir::ExpressExp::SchemaHeadFormatter do
+  describe ".format" do
+    it "formats schema head" do
+      repo = Expressir::ExpressExp::Parser.from_file(sample_file)
+
+      result = Expressir::ExpressExp::SchemaHeadFormatter.format(repo)
+
+      expect(result).to eq(<<~EXP.strip
+        SCHEMA syntax_schema 'version';
+        USE FROM contract_schema;
+        USE FROM contract_schema
+          (contract);
+        USE FROM contract_schema
+          (contract, contract2);
+        USE FROM contract_schema
+          (contract AS contract2);
+        REFERENCE FROM contract_schema;
+        REFERENCE FROM contract_schema
+          (contract);
+        REFERENCE FROM contract_schema
+          (contract, contract2);
+        REFERENCE FROM contract_schema
+          (contract AS contract2);
+      EXP
+      )
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+  end
+end

data/spec/expressir/model/{scope_spec.rb → model_element/find_spec.rb}

@@ -1,10 +1,10 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
 
-RSpec.describe Expressir::Model::Scope do
+RSpec.describe Expressir::Model::ModelElement do
   describe ".find" do
     it "finds an object" do
-      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+      repo = Expressir::ExpressExp::Parser.from_file(sample_file)
 
       # universal scope
       expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
@@ -112,6 +112,11 @@ RSpec.describe Expressir::Model::Scope do
       expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
+
+      # retry search in parent scope
+      expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
+      expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
     end
   end
 

data/spec/expressir/model/{model_element_spec.rb → model_element/hash_spec.rb}

@@ -33,9 +33,14 @@ RSpec.describe Expressir::Model::ModelElement do
 
   describe ".to_hash" do
     it "exports an object to a hash" do
-      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+      repo = Expressir::ExpressExp::Parser.from_file(sample_file)
 
-      result = repo.to_hash
+      class CustomFormatter < Expressir::ExpressExp::Formatter
+        def format_schema(node)
+          "Oook."
+        end
+      end
+      result = repo.to_hash(formatter: CustomFormatter)
       
       expect(result).to be_instance_of(Hash)
       expect(result["_class"]).to eq("Expressir::Model::Repository")
@@ -49,22 +54,6 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(result["schemas"].first["entities"].first).to be_instance_of(Hash)
       expect(result["schemas"].first["entities"].first["_class"]).to eq("Expressir::Model::Entity")
       expect(result["schemas"].first["entities"].first["id"]).to eq("empty_entity")
-    end
-
-    it "exports an object to a hash with a custom formatter" do
-      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
-
-      class CustomFormatter < Expressir::ExpressExp::Formatter
-        def format_schema(node)
-          "Oook."
-        end
-      end
-      result = repo.to_hash({ formatter: CustomFormatter })
-
-      expect(result).to be_instance_of(Hash)
-      expect(result["_class"]).to eq("Expressir::Model::Repository")
-      expect(result["schemas"]).to be_instance_of(Array)
-      expect(result["schemas"].count).to eq(1)
       expect(result["schemas"].first["source"]).to eq("Oook.")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,7 @@ files:
 - demo.rb
 - docs/development.md
 - exe/expressir
+- exe/format
 - exe/generate-parser
 - expressir.gemspec
 - ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt
@@ -554,7 +569,9 @@ files:
 - lib/expressir/express/unique_rule.rb
 - lib/expressir/express/where_rule.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/model.rb
@@ -590,7 +607,6 @@ files:
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.rb
-- lib/expressir/model/scope.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/call.rb
@@ -656,6 +672,8 @@ 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/hyperlink.exp
+- original/examples/syntax/hyperlink_formatted.exp
 - original/examples/syntax/remark.exp
 - original/examples/syntax/remark_formatted.exp
 - original/examples/syntax/simple.exp
@@ -673,16 +691,17 @@ files:
 - spec/acceptance/express_to_owl_spec.rb
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
-- spec/expressir/express_exp/ap233_spec.rb
-- spec/expressir/express_exp/format_remark_spec.rb
-- spec/expressir/express_exp/format_syntax_spec.rb
-- spec/expressir/express_exp/head_source_spec.rb
-- spec/expressir/express_exp/parse_multiple_spec.rb
-- spec/expressir/express_exp/parse_remark_spec.rb
-- spec/expressir/express_exp/parse_syntax_spec.rb
-- spec/expressir/express_exp/source_spec.rb
-- spec/expressir/model/model_element_spec.rb
-- spec/expressir/model/scope_spec.rb
+- spec/expressir/express_exp/formatter/remark_spec.rb
+- spec/expressir/express_exp/formatter/syntax_spec.rb
+- spec/expressir/express_exp/hyperlink_formatter_spec.rb
+- spec/expressir/express_exp/parser/head_source_spec.rb
+- spec/expressir/express_exp/parser/multiple_spec.rb
+- spec/expressir/express_exp/parser/remark_spec.rb
+- spec/expressir/express_exp/parser/source_spec.rb
+- spec/expressir/express_exp/parser/syntax_spec.rb
+- spec/expressir/express_exp/schema_head_formatter_spec.rb
+- spec/expressir/model/model_element/find_spec.rb
+- spec/expressir/model/model_element/hash_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb

data/lib/expressir/model/scope.rb

@@ -1,71 +0,0 @@
-module Expressir
-  module Model
-    module Scope
-      def find(path)
-        current_path, _, rest = path.partition(".")
-
-        # ignore prefix
-        _, _, current_path = current_path.rpartition(":")
-
-        current_path = current_path.downcase
-        child = children.find{|x| x.id and x.id.downcase == current_path}
-
-        if !rest.empty? and child.class.method_defined? :find
-          child.find(rest)
-        else
-          child
-        end
-      end
-
-      def find_or_create(path)
-        child = find(path)
-
-        if !child
-          # check if path should create implicit informal proposal
-          # see https://github.com/lutaml/expressir/issues/50
-          rest, _, current_path = path.rpartition(".")
-
-          if !rest.empty?
-            child = find(rest)
-          else
-            child = self
-          end
-
-          if child.class.method_defined? :informal_propositions
-            # ignore prefix
-            _, _, current_path = current_path.rpartition(":")
-
-            # match informal proposition id
-            informal_proposition_id = current_path.match(/^IP\d+$/).to_a[0]
-
-            if informal_proposition_id
-              # create implicit informal proposition
-              informal_proposition = Model::InformalProposition.new({
-                id: informal_proposition_id
-              })
-              informal_proposition.parent = child
-
-              child.informal_propositions << informal_proposition
-
-              informal_proposition
-            end
-          end
-        else
-          child
-        end
-      end
-
-      def attach_parent_to_children
-        children.each do |child_node|
-          if child_node.class.method_defined? :parent and !child_node.parent
-            child_node.parent = self
-          end
-        end
-      end
-
-      def children
-        raise 'Not implemented'
-      end
-    end
-  end
-end

data/spec/expressir/express_exp/ap233_spec.rb

@@ -1,22 +0,0 @@
-require "spec_helper"
-require "expressir/express_exp/parser"
-
-RSpec.describe Expressir::ExpressExp::Parser do
-  describe ".from_file" do
-    it "build an instance from a file" do
-      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
-
-      schemas = repo.schemas
-      expect(schemas.count).to eq(1)
-
-      schema = schemas.first
-      expect(schema.id).to eq("Ap233_systems_engineering_arm_LF")
-    end
-  end
-
-  def sample_file
-    @sample_file ||= Expressir.root_path.join(
-      "original", "examples", "ap233", "ap233e1_arm_lf_stepmod-2010-11-12.exp"
-    )
-  end
-end