expressir 0.2.10-arm64-darwin → 0.2.11-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b9fd133266e935daa1a46dd8ed3405f59dd8ef07f0cdb1c111469a30e653c9
-  data.tar.gz: 492f03f70f9ca4860d49d905094475cffe343ec8d5734f0a104c512a82be4432
+  metadata.gz: a7ca823c0cea8c0464cb3e31d6cd59d82ad2d82613260b082633d99d98380fc9
+  data.tar.gz: 0bceba8f9858852533ad4eb734b5b559a46ab97ba219594b5a44aab86e234f3d
 SHA512:
-  metadata.gz: 25bc06b8f1901b3130a6f3d3b0bda8e38d5e5c3b881019d40f0b53dcf701d9ac4451fba2621e89aa9e547e0eaa507f4ca2888944f3652323e9d7785489dd8890
-  data.tar.gz: bb6804d766279028844b929c1d3f8cdf6404c84bacf53d1c7b37b24eca23868991cdfd9ddec980ddf8905f51e78ead7e25e393be236e78ce45819c6af38c4cbb
+  metadata.gz: 9831af9252d67dee6425594d251471a64f9c769d953610fbbeb7932eed7cf3599429e466e12f78f61b793d1a294487a24dd0b8f4d04111eda1f77de611f82e52
+  data.tar.gz: 67dcad8003be72122c2b9aeeb504ce33cfd4e74fa509fa9de795050f9051b7be4220398d6de2b94d182fe15431ebbfc593c9aaf8685c03448f77558f04eec1e3

data/lib/expressir/express_exp/visitor.rb

@@ -46,7 +46,7 @@ module Expressir
       def visit(ctx)
         result = super(ctx)
         attach_source(ctx, result)
-        attach_parent(ctx, result)
+        attach_parent(result)
         attach_remarks(ctx, result)
         result
       end
@@ -124,13 +124,9 @@ module Expressir
         end
       end
 
-      def attach_parent(ctx, node)
-        if node.class.method_defined? :children
-          node.children.each do |child_node|
-            if child_node.class.method_defined? :parent and !child_node.parent
-              child_node.parent = node
-            end
-          end
+      def attach_parent(node)
+        if node.class.method_defined? :attach_parent_to_children
+          node.attach_parent_to_children
         end
       end
 

data/lib/expressir/model/model_element.rb

@@ -1,16 +1,21 @@
 module Expressir
   module Model
     class ModelElement
-      CLASS_KEY = '_class' 
+      CLASS_KEY = '_class'
+      SOURCE_KEY = 'source'
 
       def to_hash(options = {})
         skip_empty = options[:skip_empty]
+        formatter = options[:formatter]
 
-        instance_variables.select{|x| x != :@parent}.each_with_object({ CLASS_KEY => self.class.name }) do |variable, result|
+        hash = {}
+        hash[CLASS_KEY] = self.class.name
+
+        instance_variables.select{|x| x != :@parent}.each_with_object(hash) do |variable, result|
           key = variable.to_s.sub(/^@/, '')
           value = instance_variable_get(variable)
 
-          # skip default values (nil, empty array)
+          # skip empty values (nil, empty array)
           if !skip_empty or !(value.nil? or (value.is_a? Array and value.count == 0))
             result[key] = if value.is_a? Array
               value.map do |value|
@@ -27,6 +32,12 @@ module Expressir
             end
           end
         end
+
+        if formatter
+          hash[SOURCE_KEY] = formatter.format(self)
+        end
+
+        hash
       end
 
       def self.from_hash(hash)
@@ -51,13 +62,8 @@ module Expressir
 
         node = Object.const_get(node_class).new(node_options)
 
-        # attach parent
-        if node.class.method_defined? :children
-          node.children.each do |child_node|
-            if child_node.class.method_defined? :parent and !child_node.parent
-              child_node.parent = node
-            end
-          end
+        if node.class.method_defined? :attach_parent_to_children
+          node.attach_parent_to_children
         end
 
         node

data/lib/expressir/model/scope.rb

@@ -55,6 +55,14 @@ module Expressir
         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

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.10".freeze
+  VERSION = "0.2.11".freeze
 end

data/spec/expressir/model/model_element_spec.rb

@@ -1,9 +1,10 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
 
 RSpec.describe Expressir::Model::ModelElement do
   describe ".from_hash" do
-    it "parses an object from hash" do
+    it "parses an object from a hash" do
       input = {
         "_class" => "Expressir::Model::Repository",
         "schemas" => [{
@@ -21,17 +22,17 @@ RSpec.describe Expressir::Model::ModelElement do
       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")
+      expect(repo.schemas.first).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.schemas.first.id).to eq("simple_schema")
+      expect(repo.schemas.first.entities).to be_instance_of(Array)
+      expect(repo.schemas.first.entities.count).to eq(1)
+      expect(repo.schemas.first.entities.first).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.schemas.first.entities.first.id).to eq("empty_entity")
     end
   end
 
   describe ".to_hash" do
-    it "exports an object to hash" do
+    it "exports an object to a hash" do
       repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
 
       result = repo.to_hash
@@ -40,14 +41,31 @@ RSpec.describe Expressir::Model::ModelElement do
       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")
+      expect(result["schemas"].first).to be_instance_of(Hash)
+      expect(result["schemas"].first["_class"]).to eq("Expressir::Model::Schema")
+      expect(result["schemas"].first["id"]).to eq("simple_schema")
+      expect(result["schemas"].first["entities"]).to be_instance_of(Array)
+      expect(result["schemas"].first["entities"].count).to eq(1)
+      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.10
+  version: 0.2.11
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri