expressir 0.2.19-x64-mingw32 → 0.2.27-x64-mingw32

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

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

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,32 +3,33 @@ 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, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
-        @parameters = options.fetch(:parameters, [])
+        @parameters = options[:parameters] || []
         @return_type = options[:return_type]
-        @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, [])
+        @types = options[:types] || []
+        @entities = options[:entities] || []
+        @subtype_constraints = options[:subtype_constraints] || []
+        @functions = options[:functions] || []
+        @procedures = options[:procedures] || []
+        @constants = options[:constants] || []
+        @variables = options[:variables] || []
+        @statements = options[:statements] || []
 
         super
       end
@@ -47,7 +48,8 @@ module Expressir
           *functions,
           *procedures,
           *constants,
-          *variables
+          *variables,
+          *remark_items
         ]
       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,14 +4,14 @@ 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]
         @schema = options[:schema]
-        @items = options.fetch(:items, [])
+        @items = options[:items] || []
 
         super
       end

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,25 +1,26 @@
 module Expressir
   module Model
     class InterfacedItem < ModelElement
-      include Identifier
+      model_attr_accessor :id
+      model_attr_accessor :remarks
+      model_attr_accessor :remark_items
 
-      undef :source
-      undef :source=
-
-      attr_accessor :base_item
+      model_attr_accessor :base_item
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
-        # @source = options[:source]
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
 
         @base_item = options[:base_item]
 
         super
       end
 
-      def path
-        base_item.path
+      def children
+        [
+          *remark_items
+        ]
       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

@@ -5,8 +5,6 @@ module Expressir
     class ModelElement
       CLASS_KEY = '_class'
       FILE_KEY = 'file'
-      PARENT_KEY = 'parent'
-      CHILDREN_BY_ID_KEY = 'children_by_id'
       SOURCE_KEY = 'source'
 
       attr_accessor :parent
@@ -15,18 +13,14 @@ module Expressir
         attach_parent_to_children
       end
 
-      def model_instance_variables
-        skip_variables = [FILE_KEY, PARENT_KEY, CHILDREN_BY_ID_KEY].map{|x| "@#{x}".to_sym}
-        instance_variables.select{|x| !skip_variables.include?(x)}
-      end
-
       def path
-        return id if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
+        # this creates an implicit scope
+        return 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
+          if current_node.class.method_defined? :id and !(current_node.is_a? Expressions::SimpleReference)
             path_parts << current_node.id
           end
 
@@ -34,12 +28,14 @@ module Expressir
           break unless current_node
         end
 
+        return if path_parts.empty?
+
         path_parts.reverse.join(".")
       end
 
       def attach_parent_to_children
-        model_instance_variables.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|
@@ -78,6 +74,10 @@ module Expressir
           break unless current_scope
         end
 
+        if target_node.is_a? Model::InterfacedItem
+          target_node = target_node.base_item
+        end
+
         target_node
       end
 
@@ -100,18 +100,14 @@ module Expressir
 
         hash = {}
         hash[CLASS_KEY] = self.class.name
-        if self.is_a? Schema and file
-          hash[FILE_KEY] = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : file
-        end
 
-        model_instance_variables.each do |variable|
-          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
           if !empty or include_empty
-            hash[key] = if value.is_a? Array
+            hash[variable.to_s] = if value.is_a? Array
               value.map do |value|
                 if value.is_a? ModelElement
                   value.to_hash(options)
@@ -127,6 +123,10 @@ module Expressir
           end
         end
 
+        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
@@ -137,16 +137,13 @@ module Expressir
       def self.from_hash(hash, options = {})
         root_path = options[:root_path]
 
-        node_class = hash[CLASS_KEY]
+        node_class = Object.const_get(hash[CLASS_KEY])
         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
+        node_class.model_attrs.each do |variable|
+          value = hash[variable.to_s]
 
-          node_options[key] = if value.is_a? Array
+          node_options[variable] = if value.is_a? Array
             value.map do |value|
               if value.is_a? Hash
                 self.from_hash(value, options)
@@ -161,10 +158,25 @@ module Expressir
           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, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         @var = options[:var]
@@ -16,6 +17,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/procedure.rb

@@ -3,30 +3,31 @@ module Expressir
     class Procedure < ModelElement
       include Identifier
 
-      attr_accessor :parameters
-      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 :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, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @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, [])
+        @parameters = options[:parameters] || []
+        @types = options[:types] || []
+        @entities = options[:entities] || []
+        @subtype_constraints = options[:subtype_constraints] || []
+        @functions = options[:functions] || []
+        @procedures = options[:procedures] || []
+        @constants = options[:constants] || []
+        @variables = options[:variables] || []
+        @statements = options[:statements] || []
 
         super
       end
@@ -45,7 +46,8 @@ module Expressir
           *functions,
           *procedures,
           *constants,
-          *variables
+          *variables,
+          *remark_items
         ]
       end
     end