expressir 0.2.3 → 0.2.4

data/lib/expressir/model.rb

@@ -1,3 +1,6 @@
+require 'expressir/model/scope'
+require 'expressir/model/identifier'
+
 require 'expressir/model/attribute'
 require 'expressir/model/constant'
 require 'expressir/model/entity'

data/lib/expressir/model/attribute.rb

@@ -1,24 +1,23 @@
 module Expressir
   module Model
     class Attribute
+      include Identifier
+
       EXPLICIT = :EXPLICIT
       DERIVED = :DERIVED
       INVERSE = :INVERSE
 
       attr_accessor :kind
       attr_accessor :supertype_attribute
-      attr_accessor :id
       attr_accessor :optional
       attr_accessor :type
       attr_accessor :expression
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
+        @id = options[:id]
+
         @kind = options[:kind]
         @supertype_attribute = options[:supertype_attribute]
-        @id = options[:id]
         @optional = options[:optional]
         @type = options[:type]
         @expression = options[:expression]

data/lib/expressir/model/constant.rb

@@ -1,15 +1,14 @@
 module Expressir
   module Model
     class Constant
-      attr_accessor :id
+      include Identifier
+
       attr_accessor :type
       attr_accessor :expression
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @type = options[:type]
         @expression = options[:expression]
       end

data/lib/expressir/model/entity.rb

@@ -1,7 +1,9 @@
 module Expressir
   module Model
     class Entity
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :abstract
       attr_accessor :supertype_expression
       attr_accessor :subtype_of
@@ -9,11 +11,9 @@ module Expressir
       attr_accessor :unique
       attr_accessor :where
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @abstract = options[:abstract]
         @supertype_expression = options[:supertype_expression]
         @subtype_of = options[:subtype_of]

data/lib/expressir/model/enumeration_item.rb

@@ -1,10 +1,7 @@
 module Expressir
   module Model
     class EnumerationItem
-      attr_accessor :id
-
-      attr_accessor :parent
-      attr_accessor :remarks
+      include Identifier
 
       def initialize(options = {})
         @id = options[:id]

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

@@ -2,15 +2,15 @@ module Expressir
   module Model
     module Expressions
       class QueryExpression
-        attr_accessor :id
+        include Scope
+        include Identifier
+
         attr_accessor :source
         attr_accessor :expression
 
-        attr_accessor :parent
-        attr_accessor :remarks
-
         def initialize(options = {})
           @id = options[:id]
+
           @source = options[:source]
           @expression = options[:expression]
         end

data/lib/expressir/model/function.rb

@@ -1,7 +1,9 @@
 module Expressir
   module Model
     class Function
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :parameters
       attr_accessor :return_type
       attr_accessor :declarations
@@ -9,11 +11,9 @@ module Expressir
       attr_accessor :variables
       attr_accessor :statements
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @parameters = options[:parameters]
         @return_type = options[:return_type]
         @declarations = options[:declarations]

data/lib/expressir/model/identifier.rb

@@ -0,0 +1,9 @@
+module Expressir
+  module Model
+    module Identifier
+      attr_accessor :id
+      attr_accessor :parent
+      attr_accessor :remarks
+    end
+  end
+end

data/lib/expressir/model/parameter.rb

@@ -1,16 +1,15 @@
 module Expressir
   module Model
     class Parameter
+      include Identifier
+
       attr_accessor :var
-      attr_accessor :id
       attr_accessor :type
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
-        @var = options[:var]
         @id = options[:id]
+
+        @var = options[:var]
         @type = options[:type]
       end
     end

data/lib/expressir/model/procedure.rb

@@ -1,18 +1,18 @@
 module Expressir
   module Model
     class Procedure
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :parameters
       attr_accessor :declarations
       attr_accessor :constants
       attr_accessor :variables
       attr_accessor :statements
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @parameters = options[:parameters]
         @declarations = options[:declarations]
         @constants = options[:constants]

data/lib/expressir/model/repository.rb

@@ -1,6 +1,8 @@
 module Expressir
   module Model
     class Repository
+      include Scope
+
       attr_accessor :schemas
 
       def initialize(options = {})

data/lib/expressir/model/rule.rb

@@ -1,7 +1,9 @@
 module Expressir
   module Model
     class Rule
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :applies_to
       attr_accessor :declarations
       attr_accessor :constants
@@ -9,11 +11,9 @@ module Expressir
       attr_accessor :statements
       attr_accessor :where
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @applies_to = options[:applies_to]
         @declarations = options[:declarations]
         @constants = options[:constants]

