expressir 0.2.10-x86-mingw32 → 0.2.11-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e94f87997672212725a0ad9c198f2eeccefb16ff107b908bed94636dfd52780
-  data.tar.gz: 813c913be662de5154486b3f137d9cf97c3036c4e530da1daf89be3482ece51e
+  metadata.gz: 2caa21f14c104a359d1d50cd836c49ca46a8ebe459689a179d3779b1ee032ef1
+  data.tar.gz: 5249e67700694a5ab4ea1099d37ec7aaaf49d3feb0aa437b4e6e6aa9ad3f3f5d
 SHA512:
-  metadata.gz: 140390c63d94fde61fbdb12f16b7d1c447cf178c6902094d5174185e69db58755623e9d2d8d5965fcf79d313e0666c744f1a1d6db6c8077049d392640887fe20
-  data.tar.gz: 138b2066b6c9723a5d577304476824bdf514fe1abd8ead084632b79f66d73201078379e37c708ab14c2ba78a3fa1e212f06bf46f4f79783b2a42c78cce18a663
+  metadata.gz: 89c9de8f90296700a4ec3dded02e3e1dd2324d034fe9435b87c9c7a8b286f0acb317a90aa2288ea98c919b2955df57cc9c3ea3c804eecf1985b2a0674f090a76
+  data.tar.gz: 20ecf8de577f70ee3a9859c6d5b4606c3799d40cdf39c3e87c75f089780a9e93132ec5799b3dd55b7634674ed13e49ce6c78af684f99383306e532749d6dfe59

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: x86-mingw32
 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