expressir 0.2.18-x86-mingw32 → 0.2.19-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e4bfd72d76aae6047565fa31967bfa2ba7efb43bc08cb00b005843b838a304a
-  data.tar.gz: f6dafd7878cdc534e968dd1a33638cfc6887aa71f0b2042209e895bbb1609e07
+  metadata.gz: 30665a54fb3ef872295b9bab155fd4295d79000df5f62b272a0ca1e943ee75c9
+  data.tar.gz: 926267e323f7af99e5e5eaa3d5e65fbc1d23e7bf6b348758ab7d1999f2e74739
 SHA512:
-  metadata.gz: 7542778605043f104f8bc1aad4f92730cb6fdcfbb89e7a09ef110f1455128c0e58ec80ae1b7182f263d45da0e2407d695e8d1bebf9a1526b97f02fb0472df250
-  data.tar.gz: 78f8701bb93bca97182b1df538271ea3f484a7519d270d27b14cc36d168e3cf7ca79ef8a0212c371bb23ab0e73673c554ed56b71bf7c8e8d61a6035d1ef31646
+  metadata.gz: 842febbad3553c088159f97f2a564948cd718fc9822ceb0bc8857bc67020029fb12ac1238ed42d4e6cef5f34b4ea8a91a6d1f0111690965cb3e1959f7ac24f2a
+  data.tar.gz: d79229f04721fa8843266290ee82b4cddbb8e560833456ff4c0d301ff48e329b72aaa3b27043b7badb94bf0fd3d3f0a3bb808c1122fe6874e6fdfb4a83c1af16

data/.github/workflows/rake.yml

@@ -43,3 +43,8 @@ jobs:
       - run: bundle exec rake compile
 
       - run: bundle exec rake
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: express_parser-${{ matrix.os }}-${{ matrix.ruby }}
+          path: lib/expressir/express_exp/express_parser.so

data/lib/expressir/express_exp/parser.rb

@@ -5,7 +5,6 @@ rescue LoadError
   require_relative "express_parser"
 end
 require 'expressir/express_exp/visitor'
-require 'pathname'
 
 =begin
 char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
@@ -26,8 +25,6 @@ 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)
@@ -38,7 +35,7 @@ module Expressir
         repository = visitor.visit(parse_tree)
 
         repository.schemas.each do |schema|
-          schema.file = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : File.basename(file)
+          schema.file = file.to_s
         end
 
         repository

data/lib/expressir/model/model_element.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Expressir
   module Model
     class ModelElement
@@ -99,17 +101,17 @@ module Expressir
         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
+          hash[FILE_KEY] = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : file
         end
 
-        model_instance_variables.each_with_object(hash) do |variable, result|
+        model_instance_variables.each do |variable|
           key = variable.to_s.sub(/^@/, '')
           value = instance_variable_get(variable)
           empty = value.nil? || (value.is_a?(Array) && value.count == 0)
 
           # skip empty values
           if !empty or include_empty
-            result[key] = if value.is_a? Array
+            hash[key] = if value.is_a? Array
               value.map do |value|
                 if value.is_a? ModelElement
                   value.to_hash(options)
@@ -132,21 +134,28 @@ module Expressir
         hash
       end
 
-      def self.from_hash(hash)
+      def self.from_hash(hash, options = {})
+        root_path = options[:root_path]
+
         node_class = hash[CLASS_KEY]
-        node_options = hash.select{|x| x != CLASS_KEY}.each_with_object({}) do |(variable, value), result|
+        node_options = {}
+        if node_class == 'Expressir::Model::Schema' and hash[FILE_KEY]
+          node_options[FILE_KEY.to_sym] = root_path ? File.expand_path("#{root_path}/#{hash[FILE_KEY]}") : hash[FILE_KEY]
+        end
+
+        hash.select{|x| x != CLASS_KEY && x != FILE_KEY}.each do |variable, value|
           key = variable.to_sym
 
-          result[key] = if value.is_a? Array
+          node_options[key] = if value.is_a? Array
             value.map do |value|
               if value.is_a? Hash
-                self.from_hash(value)
+                self.from_hash(value, options)
               else
                 value
               end
             end
           elsif value.is_a? Hash
-            self.from_hash(value)
+            self.from_hash(value, options)
           else
             value
           end

data/lib/expressir/version.rb

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

data/original/examples/syntax/multiple.yaml

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

data/original/examples/syntax/remark.yaml

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

data/original/examples/syntax/single.yaml

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

data/original/examples/syntax/single_formatted.yaml

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

data/original/examples/syntax/syntax.yaml

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

data/spec/expressir/express_exp/parser_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -21,7 +21,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -33,7 +33,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -45,7 +45,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -83,38 +83,15 @@ RSpec.describe Expressir::ExpressExp::Parser do
 
       schemas = repo.schemas
       expect(schemas.count).to eq(5)
-      expect(schemas[0].file).to eq(exp_files[0].basename.to_s)
+      expect(schemas[0].file).to eq(exp_files[0].to_s)
       expect(schemas[0].id).to eq("single_schema")
-      expect(schemas[1].file).to eq(exp_files[1].basename.to_s)
+      expect(schemas[1].file).to eq(exp_files[1].to_s)
       expect(schemas[1].id).to eq("multiple_schema1")
-      expect(schemas[2].file).to eq(exp_files[1].basename.to_s)
+      expect(schemas[2].file).to eq(exp_files[1].to_s)
       expect(schemas[2].id).to eq("multiple_schema2")
-      expect(schemas[3].file).to eq(exp_files[1].basename.to_s)
+      expect(schemas[3].file).to eq(exp_files[1].to_s)
       expect(schemas[3].id).to eq("multiple_schema3")
-      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].file).to eq(exp_files[1].to_s)
       expect(schemas[4].id).to eq("multiple_schema4")
     end
   end

data/spec/expressir/model/model_element_spec.rb

@@ -6,27 +6,13 @@ 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(formatter: Expressir::ExpressExp::Formatter, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, formatter: Expressir::ExpressExp::Formatter, skip_empty: true))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -39,9 +25,9 @@ RSpec.describe Expressir::Model::ModelElement do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
 
       input = YAML.load(File.read(yaml_file))
-      repo = Expressir::Model::ModelElement.from_hash(input)
+      repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
@@ -51,9 +37,9 @@ RSpec.describe Expressir::Model::ModelElement do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
 
       input = YAML.load(File.read(yaml_file))
-      repo = Expressir::Model::ModelElement.from_hash(input)
+      repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
@@ -63,9 +49,9 @@ RSpec.describe Expressir::Model::ModelElement do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
 
       input = YAML.load(File.read(yaml_file))
-      repo = Expressir::Model::ModelElement.from_hash(input)
+      repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
@@ -75,9 +61,9 @@ RSpec.describe Expressir::Model::ModelElement do
       yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
 
       input = YAML.load(File.read(yaml_file))
-      repo = Expressir::Model::ModelElement.from_hash(input)
+      repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: x86-mingw32
 authors:
 - Ribose Inc.
@@ -332,7 +332,6 @@ 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

data/original/examples/syntax/single_root_path.yaml

@@ -1,9 +0,0 @@
----
-_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