expressir 2.1.0 → 2.1.1

data/lib/expressir/model/declarations/schema.rb

@@ -4,19 +4,19 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.3 Schema
       class Schema < Declaration
-        model_attr_accessor :file, 'String'
+        model_attr_accessor :file, "String"
 
         include Identifier
 
-        model_attr_accessor :version, 'SchemaVersion'
-        model_attr_accessor :interfaces, 'Array<Interface>'
-        model_attr_accessor :constants, 'Array<Constant>'
-        model_attr_accessor :types, 'Array<Type>'
-        model_attr_accessor :entities, 'Array<Entity>'
-        model_attr_accessor :subtype_constraints, 'Array<SubtypeConstraint>'
-        model_attr_accessor :functions, 'Array<Function>'
-        model_attr_accessor :rules, 'Array<Rule>'
-        model_attr_accessor :procedures, 'Array<Procedure>'
+        model_attr_accessor :version, "SchemaVersion"
+        model_attr_accessor :interfaces, "Array<Interface>"
+        model_attr_accessor :constants, "Array<Constant>"
+        model_attr_accessor :types, "Array<Type>"
+        model_attr_accessor :entities, "Array<Entity>"
+        model_attr_accessor :subtype_constraints, "Array<SubtypeConstraint>"
+        model_attr_accessor :functions, "Array<Function>"
+        model_attr_accessor :rules, "Array<Rule>"
+        model_attr_accessor :procedures, "Array<Procedure>"
 
         # @param [Hash] options
         # @option options [String] :file
@@ -53,13 +53,13 @@ module Expressir
           [
             *constants,
             *types,
-            *types.flat_map{|x| x.enumeration_items},
+            *types.flat_map(&:enumeration_items),
             *entities,
             *subtype_constraints,
             *functions,
             *rules,
             *procedures,
-            *remark_items
+            *remark_items,
           ]
         end
 
@@ -67,7 +67,7 @@ module Expressir
         def children
           [
             *interfaced_items,
-            *safe_children
+            *safe_children,
           ]
         end
 
@@ -78,7 +78,7 @@ module Expressir
         # @return [InterfacedItem]
         def create_interfaced_item(id, base_item)
           interfaced_item = InterfacedItem.new(
-            id: id
+            id: id,
           )
           interfaced_item.base_item = base_item # skip overriding parent
           interfaced_item.parent = self
@@ -93,8 +93,8 @@ module Expressir
             schema = parent.children_by_id[interface.schema.id.safe_downcase]
             if schema
               schema_safe_children = schema.safe_children
-              schema_safe_children_by_id = schema_safe_children.select{|x| x.id}.map{|x| [x.id.safe_downcase, x]}.to_h
-              if interface.items.length > 0
+              schema_safe_children_by_id = schema_safe_children.select(&:id).map { |x| [x.id.safe_downcase, x] }.to_h
+              if interface.items.length.positive?
                 interface.items.map do |interface_item|
                   base_item = schema_safe_children_by_id[interface_item.ref.id.safe_downcase]
                   if base_item
@@ -109,9 +109,9 @@ module Expressir
                 end
               end
             end
-          end.select{|x| x}
+          end.select { |x| x }
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/schema_version.rb

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.3 Schema
       class SchemaVersion < ModelElement
-        model_attr_accessor :value, 'String'
-        model_attr_accessor :items, 'Array<SchemaVersionItem>'
+        model_attr_accessor :value, "String"
+        model_attr_accessor :items, "Array<SchemaVersionItem>"
 
         # @param [Hash] options
         # @option options [String] :value
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/schema_version_item.rb

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.3 Schema
       class SchemaVersionItem < ModelElement
-        model_attr_accessor :name, 'String'
-        model_attr_accessor :value, 'String'
+        model_attr_accessor :name, "String"
+        model_attr_accessor :value, "String"
 
         # @param [Hash] options
         # @option options [String] :name
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/subtype_constraint.rb

@@ -6,10 +6,10 @@ module Expressir
       class SubtypeConstraint < Declaration
         include Identifier
 
-        model_attr_accessor :applies_to, 'Reference'
-        model_attr_accessor :abstract, 'Boolean'
-        model_attr_accessor :total_over, 'Array<Reference>'
-        model_attr_accessor :supertype_expression, 'SupertypeExpression'
+        model_attr_accessor :applies_to, "Reference"
+        model_attr_accessor :abstract, "Boolean"
+        model_attr_accessor :total_over, "Array<Reference>"
+        model_attr_accessor :supertype_expression, "SupertypeExpression"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -31,10 +31,10 @@ module Expressir
         # @return [Array<Declaration>]
         def children
           [
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/type.rb

@@ -6,9 +6,9 @@ module Expressir
       class Type < Declaration
         include Identifier
 
-        model_attr_accessor :underlying_type, 'DataType'
-        model_attr_accessor :where_rules, 'Array<WhereRule>'
-        model_attr_accessor :informal_propositions, 'Array<RemarkItem>'
+        model_attr_accessor :underlying_type, "DataType"
+        model_attr_accessor :where_rules, "Array<WhereRule>"
+        model_attr_accessor :informal_propositions, "Array<RemarkItem>"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -36,10 +36,10 @@ module Expressir
             *enumeration_items,
             *where_rules,
             *informal_propositions,
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/unique_rule.rb

@@ -6,7 +6,7 @@ module Expressir
       class UniqueRule < Declaration
         include Identifier
 
-        model_attr_accessor :attributes, 'Reference'
+        model_attr_accessor :attributes, "Reference"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -22,10 +22,10 @@ module Expressir
         # @return [Array<Declaration>]
         def children
           [
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/variable.rb

@@ -6,8 +6,8 @@ module Expressir
       class Variable < Declaration
         include Identifier
 
-        model_attr_accessor :type, 'DataType'
-        model_attr_accessor :expression, 'Expression'
+        model_attr_accessor :type, "DataType"
+        model_attr_accessor :expression, "Expression"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -25,10 +25,10 @@ module Expressir
         # @return [Array<Declaration>]
         def children
           [
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/declarations/where_rule.rb

@@ -6,7 +6,7 @@ module Expressir
       class WhereRule < Declaration
         include Identifier
 
-        model_attr_accessor :expression, 'Expression'
+        model_attr_accessor :expression, "Expression"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -22,10 +22,10 @@ module Expressir
         # @return [Array<Declaration>]
         def children
           [
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

data/lib/expressir/model/expression.rb

@@ -6,4 +6,4 @@ module Expressir
     class Expression < ModelElement
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.9 Aggregate initializer
       class AggregateInitializer < Expression
-        model_attr_accessor :items, 'Array<AggregateInitializerItem>'
+        model_attr_accessor :items, "Array<AggregateInitializerItem>"
 
         # @param [Hash] options
         # @option options [Array<AggregateInitializerItem>] :items
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.9 Aggregate initializer
       class AggregateInitializerItem < Expression
-        model_attr_accessor :expression, 'Expression'
-        model_attr_accessor :repetition, 'Expression'
+        model_attr_accessor :expression, "Expression"
+        model_attr_accessor :repetition, "Expression"
 
         # @param [Hash] options
         # @option options [Expression] :expression
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -32,12 +32,19 @@ module Expressir
         SUBTRACTION = :SUBTRACTION
         XOR = :XOR
 
-        model_attr_accessor :operator, ':ADDITION, :AND, :COMBINE, :EQUAL, :EXPONENTIATION, :GREATER_THAN, :GREATER_THAN_OR_EQUAL, :IN, :INSTANCE_EQUAL, :INSTANCE_NOT_EQUAL, :INTEGER_DIVISION, :LESS_THAN, :LESS_THAN_OR_EQUAL, :LIKE, :MODULO, :MULTIPLICATION, :NOT_EQUAL, :OR, :REAL_DIVISION, :SUBTRACTION, :XOR'
-        model_attr_accessor :operand1, 'Expression'
-        model_attr_accessor :operand2, 'Expression'
+        model_attr_accessor :operator,
+                            ":ADDITION, :AND, :COMBINE, :EQUAL, :EXPONENTIATION, :GREATER_THAN, \
+                             :GREATER_THAN_OR_EQUAL, :IN, :INSTANCE_EQUAL, :INSTANCE_NOT_EQUAL, \
+                             :INTEGER_DIVISION, :LESS_THAN, :LESS_THAN_OR_EQUAL, :LIKE, :MODULO,\
+                             :MULTIPLICATION, :NOT_EQUAL, :OR, :REAL_DIVISION, :SUBTRACTION, :XOR"
+        model_attr_accessor :operand1, "Expression"
+        model_attr_accessor :operand2, "Expression"
 
         # @param [Hash] options
-        # @option options [:ADDITION, :AND, :COMBINE, :EQUAL, :EXPONENTIATION, :GREATER_THAN, :GREATER_THAN_OR_EQUAL, :IN, :INSTANCE_EQUAL, :INSTANCE_NOT_EQUAL, :INTEGER_DIVISION, :LESS_THAN, :LESS_THAN_OR_EQUAL, :LIKE, :MODULO, :MULTIPLICATION, :NOT_EQUAL, :OR, :REAL_DIVISION, :SUBTRACTION, :XOR] :operator
+        # @option options [:ADDITION, :AND, :COMBINE, :EQUAL, :EXPONENTIATION, :GREATER_THAN,
+        #                  :GREATER_THAN_OR_EQUAL, :IN, :INSTANCE_EQUAL, :INSTANCE_NOT_EQUAL,
+        #                  :INTEGER_DIVISION, :LESS_THAN, :LESS_THAN_OR_EQUAL, :LIKE, :MODULO,
+        #                  :MULTIPLICATION, :NOT_EQUAL, :OR, :REAL_DIVISION, :SUBTRACTION, :XOR] :operator
         # @option options [Expression] :operand1
         # @option options [Expression] :operand2
         def initialize(options = {})
@@ -50,4 +57,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.2.6 Implicit declarations
       class EntityConstructor < Expression
-        model_attr_accessor :entity, 'Reference'
-        model_attr_accessor :parameters, 'Array<Expression>'
+        model_attr_accessor :entity, "Reference"
+        model_attr_accessor :parameters, "Array<Expression>"
 
         # @param [Hash] options
         # @option options [Reference] :entity
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.8 Function call
       class FunctionCall < Expression
-        model_attr_accessor :function, 'Reference'
-        model_attr_accessor :parameters, 'Array<Expression>'
+        model_attr_accessor :function, "Reference"
+        model_attr_accessor :parameters, "Array<Expression>"
 
         # @param [Hash] options
         # @option options [Reference] :function
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -7,11 +7,11 @@ module Expressir
         LESS_THAN = :LESS_THAN
         LESS_THAN_OR_EQUAL = :LESS_THAN_OR_EQUAL
 
-        model_attr_accessor :low, 'Expression'
-        model_attr_accessor :operator1, ':LESS_THAN, :LESS_THAN_OR_EQUAL'
-        model_attr_accessor :item, 'Reference'
-        model_attr_accessor :operator2, ':LESS_THAN, :LESS_THAN_OR_EQUAL'
-        model_attr_accessor :high, 'Expression'
+        model_attr_accessor :low, "Expression"
+        model_attr_accessor :operator1, ":LESS_THAN, :LESS_THAN_OR_EQUAL"
+        model_attr_accessor :item, "Reference"
+        model_attr_accessor :operator2, ":LESS_THAN, :LESS_THAN_OR_EQUAL"
+        model_attr_accessor :high, "Expression"
 
         # @param [Hash] options
         # @option options [Expression] :low
@@ -31,4 +31,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -6,8 +6,8 @@ module Expressir
       class QueryExpression < Expression
         include Identifier
 
-        model_attr_accessor :aggregate_source, 'Reference'
-        model_attr_accessor :expression, 'Expression'
+        model_attr_accessor :aggregate_source, "Reference"
+        model_attr_accessor :expression, "Expression"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -26,10 +26,10 @@ module Expressir
         def children
           [
             self,
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

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

@@ -9,8 +9,8 @@ module Expressir
         NOT = :NOT
         PLUS = :PLUS
 
-        model_attr_accessor :operator, ':MINUS, :NOT, :PLUS'
-        model_attr_accessor :operand, 'Expression'
+        model_attr_accessor :operator, ":MINUS, :NOT, :PLUS"
+        model_attr_accessor :operand, "Expression"
 
         # @param [Hash] options
         # @option options [:MINUS, :NOT, :PLUS] :operator
@@ -24,4 +24,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/identifier.rb

@@ -11,10 +11,10 @@ module Expressir
       #   @return [::String]
       # @!visibility private
       def self.included(mod)
-        mod.model_attr_accessor :id, '::String'
-        mod.model_attr_accessor :remarks, '::Array<::String>'
-        mod.model_attr_accessor :remark_items, '::Array<RemarkItem>'
-        mod.model_attr_accessor :source, '::String'
+        mod.model_attr_accessor :id, "::String"
+        mod.model_attr_accessor :remarks, "::Array<::String>"
+        mod.model_attr_accessor :remark_items, "::Array<RemarkItem>"
+        mod.model_attr_accessor :source, "::String"
       end
 
       # @param [Hash] options
@@ -31,4 +31,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/literal.rb

@@ -6,4 +6,4 @@ module Expressir
     class Literal < ModelElement
     end
   end
-end
+end

data/lib/expressir/model/literals/binary.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 7.5.1 Binary literal
       class Binary < Literal
-        model_attr_accessor :value, '::String'
+        model_attr_accessor :value, "::String"
 
         # @param [Hash] options
         # @option options [::String] :value
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/literals/integer.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 7.5.2 Integer literal
       class Integer < Literal
-        model_attr_accessor :value, '::String'
+        model_attr_accessor :value, "::String"
 
         # @param [Hash] options
         # @option options [::String] :value
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/literals/logical.rb

@@ -8,7 +8,7 @@ module Expressir
         FALSE = :FALSE
         UNKNOWN = :UNKNOWN
 
-        model_attr_accessor :value, ':TRUE, :FALSE, :UNKNOWN'
+        model_attr_accessor :value, ":TRUE, :FALSE, :UNKNOWN"
 
         # @param [Hash] options
         # @option options [:TRUE, :FALSE, :UNKNOWN] :value
@@ -20,4 +20,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/literals/real.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 7.5.3 Real literal
       class Real < Literal
-        model_attr_accessor :value, '::String'
+        model_attr_accessor :value, "::String"
 
         # @param [Hash] options
         # @option options [::String] :value
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/literals/string.rb

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 7.5.4 String literal
       class String < Literal
-        model_attr_accessor :value, '::String'
-        model_attr_accessor :encoded, '::Boolean'
+        model_attr_accessor :value, "::String"
+        model_attr_accessor :encoded, "::Boolean"
 
         # @param [Hash] options
         # @option options [::String] :value
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end