typesense-rails 1.0.0.rc4 → 1.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235c4761cba73de6042fe41ac751658c001b0a44fa2a7e2959fea7b398bf186c
-  data.tar.gz: deaaded73d6ac588e47c0439f515ff4771f05ab063692d651cdb00ab60c7513e
+  metadata.gz: 4c0186b1b9d3de405d50d5d736725d4a93863e029e116544b7d3870b83dad9fa
+  data.tar.gz: 13c8237df903014ad8147f624f3d4ca7b99429023cf6311f438b9f6f5986f312
 SHA512:
-  metadata.gz: 6004a8189a68987366577a1903404a22c2eb3fad4ac4226d6deeeacf6a34a7411d35ca6da0a9ec585278932b27b1c96a568fa192eeb69e3d1cb2b708df750768
-  data.tar.gz: 10626d38245d494eff9b81d28d5f8c2e2d409fbdc69f6bc217acd0e78079504a9b3eaf2a38fc62fe4f5582742758e6c4f14206c04125953bca2c1690061fee31
+  metadata.gz: b61f66f7abcdefc86bbd3eb0ac5a668469d299f7d0265b984950bda1fdaa2a7b6ab9ab4ff9ef5a088925e92a96ec0ba11cedce05aab48ef4e6a9e9060afb351b
+  data.tar.gz: 3da63dd78087369681b89aa9e82c0b516348c4f9db9eb119ee51f6025ef9631484048b818bff9cca9c7d08c091eceffe720eaae11d76e3e02bab02f6bd9ba18f

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'json', '>= 1.5.1'
-gem "typesense", "~> 0.13.0"
+gem "typesense", ">= 5.0.0", "< 6.0.0"
 
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'

data/Gemfile.lock

@@ -39,7 +39,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_serializers (0.10.15)
+    active_model_serializers (0.10.16)
       actionpack (>= 4.1)
       activemodel (>= 4.1)
       case_transform (>= 0.2)
@@ -66,27 +66,29 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.3)
-    base64 (0.3.0)
-    bigdecimal (3.2.3)
+    base64 (0.2.0)
+    bigdecimal (4.0.1)
     builder (3.3.0)
     case_transform (0.2)
       activesupport
-    cgi (0.5.0)
-    concurrent-ruby (1.3.5)
+    cgi (0.5.1)
+    concurrent-ruby (1.3.6)
     crass (1.0.6)
-    date (3.4.1)
+    date (3.5.1)
     diff-lcs (1.6.2)
     erb (4.0.4)
       cgi (>= 0.3.3)
     erubi (1.13.1)
-    ethon (0.15.0)
-      ffi (>= 1.15.0)
-    ffi (1.17.2)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.15.0)
+    json (2.19.3)
     jsonapi-renderer (0.2.2)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -95,10 +97,11 @@ GEM
     lefthook (0.7.7)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -107,8 +110,8 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
-    net-imap (0.4.22)
+    minitest (5.26.1)
+    net-imap (0.4.23)
       date
       net-protocol
     net-pop (0.1.2)
@@ -117,25 +120,21 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
+    nio4r (2.7.5)
     nokogiri (1.15.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.11)
-      bigdecimal (>= 3.0)
-      ostruct (>= 0.2)
-    ostruct (0.6.3)
     pagy (6.5.0)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
-    prism (1.5.1)
-    psych (5.2.6)
+    prism (1.9.0)
+    psych (5.3.1)
       date
       stringio
     racc (1.8.1)
-    rack (2.2.18)
+    rack (2.2.22)
     rack-test (2.2.0)
       rack (>= 1.3)
     rails (6.1.7.10)
@@ -157,8 +156,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (6.1.7.10)
       actionpack (= 6.1.7.10)
@@ -167,25 +166,26 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.3.0)
-    rdoc (6.14.2)
+    rake (13.3.1)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
+      tsort
     regexp_parser (2.11.3)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.81.1)
+    rspec-support (3.13.7)
+    rubocop (1.86.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -193,14 +193,15 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
-    sequel (5.96.0)
+    ruby2_keywords (0.0.5)
+    sequel (5.102.0)
       bigdecimal
     sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
@@ -212,19 +213,19 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
-    stringio (3.1.7)
-    thor (1.4.0)
-    timeout (0.4.3)
-    typesense (0.13.0)
-      oj (~> 3.11)
-      typhoeus (~> 1.4)
-    typhoeus (1.5.0)
-      ethon (>= 0.9.0, < 0.16.0)
+    stringio (3.2.0)
+    thor (1.5.0)
+    timeout (0.6.1)
+    tsort (0.2.0)
+    typesense (5.0.0)
+      base64 (~> 0.2.0)
+      faraday (~> 2.8)
+      json (~> 2.9)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
@@ -251,7 +252,7 @@ DEPENDENCIES
   rubocop (~> 1.19)
   sequel (>= 4.0)
   sqlite3 (~> 1.6.0)
-  typesense (~> 0.13.0)
+  typesense (>= 5.0.0, < 6.0.0)
   will_paginate (>= 2.3.15)
 
 BUNDLED WITH

data/README.md

@@ -18,7 +18,8 @@ Special thanks to the Algolia team for their original implementation, which prov
 - Environment-specific indexing
 - Support for faceted search and filtering
 - Customizable schema with predefined fields
-- Multi-way and one-way synonyms support
+- Multi-way and one-way synonyms support across Typesense v29 and v30+
+- Direct attachment of v30+ synonym sets and curation sets
 - Rake tasks for index management
 
 ## Installation
@@ -91,6 +92,10 @@ class Product < ApplicationRecord
       }
     ]
 
+    # Attach existing global resources on Typesense v30+
+    synonym_sets ["catalog-synonyms"]
+    curation_sets ["catalog-curations"]
+
     # Symbols to index
     symbols_to_index ["-", "_"]
 
@@ -103,6 +108,9 @@ class Product < ApplicationRecord
 end
 ```
 
+For Typesense v29, `multi_way_synonyms` and `one_way_synonyms` continue to use the legacy collection-level synonym APIs.
+For Typesense v30 and newer, this gem stores those DSL synonyms in a collection-specific synonym set and attaches it automatically, while also supporting explicit `synonym_sets` / `curation_sets`.
+
 ### Working with Relationships
 
 ```ruby

data/lib/typesense/config.rb

@@ -16,6 +16,8 @@ module Typesense
       @@pagination_backend = configuration[:pagination_backend] if configuration.key?(:pagination_backend)
       @@log_level = configuration[:log_level] if configuration.key?(:log_level)
       @@configuration = configuration
+      @client = nil
+      reset_server_version_cache!
     end
 
     def pagination_backend
@@ -66,5 +68,21 @@ module Typesense
     def setup_client
       @client = Typesense::Client.new(@@configuration)
     end
+
+    def server_major_version
+      @server_major_version ||= begin
+        version = debug_info.fetch("version", "")
+        version == "nightly" ? 30 : version.split(".").first.to_i
+      end
+    end
+
+    def debug_info
+      @debug_info ||= client.debug.retrieve
+    end
+
+    def reset_server_version_cache!
+      @server_major_version = nil
+      @debug_info = nil
+    end
   end
 end

data/lib/typesense/pagination/pagy.rb

@@ -14,7 +14,9 @@ module Typesense
         }
 
         pagy_version = Gem::Version.new(::Pagy::VERSION)
-        pagy = if pagy_version >= Gem::Version.new('9.0')
+        pagy = if pagy_version >= Gem::Version.new("43.0.0.rc1")
+                 ::Pagy::Offset.new(**vars)
+               elsif pagy_version >= Gem::Version.new("9.0")
                  ::Pagy.new(**vars)
                else
                  ::Pagy.new(vars)

data/lib/typesense/version.rb

@@ -1,3 +1,3 @@
 module Typesense
-  GEM_VERSION = "1.0.0.rc4"
+  GEM_VERSION = "1.0.0.rc7"
 end

data/lib/typesense-rails.rb

@@ -80,6 +80,8 @@ module Typesense
     OPTIONS = [
       :multi_way_synonyms,
       :one_way_synonyms,
+      :synonym_sets,
+      :curation_sets,
       :predefined_fields,
       :fields,
       :default_sorting_field,
@@ -271,11 +273,13 @@ module Typesense
       "#{typesense_collection_name(options)}_#{Time.now.to_i}"
     end
 
-    def typesense_create_collection(collection_name, settings = nil)
+    def typesense_create_collection(collection_name, settings = nil, existing_collection: nil)
       fields = settings.get_setting(:predefined_fields) || settings.get_setting(:fields)
       default_sorting_field = settings.get_setting(:default_sorting_field)
       multi_way_synonyms = settings.get_setting(:multi_way_synonyms)
       one_way_synonyms = settings.get_setting(:one_way_synonyms)
+      synonym_sets = settings.get_setting(:synonym_sets)
+      curation_sets = settings.get_setting(:curation_sets)
       symbols_to_index = settings.get_setting(:symbols_to_index)
       token_separators = settings.get_setting(:token_separators)
       enable_nested_fields = settings.get_setting(:enable_nested_fields)
@@ -300,9 +304,14 @@ module Typesense
       )
       Typesense.log(:debug, "Collection '#{collection_name}' created!")
 