data/lib/expressir/model/schema.rb

@@ -1,14 +1,14 @@
 module Expressir
   module Model
     class Schema
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :version
       attr_accessor :interfaces
       attr_accessor :constants
       attr_accessor :declarations
 
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
         @version = options[:version]

data/lib/expressir/model/scope.rb

@@ -0,0 +1,17 @@
+module Expressir
+  module Model
+    module Scope
+      def find(path)
+        path.downcase.split(".").reduce(self) do |acc, curr|
+          if acc and acc.class.method_defined? :children
+            acc.children.find{|x| x.id.downcase == curr}
+          end
+        end
+      end
+
+      def children
+        raise 'Not implemented'
+      end
+    end
+  end
+end

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

@@ -2,15 +2,15 @@ module Expressir
   module Model
     module Statements
       class Alias
-        attr_accessor :id
+        include Scope
+        include Identifier
+
         attr_accessor :expression
         attr_accessor :statements
 
-        attr_accessor :parent
-        attr_accessor :remarks
-
         def initialize(options = {})
           @id = options[:id]
+
           @expression = options[:expression]
           @statements = options[:statements]
         end

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

@@ -2,7 +2,9 @@ module Expressir
   module Model
     module Statements
       class Repeat
-        attr_accessor :id
+        include Scope
+        include Identifier
+
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :increment
@@ -10,11 +12,9 @@ module Expressir
         attr_accessor :until_expression
         attr_accessor :statements
 
-        attr_accessor :parent
-        attr_accessor :remarks
-
         def initialize(options = {})
           @id = options[:id]
+
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @increment = options[:increment]

data/lib/expressir/model/subtype_constraint.rb

@@ -1,22 +1,27 @@
 module Expressir
   module Model
     class SubtypeConstraint
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :applies_to
       attr_accessor :abstract
       attr_accessor :total_over
       attr_accessor :supertype_expression
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @applies_to = options[:applies_to]
         @abstract = options[:abstract]
         @total_over = options[:total_over]
         @supertype_expression = options[:supertype_expression]
       end
+
+      def children
+        items = []
+        items
+      end
     end
   end
 end

data/lib/expressir/model/type.rb

@@ -1,15 +1,15 @@
 module Expressir
   module Model
     class Type
-      attr_accessor :id
+      include Scope
+      include Identifier
+
       attr_accessor :type
       attr_accessor :where
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @type = options[:type]
         @where = options[:where]
       end

data/lib/expressir/model/types/aggregate.rb

@@ -2,14 +2,13 @@ module Expressir
   module Model
     module Types
       class Aggregate
-        attr_accessor :label
-        attr_accessor :base_type
+        include Identifier
 
-        attr_accessor :parent
-        attr_accessor :remarks
+        attr_accessor :base_type
 
         def initialize(options = {})
-          @label = options[:label]
+          @id = options[:id]
+
           @base_type = options[:base_type]
         end
       end

data/lib/expressir/model/types/generic.rb

@@ -2,13 +2,10 @@ module Expressir
   module Model
     module Types
       class Generic
-        attr_accessor :label
-
-        attr_accessor :parent
-        attr_accessor :remarks
+        include Identifier
 
         def initialize(options = {})
-          @label = options[:label]
+          @id = options[:id]
         end
       end
     end

data/lib/expressir/model/types/generic_entity.rb

@@ -2,13 +2,10 @@ module Expressir
   module Model
     module Types
       class GenericEntity
-        attr_accessor :label
-
-        attr_accessor :parent
-        attr_accessor :remarks
+        include Identifier
 
         def initialize(options = {})
-          @label = options[:label]
+          @id = options[:id]
         end
       end
     end

data/lib/expressir/model/unique.rb

@@ -1,14 +1,13 @@
 module Expressir
   module Model
     class Unique
-      attr_accessor :id
-      attr_accessor :attributes
+      include Identifier
 
-      attr_accessor :parent
-      attr_accessor :remarks
+      attr_accessor :attributes
 
       def initialize(options = {})
         @id = options[:id]
+
         @attributes = options[:attributes]
       end
     end

data/lib/expressir/model/variable.rb

@@ -1,15 +1,14 @@
 module Expressir
   module Model
     class Variable
-      attr_accessor :id
+      include Identifier
+
       attr_accessor :type
       attr_accessor :expression
 
-      attr_accessor :parent
-      attr_accessor :remarks
-
       def initialize(options = {})
         @id = options[:id]
+
         @type = options[:type]
         @expression = options[:expression]
       end