expressir 2.3.5 → 2.3.7

data/lib/expressir/model/model_element.rb

@@ -120,7 +120,7 @@ module Expressir
         loop do
           # Skip adding the id if this is a RemarkItem that belongs to an InformalPropositionRule
           # and has the same id as its parent
-          if !(current_node.is_a? References::SimpleReference) && current_node.class.method_defined?(:id) &&
+          if !(current_node.is_a? References::SimpleReference) && current_node.is_a?(HasId) &&
               !(is_a?(Declarations::RemarkItem) &&
                 parent.is_a?(Declarations::InformalPropositionRule) &&
                 id == parent.id)
@@ -200,7 +200,7 @@ module Expressir
         self.untagged_remarks ||= []
         return unless remark_info.is_a?(RemarkInfo)
 
-        self.untagged_remarks << remark_info
+        untagged_remarks << remark_info
       end
 
       private
@@ -208,7 +208,7 @@ module Expressir
       # @return [nil]
       def attach_parent_to_children
         self.class.attributes.each_pair do |symbol, _lutaml_attr|
-          value = send(symbol)
+          value = public_send(symbol)
 
           case value
           when Array

data/lib/expressir/model/repository.rb

@@ -24,6 +24,14 @@ module Expressir
       # Index instances (lazy-loaded)
       attr_reader :entity_index, :type_index, :reference_index
 
+      # Restore deserialized indexes (used by Package::Reader)
+      def restore_indexes(entity_index: nil, type_index: nil,
+reference_index: nil)
+        @entity_index = entity_index if entity_index
+        @type_index = type_index if type_index
+        @reference_index = reference_index if reference_index
+      end
+
       # Internal schema storage for direct manipulation
       attr_reader :_schemas
 

data/lib/expressir/model/search_engine.rb

@@ -327,7 +327,7 @@ module Expressir
         # Guard against nil schemas array
         return [] unless schemas
 
-        schemas.flat_map { |s| s.send(method) || [] }
+        schemas.flat_map { |s| s.public_send(method) || [] }
       end
 
       # Collect all attributes from entities

data/lib/expressir/package/reader.rb

@@ -132,32 +132,17 @@ module Expressir
       # @param repository [Model::Repository] Repository instance
       # @return [void]
       def load_indexes(zip, repository)
-        # Load entity index
-        entity_index_entry = zip.find_entry("entity_index.marshal")
-        if entity_index_entry
-          repository.instance_variable_set(
-            :@entity_index,
-            Marshal.load(entity_index_entry.get_input_stream.read),
-          )
+        indexes = {}
+
+        %w[entity_index type_index reference_index].each do |name|
+          entry = zip.find_entry("#{name}.marshal")
+          if entry
+            indexes[name.to_sym] =
+              Marshal.load(entry.get_input_stream.read)
+          end
         end
 
-        # Load type index
-        type_index_entry = zip.find_entry("type_index.marshal")
-        if type_index_entry
-          repository.instance_variable_set(
-            :@type_index,
-            Marshal.load(type_index_entry.get_input_stream.read),
-          )
-        end
-
-        # Load reference index
-        reference_index_entry = zip.find_entry("reference_index.marshal")
-        if reference_index_entry
-          repository.instance_variable_set(
-            :@reference_index,
-            Marshal.load(reference_index_entry.get_input_stream.read),
-          )
-        end
+        repository.restore_indexes(**indexes) unless indexes.empty?
       end
     end
   end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.3.5".freeze
+  VERSION = "2.3.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -233,6 +233,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - README.adoc
 - Rakefile
@@ -263,6 +264,7 @@ files:
 - docs/_guides/ler/loading-packages.adoc
 - docs/_guides/ler/package-formats.adoc
 - docs/_guides/ler/querying-packages.adoc
+- docs/_guides/ler/step-packages.adoc
 - docs/_guides/ler/validating-packages.adoc
 - docs/_guides/liquid/basic-templates.adoc
 - docs/_guides/liquid/documentation-generation.adoc