-      typesense_multi_way_synonyms(collection_name, multi_way_synonyms) if multi_way_synonyms
-
-      typesense_one_way_synonyms(collection_name, one_way_synonyms) if one_way_synonyms
+      apply_typesense_collection_resources(
+        collection_name,
+        multi_way_synonyms: multi_way_synonyms,
+        one_way_synonyms: one_way_synonyms,
+        synonym_sets: synonym_sets,
+        curation_sets: curation_sets,
+        existing_collection: existing_collection
+      )
     end
 
     def typesense_upsert_alias(collection_name, alias_name)
@@ -385,6 +394,103 @@ module Typesense
       end
     end
 
+    def apply_typesense_collection_resources(collection_name, multi_way_synonyms: nil, one_way_synonyms: nil, synonym_sets: nil, curation_sets: nil, existing_collection: nil)
+      if typesense_server_major_version >= 30
+        apply_v30_collection_resources(
+          collection_name,
+          multi_way_synonyms: multi_way_synonyms,
+          one_way_synonyms: one_way_synonyms,
+          synonym_sets: synonym_sets,
+          curation_sets: curation_sets,
+          existing_collection: existing_collection
+        )
+      else
+        ensure_v30_resource_support!(synonym_sets, curation_sets)
+        typesense_multi_way_synonyms(collection_name, multi_way_synonyms) if multi_way_synonyms
+        typesense_one_way_synonyms(collection_name, one_way_synonyms) if one_way_synonyms
+      end
+    end
+
+    def apply_v30_collection_resources(collection_name, multi_way_synonyms: nil, one_way_synonyms: nil, synonym_sets: nil, curation_sets: nil, existing_collection: nil)
+      inline_synonyms_present = multi_way_synonyms || one_way_synonyms
+      attached_synonym_sets = Array(existing_collection && existing_collection["synonym_sets"]) + Array(synonym_sets)
+      attached_curation_sets = Array(existing_collection && existing_collection["curation_sets"]) + Array(curation_sets)
+
+      if inline_synonyms_present
+        synonym_set_name = default_synonym_set_name(collection_name)
+        ensure_synonym_set_exists(synonym_set_name)
+        upsert_synonym_set_items(synonym_set_name, multi_way_synonyms, one_way_synonyms)
+        attached_synonym_sets << synonym_set_name
+      end
+
+      collection_patch = {}
+      collection_patch["synonym_sets"] = attached_synonym_sets.uniq if attached_synonym_sets.any?
+      collection_patch["curation_sets"] = attached_curation_sets.uniq if attached_curation_sets.any?
+
+      return if collection_patch.empty?
+
+      typesense_client.collections[collection_name].update(collection_patch)
+    end
+
+    def ensure_v30_resource_support!(synonym_sets, curation_sets)
+      unsupported = []
+      unsupported << "synonym_sets" if synonym_sets
+      unsupported << "curation_sets" if curation_sets
+      return if unsupported.empty?
+
+      raise Typesense::BadConfiguration, "#{unsupported.join(' and ')} require Typesense v30.0 or newer"
+    end
+
+    def default_synonym_set_name(collection_name)
+      "#{collection_name}_synonyms_index"
+    end
+
+    def ensure_synonym_set_exists(synonym_set_name)
+      typesense_client.synonym_sets.upsert(synonym_set_name, { "items" => [] })
+    end
+
+    def upsert_synonym_set_items(synonym_set_name, multi_way_synonyms, one_way_synonyms)
+      items = []
+
+      Array(multi_way_synonyms).each do |synonym_hash|
+        synonym_hash.each do |synonym_name, synonym|
+          items << { "id" => synonym_name, "synonyms" => synonym }
+        end
+      end
+
+      Array(one_way_synonyms).each do |synonym_hash|
+        synonym_hash.each do |synonym_name, synonym|
+          items << synonym.merge("id" => synonym_name)
+        end
+      end
+
+      typesense_client.synonym_sets.upsert(synonym_set_name, { "items" => items })
+    end
+
+    def typesense_server_major_version
+      Typesense.server_major_version
+    end
+
+    def reset_typesense_server_major_version!
+      Typesense.reset_server_version_cache!
+    end
+
+    def typesense_debug_info
+      Typesense.debug_info
+    end
+
+    def typesense_collection_resources(collection_name)
+      return {} if typesense_server_major_version < 30
+
+      collection = typesense_get_collection(collection_name)
+      return {} unless collection
+
+      {
+        "synonym_sets" => Array(collection["synonym_sets"]),
+        "curation_sets" => Array(collection["curation_sets"])
+      }
+    end
+
     def typesense(options = {}, &block)
       self.typesense_settings = IndexSettings.new(options, &block)
       self.typesense_options = { type: typesense_full_const_get(model_name.to_s) }.merge(options) # :per_page => typesense_settings.get_setting(:hitsPerPage) || 10, :page => 1
