expressir 0.2.5-x64-mingw32 → 0.2.7-x64-mingw32

data/lib/expressir/express_parser.rb

@@ -1,30 +1,30 @@
-require "expressir/parser"
-
-module Expressir
-  class ExpressParser
-    def initialize(file, options)
-      @file = file
-      @options = options
-    end
-
-    def to_owl
-      owl_parser.parse(express_xml, options)
-    end
-
-    def self.to_owl(file, **options)
-      new(file, options).to_owl
-    end
-
-    private
-
-    attr_reader :file, :options
-
-    def owl_parser
-      Expressir::Parser::OwlParser
-    end
-
-    def express_xml
-      Expressir::Express.from_xml(file)
-    end
-  end
-end
+require "expressir/parser"
+
+module Expressir
+  class ExpressParser
+    def initialize(file, options)
+      @file = file
+      @options = options
+    end
+
+    def to_owl
+      owl_parser.parse(express_xml, options)
+    end
+
+    def self.to_owl(file, **options)
+      new(file, options).to_owl
+    end
+
+    private
+
+    attr_reader :file, :options
+
+    def owl_parser
+      Expressir::Parser::OwlParser
+    end
+
+    def express_xml
+      Expressir::Express.from_xml(file)
+    end
+  end
+end

data/lib/expressir/model/attribute.rb

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

data/lib/expressir/model/constant.rb

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

data/lib/expressir/model/entity.rb

@@ -1,46 +1,46 @@
-module Expressir
-  module Model
-    class Entity
-      include Scope
-      include Identifier
-
-      attr_accessor :abstract
-      attr_accessor :supertype_expression
-      attr_accessor :subtype_of
-      attr_accessor :attributes
-      attr_accessor :unique
-      attr_accessor :where
-
-      def initialize(options = {})
-        @id = options[:id]
-
-        @abstract = options[:abstract]
-        @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of]
-        @attributes = options[:attributes]
-        @unique = options[:unique]
-        @where = options[:where]
-      end
-
-      def explicit_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::EXPLICIT}
-      end
-
-      def derived_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::DERIVED}
-      end
-
-      def inverse_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::INVERSE}
-      end
-
-      def children
-        items = []
-        items.push(*@attributes) if @attributes
-        items.push(*@unique) if @unique
-        items.push(*@where) if @where
-        items
-      end
-    end
-  end
+module Expressir
+  module Model
+    class Entity
+      include Scope
+      include Identifier
+
+      attr_accessor :abstract
+      attr_accessor :supertype_expression
+      attr_accessor :subtype_of
+      attr_accessor :attributes
+      attr_accessor :unique
+      attr_accessor :where
+
+      def initialize(options = {})
+        @id = options[:id]
+
+        @abstract = options[:abstract]
+        @supertype_expression = options[:supertype_expression]
+        @subtype_of = options[:subtype_of]
+        @attributes = options[:attributes]
+        @unique = options[:unique]
+        @where = options[:where]
+      end
+
+      def explicit_attributes
+        @attributes.select{|x| x.kind == Expressir::Model::Attribute::EXPLICIT}
+      end
+
+      def derived_attributes
+        @attributes.select{|x| x.kind == Expressir::Model::Attribute::DERIVED}
+      end
+
+      def inverse_attributes
+        @attributes.select{|x| x.kind == Expressir::Model::Attribute::INVERSE}
+      end
+
+      def children
+        items = []
+        items.push(*@attributes) if @attributes
+        items.push(*@unique) if @unique
+        items.push(*@where) if @where
+        items
+      end
+    end
+  end
 end

data/lib/expressir/model/enumeration_item.rb

@@ -1,11 +1,11 @@
-module Expressir
-  module Model
-    class EnumerationItem
-      include Identifier
-
-      def initialize(options = {})
-        @id = options[:id]
-      end
-    end
-  end
+module Expressir
+  module Model
+    class EnumerationItem
+      include Identifier
+
+      def initialize(options = {})
+        @id = options[:id]
+      end
+    end
+  end
 end

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

@@ -1,13 +1,13 @@
-module Expressir
-  module Model
-    module Expressions
-      class AggregateInitializer
-        attr_accessor :items
-
-        def initialize(options = {})
-          @items = options[:items]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class AggregateInitializer
+        attr_accessor :items
+
+        def initialize(options = {})
+          @items = options[:items]
+        end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Expressir
-  module Model
-    module Expressions
-      class AggregateItem
-        attr_accessor :expression
-        attr_accessor :repetition
-
-        def initialize(options = {})
-          @expression = options[:expression]
-          @repetition = options[:repetition]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class AggregateItem
+        attr_accessor :expression
+        attr_accessor :repetition
+
+        def initialize(options = {})
+          @expression = options[:expression]
+          @repetition = options[:repetition]
+        end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Expressir
-  module Model
-    module Expressions
-      class AttributeReference
-        attr_accessor :ref
-        attr_accessor :attribute
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @attribute = options[:attribute]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class AttributeReference
+        attr_accessor :ref
+        attr_accessor :attribute
+
+        def initialize(options = {})
+          @ref = options[:ref]
+          @attribute = options[:attribute]
+        end
+      end
+    end
+  end
 end

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

@@ -1,40 +1,40 @@
-module Expressir
-  module Model
-    module Expressions
-      class BinaryExpression
-        ADDITION = :ADDITION
-        AND = :AND
-        ANDOR = :ANDOR
-        COMBINE = :COMBINE
-        EQUAL = :EQUAL
-        EXPONENTIATION = :EXPONENTIATION
-        GREATER_THAN = :GREATER_THAN
-        GREATER_THAN_OR_EQUAL = :GREATER_THAN_OR_EQUAL
-        IN = :IN
-        INSTANCE_EQUAL = :INSTANCE_EQUAL
-        INSTANCE_NOT_EQUAL = :INSTANCE_NOT_EQUAL
-        INTEGER_DIVISION = :INTEGER_DIVISION
-        LESS_THAN = :LESS_THAN
-        LESS_THAN_OR_EQUAL = :LESS_THAN_OR_EQUAL
-        LIKE = :LIKE
-        MODULO = :MODULO
-        MULTIPLICATION = :MULTIPLICATION
-        NOT_EQUAL = :NOT_EQUAL
-        OR = :OR
-        REAL_DIVISION = :REAL_DIVISION
-        SUBTRACTION = :SUBTRACTION
-        XOR = :XOR
-
-        attr_accessor :operator
-        attr_accessor :operand1
-        attr_accessor :operand2
-
-        def initialize(options = {})
-          @operator = options[:operator]
-          @operand1 = options[:operand1]
-          @operand2 = options[:operand2]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class BinaryExpression
+        ADDITION = :ADDITION
+        AND = :AND
+        ANDOR = :ANDOR
+        COMBINE = :COMBINE
+        EQUAL = :EQUAL
+        EXPONENTIATION = :EXPONENTIATION
+        GREATER_THAN = :GREATER_THAN
+        GREATER_THAN_OR_EQUAL = :GREATER_THAN_OR_EQUAL
+        IN = :IN
+        INSTANCE_EQUAL = :INSTANCE_EQUAL
+        INSTANCE_NOT_EQUAL = :INSTANCE_NOT_EQUAL
+        INTEGER_DIVISION = :INTEGER_DIVISION
+        LESS_THAN = :LESS_THAN
+        LESS_THAN_OR_EQUAL = :LESS_THAN_OR_EQUAL
+        LIKE = :LIKE
+        MODULO = :MODULO
+        MULTIPLICATION = :MULTIPLICATION
+        NOT_EQUAL = :NOT_EQUAL
+        OR = :OR
+        REAL_DIVISION = :REAL_DIVISION
+        SUBTRACTION = :SUBTRACTION
+        XOR = :XOR
+
+        attr_accessor :operator
+        attr_accessor :operand1
+        attr_accessor :operand2
+
+        def initialize(options = {})
+          @operator = options[:operator]
+          @operand1 = options[:operand1]
+          @operand2 = options[:operand2]
+        end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Expressir
-  module Model
-    module Expressions
-      class Call
-        attr_accessor :ref
-        attr_accessor :parameters
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @parameters = options[:parameters]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class Call
+        attr_accessor :ref
+        attr_accessor :parameters
+
+        def initialize(options = {})
+          @ref = options[:ref]
+          @parameters = options[:parameters]
+        end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Expressir
-  module Model
-    module Expressions
-      class EntityConstructor
-        attr_accessor :entity
-        attr_accessor :parameters
-
-        def initialize(options = {})
-          @entity = options[:entity]
-          @parameters = options[:parameters]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class EntityConstructor
+        attr_accessor :entity
+        attr_accessor :parameters
+
+        def initialize(options = {})
+          @entity = options[:entity]
+          @parameters = options[:parameters]
+        end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Expressir
-  module Model
-    module Expressions
-      class GroupReference
-        attr_accessor :ref
-        attr_accessor :entity
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @entity = options[:entity]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class GroupReference
+        attr_accessor :ref
+        attr_accessor :entity
+
+        def initialize(options = {})
+          @ref = options[:ref]
+          @entity = options[:entity]
+        end
+      end
+    end
+  end
 end

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

@@ -1,17 +1,17 @@
-module Expressir
-  module Model
-    module Expressions
-      class IndexReference
-        attr_accessor :ref
-        attr_accessor :index1
-        attr_accessor :index2
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @index1 = options[:index1]
-          @index2 = options[:index2]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class IndexReference
+        attr_accessor :ref
+        attr_accessor :index1
+        attr_accessor :index2
+
+        def initialize(options = {})
+          @ref = options[:ref]
+          @index1 = options[:index1]
+          @index2 = options[:index2]
+        end
+      end
+    end
+  end
 end

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

@@ -1,21 +1,21 @@
-module Expressir
-  module Model
-    module Expressions
-      class Interval
-        attr_accessor :low
-        attr_accessor :operator1
-        attr_accessor :item
-        attr_accessor :operator2
-        attr_accessor :high
-
-        def initialize(options = {})
-          @low = options[:low]
-          @operator1 = options[:operator1]
-          @item = options[:item]
-          @operator2 = options[:operator2]
-          @high = options[:high]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class Interval
+        attr_accessor :low
+        attr_accessor :operator1
+        attr_accessor :item
+        attr_accessor :operator2
+        attr_accessor :high
+
+        def initialize(options = {})
+          @low = options[:low]
+          @operator1 = options[:operator1]
+          @item = options[:item]
+          @operator2 = options[:operator2]
+          @high = options[:high]
+        end
+      end
+    end
+  end
 end

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

@@ -1,26 +1,26 @@
-module Expressir
-  module Model
-    module Expressions
-      class QueryExpression
-        include Scope
-        include Identifier
-
-        attr_accessor :source
-        attr_accessor :expression
-
-        def initialize(options = {})
-          @id = options[:id]
-
-          @source = options[:source]
-          @expression = options[:expression]
-        end
-
-        def children
-          items = []
-          items.push(self)
-          items
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class QueryExpression
+        include Scope
+        include Identifier
+
+        attr_accessor :aggregate_source
+        attr_accessor :expression
+
+        def initialize(options = {})
+          @id = options[:id]
+
+          @aggregate_source = options[:aggregate_source]
+          @expression = options[:expression]
+        end
+
+        def children
+          items = []
+          items.push(self)
+          items
+        end
+      end
+    end
+  end
 end

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

@@ -1,13 +1,13 @@
-module Expressir
-  module Model
-    module Expressions
-      class SimpleReference
-        attr_accessor :id
-
-        def initialize(options = {})
-          @id = options[:id]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class SimpleReference
+        attr_accessor :id
+
+        def initialize(options = {})
+          @id = options[:id]
+        end
+      end
+    end
+  end
 end