expressir 0.2.18-x64-mingw32 → 0.2.26-x64-mingw32

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,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]
+        @remark_items = options.fetch(: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

@@ -1,10 +1,10 @@
+require 'pathname'
+
 module Expressir
   module Model
     class ModelElement
       CLASS_KEY = '_class'
       FILE_KEY = 'file'
-      PARENT_KEY = 'parent'
-      CHILDREN_BY_ID_KEY = 'children_by_id'
       SOURCE_KEY = 'source'
 
       attr_accessor :parent
@@ -13,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
 
@@ -32,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|
@@ -76,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
 
@@ -98,18 +100,14 @@ module Expressir
 
         hash = {}
         hash[CLASS_KEY] = self.class.name
-        if self.is_a? Schema and file
-          hash[FILE_KEY] = root_path ? File.expand_path("#{root_path}/#{file}") : file
-        end
 
-        model_instance_variables.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
           if !empty or include_empty
-            result[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)
@@ -125,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
@@ -132,30 +134,49 @@ module Expressir
         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 = {}
+
+        node_class.model_attrs.each do |variable|
+          value = hash[variable.to_s]
 
-          result[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)
+                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

data/lib/expressir/model/procedure.rb

@@ -3,19 +3,20 @@ 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, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @parameters = options.fetch(:parameters, [])
@@ -45,7 +46,8 @@ module Expressir
           *functions,
           *procedures,
           *constants,
-          *variables
+          *variables,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/{informal_proposition.rb → remark_item.rb}

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

data/lib/expressir/model/repository.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     class Repository < ModelElement
-      attr_accessor :schemas
+      model_attr_accessor :schemas
 
       def initialize(options = {})
         @schemas = options.fetch(:schemas, [])

data/lib/expressir/model/rule.rb

@@ -3,21 +3,22 @@ module Expressir
     class Rule < ModelElement
       include Identifier
 
-      attr_accessor :applies_to
-      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
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :applies_to
+      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
+      model_attr_accessor :where
+      model_attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @applies_to = options.fetch(:applies_to, [])
@@ -50,7 +51,8 @@ module Expressir
           *constants,
           *variables,
           *where,
-          *informal_propositions
+          *informal_propositions,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/schema.rb

@@ -1,25 +1,26 @@
 module Expressir
   module Model
     class Schema < ModelElement
-      attr_accessor :file
+      model_attr_accessor :file
 
       include Identifier
 
-      attr_accessor :version
-      attr_accessor :interfaces
-      attr_accessor :constants
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :rules
-      attr_accessor :procedures
+      model_attr_accessor :version
+      model_attr_accessor :interfaces
+      model_attr_accessor :constants
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :rules
+      model_attr_accessor :procedures
 
       def initialize(options = {})
         @file = options[:file]
 
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @version = options[:version]
@@ -45,6 +46,8 @@ module Expressir
       end
 
       def interfaced_items
+        return [] unless parent
+
         interfaces.flat_map do |interface|
           schema = parent.children_by_id[interface.schema.id.downcase]
           if schema
@@ -81,7 +84,8 @@ module Expressir
           *subtype_constraints,
           *functions,
           *rules,
-          *procedures
+          *procedures,
+          *remark_items
         ]
       end