@@ -528,8 +634,10 @@ module Typesense
       typesense_configurations.each do |options, settings|
         next if typesense_indexing_disabled?(options)
 
+        existing_collection_resources = {}
         begin
           master_index = typesense_ensure_init(options, settings, false)
+          existing_collection_resources = typesense_collection_resources(master_index[:alias_name])
           delete_collection(master_index[:alias_name])
         rescue ArgumentError
           @typesense_indexes[settings] = { collection_name: "", alias_name: typesense_collection_name(options) }
@@ -542,7 +650,7 @@ module Typesense
         tmp_options.delete(:per_environment) # already included in the temporary index_name
         tmp_settings = settings.dup
 
-        create_collection(src_index_name, settings)
+        create_collection(src_index_name, settings, existing_collection: existing_collection_resources)
 
         typesense_find_in_batches(batch_size) do |group|
           if typesense_conditional_index?(options)
@@ -847,11 +955,11 @@ module Typesense
     def typesense_full_const_get(name)
       list = name.split("::")
       list.shift if list.first.blank?
-      obj = Object.const_defined?(:RUBY_VERSION) && RUBY_VERSION.to_f < 1.9 ? Object : self
+      obj = Object
       list.each do |x|
         # This is required because const_get tries to look for constants in the
         # ancestor chain, but we only want constants that are HERE
-        obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
+        obj = obj.const_defined?(x, false) ? obj.const_get(x, false) : obj.const_missing(x)
       end
       obj
     end

data/spec/integration_spec.rb

@@ -73,6 +73,9 @@ ActiveRecord::Schema.define do
     t.string :short_name
     t.integer :hex
   end
+  create_table :collections do |t|
+    t.string :name
+  end
   create_table :namespaced_models do |t|
     t.string :name
     t.integer :another_private_value
@@ -173,6 +176,20 @@ end
 class Camera < Product
 end
 
+class V30ResourceProduct < ActiveRecord::Base
+  self.table_name = "products"
+  self.inheritance_column = :_type_disabled
+
+  include Typesense
+
+  typesense auto_index: false,
+            index_name: safe_index_name("v30_resource_products") do
+    attribute :name
+    synonym_sets [safe_index_name("shared-product-synonyms")]
+    curation_sets [safe_index_name("shared-product-curations")]
+  end
+end
+
 class Color < ActiveRecord::Base
   include Typesense
   attr_accessor :not_indexed
@@ -198,6 +215,14 @@ class Color < ActiveRecord::Base
   end
 end
 
+class Collection < ActiveRecord::Base
+  include Typesense
+
+  typesense auto_index: false, index_name: safe_index_name("Collection") do
+    attribute :name
+  end
+end
+
 class DisabledBoolean < ActiveRecord::Base
   include Typesense
 
@@ -628,6 +653,35 @@ describe "Namespaced::Model" do
   end
 end
 
+describe "Collection" do
+  it "resolves the model class instead of Typesense::Collection" do
+    expect(Collection.typesense_options[:type]).to eq(Collection)
+  end
+
+  it "uses the ActiveRecord model when loading search hits" do
+    record = Collection.create!(name: "Archive")
+
+    allow(Collection).to receive(:typesense_raw_search).and_return(
+      {
+        "hits" => [
+          {
+            "document" => { "id" => record.id.to_s },
+            "highlights" => []
+          }
+        ],
+        "found" => 1,
+        "page" => 1,
+        "request_params" => { "per_page" => 10 }
+      }
+    )
+
+    results = Collection.search("*", "name")
+
+    expect(results.length).to eq(1)
+    expect(results.first).to eq(record)
+  end
+end
+
 describe "UniqUsers" do
   before(:all) do
     UniqUser.clear_index!
