expressir 0.2.9-arm64-darwin → 0.2.14-arm64-darwin

data/lib/expressir/model/informal_proposition.rb

@@ -1,10 +1,14 @@
 module Expressir
   module Model
-    class InformalProposition
+    class InformalProposition < ModelElement
       include Identifier
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        super
       end
     end
   end

data/lib/expressir/model/interface.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Interface
+    class Interface < ModelElement
       USE = :USE
       REFERENCE = :REFERENCE
 
@@ -11,7 +11,9 @@ module Expressir
       def initialize(options = {})
         @kind = options[:kind]
         @schema = options[:schema]
-        @items = options[:items]
+        @items = options.fetch(:items, [])
+
+        super
       end
     end
   end

data/lib/expressir/model/literals/binary.rb

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Literals
-      class Binary
+      class Binary < ModelElement
         attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/integer.rb

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Literals
-      class Integer
+      class Integer < ModelElement
         attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/logical.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Literals
-      class Logical
+      class Logical < ModelElement
         TRUE = :TRUE
         FALSE = :FALSE
         UNKNOWN = :UNKNOWN
@@ -10,6 +10,8 @@ module Expressir
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/real.rb

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Literals
-      class Real
+      class Real < ModelElement
         attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/string.rb

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Literals
-      class String
+      class String < ModelElement
         attr_accessor :value
         attr_accessor :encoded
 
         def initialize(options = {})
           @value = options[:value]
           @encoded = options[:encoded]
+
+          super
         end
       end
     end

data/lib/expressir/model/model_element.rb

@@ -0,0 +1,140 @@
+module Expressir
+  module Model
+    class ModelElement
+      CLASS_KEY = '_class'
+      SOURCE_KEY = 'source'
+
+      attr_accessor :parent
+
+      def initialize(options = {})
+        attach_parent_to_children
+      end
+
+      def path
+        return id if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
+
+        current_node = self
+        path_parts = []
+        loop do
+          if current_node.class.method_defined? :id
+            path_parts << current_node.id
+          end
+
+          current_node = current_node.parent
+          break unless current_node
+        end
+
+        path_parts.reverse.join(".")
+      end
+
+      def attach_parent_to_children
+        instance_variables.select{|x| x != :@parent}.each do |variable|
+          value = instance_variable_get(variable)
+
+          if value.is_a? Array
+            value.each do |value|
+              if value.is_a? ModelElement
+                value.parent = self
+              end
+            end
+          elsif value.is_a? ModelElement
+            value.parent = self
+          end
+        end
+      end
+
+      def find(path)
+        return self if path.empty?
+
+        path_parts = path.downcase.split(/\./).map do |current_path|
+          _, _, current_path = current_path.rpartition(":") # ignore prefix
+          current_path
+        end
+
+        current_scope = self
+        target_node = nil
+        loop do
+          # find in current scope
+          current_node = current_scope
+          path_parts.each do |current_path|
+            current_node = current_node.children.find{|x| x.id and x.id.downcase == current_path}
+            break unless current_node
+          end
+          target_node = current_node
+          break if target_node
+
+          # retry search in parent scope
+          current_scope = current_scope.parent
+          break unless current_scope
+        end
+
+        target_node
+      end
+
+      def children
+        []
+      end
+
+      def to_hash(options = {})
+        skip_empty = options[:skip_empty]
+        formatter = options[:formatter]
+
+        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 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|
+                if value.is_a? ModelElement
+                  value.to_hash(options)
+                else
+                  value
+                end
+              end
+            elsif value.is_a? ModelElement
+              value.to_hash(options)
+            else
+              value
+            end
+          end
+        end
+
+        if formatter
+          hash[SOURCE_KEY] = formatter.format(self)
+        end
+
+        hash
+      end
+
+      def self.from_hash(hash)
+        node_class = hash[CLASS_KEY]
+        node_options = hash.select{|x| x != CLASS_KEY}.each_with_object({}) do |(variable, value), result|
+          key = variable.to_sym
+
+          result[key] = if value.is_a? Array
+            value.map do |value|
+              if value.is_a? Hash
+                self.from_hash(value)
+              else
+                value
+              end
+            end
+          elsif value.is_a? Hash
+            self.from_hash(value)
+          else
+            value
+          end
+        end
+
+        node = Object.const_get(node_class).new(node_options)
+
+        node
+      end
+    end
+  end
+end

data/lib/expressir/model/parameter.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Parameter
+    class Parameter < ModelElement
       include Identifier
 
       attr_accessor :var
@@ -8,9 +8,13 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @var = options[:var]
         @type = options[:type]
+
+        super
       end
     end
   end

data/lib/expressir/model/procedure.rb

@@ -1,58 +1,47 @@
 module Expressir
   module Model
-    class Procedure
-      include Scope
+    class Procedure < ModelElement
       include Identifier
 
       attr_accessor :parameters
-      attr_accessor :declarations
+      attr_accessor :types
+      attr_accessor :entities
+      attr_accessor :subtype_constraints
+      attr_accessor :functions
+      attr_accessor :procedures
       attr_accessor :constants
       attr_accessor :variables
       attr_accessor :statements
 
       def initialize(options = {})
         @id = options[:id]
