activerecord-multirange 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d7ad768c556f1c8d5ce716eb67367c6b6ace7de0ad656b9f7adf217e5ffa6c
-  data.tar.gz: fa4427fb5cded6f543bb918bc8f672245c71c0e7ab006cfd929c3a5765f6582d
+  metadata.gz: f84a86677dd7f4427b636524b7dc09ea1c5eb049db16ebc727e86b8801847245
+  data.tar.gz: e7d313979f6e205f7cc07685b6fad56d6e483e99ae8cf985eb04c5fd0c2a3acb
 SHA512:
-  metadata.gz: a8bda0778850f79cbaf2dfba6afd671f1f2b28379b735e4374c45008206afd6e30389da13ed570d53410c1a6322bf26d0f93ea1fc826274bdd813a029120d2a2
-  data.tar.gz: fa87bef90a08f6c88ceba3fa08d945ace2e3b5734bc498b955030bcc99136161e9b7cfedfab7d17ccf86dddb0cf408a4ed90b1c23f6be84c9a8e1ecb981dba1e
+  metadata.gz: 80c306db18783b1f27457706731efa67594c06ac8a7efd7fbcf5e368befbe2166ba136a676026fa6bab076fe191de1563b36cdaab3690a3b01bf9ca0d97007a3
+  data.tar.gz: 6eb784fa47af4ad1fb395d0e5f4dc56bb9e2a8f2a48b85d24bf036e5bcebc93ed128d9a9f24d75144eb05f285089d8b47e27820571e6b4cece2b43ca33f9af41

data/.rubocop.yml

@@ -1,13 +1,56 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1.2
+  EnabledByDefault: true
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'bin/{rails,rake}'
 
-Style/StringLiterals:
+require:
+  - rubocop-rails
+
+inherit_from:
+  - node_modules/@prettier/plugin-ruby/rubocop.yml
+
+Style:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Lint:
   Enabled: true
-  EnforcedStyle: double_quotes
 
-Style/StringLiteralsInInterpolation:
+Lint/ConstantResolution:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/NumberConversion:
+  Enabled: false
+
+Rails:
   Enabled: true
-  EnforcedStyle: double_quotes
 
-Layout/LineLength:
-  Max: 120
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Rails/DefaultScope:
+  Enabled: false
+
+Rails/HasManyOrHasOneDependent:
+  Enabled: false
+
+Rails/InverseOf:
+  Enabled: false
+
+Rails/Date:
+  Enabled: false
+
+Rails/TimeZone:
+  Enabled: false
+
+Rails/RequestReferer:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-05-29
+## [1.1.0] - 2024-12-19
+
+- Minor version bump with improvements and updates
+
+## [1.0.0] - 2023-05-29
 
 - Initial release

data/Gemfile

@@ -6,9 +6,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.21"
-
-gem "pry"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multirange (0.1.0)
+    activerecord-multirange (1.1.0)
       pg (>= 1)
       rails (>= 6)
 
@@ -76,8 +76,16 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
+    combustion (1.3.7)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     date (3.3.3)
     diff-lcs (1.5.0)
     erubi (1.12.0)
@@ -108,8 +116,12 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.1)
       ast (~> 2.4.1)
@@ -190,14 +202,18 @@ GEM
     zeitwerk (2.6.11)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   activerecord-multirange!
+  combustion (~> 1.3)
+  database_cleaner-active_record
   pry
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop
 
 BUNDLED WITH
    2.4.13

data/README.md

@@ -2,6 +2,8 @@
  
 This gem adds full suppport of [Postgress Multiranges](https://www.postgresql.org/docs/14/rangetypes.html#RANGETYPES-BUILTIN) types.
 
+[![Gem Version](https://badge.fury.io/rb/activerecord-multirange.svg)](https://badge.fury.io/rb/activerecord-multirange)
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/lib/activerecord-multirange/adapter.rb

@@ -8,17 +8,54 @@ module Activerecord
         load_multirange_types
       end
 
+      def self.native_database_types
+        super.merge(
+          {
+            datemultirange: {
+              name: 'datemultirange'
+            },
+            nummultirange: {
+              name: 'nummultirange'
+            },
+            tsmultirange: {
+              name: 'tsmultirange'
+            },
+            tstzmultirange: {
+              name: 'tstzmultirange'
+            },
+            int4multirange: {
+              name: 'int4multirange'
+            },
+            int8multirange: {
+              name: 'int8multirange'
+            }
+          }
+        )
+      end
+
       def load_multirange_types
-        initializer = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TypeMapInitializer.new(type_map)
-        query = <<-QUERY
-            SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
-            FROM pg_type as t
-            JOIN pg_range as r ON oid = "rngmultitypid";
+        initializer =
+          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::TypeMapInitializer
+            .new(type_map)
+        
+        # Query for multirange types and their corresponding base types (not range types)
+        # We need to get the range's subtype (e.g., date) not the range type itself
+        query = <<-QUERY.squish
+          SELECT m.oid, m.typname, m.typelem, m.typdelim, m.typinput, 
+                 pr.rngsubtype, m.typtype, m.typbasetype
+          FROM pg_type m 
+          JOIN pg_type r ON REPLACE(m.typname, 'multirange', 'range') = r.typname
+          JOIN pg_range pr ON r.oid = pr.rngtypid
+          WHERE m.typtype = 'm';
         QUERY
 
-        execute_and_clear(query, "SCHEMA", []) do |records|
-          initializer.register_multirange_type(records)
+        # Use exec_query for all Rails versions since execute_and_clear is private
+        result = exec_query(query, 'SCHEMA', [])
+        # Convert rows to hash format with column names as keys
+        records = result.rows.map do |row|
+          result.columns.zip(row).to_h
         end
+        initializer.register_multirange_type(records)
       end
     end
   end

data/lib/activerecord-multirange/oid/multi_range.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_model"
+
 module Activerecord
   module Multirange
     module OID # :nodoc:
@@ -11,6 +13,8 @@ module Activerecord
         def initialize(subtype, type = :multirange)
           @subtype = subtype
           @type = type
+
+          super()
         end
 
         def deserialize(value)
@@ -74,6 +78,8 @@ module Activerecord
         # * https://www.postgresql.org/docs/current/rangetypes.html#RANGETYPES-IO
         # * https://www.postgresql.org/docs/current/rowtypes.html#ROWTYPES-IO-SYNTAX
         def unquote(value)
+          return value if value.nil?
+          
           if value.start_with?('"') && value.end_with?('"')
             unquoted_value = value[1..-2]
             unquoted_value.gsub!('""', '"')
@@ -85,15 +91,21 @@ module Activerecord
         end
 
         def parse_lower(value)
-          return infinity_value(value, negative: true) if ["", "-infinity"].include?(value)
+          return infinity_value(value, negative: true) if value.nil? || ["", "-infinity"].include?(value)
 
-          @subtype.deserialize(unquote(value))
+          unquoted = unquote(value)
+          return nil if unquoted.nil?
+          
+          @subtype.deserialize(unquoted)
         end
 
         def parse_upper(value)
-          return infinity_value(value) if ["", "infinity"].include?(value)
+          return infinity_value(value) if value.nil? || ["", "infinity"].include?(value)
 
-          @subtype.deserialize(unquote(value))
+          unquoted = unquote(value)
+          return nil if unquoted.nil?
+          
+          @subtype.deserialize(unquoted)
         end
 
         def extract_range_data(value)
@@ -113,7 +125,8 @@ module Activerecord
 
           if !infinity?(extracted[:from]) && extracted[:exclude_start]
             raise ArgumentError,
-                  "The Ruby Range object does not support excluding the beginning of a Range. (unsupported value: '#{value}')"
+                  "The Ruby Range object does not support excluding the beginning of a Range.
+                  (unsupported value: '#{value}')"
           end
 
           ::Range.new(extracted[:from], extracted[:to], extracted[:exclude_end])

data/lib/activerecord-multirange/schema_statements.rb

@@ -2,17 +2,17 @@
 
 module Activerecord
   module Multirange
-      module SchemaStatements
-        def native_database_types
-          super.merge({
-                        tsmultirange: { name: "tsmultirange" },
-                        datemultirange: { name: "datemultirange" },
-                        tstzmultirange: { name: "tstzmultirange" },
-                        nummultirange: { name: "nummultirange" },
-                        int8multirange: { name: "int8multirange" },
-                        int4multirange: { name: "int4multirange" }
-                      })
-        end
+    module SchemaStatements
+      def native_database_types
+        super.merge({
+                      tsmultirange: { name: "tsmultirange" },
+                      datemultirange: { name: "datemultirange" },
+                      tstzmultirange: { name: "tstzmultirange" },
+                      nummultirange: { name: "nummultirange" },
+                      int8multirange: { name: "int8multirange" },
+                      int4multirange: { name: "int4multirange" }
+                    })
       end
     end
+  end
 end

data/lib/activerecord-multirange/type_map.rb

@@ -1,15 +1,27 @@
 # frozen_string_literal: true
 
-require "activerecord-multirange/oid/multi_range"
+require 'activerecord-multirange/oid/multi_range'
 
 module Activerecord
   module Multirange
     module TypeMap
       def register_multirange_type(records)
         records.each do |row|
-          register_with_subtype(row["oid"], row["rngsubtype"].to_i) do |subtype|
-            Activerecord::Multirange::OID::MultiRange.new(subtype, row["typname"].to_sym)
-          end
+          multirange_oid = row['oid']
+          range_oid = row['rngsubtype'] 
+          type_name = row['typname']
+          
+          # Get the range subtype from the type map
+          range_type = @store.lookup(range_oid)
+          next unless range_type
+          
+          # Create and register the multirange type
+          multirange_type = Activerecord::Multirange::OID::MultiRange.new(
+            range_type,
+            type_name.to_sym
+          )
+          
+          register(multirange_oid, multirange_type)
         end
       end
     end

data/lib/activerecord-multirange/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Multirange
-    VERSION = "0.1.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/activerecord-multirange.rb

@@ -1,24 +1,30 @@
 # frozen_string_literal: true
 
-require "activerecord-multirange/version"
-require "activerecord-multirange/adapter"
-require "activerecord-multirange/quoting"
-require "activerecord-multirange/schema_statements"
-require "activerecord-multirange/table_definition"
-require "activerecord-multirange/type_map"
-require "active_record"
+require 'activerecord-multirange/version'
+require 'activerecord-multirange/adapter'
+require 'activerecord-multirange/quoting'
+require 'activerecord-multirange/schema_statements'
+require 'activerecord-multirange/table_definition'
+require 'activerecord-multirange/type_map'
+require 'active_record'
 
 module Activerecord
   module Multirange
-    class Error < StandardError; end
+    class Error < StandardError
+    end
 
     def self.add_multirange_column_type
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Adapter)
-        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::TypeMapInitializer.prepend(TypeMap)
+        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::TypeMapInitializer
+          .prepend(TypeMap)
         ActiveRecord::ConnectionAdapters::PostgreSQL::Quoting.prepend(Quoting)
-        ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.prepend(SchemaStatements)
-        ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.prepend(TableDefinition)
+        ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.prepend(
+          SchemaStatements
+        )
+        ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.prepend(
+          TableDefinition
+        )
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multirange
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gustavo Warmling Teixeira
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -38,6 +37,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Add PostgreSQL multiranges support
 email:
 - gustavowt@gmail.com
@@ -53,6 +122,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config.ru
 - lib/activerecord-multirange.rb
 - lib/activerecord-multirange/adapter.rb
 - lib/activerecord-multirange/oid/multi_range.rb
@@ -68,7 +138,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/gustavowt/activerecord-multirange
   source_code_uri: https://github.com/gustavowt/activerecord-multirange
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.6
 specification_version: 4
 summary: PostgreSQL multiranges support
 test_files: []