expressir 0.2.17-arm64-darwin → 0.2.18-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b062539c95ceffeabeed14198454dc989cceba5cccff2ed616da4b11fd1dff5a
-  data.tar.gz: 3d58d00d08553a0bda9dd7cb347ea2160f7d86a29ca9315771af3c5db1b82d73
+  metadata.gz: 0fc925e9e40f5ff197b2886575187dcd59b26df7bb5949c7337a8b2769dffcc8
+  data.tar.gz: a6fd20f728d03289f341415f1e240585d3b79df85cc25f74ca6e59a9f07a8deb
 SHA512:
-  metadata.gz: 6445e6e3509c45c8d561f72fa64bd5a6b056a9ca8f2b55787c0c0e917d770e89471957f859000a4cb07628ab36de9b77b271f9e93ea27d211c209d15e938a1d6
-  data.tar.gz: 39696b728b724b93a577a2fb73cdbe646ae8a10b7e4035f3c410761f99f04b632b7fb96d835a3dfca43a6572d3152d1a2c7959312a94a30e133684adf899ce4d
+  metadata.gz: c0ebb243ba8ac2bd49240464ab71d3df7888e40113dd0f89165a4e176984eb5fb10733e86bdb73f62d3e9913002378362b42915f48c0a4d97836b4d77c13de05
+  data.tar.gz: 8389c687c263565a7ea98181d8bcc9c0864cfb2920fac776a96b39716d6ba42fdbd977355a4f9f6017f4e61702823ff8b48f7254944ab6ec331c83663117c315

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: arm64-darwin
 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