expressir 0.2.16-x64-mingw32 → 0.2.24-x64-mingw32

data/lib/expressir/model/expressions/index_reference.rb

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Expressions
       class IndexReference < ModelElement
-        attr_accessor :ref
-        attr_accessor :index1
-        attr_accessor :index2
+        model_attr_accessor :ref
+        model_attr_accessor :index1
+        model_attr_accessor :index2
 
         def initialize(options = {})
           @ref = options[:ref]

data/lib/expressir/model/expressions/interval.rb

@@ -2,11 +2,11 @@ module Expressir
   module Model
     module Expressions
       class Interval < ModelElement
-        attr_accessor :low
-        attr_accessor :operator1
-        attr_accessor :item
-        attr_accessor :operator2
-        attr_accessor :high
+        model_attr_accessor :low
+        model_attr_accessor :operator1
+        model_attr_accessor :item
+        model_attr_accessor :operator2
+        model_attr_accessor :high
 
         def initialize(options = {})
           @low = options[:low]

data/lib/expressir/model/expressions/query_expression.rb

@@ -4,12 +4,13 @@ module Expressir
       class QueryExpression < ModelElement
         include Identifier
 
-        attr_accessor :aggregate_source
-        attr_accessor :expression
+        model_attr_accessor :aggregate_source
+        model_attr_accessor :expression
 
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           @aggregate_source = options[:aggregate_source]
@@ -19,9 +20,10 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self,
+            *remark_items
+          ]
         end
       end
     end

data/lib/expressir/model/expressions/simple_reference.rb

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Expressions
       class SimpleReference < ModelElement
-        attr_accessor :id
+        model_attr_accessor :id
 
         def initialize(options = {})
           @id = options[:id]

data/lib/expressir/model/expressions/unary_expression.rb

@@ -6,8 +6,8 @@ module Expressir
         NOT = :NOT
         PLUS = :PLUS
 
-        attr_accessor :operator
-        attr_accessor :operand
+        model_attr_accessor :operator
+        model_attr_accessor :operand
 
         def initialize(options = {})
           @operator = options[:operator]

data/lib/expressir/model/function.rb

@@ -3,20 +3,21 @@ module Expressir
     class Function < ModelElement
       include Identifier
 
-      attr_accessor :parameters
-      attr_accessor :return_type
-      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
+      model_attr_accessor :parameters
+      model_attr_accessor :return_type
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :procedures
+      model_attr_accessor :constants
+      model_attr_accessor :variables
+      model_attr_accessor :statements
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @parameters = options.fetch(:parameters, [])
@@ -33,18 +34,23 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        types.flat_map{|x| x.enumeration_items}
+      end
+
       def children
