activerecord-multirange 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5e5824edcee8ed0ade179513082b83dce32d8a662290defb2b06813028ea14
-  data.tar.gz: b23ec872923746b1610c3979c8a1c8cc5baf09ff374cee1114e5f0ceaf616aec
+  metadata.gz: 2e8ec13d27ae216e0f400e1624b05c71e9276a450e53622aba243f181443213a
+  data.tar.gz: 1ee4ac085770e7711541f70eccebaf8fc6e3fb11c45f6e49ebaece4536d29420
 SHA512:
-  metadata.gz: 330815a9a9e8856e8db6c742a502e1bc25a93edfe4a0cc137dbeee7d8f4682fc58f9ba519fc33a0096795e47996f9b4376ae3dd3d27dd63ec9b8f02c19981f30
-  data.tar.gz: 63e94b1eb651bfff3211f7dcaa15dbcc92f294d75e84cb95c16329493d1f9b11b1b7de1dc57af0a991ffec20c7c07d630b9f8008c90ea7616bed4118ba3e08ce
+  metadata.gz: efa82b9f56b823dafa589c40de04d072aa9c6d7e6deefb4933e3460fecee039ec77952108709803647a77d7d9a42eac3805ed3a8637dcf64c2ed07bca31a65cb
+  data.tar.gz: 2aaf66267a719ae95509a1a8ce50eb78b476734c74ad15f7ee8ca0c778b59fbbfcf490c08974421deda75aa94a0b2c17527d008b52f664ddbb7976a842449b47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multirange (1.1.2)
+    activerecord-multirange (1.2.1)
       pg (>= 1)
       rails (>= 6)
 

data/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: activerecord_multirange_test
+    ports:
+      - "15432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./docker/postgres-init:/docker-entrypoint-initdb.d
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data:

data/lib/activerecord-multirange/quoting.rb

@@ -5,21 +5,84 @@ module Activerecord
     module Quoting
       def quote(value)
         return quote(encode_multirange(value)) if value.is_a?(::Activerecord::Multirange::OID::MultiRange::Data)
+        return quote_array_as_multirange(value) if array_of_ranges?(value)
 
         super
       end
 
       def type_cast(value)
         return encode_multirange(value) if value.is_a?(::Activerecord::Multirange::OID::MultiRange::Data)
+        return encode_array_as_multirange(value) if array_of_ranges?(value)
 
         super
       end
 
+      # Override the bound value quoting for parameter binding in WHERE clauses
+      def quoted_literal(value)
+        if array_of_ranges?(value)
+          encode_array_as_multirange(value)
+        else
+          super
+        end
+      end
+
+      # Override quote_bound_value for newer Rails versions
+      def quote_bound_value(value)
+        if array_of_ranges?(value)
+          "'#{encode_array_as_multirange(value)}'"
+        else
+          super
+        end
+      end
+
+      # Override for default expression quoting
+      def quote_default_expression(value, column)
+        if array_of_ranges?(value)
+          "'#{encode_array_as_multirange(value)}'"
+        else
+          super
+        end
+      end
+
+      # Override sanitize_sql_array to catch arrays of ranges at parameter binding level
+      def sanitize_sql_array(ary)
+        statement, *values = ary
+        if statement.respond_to?(:to_str)
+          # Convert arrays of ranges to multirange format in the values
+          converted_values = values.map do |value|
+            if array_of_ranges?(value)
+              encode_array_as_multirange(value)
+            else
+              value
+            end
+          end
+          sanitize_sql_for_conditions([statement, *converted_values])
+        else
+          super
+        end
+      end
+
       def encode_multirange(range_data)
         collection = range_data.ranges.map { |r| encode_range(r) }.join(",")
 
         "{#{collection}}"
       end
+
+      private
+
+      def array_of_ranges?(value)
+        value.is_a?(::Array) && value.all? { |item| item.is_a?(::Range) }
+      end
+
+      def quote_array_as_multirange(ranges)
+        encoded_multirange = encode_array_as_multirange(ranges)
+        "'#{encoded_multirange}'"
+      end
+
+      def encode_array_as_multirange(ranges)
+        collection = ranges.map { |r| encode_range(r) }.join(",")
+        "{#{collection}}"
+      end
     end
   end
 end

data/lib/activerecord-multirange/relation.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Activerecord
+  module Multirange
+    module Relation
+      def where(*args)
+        if args.length > 1 && args.first.is_a?(String)
+          # Convert any arrays of ranges in the parameters to multirange format
+          converted_rest = args.from(1).map do |param|
+            if array_of_ranges?(param)
+              encode_array_as_multirange(param)
+            else
+              param
+            end
+          end
+          super(args.first, *converted_rest)
+        else
+          super
+        end
+      end
+
+      private
+
+      def array_of_ranges?(value)
+        value.is_a?(::Array) && value.all? { |item| item.is_a?(::Range) }
+      end
+
+      def encode_array_as_multirange(ranges)
+        collection = ranges.map { |r| connection.send(:encode_range, r) }.join(",")
+        "{#{collection}}"
+      end
+    end
+  end
+end

data/lib/activerecord-multirange/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Multirange
-    VERSION = '1.1.2'
+    VERSION = '1.2.1'
   end
 end

data/lib/activerecord-multirange.rb

@@ -6,6 +6,7 @@ require 'activerecord-multirange/quoting'
 require 'activerecord-multirange/schema_statements'
 require 'activerecord-multirange/table_definition'
 require 'activerecord-multirange/type_map'
+require 'activerecord-multirange/relation'
 require 'active_record'
 
 module Activerecord
@@ -38,6 +39,7 @@ module Activerecord
         ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.prepend(
           TableDefinition
         )
+        ActiveRecord::Relation.prepend(Relation)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multirange
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Gustavo Warmling Teixeira
 bindir: exe
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -124,10 +124,12 @@ files:
 - Rakefile
 - activerecord-multirange-1.1.0.gem
 - config.ru
+- docker-compose.yml
 - lib/activerecord-multirange.rb
 - lib/activerecord-multirange/adapter.rb
 - lib/activerecord-multirange/oid/multi_range.rb
 - lib/activerecord-multirange/quoting.rb
+- lib/activerecord-multirange/relation.rb
 - lib/activerecord-multirange/schema_statements.rb
 - lib/activerecord-multirange/table_definition.rb
 - lib/activerecord-multirange/type_map.rb