expressir 2.1.0 → 2.1.1

data/lib/expressir/model/model_element.rb

@@ -1,12 +1,12 @@
-require 'pathname'
+require "pathname"
 
 module Expressir
   module Model
     # Base model element
     class ModelElement
-      CLASS_KEY = '_class'
-      FILE_KEY = 'file'
-      SOURCE_KEY = 'source'
+      CLASS_KEY = "_class".freeze
+      FILE_KEY = "file".freeze
+      SOURCE_KEY = "source".freeze
 
       private_constant :CLASS_KEY
       private_constant :FILE_KEY
@@ -16,19 +16,19 @@ module Expressir
       attr_accessor :parent
 
       # @param [Hash] options
-      def initialize(options = {})
+      def initialize(_options = {})
         attach_parent_to_children
       end
 
       # @return [String]
       def path
         # this creates an implicit scope
-        return if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
+        return if is_a?(Statements::Alias) || is_a?(Statements::Repeat) || is_a?(Expressions::QueryExpression)
 
         current_node = self
         path_parts = []
         loop do
-          if current_node.class.method_defined? :id and !(current_node.is_a? References::SimpleReference)
+          if current_node.class.method_defined?(:id) && !(current_node.is_a? References::SimpleReference)
             path_parts << current_node.id
           end
 
@@ -82,7 +82,7 @@ module Expressir
 
       # @return [Hash<String, Declaration>]
       def children_by_id
-        @children_by_id ||= children.select{|x| x.id}.map{|x| [x.id.safe_downcase, x]}.to_h
+        @children_by_id ||= children.select(&:id).map { |x| [x.id.safe_downcase, x] }.to_h
       end
 
       # @return [nil]
@@ -105,11 +105,11 @@ module Expressir
         hash[CLASS_KEY] = self.class.name
 
         self.class.model_attrs.each do |variable|
-          value = self.send(variable)
-          empty = value.nil? || (value.is_a?(Array) && value.count == 0)
+          value = send(variable)
+          empty = value.nil? || (value.is_a?(Array) && value.count.zero?)
 
           # skip empty values
-          next unless !empty or include_empty
+          next unless !empty || include_empty
 
           value_hash = case value
                        when Array
@@ -119,7 +119,7 @@ module Expressir
                                root_path: root_path,
                                formatter: formatter,
                                include_empty: include_empty,
-                               select_proc: select_proc
+                               select_proc: select_proc,
                              )
                            else
                              v
@@ -130,7 +130,7 @@ module Expressir
                            root_path: root_path,
                            formatter: formatter,
                            include_empty: include_empty,
-                           select_proc: select_proc
+                           select_proc: select_proc,
                          )
                        else
                          value
@@ -139,11 +139,11 @@ module Expressir
           hash[variable.to_s] = value_hash unless value_hash.nil?
         end
 
-        if self.is_a? Declarations::Schema and file
+        if is_a?(Declarations::Schema) && file
           hash[FILE_KEY] = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : file
         end
 
-        if self.class.method_defined? :source and formatter
+        if self.class.method_defined?(:source) && formatter
           hash[SOURCE_KEY] = formatter.format(self)
         end
 
@@ -152,19 +152,15 @@ module Expressir
 
       # @return [Liquid::Drop]
       def to_liquid
-        klass_name = self.class.name.gsub("::Model::", "::Liquid::") + "Drop"
+        klass_name = "#{self.class.name.gsub('::Model::', '::Liquid::')}Drop"
         klass = Object.const_get(klass_name)
         klass.new(self)
       end
 
-      def to_s
-        to_s(no_remarks: false, formatter: nil)
-      end
-
       def to_s(no_remarks: false, formatter: nil)
         formatter ||= Class.new(Expressir::Express::Formatter) do
           if no_remarks
-            def format_remarks(node); []; end
+            def format_remarks(_node); []; end
           end
         end
         formatter.format(self)
@@ -181,28 +177,26 @@ module Expressir
           value = hash[variable.to_s]
 
           node_options[variable] = case value
-          when Array
-            value.map do |value|
-              if value.is_a? Hash
-                self.from_hash(value, root_path: root_path)
-              else
-                value
-              end
-            end
-          when Hash
-            self.from_hash(value, root_path: root_path)
-          else
-            value
-          end
+                                   when Array
+                                     value.map do |value|
+                                       if value.is_a? Hash
+                                         from_hash(value, root_path: root_path)
+                                       else
+                                         value
+                                       end
+                                     end
+                                   when Hash
+                                     from_hash(value, root_path: root_path)
+                                   else
+                                     value
+                                   end
         end
 
-        if node_class == Declarations::Schema and hash[FILE_KEY]
+        if (node_class == Declarations::Schema) && hash[FILE_KEY]
           node_options[FILE_KEY.to_sym] = root_path ? File.expand_path("#{root_path}/#{hash[FILE_KEY]}") : hash[FILE_KEY]
         end
 
-        node = node_class.new(node_options)
-
-        node
+        node_class.new(node_options)
       end
 
       # @return [Array<Symbol>]
@@ -216,7 +210,7 @@ module Expressir
       # @!macro [attach] model_attr_accessor
       #   @!attribute $1
       #     @return [$2]
-      def self.model_attr_accessor(attr_name, attr_type = nil)
+      def self.model_attr_accessor(attr_name, _attr_type = nil)
         @model_attrs ||= []
         @model_attrs << attr_name
 
@@ -228,7 +222,7 @@ module Expressir
       # @return [nil]
       def attach_parent_to_children
         self.class.model_attrs.each do |variable|
-          value = self.send(variable)
+          value = send(variable)
 
           case value
           when Array
@@ -245,4 +239,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/reference.rb

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

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.7.3 Attribute references
       class AttributeReference < Reference
-        model_attr_accessor :ref, 'Reference'
-        model_attr_accessor :attribute, 'Reference'
+        model_attr_accessor :ref, "Reference"
+        model_attr_accessor :attribute, "Reference"
 
         # @param [Hash] options
         # @option options [Reference] :ref
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.7.4 Group references
       class GroupReference < Reference
-        model_attr_accessor :ref, 'Reference'
-        model_attr_accessor :entity, 'Reference'
+        model_attr_accessor :ref, "Reference"
+        model_attr_accessor :entity, "Reference"
 
         # @param [Hash] options
         # @option options [Reference] :ref
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -6,9 +6,9 @@ module Expressir
       # - section 12.5.1 String indexing
       # - section 12.6.1 Aggregate indexing
       class IndexReference < Reference
-        model_attr_accessor :ref, 'Reference'
-        model_attr_accessor :index1, 'Expression'
-        model_attr_accessor :index2, 'Expression'
+        model_attr_accessor :ref, "Reference"
+        model_attr_accessor :index1, "Expression"
+        model_attr_accessor :index2, "Expression"
 
         # @param [Hash] options
         # @option options [Reference] :ref
@@ -24,4 +24,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,9 +4,9 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 12.7.1 Simple references
       class SimpleReference < Reference
-        model_attr_accessor :id, 'String'
+        model_attr_accessor :id, "String"
 
-        model_attr_accessor :base_path, 'String'
+        model_attr_accessor :base_path, "String"
 
         # @param [Hash] options
         # @option options [String] :id
@@ -21,4 +21,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/repository.rb

@@ -2,7 +2,7 @@ module Expressir
   module Model
     # Multi-schema global scope
     class Repository < ModelElement
-      model_attr_accessor :schemas, 'Array<Declarations::Schema>'
+      model_attr_accessor :schemas, "Array<Declarations::Schema>"
 
       # @param [Hash] options
       # @option options [Array<Declarations::Schema>] :schemas
@@ -15,10 +15,9 @@ module Expressir
       # @return [Array<Declaration>]
       def children
         [
-          *schemas
+          *schemas,
         ]
       end
-
     end
   end
-end
+end

data/lib/expressir/model/statement.rb

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

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

@@ -6,8 +6,8 @@ module Expressir
       class Alias < Statement
         include Identifier
 
-        model_attr_accessor :expression, 'Expression'
-        model_attr_accessor :statements, 'Array<Statement>'
+        model_attr_accessor :expression, "Expression"
+        model_attr_accessor :statements, "Array<Statement>"
 
         # @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/statements/assignment.rb

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.3 Assignment
       class Assignment < Statement
-        model_attr_accessor :ref, 'Reference'
-        model_attr_accessor :expression, 'Expression'
+        model_attr_accessor :ref, "Reference"
+        model_attr_accessor :expression, "Expression"
 
         # @param [Hash] options
         # @option options [Reference] :ref
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,9 +4,9 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.4 Case statement
       class Case < Statement
-        model_attr_accessor :expression, 'Expression'
-        model_attr_accessor :actions, 'Array<CaseAction>'
-        model_attr_accessor :otherwise_statement, 'Statement'
+        model_attr_accessor :expression, "Expression"
+        model_attr_accessor :actions, "Array<CaseAction>"
+        model_attr_accessor :otherwise_statement, "Statement"
 
         # @param [Hash] options
         # @option options [Expression] :expression
@@ -22,4 +22,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.4 Case statement
       class CaseAction < ModelElement
-        model_attr_accessor :labels, 'Array<Expression>'
-        model_attr_accessor :statement, 'Statement'
+        model_attr_accessor :labels, "Array<Expression>"
+        model_attr_accessor :statement, "Statement"
 
         # @param [Hash] options
         # @option options [Array<Expression>] :labels
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.5 Compound statement
       class Compound < Statement
-        model_attr_accessor :statements, 'Array<Statement>'
+        model_attr_accessor :statements, "Array<Statement>"
 
         # @param [Hash] options
         # @option options [Array<Statement>] :statements
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,9 +4,9 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.7 If ... Then ... Else statement
       class If < Statement
-        model_attr_accessor :expression, 'Expression'
-        model_attr_accessor :statements, 'Array<Statement>'
-        model_attr_accessor :else_statements, 'Array<Statement>'
+        model_attr_accessor :expression, "Expression"
+        model_attr_accessor :statements, "Array<Statement>"
+        model_attr_accessor :else_statements, "Array<Statement>"
 
         # @param [Hash] options
         # @option options [Expression] :expression
@@ -22,4 +22,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -4,8 +4,8 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.8 Procedure call statement
       class ProcedureCall < Statement
-        model_attr_accessor :procedure, 'Reference'
-        model_attr_accessor :parameters, 'Array<Expression>'
+        model_attr_accessor :procedure, "Reference"
+        model_attr_accessor :parameters, "Array<Expression>"
 
         # @param [Hash] options
         # @option options [Reference] :procedure
@@ -19,4 +19,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -6,12 +6,12 @@ module Expressir
       class Repeat < Statement
         include Identifier
 
-        model_attr_accessor :bound1, 'Expression'
-        model_attr_accessor :bound2, 'Expression'
-        model_attr_accessor :increment, 'Expression'
-        model_attr_accessor :while_expression, 'Expression'
-        model_attr_accessor :until_expression, 'Expression'
-        model_attr_accessor :statements, 'Array<Statement>'
+        model_attr_accessor :bound1, "Expression"
+        model_attr_accessor :bound2, "Expression"
+        model_attr_accessor :increment, "Expression"
+        model_attr_accessor :while_expression, "Expression"
+        model_attr_accessor :until_expression, "Expression"
+        model_attr_accessor :statements, "Array<Statement>"
 
         # @param [Hash] options
         # @option (see Identifier#initialize_identifier)
@@ -38,10 +38,10 @@ module Expressir
         def children
           [
             self,
-            *remark_items
+            *remark_items,
           ]
         end
       end
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 13.10 Return statement
       class Return < Statement
-        model_attr_accessor :expression, 'Expression'
+        model_attr_accessor :expression, "Expression"
 
         # @param [Hash] options
         # @option options [Expression] :expression
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/supertype_expression.rb

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

data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb

@@ -8,9 +8,9 @@ module Expressir
         AND = :AND
         ANDOR = :ANDOR
 
-        model_attr_accessor :operator, ':AND, :ANDOR'
-        model_attr_accessor :operand1, 'SupertypeExpression'
-        model_attr_accessor :operand2, 'SupertypeExpression'
+        model_attr_accessor :operator, ":AND, :ANDOR"
+        model_attr_accessor :operand1, "SupertypeExpression"
+        model_attr_accessor :operand2, "SupertypeExpression"
 
         # @param [Hash] options
         # @option options [:AND, :ANDOR] :operator
@@ -26,4 +26,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb

@@ -4,7 +4,7 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.2.5.2 ONEOF
       class OneofSupertypeExpression < SupertypeExpression
-        model_attr_accessor :operands, 'Array<SupertypeExpression>'
+        model_attr_accessor :operands, "Array<SupertypeExpression>"
 
         # @param [Hash] options
         # @option options [Array<SupertypeExpression>] :operands
@@ -16,4 +16,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set
   of tools for accessing EXPRESS data models.
 email: