active_record-json_associations 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6216fb9d4e62c9c8cb923d201468dcf3cf6843b287e747a068fd646e9c49a3f
-  data.tar.gz: 31f562eb9e8e9f2d029a59539977bb2e10a21555532b1dc3031a971487335f69
+  metadata.gz: c6e92de811720d3a6f9ed242d374f6f4b6e604e09977476f619355918c22b6ea
+  data.tar.gz: 31e0f02c6b52dbc6994d3d4c2ae7016287a2d2488ad1371ddac6ba65bf9598d8
 SHA512:
-  metadata.gz: c3913f45325fbd16a2983f9ec5e9d38d9f4121984d585baacb782a40ad01b54c99de287eeca8151b2aa1556153aee3157d8776c9f0515688e5122ffd7f0b61a5
-  data.tar.gz: 7a280e3431ed93c53719ced45e48dc85f39c797ffd2e39483a8bb060a3f18d63c3f1c99ff3c33a5b55e1f1c74fe0721b5786fa2b28853aefb035dbf91e3e40dc
+  metadata.gz: 1773bd6dd9c36865e772b81c6e0c7ac9ece43028cdc1c5e254047dcc5349bb0cc4a8073b30de3cd114bed20be88ab30495b6f5b2f9a241caa78f9fd8c1a67908
+  data.tar.gz: 4312ec59acc30da426d32c53dea432bcdd2064a21fea69faa826f6dd1347887668e6fc7280be9a107973ad9ac6f19745e43df382c573831b71623ed3f8889a32

data/.github/workflows/ci.yml

@@ -5,17 +5,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [ rails_6.1, rails_7.0, rails_7.1 ]
-        ruby: [ 2.6, 2.7, '3.0', 3.1, 3.2 ]
-        exclude:
-          - gemfile: rails_5.1
-            ruby: 3.0
-          - gemfile: rails_5.2
-            ruby: 3.0
-          - gemfile: rails_7.0
-            ruby: 2.6
-          - gemfile: rails_7.1
-            ruby: 2.6
+        gemfile: [ rails_7.0, rails_7.1, rails_7.2 ]
+        ruby: [ 3.1, 3.2, 3.3 ]
 
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps

data/Appraisals

@@ -1,12 +1,13 @@
-appraise "rails-6.1" do
-  gem "rails", "~>6.1.0"
-end
-
 appraise "rails-7.0" do
   gem "rails", "~>7.0.0"
+  gem "sqlite3", "~>1.0"
 end
 
 appraise "rails-7.1" do
   gem "rails", "~>7.1.0"
 end
 
+appraise "rails-7.2" do
+  gem "rails", "~>7.2.0"
+end
+

data/README.md

@@ -1,6 +1,6 @@
 # ActiveRecord::JsonAssociations
 
-[![Build Status](https://travis-ci.org/botandrose/active_record-json_associations.svg)](https://travis-ci.org/botandrose/active_record-json_associations)
+[![CI Status](https://github.com/botandrose/active_record-json_associations/actions/workflows/ci.yml/badge.svg)](https://github.com/botandrose/active_record-json_associations/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/botandrose/active_record-json_associations/badges/gpa.svg)](https://codeclimate.com/github/botandrose/active_record-json_associations)
 
 Instead of keeping the foreign keys on the children, or in a many-to-many join table, let's keep them in a JSON array on the parent.

data/gemfiles/rails_7.0.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~>7.0.0"
+gem "sqlite3", "~>1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1.gemfile → rails_7.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~>6.1.0"
+gem "rails", "~>7.2.0"
 
 gemspec path: "../"

data/lib/active_record/json_associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JsonAssociations
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

data/lib/active_record/json_associations.rb

@@ -4,10 +4,16 @@ require "json"
 module ActiveRecord
   module JsonAssociations
     FIELD_INCLUDE_SCOPE_BUILDER_PROC = proc do |context, field, id|
-      context.where("#{field}='[#{id}]'").or(
-        context.where("#{field} LIKE '[#{id},%'")).or(
-          context.where("#{field} LIKE '%,#{id},%'")).or(
-            context.where("#{field} LIKE '%,#{id}]'"))
+      using_json = context.columns_hash[field.to_s].type == :json
+
+      if using_json
+        context.where("JSON_CONTAINS(#{field}, ?, '$')", id.to_json)
+      else
+        context.where("#{field}='[#{id}]'").or(
+          context.where("#{field} LIKE '[#{id},%'")).or(
+            context.where("#{field} LIKE '%,#{id},%'")).or(
+              context.where("#{field} LIKE '%,#{id}]'"))
+      end
     end
     private_constant :FIELD_INCLUDE_SCOPE_BUILDER_PROC
 
@@ -20,11 +26,14 @@ module ActiveRecord
 
       class_name ||= one.classify
 
+      using_json = columns_hash[one_ids.to_s].type == :json
 
-      if ActiveRecord.version >= Gem::Version.new("7.1")
-        serialize one_ids, coder: JSON
-      else
-        serialize one_ids, JSON
+      if !using_json
+        if ActiveRecord.version >= Gem::Version.new("7.1")
+          serialize one_ids, coder: JSON
+        else
+          serialize one_ids, JSON
+        end
       end
 
       if touch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-json_associations
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,9 +140,9 @@ files:
 - Rakefile
 - active_record-json_associations.gemspec
 - bin/setup
-- gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/active_record/json_associations.rb
 - lib/active_record/json_associations/version.rb
 - spec/json_associations_spec.rb
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Instead of a many-to-many join table, serialize the ids into a JSON array.