attr_json-associations 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e61f07de1ec25bef3ea2eace45308e04e8d69a020f47cb2fa109f6e644ea0152
-  data.tar.gz: 843e0103208a27818b7a5c66787a7957b92384744b914ab8dcfbc7adf83afa09
+  metadata.gz: 364001e04ab5257a1a38332493abf5e8f96bbe9dc6166efdc74634ff829ba4ef
+  data.tar.gz: c71e6c55e9a895405e11a780bfa9697ecccdee983670354f0230c1091039189a
 SHA512:
-  metadata.gz: a1282efc741996be66fc28616ec6da92035302238eee2dd4e6098d2355a4abaca47041aaa8471089d7b01646cacbe0bdea257bd2c8058e5cb7461c19e4619290
-  data.tar.gz: aa54d05cc2e46b52126e5d196738049d0879ed0b19e9b05264b25aa386ccee42e3a3b261c877e5ce8e7cf29de47f19065c482280cf4210ebd9043461420fd225
+  metadata.gz: 3219055ded80bb5305ca782362bf28e9a3a1173fe620649b52b0d6644162fcca69692505e4a7fc93852765cf163fb5f1193d051f15fd58c8aa14b4a8658c12b1
+  data.tar.gz: 73723a32e72aa366d24d5a4fa6b294180449c5f564c65620f612194c172305482298cafa4148ecabff85260192cda1fb19092b70adb0a91c519546f93e52bb5a

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:15
@@ -17,37 +17,74 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, 3.3]
-        gemfile: ['rails60', 'rails61', 'rails70', 'rails71']
-        attr_json: [1.3, 1.4, 1.5, '2.0', 2.1, 2.2]
+        ruby: ['3.0', 3.1, 3.2, 3.3, 3.4, '4.0']
+        gemfile: ['rails70', 'rails71', 'rails72', 'rails80', 'rails81']
+        attr_json: ['2.0', 2.1, 2.2, 2.3, 2.4, 2.5, 2.6]
         exclude:
-          - attr_json: 1.3
-            gemfile: rails70
-          - attr_json: 1.3
-            gemfile: rails71
-          - attr_json: 1.4
-            gemfile: rails71
-          - attr_json: 1.5
+          - ruby: 3.0
+            gemfile: rails72
+          - ruby: 3.0
+            gemfile: rails80
+          - ruby: 3.0
+            gemfile: rails81
+          - ruby: 3.1
+            gemfile: rails80
+          - ruby: 3.1
+            gemfile: rails81
+          - attr_json: 2.0
             gemfile: rails71
           - attr_json: 2.0
+            gemfile: rails72
+          - attr_json: 2.0
+            gemfile: rails80
+          - attr_json: 2.0
+            gemfile: rails81
+          - attr_json: 2.1
             gemfile: rails71
           - attr_json: 2.1
+            gemfile: rails72
+          - attr_json: 2.1
+            gemfile: rails80
+          - attr_json: 2.1
+            gemfile: rails81
+          - attr_json: 2.2
             gemfile: rails71
+          - attr_json: 2.2
+            gemfile: rails72
+          - attr_json: 2.2
+            gemfile: rails80
+          - attr_json: 2.2
+            gemfile: rails81
+          - attr_json: 2.3
+            gemfile: rails72
+          - attr_json: 2.3
+            gemfile: rails80
+          - attr_json: 2.3
+            gemfile: rails81
+          - attr_json: 2.4
+            gemfile: rails80
+          - attr_json: 2.4
+            gemfile: rails81
+          - attr_json: 2.5
+            gemfile: rails81
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}, attr_json ${{ matrix.attr_json }}
 
     env:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      ATTR_JSON_VERSION: ${{ matrix.attr_json }}
+      ATTR_JSON_VERSION: ${{ matrix.attr_json }}.0
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+    - name: Bundle list
+      run: |
+        bundle list
     - name: Prepare test
       run: |
         cd spec/dummy

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.2.1
+
+* Prepend module to overwrite association methods.
+
+## 0.2.0
+
+* Clear cache if FK value is changed for belongs_to association.
+* Drop support for ruby <= 2.7, rails <= 6.1, attr_json <= 1.5.
+
 ## 0.1.2
 
 * Add `frozen_string_literal: true`.

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rails", ">= 7.0"
+gem "pg"
+gem "attr_json", ">= 2.0"

data/README.md

@@ -4,10 +4,10 @@ A simple association extension for [attr_json](https://github.com/jrochkind/attr
 
 ## Dependencies
 
-* ruby 2.7+
-* attr_json 1.3
-* activerecord 6.0+
-* activesupport 6.0+
+* ruby 3.0+
+* attr_json 2.0+
+* activerecord 7.0+
+* activesupport 7.0+
 
 ## Installation
 

data/attr_json-associations.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "attr_json", ">= 1.3"
-  spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "activesupport", ">= 6.0"
+  spec.required_ruby_version = ">= 3.0"
+
+  spec.add_dependency "attr_json", ">= 2.0"
+  spec.add_dependency "activerecord", ">= 7.0"
+  spec.add_dependency "activesupport", ">= 7.0"
 
-  spec.add_development_dependency "rails", ">= 6.0"
-  spec.add_development_dependency "pg"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "logger"
 end

data/gemfiles/rails70.gemfile

@@ -1,6 +1,20 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 7.0.1"
+gem "pg"
 gem "attr_json", "~> #{ENV['ATTR_JSON_VERSION']}"
 
+gem "concurrent-ruby", "<= 1.3.4"
+
+if RUBY_VERSION >= "3.4"
+  gem "base64"
+  gem "bigdecimal"
+  gem "drb"
+  gem "mutex_m"
+end
+
+if RUBY_VERSION >= "4.0"
+  gem "tsort"
+end
+
 gemspec path: "../"

data/gemfiles/rails71.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 7.1.0"
+gem "pg"
 gem "attr_json", "~> #{ENV['ATTR_JSON_VERSION']}"
 
 gemspec path: "../"

data/gemfiles/{rails61.gemfile → rails72.gemfile}

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 7.2.0"
+gem "pg"
 gem "attr_json", "~> #{ENV['ATTR_JSON_VERSION']}"
 
 gemspec path: "../"

data/gemfiles/{rails60.gemfile → rails80.gemfile}

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 8.0.0"
+gem "pg"
 gem "attr_json", "~> #{ENV['ATTR_JSON_VERSION']}"
-gem "psych", "~> 3.3.0"
 
 gemspec path: "../"

data/gemfiles/rails81.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 8.1.0"
+gem "pg"
+gem "attr_json", "~> #{ENV['ATTR_JSON_VERSION']}"
+
+gem "json", "< 3.0"
+
+gemspec path: "../"

data/lib/attr_json/associations/definer.rb

@@ -17,13 +17,35 @@ module AttrJson::Associations
 
     def call
       @klass.attr_json_associations = @klass.attr_json_associations.merge(@assoc.name => @assoc)
-      @klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      generated_association_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{@assoc.name}
           assoc = self.class.attr_json_associations[:#{@assoc.name}]
           @attr_json_associations_cache[:#{@assoc.name}] ||=
             AttrJson::Associations::Loader::#{@type.to_s.classify}.new(assoc, self).call
         end
       RUBY
+
+      if @assoc.is_a?(AttrJson::Associations::Association::BelongsTo)
+        generated_association_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{@assoc.foreign_key}=(val)
+            super.tap do
+              @attr_json_associations_cache[:#{@assoc.name}] = nil
+            end
+          end
+        RUBY
+      end
+    end
+
+    private
+
+    def generated_association_methods
+      if @klass.const_defined?(:AttrJsonAssociationsMethods, false)
+        @klass.const_get(:AttrJsonAssociationsMethods, false)
+      else
+        @klass.const_set(:AttrJsonAssociationsMethods, Module.new).tap do |mod|
+          @klass.prepend mod
+        end
+      end
     end
   end
 end

data/lib/attr_json/associations/version.rb

@@ -2,6 +2,6 @@
 
 module AttrJson
   module Associations
-    VERSION = '0.1.2'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: attr_json-associations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_json
@@ -16,58 +15,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,10 +109,11 @@ files:
 - README.md
 - Rakefile
 - attr_json-associations.gemspec
-- gemfiles/rails60.gemfile
-- gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
 - gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
+- gemfiles/rails81.gemfile
 - lib/attr_json-associations.rb
 - lib/attr_json/associations.rb
 - lib/attr_json/associations/association/base.rb
@@ -148,7 +134,6 @@ files:
 homepage: https://github.com/kanety/attr_json-associations
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,15 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: An association extension for attr_json
 test_files: []