expressir 0.2.5 → 0.2.10

data/spec/expressir/express_exp/source_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::ExpressExp::Parser do
+  describe ".source" do
+    it "contains original source" do
+      input = File.read(sample_file)
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      schema = repo.schemas.first
+      start_index = input.index("SCHEMA")
+      stop_index = input.index("END_SCHEMA;") + "END_SCHEMA;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(schema.source).to eq(expected_result)
+
+      entity = schema.entities.first
+      start_index = input.index("ENTITY")
+      stop_index = input.index("END_ENTITY;") + "END_ENTITY;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(entity.source).to eq(expected_result)
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "source.exp"
+    )
+  end
+end

data/spec/expressir/model/model_element_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::ModelElement do
+  describe ".from_hash" do
+    it "parses an object from hash" do
+      input = {
+        "_class" => "Expressir::Model::Repository",
+        "schemas" => [{
+          "_class" => "Expressir::Model::Schema",
+          "id" => "simple_schema",
+          "entities" => [{
+            "_class" => "Expressir::Model::Entity",
+            "id" => "empty_entity"
+          }]
+        }]
+      }
+
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      expect(repo).to be_instance_of(Expressir::Model::Repository)
+      expect(repo.schemas).to be_instance_of(Array)
+      expect(repo.schemas.count).to eq(1)
+      expect(repo.schemas[0]).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.schemas[0].id).to eq("simple_schema")
+      expect(repo.schemas[0].entities).to be_instance_of(Array)
+      expect(repo.schemas[0].entities.count).to eq(1)
+      expect(repo.schemas[0].entities[0]).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.schemas[0].entities[0].id).to eq("empty_entity")
+    end
+  end
+
+  describe ".to_hash" do
+    it "exports an object to hash" do
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      result = repo.to_hash
+      
+      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"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["_class"]).to eq("Expressir::Model::Schema")
+      expect(result["schemas"][0]["id"]).to eq("simple_schema")
+      expect(result["schemas"][0]["entities"]).to be_instance_of(Array)
+      expect(result["schemas"][0]["entities"].count).to eq(1)
+      expect(result["schemas"][0]["entities"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["entities"][0]["_class"]).to eq("Expressir::Model::Entity")
+      expect(result["schemas"][0]["entities"][0]["id"]).to eq("empty_entity")
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "simple.exp"
+    )
+  end
+end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
 
-RSpec.describe Expressir::Model do
+RSpec.describe Expressir::Model::Scope do
   describe ".find" do
     it "finds an object" do
       repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
@@ -10,13 +10,16 @@ RSpec.describe Expressir::Model do
       expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
       expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
+      expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Entity)
       expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_unique')).to be_instance_of(Expressir::Model::Unique)
-      expect(repo.find('remark_schema.remark_entity.remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -35,7 +38,8 @@ RSpec.describe Expressir::Model do
       expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(repo.find('remark_schema.remark_rule.remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # schema scope
       schema = repo.schemas.first
@@ -47,7 +51,8 @@ RSpec.describe Expressir::Model do
       expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(schema.find('remark_entity.remark_unique')).to be_instance_of(Expressir::Model::Unique)
-      expect(schema.find('remark_entity.remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -66,7 +71,13 @@ RSpec.describe Expressir::Model do
       expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(schema.find('remark_rule.remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+
+      # type scope
+      type = schema.types.first
+      expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # entity scope
       entity = schema.entities.first
@@ -74,7 +85,8 @@ RSpec.describe Expressir::Model do
       expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_unique')).to be_instance_of(Expressir::Model::Unique)
-      expect(entity.find('remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
 
       # function scope
       function = schema.functions.first
@@ -98,7 +110,8 @@ RSpec.describe Expressir::Model do
       expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(rule.find('remark_where')).to be_instance_of(Expressir::Model::Where)
+      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
     end
   end
 

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rice
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: antlr4-native
+  name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: antlr4-native
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ extensions:
 - ext/express-parser/extconf.rb
 extra_rdoc_files: []
 files:
+- ".cross_rubies"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -561,12 +576,14 @@ 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/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/renamed_ref.rb
@@ -641,6 +658,8 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml
 - original/examples/syntax/remark.exp
 - original/examples/syntax/remark_formatted.exp
+- original/examples/syntax/simple.exp
+- original/examples/syntax/source.exp
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax_formatted.exp
 - original/exp2ruby.rb
@@ -650,15 +669,20 @@ files:
 - original/mapping_uml2.rb
 - 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/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/model/find_spec.rb
+- spec/expressir/express_exp/source_spec.rb
+- spec/expressir/model/model_element_spec.rb
+- spec/expressir/model/scope_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb
@@ -677,7 +701,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="