-
-        @parameters = options[:parameters]
-        @declarations = options[:declarations]
-        @constants = options[:constants]
-        @variables = options[:variables]
-        @statements = options[:statements]
-      end
-
-      def types
-        @declarations.select{|x| x.instance_of? Expressir::Model::Type}
-      end
-
-      def entities
-        @declarations.select{|x| x.instance_of? Expressir::Model::Entity}
-      end
-
-      def subtype_constraints
-        @declarations.select{|x| x.instance_of? Expressir::Model::SubtypeConstraint}
-      end
-
-      def functions
-        @declarations.select{|x| x.instance_of? Expressir::Model::Function}
-      end
-
-      def procedures
-        @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        @parameters = options.fetch(:parameters, [])
+        @types = options.fetch(:types, [])
+        @entities = options.fetch(:entities, [])
+        @subtype_constraints = options.fetch(:subtype_constraints, [])
+        @functions = options.fetch(:functions, [])
+        @procedures = options.fetch(:procedures, [])
+        @constants = options.fetch(:constants, [])
+        @variables = options.fetch(:variables, [])
+        @statements = options.fetch(:statements, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*@parameters) if @parameters
-        items.push(*@declarations.flat_map do |x|
-          [
-            x,
-            *if x.instance_of? Expressir::Model::Type and x.type.instance_of? Expressir::Model::Types::Enumeration
-              x.type.items
-            end
-          ]
-        end) if @declarations
-        items.push(*@constants) if @constants
-        items.push(*@variables) if @variables
+        items.push(*@parameters)
+        items.push(*@types)
+        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
+        items.push(*@entities)
+        items.push(*@subtype_constraints)
+        items.push(*@functions)
+        items.push(*@procedures)
+        items.push(*@constants)
+        items.push(*@variables)
         items
       end
     end

data/lib/expressir/model/renamed_ref.rb

@@ -1,12 +1,14 @@
 module Expressir
   module Model
-    class RenamedRef
+    class RenamedRef < ModelElement
       attr_accessor :ref
       attr_accessor :id
 
       def initialize(options = {})
         @ref = options[:ref]
         @id = options[:id]
+
+        super
       end
     end
   end

data/lib/expressir/model/repository.rb

@@ -1,17 +1,17 @@
 module Expressir
   module Model
-    class Repository
-      include Scope
-
+    class Repository < ModelElement
       attr_accessor :schemas
 
       def initialize(options = {})
-        @schemas = options[:schemas]
+        @schemas = options.fetch(:schemas, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*@schemas) if @schemas
+        items.push(*@schemas)
         items
       end
     end

data/lib/expressir/model/rule.rb

@@ -1,11 +1,14 @@
 module Expressir
   module Model
-    class Rule
-      include Scope
+    class Rule < ModelElement
       include Identifier
 
       attr_accessor :applies_to
-      attr_accessor :declarations
+      attr_accessor :types
+      attr_accessor :entities
+      attr_accessor :subtype_constraints
+      attr_accessor :functions
+      attr_accessor :procedures
       attr_accessor :constants
       attr_accessor :variables
       attr_accessor :statements
@@ -14,50 +17,36 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
-
-        @applies_to = options[:applies_to]
-        @declarations = options[:declarations]
-        @constants = options[:constants]
-        @variables = options[:variables]
-        @statements = options[:statements]
-        @where = options[:where]
-        @informal_propositions = options[:informal_propositions]
-      end
-
-      def types
-        @declarations.select{|x| x.instance_of? Expressir::Model::Type}
-      end
-
-      def entities
-        @declarations.select{|x| x.instance_of? Expressir::Model::Entity}
-      end
-
-      def subtype_constraints
-        @declarations.select{|x| x.instance_of? Expressir::Model::SubtypeConstraint}
-      end
-
-      def functions
-        @declarations.select{|x| x.instance_of? Expressir::Model::Function}
-      end
-
-      def procedures
-        @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+
+        @applies_to = options.fetch(:applies_to, [])
+        @types = options.fetch(:types, [])
+        @entities = options.fetch(:entities, [])
+        @subtype_constraints = options.fetch(:subtype_constraints, [])
+        @functions = options.fetch(:functions, [])
+        @procedures = options.fetch(:procedures, [])
+        @constants = options.fetch(:constants, [])
+        @variables = options.fetch(:variables, [])
+        @statements = options.fetch(:statements, [])
+        @where = options.fetch(:where, [])
+        @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*@declarations.flat_map do |x|
-          [
-            x,
-            *if x.instance_of? Expressir::Model::Type and x.type.instance_of? Expressir::Model::Types::Enumeration
-              x.type.items
-            end
-          ]
-        end) if @declarations
-        items.push(*@constants) if @constants
-        items.push(*@variables) if @variables
-        items.push(*@where) if @where
-        items.push(*@informal_propositions) if @informal_propositions
+        items.push(*@types)
+        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
+        items.push(*@entities)
+        items.push(*@subtype_constraints)
+        items.push(*@functions)
+        items.push(*@procedures)
+        items.push(*@constants)
+        items.push(*@variables)
+        items.push(*@where)
+        items.push(*@informal_propositions)
         items
       end
     end