jsonb_accessor 1.3.10 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5593f84fe3d0e2038beeac5377fef22f4d1b1b18daf78b3f65dc4c55362592e0
-  data.tar.gz: 3421f8ce790d9ca3db6f93007ce3a0ca327a749073f6f8df36f7fb922f5485af
+  metadata.gz: ddb7db7a9ab5930ae31cac0fa871289638b0c5a3ba2f3486b4731a39e5d8f3aa
+  data.tar.gz: 8c279fcfd16e6c5d490f31a45b0734f06fe70ee500c2a72cae1204d4d6a93e29
 SHA512:
-  metadata.gz: a1433289f8c96cd0105f9b49922a4771c99a886f593b79225c835850d6875fad420fd91c60f6c05844464ae757ff597ec1a287245c75bf1afb823fff457eb33a
-  data.tar.gz: 9b3af34ed491b630e2e0f5859e263cbd157a2d7c6d29713d8536a7e389a21dc356a70e2b70ec3b207cb42c26814736e1fe984e3201acd34e58b08813d5a1a2fd
+  metadata.gz: 8a9b59f77d798b4e4134ccf5305a107bd220c89f1a377b7c6899273ba62c0c75ad697cb527c60f9a7a6e81dff52087c286cd8518859f00da4a2e8c37e3094531
+  data.tar.gz: 733ee774842a1f4c2b734913fd1af2c02b43a892b27a955e64f44c46ca6bff93466436fd5e9d651e0ad081a09dc7d2a704302e6f5039b4db49e00d38544030f6

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/ci.yml

@@ -4,149 +4,67 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: ['**']
+    branches: [master]
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
-    
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+    - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf # v1.284.0
       with:
+        ruby-version: "3.4"
         bundler-cache: true
-        
-    - name: Rubocop
-      run: bundle exec rubocop
+
+    - run: bundle exec rubocop
 
   tests:
     needs: lint
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:         ["ruby-3.2", "ruby-3.3", "ruby-3.4", "ruby-4.0", "jruby-9.4", "jruby-10.0"]
+        activerecord: ["6.1", "7.0", "7.1", "7.2", "8.0", "8.1"]
+        postgresql:   ["13", "14", "15", "16", "17", "18"]
+        exclude:
+          # fails due to "ArgumentError: when initializing an Active Record adapter with a config hash, that should be the only argument" in db:schema:load
+          - ruby: "jruby-9.4"
+            activerecord: "7.2"
+          - ruby: "jruby-9.4"
+            activerecord: "8.0"
+          # fails due to "Because activerecord >= 8.0.0.beta1 depends on Ruby >= 3.2.0 and Gemfile depends on activerecord ~> 8.1, Ruby >= 3.2.0 is required. So, because current Ruby version is = 3.1.7, version solving has failed."
+          - ruby: "jruby-9.4"
+            activerecord: "8.1"
+          # https://github.com/jruby/activerecord-jdbc-adapter/issues/1173
+          - ruby: "jruby-10.0"
+            activerecord: "8.0"
+          # https://github.com/jruby/activerecord-jdbc-adapter/issues/1184
+          - ruby: "jruby-10.0"
+            activerecord: "8.1"
+    name: "Active Record ${{ matrix.activerecord }} with PostgreSQL ${{ matrix.postgresql }} on ${{ matrix.ruby }}"
     services:
       db:
-        image: postgres:9.4
+        image: postgres:${{ matrix.postgresql }}
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: jsonb_accessor
         ports: ['5432:5432']
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - gemfile: activerecord_5.0.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.1.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.2.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_5.1.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_5.2.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_6.0.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_5.1.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_5.2.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_6.0.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_5.1.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_5.2.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_6.0.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_7.0.1
-            ruby: '2.7'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '3.0'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '3.1'
-
-          - gemfile: activerecord_6.1.0
-            ruby: '3.2'
-
-          - gemfile: activerecord_7.0.1
-            ruby: '3.0'
-
-          - gemfile: activerecord_7.0.1
-            ruby: '3.1'
-
-          - gemfile: activerecord_7.0.1
-            ruby: '3.2'
-
-          - gemfile: activerecord_5.1.0
-            ruby: 'jruby-9.3'
-
-          - gemfile: activerecord_5.2.0
-            ruby: 'jruby-9.3'
-
-          - gemfile: activerecord_6.0.0
-            ruby: 'jruby-9.3'
-
-          - gemfile: activerecord_6.1.0
-            ruby: 'jruby-9.3'
-
-          # waiting for https://github.com/jruby/activerecord-jdbc-adapter/issues/1125 to be addressed
-          # - gemfile: activerecord_7.0.1
-          #   ruby: 'jruby-9.4'
+    - run: echo "gem 'activerecord', '~> ${{ matrix.activerecord }}.0'" > Gemfile.local
 
-    name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
+    - if:  matrix.activerecord == '6.1' # see https://github.com/rails/rails/pull/54264#issuecomment-2596149819 and https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-0-released/#standard-library-updates and https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/#stdlib-updates
+      run: printf "gem 'concurrent-ruby', '< 1.3.5'\ngem 'mutex_m'\ngem 'base64'\ngem 'bigdecimal'\ngem 'logger'\n" >> Gemfile.local
 
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+    - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf # v1.284.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
 
-    - name: Bundle install
-      run: |
-        bundle config set gemfile "${GITHUB_WORKSPACE}/gemfiles/${{ matrix.gemfile }}.gemfile"
-        bundle install --jobs 4 --retry 3
-
-    - name: Setup DB
-      run: |
-        bundle exec rake db:schema:load
+    - run: bundle exec rake db:schema:load
 
-    - name: Run tests
-      run: |
-        bundle exec rake spec
+    - run: bundle exec rake spec

data/.github/workflows/push_gem.yml

@@ -0,0 +1,43 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'madeintandem/jsonb_accessor'
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: write
+      id-token: write
+
+    strategy:
+      matrix:
+        ruby: ["ruby-3.4", "jruby-9.4"]
+
+    steps:
+      - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - if: matrix.ruby == 'jruby-9.4' # cribbed from https://github.com/ruby/psych/blob/v5.2.4/.github/workflows/push_gem.yml
+        run: |
+          sudo apt install default-jdk maven
+          gem update --system
+          gem install ruby-maven rake-compiler --no-document
+          rake compile
+
+      - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf # v1.284.0
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+
+      - uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7.2
+  TargetRubyVersion: 3.2.8
   SuggestExtensions: false
   Exclude:
     - "db/**/*"

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.4.3

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 ## [Unreleased]
 
+## [1.4.1] - 2026-01-22
+### Added
+- Support for `prefix` and `suffix` options to customize attribute accessor names while preserving original keys in the JSONB column. [#173](https://github.com/madeintandem/jsonb_accessor/issues/173)
+
+## [1.4] - 2023-10-15
+### Breaking change
+- `jsonb_accessor` dropped support for Ruby 2 and Rails versions lower than 6.1. Support for ActiveRecord::Enum was also
+dropped because ActiveRecord 7.1 now requires each enum field to be backed by a database column. Enums will still work
+when using AR versions lower than 7.1. This is a limitation of Rails, not of this gem.
+
+### Fixed
+
+- Bug fix: An array of datetimes previously caused an error. https://github.com/madeintandem/jsonb_accessor/pull/169. Thanks @bekicot.
+- Rails 7.1 is officially supported and tested against.
+
 ## [1.3.10] - 2023-05-30
 ### No changes
 A new release was necessary to fix the corrupted 1.3.9 Java release on RubyGems.

data/Gemfile

@@ -4,3 +4,6 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in jsonb_accessor.gemspec
 gemspec
+
+local_gemfile = File.expand_path("Gemfile.local", __dir__)
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

data/README.md

@@ -8,6 +8,10 @@ Adds typed `jsonb` backed fields as first class citizens to your `ActiveRecord`
 
 It also adds generic scopes for querying `jsonb` columns.
 
+## ⚠️ Status
+
+This gem is in maintenance mode and no active development of new features is planned. The major focus is to keep it working with new Ruby/Rails versions and fix any bugs reported. Any PRs for feature requests or enhancements will be reviewed and merged -- so contributions are encouraged!
+
 ## Table of Contents
 
 - [Installation](#installation)
@@ -87,6 +91,58 @@ product.title #=> "Foo"
 product.data #=> { "t" => "Foo" }
 ```
 
+You can also pass in a `prefix` or `suffix` option.
+
+```ruby
+class Product < ActiveRecord::Base
+  jsonb_accessor :data,
+    title: [:string, prefix: :data],
+    external_id: [:integer, suffix: :attr]
+end
+```
+
+This allows you to use `data_title` and `external_id_attr` for your getters and setters, but use `title` and `external_id` as the key in the `jsonb`.
+Also, you can pass `true` as a value for `prefix` or `suffix` to use the json_accessor name.
+
+```ruby
+product = Product.new(data_title: "Foo", external_id_attr: 12314122)
+product.data_title #=> "Foo"
+product.external_id_attr #=> 12314122
+product.data #=> { "title" => "Foo", "external_id" => 12314122 }
+```
+
+### Global Options
+
+You can apply options to all fields by passing an options hash as the second parameter:
+
+```ruby
+class Product < ActiveRecord::Base
+  jsonb_accessor :data, { prefix: true },
+    title: :string,
+    external_id: :integer,
+    price: :decimal
+end
+```
+
+This applies the `prefix` to all fields. You can still override it for individual fields:
+
+```ruby
+class Product < ActiveRecord::Base
+  jsonb_accessor :data, { prefix: :product },
+    title: :string,
+    external_id: [:integer, prefix: :custom],
+    price: :decimal
+end
+
+product = Product.new(product_title: "Widget", custom_external_id: 123, product_price: 19.99)
+product.product_title #=> "Widget"
+product.custom_external_id #=> 123
+product.product_price #=> 19.99
+product.data #=> { "title" => "Widget", "external_id" => 123, "price" => 19.99 }
+```
+
+Global options currently support `:prefix` and `:suffix`.
+
 ## Scopes
 
 Jsonb Accessor provides several scopes to make it easier to query `jsonb` columns. `jsonb_contains`, `jsonb_number_where`, `jsonb_time_where`, and `jsonb_where` are available on all `ActiveRecord::Base` subclasses and don't require that you make use of the `jsonb_accessor` declaration.
@@ -318,33 +374,22 @@ Because this gem promotes attributes nested into the JSON column to first level
 
 ## Dependencies
 
-- ActiveRecord >= 5.0
-- Postgres >= 9.4 (in order to use the [jsonb column type](http://www.postgresql.org/docs/9.4/static/datatype-json.html)).
+We actively test the following in CI, older versions may work but are **not** supported:
 
-## Upgrading
+- Ruby >= 3.2 or JRuby >= 9.4
+- Rails >= 6.1
+- PostgreSQL >= 13
 
-See the [upgrade guide](UPGRADE_GUIDE.md).
+JRuby isn't fully supported due to errors, see the CI matrix -- contributions to improve support are welcome!
 
 ## Development
 
-### On your local machine
-
 After checking out the repo, run `bin/setup` to install dependencies (make sure postgres is running first).
 
 Run `bin/console` for an interactive prompt that will allow you to experiment.
 
 `rake` will run Rubocop and the specs.
 
-### With Docker
-
-```
-# setup
-docker-compose build
-docker-compose run ruby rake db:migrate
-# run test suite
-docker-compose run ruby rake spec
-```
-
 ## Contributing
 
 1. [Fork it](https://github.com/madeintandem/jsonb_accessor/fork)

data/bin/console

@@ -7,7 +7,7 @@ require "rspec"
 require File.expand_path("../spec/spec_helper.rb", __dir__)
 
 dbconfig = YAML.safe_load(ERB.new(File.read(File.join("db", "config.yml"))).result, aliases: true)
-ActiveRecord::Base.establish_connection(dbconfig["development"])
+ActiveRecord::Base.establish_connection(dbconfig["test"])
 
 # rubocop:disable Lint/UselessAssignment
 x = Product.new

data/db/config.yml

@@ -2,7 +2,7 @@ default: &default
   adapter: postgresql
   database: jsonb_accessor
   host: <%= ENV.fetch("DATABASE_HOST") { "127.0.0.1" } %>
-  user: postgres
+  username: <%= ENV.fetch("DATABASE_USER") { "postgres" } %>
 
 test:
   <<: *default

data/db/schema.rb

@@ -1,18 +1,16 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_150_407_031_737) do
+ActiveRecord::Schema.define(version: 2015_04_07_031737) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -30,7 +28,8 @@ ActiveRecord::Schema.define(version: 20_150_407_031_737) do
     t.float "float_type"
     t.time "time_type"
     t.date "date_type"
-    t.datetime "datetime_type"
+    t.datetime "datetime_type", precision: nil
     t.decimal "decimal_type"
   end
+
 end

data/jsonb_accessor.gemspec

@@ -15,31 +15,32 @@ Gem::Specification.new do |spec|
 
   spec.summary               = "Adds typed jsonb backed fields to your ActiveRecord models."
   spec.description           = "Adds typed jsonb backed fields to your ActiveRecord models."
-  spec.homepage              = "https://github.com/devmynd/jsonb_accessor"
+  spec.homepage              = "https://github.com/madeintandem/jsonb_accessor"
   spec.license               = "MIT"
-  spec.required_ruby_version = ">= 2"
+  spec.required_ruby_version = ">= 3"
 
   spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(/png\z/) }
   spec.bindir                = "exe"
   spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths         = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0"
-  spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
   if is_java
     spec.add_dependency "activerecord-jdbcpostgresql-adapter", ">= 50.0"
   else
     spec.add_dependency "pg", ">= 0.18.1"
   end
 
-  spec.add_development_dependency "appraisal", "~> 2.2.0"
   spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "database_cleaner", "~> 1.6.0"
+  spec.add_development_dependency "benchmark" # for Ruby 4.0
+  spec.add_development_dependency "database_cleaner-active_record", ">= 2.1"
+  spec.add_development_dependency "ostruct"   # for Ruby 4.0
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "psych", "~> 3"
+  spec.add_development_dependency "psych", ">= 3"
   spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.6.0"
-  spec.add_development_dependency "rubocop", "~> 1"
+  spec.add_development_dependency "rspec", ">= 3.6.0"
+  spec.add_development_dependency "rubocop", ">= 1.0"
 end

data/lib/jsonb_accessor/helpers.rb

@@ -24,14 +24,46 @@ module JsonbAccessor
       return value if value.blank?
 
       if attribute_type == :datetime
-        value = if active_record_default_timezone == :utc
-                  Time.find_zone("UTC").parse(value).in_time_zone
+        value = if value.is_a?(Array)
+                  value.map { |v| parse_date(v) }
                 else
-                  Time.zone.parse(value)
+                  parse_date(value)
                 end
       end
 
       value
     end
+
+    # Parse datetime based on the configured default_timezone
+    def parse_date(datetime)
+      if active_record_default_timezone == :utc
+        Time.find_zone("UTC").parse(datetime).in_time_zone
+      else
+        Time.zone.parse(datetime)
+      end
+    end
+
+    def define_attribute_name(json_attribute, name, prefix, suffix)
+      accessor_prefix =
+        case prefix
+        when String, Symbol
+          "#{prefix}_"
+        when TrueClass
+          "#{json_attribute}_"
+        else
+          ""
+        end
+      accessor_suffix =
+        case suffix
+        when String, Symbol
+          "_#{suffix}"
+        when TrueClass
+          "_#{json_attribute}"
+        else
+          ""
+        end
+
+      "#{accessor_prefix}#{name}#{accessor_suffix}"
+    end
   end
 end

data/lib/jsonb_accessor/macro.rb

@@ -3,22 +3,30 @@
 module JsonbAccessor
   module Macro
     module ClassMethods
-      def jsonb_accessor(jsonb_attribute, field_types)
-        names_and_store_keys = field_types.each_with_object({}) do |(name, type), mapping|
-          _type, options = Array(type)
-          mapping[name.to_s] = (options.try(:delete, :store_key) || name).to_s
-        end
-
-        # Defines virtual attributes for each jsonb field.
-        field_types.each do |name, type|
-          next attribute name, type unless type.is_a?(Array)
-          next attribute name, *type unless type.last.is_a?(Hash)
-
-          *args, keyword_args = type
-          attribute name, *args, **keyword_args
+      def jsonb_accessor(jsonb_attribute, global_options = {}, **definitions)
+        names_and_store_keys = {}
+        names_and_defaults = {}
+        names_and_attribute_names = {}
+
+        definitions.each do |name, value|
+          args = Array(value)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+
+          # Determine store keys and default values for each field
+          names_and_store_keys[name.to_s] = (options.delete(:store_key) || name).to_s
+          names_and_defaults[name.to_s] = options.delete(:default) unless options[:default].nil?
+
+          prefix = options.delete(:prefix) || global_options[:prefix]
+          suffix = options.delete(:suffix) || global_options[:suffix]
+          attribute_name = JsonbAccessor::Helpers.define_attribute_name(jsonb_attribute, name, prefix, suffix)
+
+          # Define virtual attributes for each field
+          names_and_attribute_names[name.to_s] = attribute_name
+          attribute attribute_name, *args, **options
         end
 
         store_key_mapping_method_name = "jsonb_store_key_mapping_for_#{jsonb_attribute}"
+        attribute_name_mapping_method_name = "jsonb_attribute_name_mapping_for_#{jsonb_attribute}"
         # Defines methods on the model class
         class_methods = Module.new do
           # Allows us to get a mapping of field names to store keys scoped to the column
@@ -26,17 +34,16 @@ module JsonbAccessor
             superclass_mapping = superclass.try(store_key_mapping_method_name) || {}
             superclass_mapping.merge(names_and_store_keys)
           end
+
+          # Allows us to get a mapping of field names to attribute names scoped to the column
+          define_method(attribute_name_mapping_method_name) do
+            superclass_mapping = superclass.try(attribute_name_mapping_method_name) || {}
+            superclass_mapping.merge(names_and_attribute_names)
+          end
         end
         # We extend with class methods here so we can use the results of methods it defines to define more useful methods later
         extend class_methods
 
-        # Get field names to default values mapping
-        names_and_defaults = field_types.each_with_object({}) do |(name, type), mapping|
-          _type, options = Array(type)
-          field_default = options.try(:delete, :default)
-          mapping[name.to_s] = field_default unless field_default.nil?
-        end
-
         # Get store keys to default values mapping
         store_keys_and_defaults = JsonbAccessor::Helpers.convert_keys_to_store_keys(names_and_defaults, public_send(store_key_mapping_method_name))
 
@@ -63,11 +70,13 @@ module JsonbAccessor
         setters = Module.new do
           # Overrides the setter created by `attribute` above to make sure the jsonb attribute is kept in sync.
           names_and_store_keys.each do |name, store_key|
-            define_method("#{name}=") do |value|
+            attribute_name = names_and_attribute_names[name]
+
+            define_method("#{attribute_name}=") do |value|
               super(value)
 
               # If enum was defined, take the value from the enum and not what comes out directly from the getter
-              attribute_value = defined_enums[name].present? ? defined_enums[name][value] : public_send(name)
+              attribute_value = defined_enums[attribute_name].present? ? defined_enums[attribute_name][value] : public_send(attribute_name)
 
               # Rails always saves time based on `default_timezone`. Since #as_json considers timezone, manual conversion is needed
               if attribute_value.acts_like?(:time)
@@ -83,6 +92,7 @@ module JsonbAccessor
           define_method("#{jsonb_attribute}=") do |value|
             value ||= {}
             names_to_store_keys = self.class.public_send(store_key_mapping_method_name)
+            names_to_attribute_names = self.class.public_send(attribute_name_mapping_method_name)
 
             # this is the raw hash we want to save in the jsonb_attribute
             value_with_store_keys = JsonbAccessor::Helpers.convert_keys_to_store_keys(value, names_to_store_keys)
@@ -96,7 +106,8 @@ module JsonbAccessor
               # Only proceed if this attribute has been defined using `jsonb_accessor`.
               next unless names_to_store_keys.key?(name)
 
-              write_attribute(name, attribute_value)
+              attribute_name = names_to_attribute_names[name]
+              write_attribute(attribute_name, attribute_value)
             end
           end
         end
@@ -109,13 +120,15 @@ module JsonbAccessor
           jsonb_values = public_send(jsonb_attribute) || {}
           jsonb_values.each do |store_key, value|
             name = names_and_store_keys.key(store_key)
-            next unless name
+            attribute_name = names_and_attribute_names[name]
+
+            next unless attribute_name
 
             write_attribute(
-              name,
-              JsonbAccessor::Helpers.deserialize_value(value, self.class.type_for_attribute(name).type)
+              attribute_name,
+              JsonbAccessor::Helpers.deserialize_value(value, self.class.type_for_attribute(attribute_name).type)
             )
-            clear_attribute_change(name) if persisted?
+            clear_attribute_change(attribute_name) if persisted?
           end
         end
 

data/lib/jsonb_accessor/version.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.3.10"
+  VERSION = "1.4.1"
+
+  def self.enum_support?
+    # From AR 7.1 on, enums require a database column.
+    Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("7.1")
+  end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Crismali
 - Joe Hirn
 - Jason Haruska
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -55,21 +54,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,19 +82,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  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
@@ -142,14 +155,14 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -170,30 +183,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 description: Adds typed jsonb backed fields to your ActiveRecord models.
 email:
 - michael@crismali.com
@@ -203,15 +216,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Dockerfile
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -223,13 +236,6 @@ files:
 - db/config.yml
 - db/migrate/20150407031737_set_up_testing_db.rb
 - db/schema.rb
-- docker-compose.yml
-- gemfiles/activerecord_5.0.0.gemfile
-- gemfiles/activerecord_5.1.0.gemfile
-- gemfiles/activerecord_5.2.0.gemfile
-- gemfiles/activerecord_6.0.0.gemfile
-- gemfiles/activerecord_6.1.0.gemfile
-- gemfiles/activerecord_7.0.1.gemfile
 - jsonb_accessor.gemspec
 - lib/jsonb_accessor.rb
 - lib/jsonb_accessor/attribute_query_methods.rb
@@ -238,11 +244,10 @@ files:
 - lib/jsonb_accessor/query_builder.rb
 - lib/jsonb_accessor/query_helper.rb
 - lib/jsonb_accessor/version.rb
-homepage: https://github.com/devmynd/jsonb_accessor
+homepage: https://github.com/madeintandem/jsonb_accessor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -250,15 +255,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Adds typed jsonb backed fields to your ActiveRecord models.
 test_files: []

data/Appraisals

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-appraise "activerecord-5.0.0" do
-  gem "activerecord", "~> 5.0.0"
-end
-
-appraise "activerecord-5.1.0" do
-  gem "activerecord", "~> 5.1.3"
-end
-
-appraise "activerecord-5.2.0" do
-  gem "activerecord", "~> 5.2.8"
-end
-
-appraise "activerecord-6.0.0" do
-  gem "activerecord", "~> 6.0.6"
-end
-
-appraise "activerecord-6.1.0" do
-  gem "activerecord", "~> 6.1"
-end
-
-appraise "activerecord-7.0.1" do
-  gem "activerecord", "~> 7.0.1"
-end

data/Dockerfile

@@ -1,12 +0,0 @@
-ARG RUBY_VERSION
-ARG RUBY_PLATFORM
-FROM ${RUBY_PLATFORM}:${RUBY_VERSION}
-
-RUN apt-get update && apt-get install -y --no-install-recommends git
-
-WORKDIR /usr/src/app
-
-COPY lib/jsonb_accessor/version.rb ./lib/jsonb_accessor/version.rb
-COPY jsonb_accessor.gemspec Gemfile ./
-# RUN bundle install
-COPY . ./

data/docker-compose.yml

@@ -1,30 +0,0 @@
-version: '3'
-
-services:
-  ruby:
-    environment:
-      - DATABASE_HOST=postgres
-    build:
-      args:
-        - RUBY_VERSION=${RUBY_VERSION:-3.2.2}
-        - RUBY_PLATFORM=${RUBY_PLATFORM:-ruby}
-      context: .
-    volumes:
-      - '.:/usr/src/app'
-    depends_on:
-      - postgres
-
-
-  postgres:
-    image: postgres:12
-    environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
-      - POSTGRES_DB=jsonb_accessor
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes:                                                                                    
-      - pg_data:/var/lib/postgresql/data/pgdata
-    ports:
-      - 5432:5432
-
-volumes:                                                                                        
-  pg_data:

data/gemfiles/activerecord_5.0.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/activerecord_5.1.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.3"
-
-gemspec path: "../"

data/gemfiles/activerecord_5.2.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.8"
-
-gemspec path: "../"

data/gemfiles/activerecord_6.0.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.0.6"
-
-gemspec path: "../"

data/gemfiles/activerecord_6.1.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.1"
-
-gemspec path: "../"

data/gemfiles/activerecord_7.0.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 7.0.1"
-
-gemspec path: "../"