expressir 0.2.9 → 0.2.10

data/lib/expressir/model/model_element.rb

@@ -0,0 +1,67 @@
+module Expressir
+  module Model
+    class ModelElement
+      CLASS_KEY = '_class' 
+
+      def to_hash(options = {})
+        skip_empty = options[:skip_empty]
+
+        instance_variables.select{|x| x != :@parent}.each_with_object({ CLASS_KEY => self.class.name }) do |variable, result|
+          key = variable.to_s.sub(/^@/, '')
+          value = instance_variable_get(variable)
+
+          # skip default 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
+      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)
+
+        # 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
+        end
+
+        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,6 +8,8 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @var = options[:var]
         @type = options[:type]

data/lib/expressir/model/procedure.rb

@@ -1,58 +1,52 @@
 module Expressir
   module Model
-    class Procedure
+    class Procedure < ModelElement
       include Scope
       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, [])
       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 do |x|
+          if x.type.instance_of? Expressir::Model::Types::Enumeration
+            x.type.items
+          else
+            []
+          end
+        end)
+        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,6 +1,6 @@
 module Expressir
   module Model
-    class RenamedRef
+    class RenamedRef < ModelElement
       attr_accessor :ref
       attr_accessor :id
 

data/lib/expressir/model/repository.rb

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

data/lib/expressir/model/rule.rb

@@ -1,11 +1,15 @@
 module Expressir
   module Model
-    class Rule
+    class Rule < ModelElement
       include Scope
       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 +18,40 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @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}
+        @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, [])
       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 do |x|
+          if x.type.instance_of? Expressir::Model::Types::Enumeration
+            x.type.items
+          else
+            []
+          end
+        end)
+        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

data/lib/expressir/model/schema.rb

@@ -1,67 +1,54 @@
 module Expressir
   module Model
-    class Schema
+    class Schema < ModelElement
       include Scope
       include Identifier
 
+      attr_accessor :head_source
+
       attr_accessor :version
       attr_accessor :interfaces
       attr_accessor :constants
-      attr_accessor :declarations
-
-      attr_accessor :head_source
+      attr_accessor :types
+      attr_accessor :entities
+      attr_accessor :subtype_constraints
+      attr_accessor :functions
+      attr_accessor :procedures
+      attr_accessor :rules
 
       def initialize(options = {})
         @id = options[:id]
-        @version = options[:version]
-        @interfaces = options[:interfaces]
-        @constants = options[:constants]
-        @declarations = options[:declarations]
-      end
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+        @head_source = options[:head_source]
 
-      def use_interfaces
-        @interfaces.select{|x| x.kind == Expressir::Model::Interface::USE}
-      end
-
-      def reference_interfaces
-        @interfaces.select{|x| x.kind == Expressir::Model::Interface::REFERENCE}
-      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}
-      end
-
-      def rules
-        @declarations.select{|x| x.instance_of? Expressir::Model::Rule}
+        @version = options[:version]
+        @interfaces = options.fetch(:interfaces, [])
+        @constants = options.fetch(:constants, [])
+        @types = options.fetch(:types, [])
+        @entities = options.fetch(:entities, [])
+        @subtype_constraints = options.fetch(:subtype_constraints, [])
+        @functions = options.fetch(:functions, [])
+        @procedures = options.fetch(:procedures, [])
+        @rules = options.fetch(:rules, [])
       end
 
       def children
         items = []
-        items.push(*@constants) if @constants
-        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)
+        items.push(*@types)
+        items.push(*@types.flat_map do |x|
+          if x.type.instance_of? Expressir::Model::Types::Enumeration
+            x.type.items
+          else
+            []
+          end
+        end)
+        items.push(*@entities)
+        items.push(*@subtype_constraints)
+        items.push(*@functions)
+        items.push(*@procedures)
+        items.push(*@rules)
         items
       end
     end

data/lib/expressir/model/scope.rb

@@ -1,8 +1,6 @@
 module Expressir
   module Model
     module Scope
-      attr_accessor :source
-
       def find(path)
         current_path, _, rest = path.partition(".")
 
@@ -47,7 +45,6 @@ module Expressir
               })
               informal_proposition.parent = child
 
-              child.informal_propositions ||= []
               child.informal_propositions << informal_proposition
 
               informal_proposition

data/lib/expressir/model/statements/alias.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Alias
+      class Alias < ModelElement
         include Scope
         include Identifier
 
@@ -10,9 +10,11 @@ module Expressir
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @expression = options[:expression]
-          @statements = options[:statements]
+          @statements = options.fetch(:statements, [])
         end
 
         def children