@@ -1049,6 +1103,199 @@ describe "Book" do
   end
 end
 
+describe "Typesense version compatibility" do
+  let(:settings) { Product.typesense_settings }
+
+  it "uses collection-level synonyms on v29" do
+    allow(Product).to receive(:typesense_server_major_version).and_return(29)
+    expect(Product).to receive(:typesense_multi_way_synonyms)
+      .with("products_v29", settings.get_setting(:multi_way_synonyms))
+    expect(Product).to receive(:typesense_one_way_synonyms)
+      .with("products_v29", settings.get_setting(:one_way_synonyms))
+
+    Product.apply_typesense_collection_resources(
+      "products_v29",
+      multi_way_synonyms: settings.get_setting(:multi_way_synonyms),
+      one_way_synonyms: settings.get_setting(:one_way_synonyms)
+    )
+  end
+
+  it "creates and attaches synonym sets on v30+" do
+    collection_resource = double("collection_resource")
+    collections_resource = double("collections_resource")
+    synonym_sets_resource = double("synonym_sets_resource")
+    client = double("typesense_client", collections: collections_resource, synonym_sets: synonym_sets_resource)
+
+    allow(Product).to receive(:typesense_server_major_version).and_return(30)
+    allow(Product).to receive(:typesense_client).and_return(client)
+    expect(collections_resource).to receive(:[]).with("products_v30").and_return(collection_resource)
+    expect(synonym_sets_resource).to receive(:upsert).with("products_v30_synonyms_index", { "items" => [] }).ordered
+    expect(synonym_sets_resource).to receive(:upsert).with(
+      "products_v30_synonyms_index",
+      {
+        "items" => [
+          { "id" => "phone-synonym", "synonyms" => %w[galaxy samsung samsung_electronics] },
+          { "id" => "smart-phone-synonym", "root" => "smartphone",
+            "synonyms" => %w[nokia samsung motorola android] }
+        ]
+      }
+    ).ordered
+    expect(collection_resource).to receive(:update) do |payload|
+      expect(payload["synonym_sets"]).to match_array(%w[existing-shared shared-synonyms products_v30_synonyms_index])
+      expect(payload["curation_sets"]).to match_array(%w[existing-curation shared-curations])
+    end
+
+    Product.apply_typesense_collection_resources(
+      "products_v30",
+      multi_way_synonyms: settings.get_setting(:multi_way_synonyms),
+      one_way_synonyms: settings.get_setting(:one_way_synonyms),
+      synonym_sets: ["shared-synonyms"],
+      curation_sets: ["shared-curations"],
+      existing_collection: {
+        "synonym_sets" => ["existing-shared"],
+        "curation_sets" => ["existing-curation"]
+      }
+    )
+  end
+
+  it "rejects v30-only collection resources on v29" do
+    allow(Product).to receive(:typesense_server_major_version).and_return(29)
+
+    expect do
+      Product.apply_typesense_collection_resources(
+        "products_v29",
+        synonym_sets: ["shared-synonyms"]
+      )
+    end.to raise_error(Typesense::BadConfiguration, /synonym_sets require Typesense v30.0 or newer/)
+  end
+end
+
+describe "Typesense v30 resource integration" do
+  before do
+    skip("SynonymSets and CurationSets are only supported in Typesense v30+") unless typesense_v30_or_above?
+  end
+
+  after do
+    begin
+      Typesense.client.synonym_sets.retrieve.each do |set|
+        Typesense.client.synonym_sets[set["name"]].delete if set["name"].include?(SAFE_INDEX_PREFIX)
+      end
+    rescue StandardError
+      nil
+    end
+
+    begin
+      Typesense.client.curation_sets.retrieve.each do |set|
+        Typesense.client.curation_sets[set["name"]].delete if set["name"].include?(SAFE_INDEX_PREFIX)
+      end
+    rescue StandardError
+      nil
+    end
+
+    begin
+      V30ResourceProduct.clear_index!
+    rescue StandardError
+      nil
+    end
+
+    begin
+      Product.clear_index!
+    rescue StandardError
+      nil
+    end
+  end
+
+  it "attaches generated synonym sets for inline synonym DSL" do
+    begin
+      Product.clear_index!
+    rescue StandardError
+      nil
+    end
+    collection_obj = Product.typesense_index
+
+    collection = Typesense.client.collections[collection_obj[:collection_name]].retrieve
+    generated_synonym_set = "#{collection_obj[:collection_name]}_synonyms_index"
+
+    expect(collection["synonym_sets"]).to include(generated_synonym_set)
+
+    synonym_set = Typesense.client.synonym_sets[generated_synonym_set].retrieve
+    item_ids = synonym_set.fetch("items").map { |item| item["id"] }
+
+    expect(item_ids).to include("phone-synonym", "smart-phone-synonym")
+  end
+
+  it "attaches explicit synonym sets and curation sets to the collection" do
+    synonym_set_name = safe_index_name("shared-product-synonyms")
+    curation_set_name = safe_index_name("shared-product-curations")
+
+    Typesense.client.synonym_sets.upsert(
+      synonym_set_name,
+      {
+        "items" => [
+          { "id" => "shared-phone", "root" => "phone", "synonyms" => %w[handset mobile] }
+        ]
+      }
+    )
+    Typesense.client.curation_sets.upsert(
+      curation_set_name,
+      {
+        "items" => [
+          {
+            "id" => "promote-phone",
+            "rule" => { "query" => "phone", "match" => "exact" },
+            "includes" => [{ "id" => "1", "position" => 1 }],
+            "excludes" => [],
+            "filter_curated_hits" => false,
+            "remove_matched_tokens" => false,
+            "stop_processing" => true
+          }
+        ]
+      }
+    )
+
+    V30ResourceProduct.typesense_index
+
+    collection = Typesense.client.collections[V30ResourceProduct.collection_name].retrieve
+
+    expect(collection["synonym_sets"]).to include(synonym_set_name)
+    expect(collection["curation_sets"]).to include(curation_set_name)
+  end
+
+  it "preserves attached synonym sets and curation sets through reindex" do
+    synonym_set_name = safe_index_name("shared-product-synonyms")
+    curation_set_name = safe_index_name("shared-product-curations")
+
+    Typesense.client.synonym_sets.upsert(
+      synonym_set_name,
+      { "items" => [{ "id" => "shared-phone", "root" => "phone", "synonyms" => %w[handset mobile] }] }
+    )
+    Typesense.client.curation_sets.upsert(
+      curation_set_name,
+      {
+        "items" => [
+          {
+            "id" => "promote-phone",
+            "rule" => { "query" => "phone", "match" => "exact" },
+            "includes" => [{ "id" => "1", "position" => 1 }],
+            "excludes" => [],
+            "filter_curated_hits" => false,
+            "remove_matched_tokens" => false,
+            "stop_processing" => true
+          }
+        ]
+      }
+    )
+
+    V30ResourceProduct.typesense_index
+    V30ResourceProduct.reindex
+
+    collection = Typesense.client.collections[V30ResourceProduct.collection_name].retrieve
+
+    expect(collection["synonym_sets"]).to include(synonym_set_name)
+    expect(collection["curation_sets"]).to include(curation_set_name)
+  end
+end
+
 describe "Kaminari" do
   before(:all) do
     require "kaminari"