-        items = []
-        items.push(*@parameters)
-        items.push(*@types)
-        items.push(*@types.flat_map{|x| x.type.is_a?(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
+        [
+          *parameters,
+          *types,
+          *enumeration_items,
+          *entities,
+          *subtype_constraints,
+          *functions,
+          *procedures,
+          *constants,
+          *variables,
+          *remark_items
+        ]
       end
     end
   end

data/lib/expressir/model/identifier.rb

@@ -1,9 +1,12 @@
 module Expressir
   module Model
     module Identifier
-      attr_accessor :id
-      attr_accessor :remarks
-      attr_accessor :source
+      def self.included(mod)
+        mod.model_attr_accessor :id
+        mod.model_attr_accessor :remarks
+        mod.model_attr_accessor :remark_items
+        mod.model_attr_accessor :source
+      end
     end
   end
 end

data/lib/expressir/model/interface.rb

@@ -4,9 +4,9 @@ module Expressir
       USE = :USE
       REFERENCE = :REFERENCE
 
-      attr_accessor :kind
-      attr_accessor :schema
-      attr_accessor :items
+      model_attr_accessor :kind
+      model_attr_accessor :schema
+      model_attr_accessor :items
 
       def initialize(options = {})
         @kind = options[:kind]

data/lib/expressir/model/interface_item.rb

@@ -1,8 +1,8 @@
 module Expressir
   module Model
     class InterfaceItem < ModelElement
-      attr_accessor :ref
-      attr_accessor :id
+      model_attr_accessor :ref
+      model_attr_accessor :id
 
       def initialize(options = {})
         @ref = options[:ref] 

data/lib/expressir/model/interfaced_item.rb

@@ -1,14 +1,16 @@
 module Expressir
   module Model
     class InterfacedItem < ModelElement
-      include Identifier
+      model_attr_accessor :id
+      model_attr_accessor :remarks
+      model_attr_accessor :remark_items
 
-      attr_accessor :base_item
+      model_attr_accessor :base_item
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
-        @source = options[:source]
+        @remark_items = options.fetch(:remark_items, [])
 
         @base_item = options[:base_item]
 
@@ -18,6 +20,12 @@ module Expressir
       def path
         base_item.path
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Literals
       class Binary < ModelElement
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Literals
       class Integer < ModelElement
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -6,7 +6,7 @@ module Expressir
         FALSE = :FALSE
         UNKNOWN = :UNKNOWN
 
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Literals
       class Real < ModelElement
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Literals
       class String < ModelElement
-        attr_accessor :value
-        attr_accessor :encoded
+        model_attr_accessor :value
+        model_attr_accessor :encoded
 
         def initialize(options = {})
           @value = options[:value]

data/lib/expressir/model/model_element.rb

@@ -1,7 +1,10 @@
+require 'pathname'
+
 module Expressir
   module Model
     class ModelElement
       CLASS_KEY = '_class'
+      FILE_KEY = 'file'
       SOURCE_KEY = 'source'
 
       attr_accessor :parent
@@ -28,8 +31,8 @@ module Expressir
       end
 
       def attach_parent_to_children
-        instance_variables.select{|x| x != :@parent}.each do |variable|
-          value = instance_variable_get(variable)
+        self.class.model_attrs.each do |variable|
+          value = self.send(variable)
 
           if value.is_a? Array
             value.each do |value|
@@ -57,7 +60,7 @@ module Expressir
           # 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}
+            current_node = current_node.children_by_id[current_path]
             break unless current_node
           end
           target_node = current_node
@@ -75,20 +78,29 @@ module Expressir
         []
       end
 
+      def children_by_id
+        @children_by_id ||= children.select{|x| x.id}.map{|x| [x.id.downcase, x]}.to_h
+      end
+
+      def reset_children_by_id
+        @children_by_id = nil
+      end
+
       def to_hash(options = {})
-        skip_empty = options[: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
 
-        instance_variables.select{|x| x != :@parent}.each_with_object(hash) do |variable, result|
-          key = variable.to_s.sub(/^@/, '')
-          value = instance_variable_get(variable)
+        self.class.model_attrs.each do |variable|
+          value = self.send(variable)
+          empty = value.nil? || (value.is_a?(Array) && value.count == 0)
 
-          # 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
+          # skip empty values
+          if !empty or include_empty
+            hash[variable.to_s] = if value.is_a? Array
               value.map do |value|
                 if value.is_a? ModelElement
                   value.to_hash(options)
@@ -104,37 +116,60 @@ module Expressir
           end
         end
 
-        if formatter
+        if self.is_a? Schema and file
+          hash[FILE_KEY] = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : file
+        end
+
+        if self.class.method_defined? :source and 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
+      def self.from_hash(hash, options = {})
+        root_path = options[:root_path]
+
+        node_class = Object.const_get(hash[CLASS_KEY])
+        node_options = {}
 
-          result[key] = if value.is_a? Array
+        node_class.model_attrs.each do |variable|
+          value = hash[variable.to_s]
+
+          node_options[variable] = 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
         end
 
-        node = Object.const_get(node_class).new(node_options)
+        if node_class == 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
+
+        node = node_class.new(node_options)
 
         node
       end
+
+      def self.model_attrs
+        @model_attrs ||= []
+      end
+
+      def self.model_attr_accessor(*vars)
+        @model_attrs ||= []
+        @model_attrs.concat(vars)
+
+        attr_accessor *vars
+      end
     end
   end
 end

data/lib/expressir/model/parameter.rb

@@ -3,12 +3,13 @@ module Expressir
     class Parameter < ModelElement
       include Identifier
 
-      attr_accessor :var
-      attr_accessor :type
+      model_attr_accessor :var
+      model_attr_accessor :type
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @var = options[:var]
@@ -16,6 +17,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end