expressir 0.2.17-x86-linux → 0.2.18-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85881d47f6f0ae98d38e81923c841e53e01f7c0c1e5acc002d22dd2393d5b798
-  data.tar.gz: 2a0a8c25dd8b7e468a0ff9d40e16c52a730c19075c4c15719c7edcfc95c3413f
+  metadata.gz: 937ca3946d428e24acae755e9e7e5e0b0db96f3b0604348ef3aaa8e233f3b7bd
+  data.tar.gz: f6b951c4609b18640cb4dbcbeaf72ed2e1c47389d5863945a2849bf454aa864b
 SHA512:
-  metadata.gz: 886134f22089082f34cccba7ee85eac35a0969a8aa28416dceb75165e6fcc8be21bed1d7eefa25a7fc4aa844d16ace21babbfe65c0ded9531ea198d9b70d29fc
-  data.tar.gz: 434341f651c7680a1583fef1e1373e54ba298117077f77677892ee14541c18cf1eef9b0e66e42e959f9f9039496db1bc8426cdc164c42bf6834f94edbc70d181
+  metadata.gz: 518b0d2ad6e746b56079203a98d51a230ef0bfb1b5971390f09e2363056664138fdd974d5ffed40647f3bc32610ae880506d9527510a10eff2b6a5bf56990a71
+  data.tar.gz: 7cacd6bbb553a377a604e04e83e2a2cf53192224c9430bb9be4b704a2cf9725e9d02136d4434f85964ec7be6973403611123f711dd9cf6574579571304842cdf

data/lib/expressir/express_exp/parser.rb

@@ -5,6 +5,7 @@ rescue LoadError
   require_relative "express_parser"
 end
 require 'expressir/express_exp/visitor'
+require 'pathname'
 
 =begin
 char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
@@ -25,6 +26,8 @@ module Expressir
   module ExpressExp
     class Parser
       def self.from_file(file, options = {})
+        root_path = options[:root_path]
+
         input = File.read(file)
 
         parser = ::ExpressParser::Parser.parse(input)
@@ -34,7 +37,9 @@ module Expressir
         visitor = Visitor.new(parser.tokens, options)
         repository = visitor.visit(parse_tree)
 
-        repository.schemas.each{|schema| schema.file = file}
+        repository.schemas.each do |schema|
+          schema.file = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : File.basename(file)
+        end
 
         repository
       end
@@ -51,7 +56,9 @@ module Expressir
           schemas: schemas
         })
 
-        repository.schemas.each{|schema| schema.parent = repository}
+        repository.schemas.each do |schema|
+          schema.parent = repository
+        end
 
         repository
       end

data/lib/expressir/model/model_element.rb

@@ -2,6 +2,9 @@ module Expressir
   module Model
     class ModelElement
       CLASS_KEY = '_class'
+      FILE_KEY = 'file'
+      PARENT_KEY = 'parent'
+      CHILDREN_BY_ID_KEY = 'children_by_id'
       SOURCE_KEY = 'source'
 
       attr_accessor :parent
@@ -11,7 +14,8 @@ module Expressir
       end
 
       def model_instance_variables
-        instance_variables.select{|x| x != :@file && x != :@parent && x != :@children_by_id}
+        skip_variables = [FILE_KEY, PARENT_KEY, CHILDREN_BY_ID_KEY].map{|x| "@#{x}".to_sym}
+        instance_variables.select{|x| !skip_variables.include?(x)}
       end
 
       def path
@@ -88,11 +92,15 @@ module Expressir
       end
 
       def to_hash(options = {})
-        include_empty = options[:include_empty] || !options[:skip_empty] # TODO: remove skip_empty
+        root_path = options[:root_path]
         formatter = options[:formatter]
+        include_empty = options[:include_empty] || !options[:skip_empty] # TODO: remove skip_empty
 
         hash = {}
         hash[CLASS_KEY] = self.class.name
+        if self.is_a? Schema and file
+          hash[FILE_KEY] = root_path ? File.expand_path("#{root_path}/#{file}") : file
+        end
 
         model_instance_variables.each_with_object(hash) do |variable, result|
           key = variable.to_s.sub(/^@/, '')

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.17".freeze
+  VERSION = "0.2.18".freeze
 end

data/original/examples/syntax/multiple.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: multiple.exp
   id: multiple_schema1
   interfaces:
   - _class: Expressir::Model::Interface
@@ -146,6 +147,7 @@ schemas:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: missing_entity
 - _class: Expressir::Model::Schema
+  file: multiple.exp
   id: multiple_schema2
   entities:
   - _class: Expressir::Model::Entity
@@ -157,6 +159,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
+  file: multiple.exp
   id: multiple_schema3
   entities:
   - _class: Expressir::Model::Entity
@@ -168,6 +171,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
+  file: multiple.exp
   id: multiple_schema4
   entities:
   - _class: Expressir::Model::Entity

data/original/examples/syntax/remark.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: remark.exp
   id: remark_schema
   remarks:
   - |-

data/original/examples/syntax/single.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: single.exp
   id: single_schema
   entities:
   - _class: Expressir::Model::Entity

data/original/examples/syntax/single_formatted.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: single.exp
   id: single_schema
   entities:
   - _class: Expressir::Model::Entity

data/original/examples/syntax/single_root_path.yaml

@@ -0,0 +1,9 @@
+---
+_class: Expressir::Model::Repository
+schemas:
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/single.exp
+  id: single_schema
+  entities:
+  - _class: Expressir::Model::Entity
+    id: empty_entity

data/original/examples/syntax/syntax.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: syntax.exp
   id: syntax_schema
   version:
     _class: Expressir::Model::Literals::String

data/spec/expressir/express_exp/formatter_spec.rb

@@ -1,3 +1,4 @@
+require "yaml"
 require "spec_helper"
 require "expressir/express_exp/parser"
 require "expressir/express_exp/formatter"

data/spec/expressir/express_exp/parser_spec.rb

@@ -83,15 +83,38 @@ RSpec.describe Expressir::ExpressExp::Parser do
 
       schemas = repo.schemas
       expect(schemas.count).to eq(5)
-      expect(schemas[0].file).to eq(exp_files[0])
+      expect(schemas[0].file).to eq(exp_files[0].basename.to_s)
       expect(schemas[0].id).to eq("single_schema")
-      expect(schemas[1].file).to eq(exp_files[1])
+      expect(schemas[1].file).to eq(exp_files[1].basename.to_s)
       expect(schemas[1].id).to eq("multiple_schema1")
-      expect(schemas[2].file).to eq(exp_files[1])
+      expect(schemas[2].file).to eq(exp_files[1].basename.to_s)
       expect(schemas[2].id).to eq("multiple_schema2")
-      expect(schemas[3].file).to eq(exp_files[1])
+      expect(schemas[3].file).to eq(exp_files[1].basename.to_s)
       expect(schemas[3].id).to eq("multiple_schema3")
-      expect(schemas[4].file).to eq(exp_files[1])
+      expect(schemas[4].file).to eq(exp_files[1].basename.to_s)
+      expect(schemas[4].id).to eq("multiple_schema4")
+    end
+
+    it "parses multiple files with a root path (single.exp, multiple.exp)" do
+      exp_files = [
+        Expressir.root_path.join("original", "examples", "syntax", "single.exp"),
+        Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+      ]
+      root_path = Expressir.root_path
+
+      repo = Expressir::ExpressExp::Parser.from_files(exp_files, root_path: root_path)
+
+      schemas = repo.schemas
+      expect(schemas.count).to eq(5)
+      expect(schemas[0].file).to eq(exp_files[0].relative_path_from(root_path).to_s)
+      expect(schemas[0].id).to eq("single_schema")
+      expect(schemas[1].file).to eq(exp_files[1].relative_path_from(root_path).to_s)
+      expect(schemas[1].id).to eq("multiple_schema1")
+      expect(schemas[2].file).to eq(exp_files[1].relative_path_from(root_path).to_s)
+      expect(schemas[2].id).to eq("multiple_schema2")
+      expect(schemas[3].file).to eq(exp_files[1].relative_path_from(root_path).to_s)
+      expect(schemas[3].id).to eq("multiple_schema3")
+      expect(schemas[4].file).to eq(exp_files[1].relative_path_from(root_path).to_s)
       expect(schemas[4].id).to eq("multiple_schema4")
     end
   end

data/spec/expressir/model/model_element_spec.rb

@@ -1,15 +1,32 @@
+
+require "yaml"
 require "spec_helper"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
 
 RSpec.describe Expressir::Model::ModelElement do
   describe ".to_hash" do
+    it "exports an object with a root path (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single_root_path.yaml")
+      root_path = Expressir.root_path
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file, root_path: root_path)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+
     it "exports an object with a formatter (single.exp)" do
       exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.yaml")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
 
-      result = YAML.dump(repo.to_hash(skip_empty: true, formatter: Expressir::ExpressExp::Formatter))
+      result = YAML.dump(repo.to_hash(formatter: Expressir::ExpressExp::Formatter, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: x86-linux
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -332,6 +332,7 @@ files:
 - original/examples/syntax/single.yaml
 - original/examples/syntax/single_formatted.exp
 - original/examples/syntax/single_formatted.yaml
+- original/examples/syntax/single_root_path.yaml
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax.yaml
 - original/examples/syntax/syntax_formatted.exp