simple_inline_text_annotation 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa33452d357e5a3a6c59e9283111d87cad5b3153e97c759e59b98efed7ec18a
-  data.tar.gz: 3ad0707815cbad9040153cee41c6e54761f32364bec3c9780f23d7a119c2e2b5
+  metadata.gz: 3c4a6b74cd54c5a3ef2263ee7e591cc1f5ef2acab8f36b991fdd3a7f84fc887c
+  data.tar.gz: a436a2add0c95d4484f096a4c56ca1dc283f5e54178377ebeb50f53c4cbe9ddb
 SHA512:
-  metadata.gz: 22726d0174ed12d50a435d038d6f78adb2bc51062c692d94704705b511cbaffbbfa47c1b4d997bed6519bcf1eb30dc200fbd8380fc3887444fa5bd45668cf524
-  data.tar.gz: 45d9bc60245dc1f91b72f77110ce04b4b00010c674b1b2be61c46f3499683cf392451279cc126e6d24518a14dedfe4919f23615f6a963c8d0267a77096f73d6d
+  metadata.gz: a34913353fd069aab8ad9e19955fcfaf50e8856d8e49c91034eb271c5eb9e156f3cf03371f4b053a9f4fc85d5f3d4e5fc62afaefbc7d5da0b70e93f72acee825
+  data.tar.gz: 4eddd143142df13d5b4653805bac281e9b2043fd3ec9ab4ac4d2bf1c104eb43ffa2b2f2491435a31e6a0f8ff0b1145ba29ba246df94d6aee7f93aea28fe20ab2

data/.ruby-version

@@ -0,0 +1 @@
+3.4.4

data/lib/simple_inline_text_annotation/denotation_validator.rb

@@ -15,7 +15,11 @@ class SimpleInlineTextAnnotation
     private
 
     def remove_duplicates_from(denotations)
-      denotations.uniq(&:span)
+      # Deduplicate on the FULL identity (span + obj + id), not just span —
+      # two denotations sharing a span but pointing at different objs are the
+      # multi-label case (e.g. `[eye][UBERON_0000019|UBERON_0000955]`) and
+      # Generator pipe-joins them. Only truly identical entries are dropped.
+      denotations.uniq { |d| [d.span, d.obj, d.id] }
     end
 
     def remove_non_integer_positions_from(denotations)
@@ -40,12 +44,19 @@ class SimpleInlineTextAnnotation
       result = []
 
       sorted_denotations.each do |denotation|
-        result << denotation unless result.any? { |outer| denotation.nested_within?(outer) }
+        # Preserve denotations that share an EXACT span with an already-accepted
+        # one (the multi-label case — Generator will pipe-join their labels).
+        # Only drop those STRICTLY nested inside a larger outer span.
+        result << denotation unless result.any? { |outer| strictly_nested?(denotation, outer) }
       end
 
       result
     end
 
+    def strictly_nested?(inner, outer)
+      inner.nested_within?(outer) && (inner.begin_pos != outer.begin_pos || inner.end_pos != outer.end_pos)
+    end
+
     def remove_boundary_crosses_from(denotations)
       denotations.reject do |denotation|
         denotations.any? { |existing| denotation.boundary_crossing?(existing) }

data/lib/simple_inline_text_annotation/generator.rb

@@ -34,27 +34,46 @@ class SimpleInlineTextAnnotation
     end
 
     def annotate_text(text, denotations, relations)
+      # Group denotations by span position so multiple denotations on the
+      # SAME span emit ONE annotation with a pipe-joined label
+      # (e.g. `[eye][UBERON_0000019|UBERON_0000955]`) — the SIAF spec's
+      # extension for multi-labelled spans. Individual URL resolution via
+      # `entity types` config still applies to each label independently, so
+      # the tail reference block lists every underlying URL.
+      grouped = denotations.group_by { |d| [d.begin_pos, d.end_pos] }
+
       # Annotate text from the end to ensure position calculation.
-      denotations.sort_by(&:begin_pos).reverse_each do |denotation|
-        text = annotate_text_with_denotation(text, denotation, relations)
+      grouped.sort_by { |(b, _e), _| b }.reverse_each do |(_b, _e), ds|
+        text = annotate_text_with_denotations(text, ds, relations)
       end
 
       text
     end
 
-    def annotate_text_with_denotation(text, denotation, relations)
-      begin_pos = denotation.begin_pos
-      end_pos = denotation.end_pos
-      annotation = if denotation.id && !denotation.id.empty?
-                     get_annotations(denotation, relations)
-                   else
-                     get_obj(denotation.obj)
-                   end
+    def annotate_text_with_denotations(text, denotations, relations)
+      begin_pos = denotations.first.begin_pos
+      end_pos   = denotations.first.end_pos
+      composite = compose_label(denotations, relations)
 
-      annotated_text = "[#{text[begin_pos...end_pos]}][#{annotation}]"
+      annotated_text = "[#{text[begin_pos...end_pos]}][#{composite}]"
       text[0...begin_pos] + annotated_text + text[end_pos..]
     end
 
+    # Compose each denotation's label independently (honors get_obj URL →
+    # short-label lookup and per-denotation relation composition), then
+    # pipe-join with dedupe to preserve insertion order.
+    def compose_label(denotations, relations)
+      denotations.map { |d| label_for(d, relations) }.uniq.join("|")
+    end
+
+    def label_for(denotation, relations)
+      if denotation.id && !denotation.id.empty?
+        get_annotations(denotation, relations)
+      else
+        get_obj(denotation.obj)
+      end
+    end
+
     def labeled_entity_types
       return nil unless @config
 

data/lib/simple_inline_text_annotation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SimpleInlineTextAnnotation
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simple_inline_text_annotation
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - xaiBUh29wX
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides inline text annotation functionality, extracted from
   PubAnnotation, with support for denotations, entity types, and nested spans.
@@ -20,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
@@ -43,7 +43,6 @@ metadata:
   homepage_uri: https://github.com/pubannotation/simple_inline_annotation_format
   changelog_uri: https://github.com/pubannotation/simple_inline_annotation_format/blob/master/ruby/CHANGELOG.md
   rubygems_uri: https://rubygems.org/gems/simple_inline_text_annotation
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A Ruby gem for inline text annotation with denotations and entity types.
 test_files: []