data/spec/spec_helper.rb

@@ -52,3 +52,17 @@ def safe_index_list
   list = Typesense.client.collections.retrieve()
   list = list.select { |index| index["name"].include?(SAFE_INDEX_PREFIX) }
 end
+
+def typesense_version
+  Typesense.client.debug.retrieve["version"]
+rescue StandardError
+  nil
+end
+
+def typesense_v30_or_above?
+  version = typesense_version
+  return false unless version
+  return true if version == "nightly"
+
+  version.to_s[/\d+/].to_i >= 30
+end

data/typesense-rails.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.2.0")
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<typesense>, [">= 0.13.0"])
+      s.add_runtime_dependency(%q<typesense>, [">= 5.0.0", "< 6.0.0"])
       s.add_development_dependency(%q<will_paginate>, [">= 2.3.15"])
       s.add_development_dependency(%q<kaminari>, [">= 0"])
       s.add_development_dependency(%q<pagy>, [">= 0"])
@@ -60,10 +60,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency "rdoc"
     else
       s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<typesense>, [">= 0.13.0"])
+      s.add_dependency(%q<typesense>, [">= 5.0.0", "< 6.0.0"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<typesense>, [">= 0.13.0"])
+    s.add_dependency(%q<typesense>, [">= 5.0.0", "< 6.0.0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typesense-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc7
 platform: ruby
 authors:
 - typesense
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2026-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement