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

data/lib/expressir/express/derived.rb

@@ -1,65 +1,65 @@
-module Expressir
-  module Express
-    class Derived < ExplicitOrDerived
-      attr_accessor :expression
-
-      def initialize(options = {})
-        @options = options
-        @entity = options.fetch(:entity, nil)
-      end
-
-      def parse
-        document = @options.fetch(:document, nil)
-        extract_common_attributes(document)
-        extract_type_specific_attributes(document)
-
-        self
-      end
-
-      def self.parse(document, entity)
-        new(document: document, entity: entity).parse
-      end
-
-      private
-
-      def extract_type_specific_attributes(document); end
-
-      def extract_common_attributes(document)
-        @name = document.attributes["name"].to_s
-        @expression = document.attributes["expression"].to_s
-        @domain = extract_domain_name(document.xpath("typename"))
-
-        extract_builtintype_attributes(document)
-        extract_redeclaration_attributes(document)
-      end
-
-      def extract_domain_name(typename)
-        unless typename.empty?
-          typename.first.attributes["name"].to_s
-        end
-      end
-
-      def extract_redeclaration_attributes(document)
-        redeclaration = document.xpath("redeclaration").first
-
-        if redeclaration
-          @redeclare_entity = redeclaration.attributes["entity-ref"].to_s
-          old_name = redeclaration.attributes["old_name"]
-          @redeclare_oldname = old_name.to_s if old_name
-        end
-      end
-
-      def extract_builtintype_attributes(document)
-        builtin_type = document.xpath("builtintype").first
-
-        if builtin_type
-          @isBuiltin = true
-          @domain = builtin_type.attributes["type"].to_s
-          @width = builtin_type.attributes["width"].to_s
-          @fixed = builtin_type.attributes["fixed"] == "YES"
-          @precision = builtin_type.attributes["precision"].to_s
-        end
-      end
-    end
-  end
-end
+module Expressir
+  module Express
+    class Derived < ExplicitOrDerived
+      attr_accessor :expression
+
+      def initialize(options = {})
+        @options = options
+        @entity = options.fetch(:entity, nil)
+      end
+
+      def parse
+        document = @options.fetch(:document, nil)
+        extract_common_attributes(document)
+        extract_type_specific_attributes(document)
+
+        self
+      end
+
+      def self.parse(document, entity)
+        new(document: document, entity: entity).parse
+      end
+
+      private
+
+      def extract_type_specific_attributes(document); end
+
+      def extract_common_attributes(document)
+        @name = document.attributes["name"].to_s
+        @expression = document.attributes["expression"].to_s
+        @domain = extract_domain_name(document.xpath("typename"))
+
+        extract_builtintype_attributes(document)
+        extract_redeclaration_attributes(document)
+      end
+
+      def extract_domain_name(typename)
+        unless typename.empty?
+          typename.first.attributes["name"].to_s
+        end
+      end
+
+      def extract_redeclaration_attributes(document)
+        redeclaration = document.xpath("redeclaration").first
+
+        if redeclaration
+          @redeclare_entity = redeclaration.attributes["entity-ref"].to_s
+          old_name = redeclaration.attributes["old_name"]
+          @redeclare_oldname = old_name.to_s if old_name
+        end
+      end
+
+      def extract_builtintype_attributes(document)
+        builtin_type = document.xpath("builtintype").first
+
+        if builtin_type
+          @isBuiltin = true
+          @domain = builtin_type.attributes["type"].to_s
+          @width = builtin_type.attributes["width"].to_s
+          @fixed = builtin_type.attributes["fixed"] == "YES"
+          @precision = builtin_type.attributes["precision"].to_s
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express/derived_aggregate.rb

@@ -1,43 +1,43 @@
-module Expressir
-  module Express
-    class DerivedAggregate < Derived
-      attr_accessor :rank, :dimensions
-
-      def initialize(options = {})
-        @rank = 0
-        @dimensions = []
-
-        super(options)
-      end
-
-      private
-
-      def extract_type_specific_attributes(document)
-        @dimensions = document.xpath("aggregate").map do |aggregate|
-          Express::AggregateDimension.parse(aggregate)
-        end
-
-        @rank = @dimensions.size
-        extract_inverse_aggregate(document)
-      end
-
-      # @todo: Non existance attributes
-      #
-      # In the codebase, they are trying to add couple of aggregate
-      # dimensions related attributes that was never a part of the
-      # Explict class, but for consistency we are keeping those as
-      # it is for now. let's revist those later and fix it.
-      #
-      def extract_inverse_aggregate(document)
-        aggregates = document.xpath("inverse.aggregate")
-
-        if !aggregates.empty?
-          dimension = Express::AggregateDimension.parse(aggregates.first)
-          @aggrtype = dimension.aggrtype
-          @lower = dimension.lower
-          @upper = dimension.upper
-        end
-      end
-    end
-  end
-end
+module Expressir
+  module Express
+    class DerivedAggregate < Derived
+      attr_accessor :rank, :dimensions
+
+      def initialize(options = {})
+        @rank = 0
+        @dimensions = []
+
+        super(options)
+      end
+
+      private
+
+      def extract_type_specific_attributes(document)
+        @dimensions = document.xpath("aggregate").map do |aggregate|
+          Express::AggregateDimension.parse(aggregate)
+        end
+
+        @rank = @dimensions.size
+        extract_inverse_aggregate(document)
+      end
+
+      # @todo: Non existance attributes
+      #
+      # In the codebase, they are trying to add couple of aggregate
+      # dimensions related attributes that was never a part of the
+      # Explict class, but for consistency we are keeping those as
+      # it is for now. let's revist those later and fix it.
+      #
+      def extract_inverse_aggregate(document)
+        aggregates = document.xpath("inverse.aggregate")
+
+        if !aggregates.empty?
+          dimension = Express::AggregateDimension.parse(aggregates.first)
+          @aggrtype = dimension.aggrtype
+          @lower = dimension.lower
+          @upper = dimension.upper
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express/entity.rb

@@ -1,137 +1,137 @@
-require "expressir/express/explicit"
-require "expressir/express/inverse"
-require "expressir/express/derived"
-require "expressir/express/named_type"
-require "expressir/express/where_rule"
-require "expressir/express/unique_rule"
-
-require "expressir/express/explicit_aggregate"
-require "expressir/express/inverse_aggregate"
-require "expressir/express/derived_aggregate"
-
-module Expressir
-  module Express
-    class Entity < NamedType
-      attr_accessor :supertypes, :attributes, :isAbs, :superexpression,
-        :uniques, :subtypes_array, :supertypes_array, :attributes_all_array,
-        :supertypes_all
-
-      def initialize(document: nil, schema: nil, **options)
-        @isAbs = false
-        @attributes = []
-        @uniques = []
-        @wheres = []
-        @subtypes_array = []
-        @supertypes_array = []
-        @attributes_all_array = []
-        @supertypes = nil
-        @supertypes_all = nil
-        @superexpression = nil
-        @selectedBy = []
-
-        @schema = schema
-        @document = document
-        @options = options
-      end
-
-      def find_attr_by_name( attrname )
-        for attribute in attributes
-          if attrname == attribute.name
-            return attribute
-          end
-        end
-        return nil
-      end
-
-      def find_attr_by_name_full( attrname )
-        attr = find_attr_by_name( attrname )
-        if attr != nil
-          return attr
-        end
-        for supertype in supertypes_array
-          attr = supertype.find_attr_by_name_full (attrname)
-          if attr != nil
-            return attr
-          end
-        end
-      end
-
-      def parse
-        extract_attributes(@document, @schema)
-        self
-      end
-
-      def self.parse(document, schema)
-        new(document: document, schema: schema).parse
-      end
-
-      private
-
-      def extract_attributes(document, schema)
-        @name = document.attributes["name"].to_s
-        @supertypes = document.attributes["supertypes"]
-        @superexpression = document.attributes["super.expression"]
-
-        @wheres = extract_where_rules(document)
-        @uniques = extract_unique_rules(document)
-
-        @isAbs = document.attributes["supertypes"] == "YES" ||
-          document.attributes["abstract.entity"] == "YES"
-
-        @attributes = [
-          extract_eplicits(document),
-          extract_inverses(document),
-          extract_derivedes(document),
-        ].flatten
-      end
-
-      def extract_eplicits(document)
-        document.xpath("explicit").map do |explicit|
-          explicit_type = Express::Explicit
-
-          if !explicit.xpath("aggregate").empty?
-            explicit_type = Express::ExplicitAggregate
-          end
-
-          explicit_type.parse(explicit, self)
-        end
-      end
-
-      def extract_inverses(document)
-        document.xpath("inverse").map do |inverse|
-          inverse_type = Express::Inverse
-
-          if !inverse.xpath("inverse.aggregate").empty?
-            inverse_type = Express::InverseAggregate
-          end
-
-          inverse_type.parse(inverse, self)
-        end
-      end
-
-      def extract_derivedes(document)
-        document.xpath("derived").map do |derived|
-          derived_type = Express::Derived
-
-          if !derived.xpath("aggregate").empty?
-            derived_type = Express::DerivedAggregate
-          end
-
-          derived_type.parse(derived, self)
-        end
-      end
-
-      def extract_unique_rules(document)
-        document.xpath("unique").map do |unique|
-          Express::UniqueRule.parse(unique)
-        end
-      end
-
-      def extract_where_rules(document)
-        document.xpath("where").map do |where|
-          Express::WhereRule.parse(where)
-        end
-      end
-    end
-  end
-end
+require "expressir/express/explicit"
+require "expressir/express/inverse"
+require "expressir/express/derived"
+require "expressir/express/named_type"
+require "expressir/express/where_rule"
+require "expressir/express/unique_rule"
+
+require "expressir/express/explicit_aggregate"
+require "expressir/express/inverse_aggregate"
+require "expressir/express/derived_aggregate"
+
+module Expressir
+  module Express
+    class Entity < NamedType
+      attr_accessor :supertypes, :attributes, :isAbs, :superexpression,
+        :uniques, :subtypes_array, :supertypes_array, :attributes_all_array,
+        :supertypes_all
+
+      def initialize(document: nil, schema: nil, **options)
+        @isAbs = false
+        @attributes = []
+        @uniques = []
+        @wheres = []
+        @subtypes_array = []
+        @supertypes_array = []
+        @attributes_all_array = []
+        @supertypes = nil
+        @supertypes_all = nil
+        @superexpression = nil
+        @selectedBy = []
+
+        @schema = schema
+        @document = document
+        @options = options
+      end
+
+      def find_attr_by_name( attrname )
+        for attribute in attributes
+          if attrname == attribute.name
+            return attribute
+          end
+        end
+        return nil
+      end
+
+      def find_attr_by_name_full( attrname )
+        attr = find_attr_by_name( attrname )
+        if attr != nil
+          return attr
+        end
+        for supertype in supertypes_array
+          attr = supertype.find_attr_by_name_full (attrname)
+          if attr != nil
+            return attr
+          end
+        end
+      end
+
+      def parse
+        extract_attributes(@document, @schema)
+        self
+      end
+
+      def self.parse(document, schema)
+        new(document: document, schema: schema).parse
+      end
+
+      private
+
+      def extract_attributes(document, schema)
+        @name = document.attributes["name"].to_s
+        @supertypes = document.attributes["supertypes"]
+        @superexpression = document.attributes["super.expression"]
+
+        @wheres = extract_where_rules(document)
+        @uniques = extract_unique_rules(document)
+
+        @isAbs = document.attributes["supertypes"] == "YES" ||
+          document.attributes["abstract.entity"] == "YES"
+
+        @attributes = [
+          extract_eplicits(document),
+          extract_inverses(document),
+          extract_derivedes(document),
+        ].flatten
+      end
+
+      def extract_eplicits(document)
+        document.xpath("explicit").map do |explicit|
+          explicit_type = Express::Explicit
+
+          if !explicit.xpath("aggregate").empty?
+            explicit_type = Express::ExplicitAggregate
+          end
+
+          explicit_type.parse(explicit, self)
+        end
+      end
+
+      def extract_inverses(document)
+        document.xpath("inverse").map do |inverse|
+          inverse_type = Express::Inverse
+
+          if !inverse.xpath("inverse.aggregate").empty?
+            inverse_type = Express::InverseAggregate
+          end
+
+          inverse_type.parse(inverse, self)
+        end
+      end
+
+      def extract_derivedes(document)
+        document.xpath("derived").map do |derived|
+          derived_type = Express::Derived
+
+          if !derived.xpath("aggregate").empty?
+            derived_type = Express::DerivedAggregate
+          end
+
+          derived_type.parse(derived, self)
+        end
+      end
+
+      def extract_unique_rules(document)
+        document.xpath("unique").map do |unique|
+          Express::UniqueRule.parse(unique)
+        end
+      end
+
+      def extract_where_rules(document)
+        document.xpath("where").map do |where|
+          Express::WhereRule.parse(where)
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express/explicit.rb

@@ -1,70 +1,70 @@
-require "expressir/express/explicit_or_derived"
-
-module Expressir
-  module Express
-    class Explicit < ExplicitOrDerived
-      attr_accessor :isOptional
-
-      def initialize(options = {})
-        @isOptional = false
-        @options = options
-        @entity = options.fetch(:entity, nil)
-      end
-
-      def parse
-        document = options.fetch(:document)
-        extract_common_attributes(document)
-        extract_type_specific_attributes(document)
-
-        self
-      end
-
-      def self.parse(document, entity)
-        new(document: document, entity: entity).parse
-      end
-
-      private
-
-      attr_reader :options
-
-      def extract_type_specific_attributes(document); end
-
-      def extract_common_attributes(document)
-        @name = document.attributes["name"].to_s
-        @domain = extract_domain_name(document.xpath("typename"))
-        @isOptional = document.attributes["optional"].to_s == "YES"
-
-        extract_builtintype_attributes(document)
-        extract_redeclaration_attributes(document)
-      end
-
-      def extract_domain_name(typename)
-        unless typename.empty?
-          typename.first.attributes["name"].to_s
-        end
-      end
-
-      def extract_builtintype_attributes(document)
-        builtin_type = document.xpath("builtintype").first
-
-        if builtin_type
-          @isBuiltin = true
-          @domain = builtin_type.attributes["type"].to_s
-          @width = builtin_type.attributes["width"].to_s
-          @fixed = builtin_type.attributes["fixed"] == "YES"
-          @precision = builtin_type.attributes["precision"].to_s
-        end
-      end
-
-      def extract_redeclaration_attributes(document)
-        redeclaration = document.xpath("redeclaration").first
-
-        if redeclaration
-          @redeclare_entity = redeclaration.attributes["entity-ref"].to_s
-          old_name = redeclaration.attributes["old_name"]
-          @redeclare_oldname = old_name.to_s if old_name
-        end
-      end
-    end
-  end
-end
+require "expressir/express/explicit_or_derived"
+
+module Expressir
+  module Express
+    class Explicit < ExplicitOrDerived
+      attr_accessor :isOptional
+
+      def initialize(options = {})
+        @isOptional = false
+        @options = options
+        @entity = options.fetch(:entity, nil)
+      end
+
+      def parse
+        document = options.fetch(:document)
+        extract_common_attributes(document)
+        extract_type_specific_attributes(document)
+
+        self
+      end
+
+      def self.parse(document, entity)
+        new(document: document, entity: entity).parse
+      end
+
+      private
+
+      attr_reader :options
+
+      def extract_type_specific_attributes(document); end
+
+      def extract_common_attributes(document)
+        @name = document.attributes["name"].to_s
+        @domain = extract_domain_name(document.xpath("typename"))
+        @isOptional = document.attributes["optional"].to_s == "YES"
+
+        extract_builtintype_attributes(document)
+        extract_redeclaration_attributes(document)
+      end
+
+      def extract_domain_name(typename)
+        unless typename.empty?
+          typename.first.attributes["name"].to_s
+        end
+      end
+
+      def extract_builtintype_attributes(document)
+        builtin_type = document.xpath("builtintype").first
+
+        if builtin_type
+          @isBuiltin = true
+          @domain = builtin_type.attributes["type"].to_s
+          @width = builtin_type.attributes["width"].to_s
+          @fixed = builtin_type.attributes["fixed"] == "YES"
+          @precision = builtin_type.attributes["precision"].to_s
+        end
+      end
+
+      def extract_redeclaration_attributes(document)
+        redeclaration = document.xpath("redeclaration").first
+
+        if redeclaration
+          @redeclare_entity = redeclaration.attributes["entity-ref"].to_s
+          old_name = redeclaration.attributes["old_name"]
+          @redeclare_oldname = old_name.to_s if old_name
+        end
+      end
+    end
+  end
+end