jsonb_accessor 1.2.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80ed7aa0b3f529122a97b2a00b4f81011ef18014
-  data.tar.gz: 407d572cea056870ce66d7b92c89d1b3e15bdb2d
+SHA256:
+  metadata.gz: f098f30fabf2c5bbbe39acaecc6487c84516837bb8f55ff1ecfcde0bdda24e2f
+  data.tar.gz: 9dd89e98ec2937007ca3a11794ad3c0b3d48f8510a8f2836e0a1276b9ba8d5e0
 SHA512:
-  metadata.gz: be4ffe5fc2318edc84b98ffee5296d30d2a9d03817540c4622f04875d0a41c19022c19c0c998357f6730cad37103ce79c43b46c5aa08a46dce8078b77f03752d
-  data.tar.gz: c02e7189b7354d5d112aa9414e9cb4e5329d57b97b75b4d07a7e64da1abab04c63a0419509335fd557728eb48df1183d2a2d00c9c84ed7216ac4461205ec1c4d
+  metadata.gz: 2f7ca35afa36d13d4907b7e81ccf9c380c9eba36d7a18c6b6a10a1dcc6e423096fd39ab7c69ef372d9a217a01f31530b271e2f5a72ed482be1faa4dcc43806ea
+  data.tar.gz: 7389bebb7a9f7d6d4fcbde9cecc339f8505ae5cda68a6dbdd0489f10bcb1172919c9bd60d8bddee9be9a1053867ba99eefafce0be7cbf0022a151f9207fac069

data/.github/workflows/ci.yml

@@ -0,0 +1,92 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  tests:
+    services:
+      db:
+        image: postgres:9.4
+        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
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - gemfile: activerecord_5.0.0
+            ruby: 2.4.5
+
+          - gemfile: activerecord_5.1.0
+            ruby: 2.4.5
+
+          - gemfile: activerecord_5.0.0
+            ruby: 2.5.3
+
+          - gemfile: activerecord_5.1.0
+            ruby: 2.5.3
+
+          - gemfile: activerecord_6.1.0
+            ruby: 2.5.3
+
+          - gemfile: activerecord_5.0.0
+            ruby: 2.6.1
+
+          - gemfile: activerecord_5.1.0
+            ruby: 2.6.1
+
+          - gemfile: activerecord_6.1.0
+            ruby: 2.6.1
+
+          - gemfile: activerecord_5.0.0
+            ruby: 2.7.2
+
+          - gemfile: activerecord_5.1.0
+            ruby: 2.7.2
+
+          - gemfile: activerecord_6.1.0
+            ruby: 2.7.2
+
+          - gemfile: activerecord_7.0.1
+            ruby: 2.7.2
+
+          - gemfile: activerecord_6.1.0
+            ruby: 3.0.0
+
+          - gemfile: activerecord_7.0.1
+            ruby: 3.0.0
+
+          - gemfile: activerecord_7.0.1
+            ruby: 3.1.0
+
+    name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      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:create db:schema:load
+
+    - name: Run tests
+      run: |
+        bundle exec rake spec

data/.rubocop.yml

@@ -1,11 +1,16 @@
 AllCops:
-  Include:
-    - "**/Rakefile"
+  NewCops: enable
+  TargetRubyVersion: 2.7.2
+  SuggestExtensions: false
   Exclude:
-    - db/**/*
-    - gemfiles/**/*
-    - vendor/**/*
-Style/SpaceBeforeFirstArg:
+    - "db/**/*"
+    - "gemfiles/**/*"
+    - "vendor/**/*"
+Layout/SpaceBeforeFirstArg:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -17,8 +22,6 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -27,10 +30,6 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-Security/YAMLLoad:
-  Enabled: false
-Style/AlignParameters:
-  Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/ClassVars:
@@ -39,25 +38,25 @@ Style/Documentation:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
-Style/FileName:
+Naming/FileName:
   Enabled: false
 Style/GuardClause:
   Enabled: false
-Style/IndentHash:
-  Enabled: false
 Style/NilComparison:
   Enabled: false
-Style/OpMethod:
-  Enabled: false
 Style/RescueModifier:
   Enabled: false
 Style/SignalException:
   Enabled: false
 Style/SingleLineMethods:
   Enabled: false
-Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: false
 Style/StringLiterals:
   EnforcedStyle: double_quotes
-Performance/EndWith:
+Naming/BinaryOperatorParameterName:
+  Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Gemspec/RequireMFA:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.2

data/Appraisals

@@ -7,3 +7,11 @@ end
 appraise "activerecord-5.1.0" do
   gem "activerecord", "~> 5.1.3"
 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/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+## [Unreleased]
+
+## [1.3.3] - 2022-01-29
+### Fixed
+
+- Bug fix: DateTime objects are now correctly written without timezone
+information [#137](https://github.com/madeintandem/jsonb_accessor/pull/137).
+Thanks @caiohsramos

data/Dockerfile

@@ -0,0 +1,12 @@
+ARG RUBY_VERSION=latest
+FROM ruby:${RUBY_VERSION}
+
+WORKDIR /usr/src/app
+
+RUN mkdir -p lib/jsonb_accessor
+COPY lib/jsonb_accessor/version.rb ./lib/jsonb_accessor/
+COPY *.gemspec Gemfile* ./
+
+RUN bundle install
+
+COPY . .

data/README.md

@@ -2,7 +2,7 @@
 
 Created by &nbsp;&nbsp;&nbsp; [<img src="https://raw.githubusercontent.com/madeintandem/jsonb_accessor/master/tandem-logo.png" alt="Tandem Logo" />](https://www.madeintandem.com/)
 
-[![Gem Version](https://badge.fury.io/rb/jsonb_accessor.svg)](http://badge.fury.io/rb/jsonb_accessor) &nbsp;&nbsp;&nbsp;[![Build Status](https://travis-ci.org/madeintandem/jsonb_accessor.svg)](https://travis-ci.org/madeintandem/jsonb_accessor) <img src="https://raw.githubusercontent.com/madeintandem/jsonb_accessor/master/json-bee.png" alt="JSONb Accessor Logo" align="right" />
+[![Gem Version](https://badge.fury.io/rb/jsonb_accessor.svg)](http://badge.fury.io/rb/jsonb_accessor) &nbsp;&nbsp;&nbsp;![CI](https://github.com/madeintandem/jsonb_accessor/actions/workflows/ci.yml/badge.svg) <img src="https://raw.githubusercontent.com/madeintandem/jsonb_accessor/master/json-bee.png" alt="JSONb Accessor Logo" align="right" />
 
 Adds typed `jsonb` backed fields as first class citizens to your `ActiveRecord` models. This gem is similar in spirit to [HstoreAccessor](https://github.com/madeintandem/hstore_accessor), but the `jsonb` column in PostgreSQL has a few distinct advantages, mostly around nested documents and support for collections.
 
@@ -10,15 +10,15 @@ It also adds generic scopes for querying `jsonb` columns.
 
 ## Table of Contents
 
-* [Installation](#installation)
-* [Usage](#usage)
-* [Scopes](#scopes)
-* [Single-Table Inheritance](#single-table-inheritance)
-* [Dependencies](#dependencies)
-* [Validations](#validations)
-* [Upgrading](#upgrading)
-* [Development](#development)
-* [Contributing](#contributing)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Scopes](#scopes)
+- [Single-Table Inheritance](#single-table-inheritance)
+- [Dependencies](#dependencies)
+- [Validations](#validations)
+- [Upgrading](#upgrading)
+- [Development](#development)
+- [Contributing](#contributing)
 
 ## Installation
 
@@ -158,6 +158,7 @@ Product.all.jsonb_where(:data, reviewed_at: { before: Time.current }, p: { great
 
 Product.all.data_where(reviewed_at: { before: Time.current }, price: { greater_than: 5 })
 ```
+
 This scope makes use of the `jsonb_contains`, `jsonb_number_where`, and `jsonb_time_where` `scope`s.
 
 ### `jsonb_where_not`
@@ -219,14 +220,14 @@ Product.all.jsonb_number_where(:data, :price_in_cents, :greater_than, 300)
 
 It supports:
 
-* `>`
-* `>=`
-* `greater_than`
-* `greater_than_or_equal_to`
-* `<`
-* `<=`
-* `less_than`
-* `less_than_or_equal_to`
+- `>`
+- `>=`
+- `greater_than`
+- `greater_than_or_equal_to`
+- `<`
+- `<=`
+- `less_than`
+- `less_than_or_equal_to`
 
 and it is indifferent to strings/symbols.
 
@@ -259,9 +260,9 @@ Product.all.jsonb_time_where_not(:data, :reviewed_at, :before, 2.days.ago)
 ## Single-Table Inheritance
 
 One of the big issues with `ActiveRecord` single-table inheritance (STI)
-is sparse columns.  Essentially, as sub-types of the original table
+is sparse columns. Essentially, as sub-types of the original table
 diverge further from their parent more columns are left empty in a given
-table.  Postgres' `jsonb` type provides part of the solution in that
+table. Postgres' `jsonb` type provides part of the solution in that
 the values in an `jsonb` column does not impose a structure - different
 rows can have different values.
 
@@ -305,7 +306,7 @@ end
 ```
 
 From here any attributes specific to any sub-class can be stored in the
-`jsonb` column avoiding sparse data.  Indices can also be created on
+`jsonb` column avoiding sparse data. Indices can also be created on
 individual fields in an `jsonb` column.
 
 This approach was originally conceived by Joe Hirn in [this blog
@@ -326,12 +327,24 @@ See the [upgrade guide](UPGRADE_GUIDE.md).
 
 ## 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/Rakefile

@@ -5,10 +5,29 @@ require "bundler/setup"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
-require "standalone_migrations"
-StandaloneMigrations::Tasks.load_tasks
+require "active_record"
+require "erb"
 
 RSpec::Core::RakeTask.new
 RuboCop::RakeTask.new
 
+# rubocop:disable Style/MixinUsage
+include ActiveRecord::Tasks
+# rubocop:enable Style/MixinUsage
+
+root = File.expand_path __dir__
+db_dir = File.join(root, "db")
+DatabaseTasks.root = root
+DatabaseTasks.db_dir = db_dir
+DatabaseTasks.database_configuration = YAML.safe_load(ERB.new(File.read(File.join(db_dir, "config.yml"))).result, aliases: true)
+DatabaseTasks.migrations_paths = [File.join(db_dir, "migrate")]
+DatabaseTasks.env = "test"
+
+task :environment do
+  ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
+  ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
+end
+
+load "active_record/railties/databases.rake"
+
 task(default: %i[rubocop spec])

data/bin/console

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# rubocop:disable Lint/UselessAssignment
-
 require "bundler/setup"
 require "jsonb_accessor"
 require "rspec"
-require File.expand_path("../../spec/spec_helper.rb", __FILE__)
+require File.expand_path("../spec/spec_helper.rb", __dir__)
 
-dbconfig = YAML.load(File.open("db/config.yml"))
+dbconfig = YAML.safe_load(ERB.new(File.read(File.join("db", "config.yml"))).result, aliases: true)
 ActiveRecord::Base.establish_connection(dbconfig["development"])
 
+# rubocop:disable Lint/UselessAssignment
 x = Product.new
+# rubocop:enable Lint/UselessAssignment
 
 Pry.start

data/db/config.yml

@@ -1,9 +1,8 @@
 default: &default
   adapter: postgresql
   database: jsonb_accessor
-
-development:
-  <<: *default
+  host: <%= ENV.fetch("DATABASE_HOST") { "127.0.0.1" } %>
+  user: postgres
 
 test:
   <<: *default

data/db/migrate/20150407031737_set_up_testing_db.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SetUpTestingDb < ActiveRecord::Migration[5.0]
   def change
     create_table :products do |t|

data/db/schema.rb

@@ -1,3 +1,5 @@
+# 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.
@@ -10,8 +12,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150407031737) do
-
+ActiveRecord::Schema.define(version: 20_150_407_031_737) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -32,5 +33,4 @@ ActiveRecord::Schema.define(version: 20150407031737) do
     t.datetime "datetime_type"
     t.decimal "decimal_type"
   end
-
 end

data/docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+  ruby:
+    environment:
+      - DATABASE_HOST=postgres
+    build:
+      args:
+        - RUBY_VERSION=${RUBY_VERSION:-2.7.2}
+      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_6.1.0.gemfile

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

data/gemfiles/activerecord_7.0.1.gemfile

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

data/jsonb_accessor.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jsonb_accessor/version"
 
@@ -15,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description           = "Adds typed jsonb backed fields to your ActiveRecord models."
   spec.homepage              = "https://github.com/devmynd/jsonb_accessor"
   spec.license               = "MIT"
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2"
 
   spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(/png\z/) }
   spec.bindir                = "exe"
@@ -27,14 +26,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pg", ">= 0.18.1"
 
   spec.add_development_dependency "appraisal", "~> 2.2.0"
-  spec.add_development_dependency "bundler", "~> 2.1.4"
-  spec.add_development_dependency "database_cleaner", "~> 1.6.0"
   spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency "database_cleaner", "~> 1.6.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 "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.6.0"
-  spec.add_development_dependency "rubocop", "~> 0.48.1"
-  spec.add_development_dependency "standalone_migrations", "~> 5.2.0"
+  spec.add_development_dependency "rubocop", "~> 1"
 end

data/lib/jsonb_accessor/attribute_query_methods.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module JsonbAccessor
+  class AttributeQueryMethods
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def define(store_key_mapping_method_name, jsonb_attribute)
+      return if klass.superclass.respond_to? store_key_mapping_method_name
+
+      # <jsonb_attribute>_where scope
+      klass.define_singleton_method "#{jsonb_attribute}_where" do |attributes|
+        store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+        jsonb_where(jsonb_attribute, store_key_attributes)
+      end
+
+      # <jsonb_attribute>_where_not scope
+      klass.define_singleton_method "#{jsonb_attribute}_where_not" do |attributes|
+        store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+        jsonb_where_not(jsonb_attribute, store_key_attributes)
+      end
+
+      # <jsonb_attribute>_order scope
+      klass.define_singleton_method "#{jsonb_attribute}_order" do |*args|
+        ordering_options = args.extract_options!
+        order_by_defaults = args.each_with_object({}) { |attribute, config| config[attribute] = :asc }
+        store_key_mapping = all.model.public_send(store_key_mapping_method_name)
+
+        order_by_defaults.merge(ordering_options).reduce(all) do |query, (name, direction)|
+          key = store_key_mapping[name.to_s]
+          order_query = jsonb_order(jsonb_attribute, key, direction)
+          query.merge(order_query)
+        end
+      end
+    end
+
+    private
+
+    attr_reader :klass
+  end
+end

data/lib/jsonb_accessor/helpers.rb

@@ -0,0 +1,9 @@
+module JsonbAccessor
+  module Helpers
+    module_function
+
+    def active_record_default_timezone
+      ActiveRecord.try(:default_timezone) || ActiveRecord::Base.default_timezone
+    end
+  end
+end

data/lib/jsonb_accessor/macro.rb

@@ -55,7 +55,7 @@ module JsonbAccessor
         # each time it is evaluated.
         all_defaults_mapping_proc =
           if all_defaults_mapping.present?
-            -> { all_defaults_mapping.map { |key, value| [key, value.respond_to?(:call) ? value.call : value] }.to_h }
+            -> { all_defaults_mapping.transform_values { |value| value.respond_to?(:call) ? value.call : value }.to_h.compact }
           end
         attribute jsonb_attribute, :jsonb, default: all_defaults_mapping_proc if all_defaults_mapping_proc.present?
 
@@ -65,65 +65,57 @@ module JsonbAccessor
           names_and_store_keys.each do |name, store_key|
             define_method("#{name}=") do |value|
               super(value)
-              new_values = (public_send(jsonb_attribute) || {}).merge(store_key => public_send(name))
+
+              attribute_value = public_send(name)
+              # Rails always saves time based on `default_timezone`. Since #as_json considers timezone, manual conversion is needed
+              if attribute_value.acts_like?(:time)
+                attribute_value = (::JsonbAccessor::Helpers.active_record_default_timezone == :utc ? attribute_value.utc : attribute_value.in_time_zone).strftime("%F %R:%S.%L")
+              end
+
+              new_values = (public_send(jsonb_attribute) || {}).merge(store_key => attribute_value)
               write_attribute(jsonb_attribute, new_values)
             end
           end
 
           # Overrides the jsonb attribute setter to make sure the jsonb fields are kept in sync.
-          define_method("#{jsonb_attribute}=") do |given_value|
-            value = given_value || {}
+          define_method("#{jsonb_attribute}=") do |value|
+            value ||= {}
             names_to_store_keys = self.class.public_send(store_key_mapping_method_name)
 
-            empty_store_key_attributes = names_to_store_keys.values.each_with_object({}) { |name, defaults| defaults[name] = nil }
-            empty_named_attributes = names_to_store_keys.keys.each_with_object({}) { |name, defaults| defaults[name] = nil }
+            # this is the raw hash we want to save in the jsonb_attribute
+            value_with_store_keys = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(value, names_to_store_keys)
+            write_attribute(jsonb_attribute, value_with_store_keys)
 
-            store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(value, names_to_store_keys)
-            write_attribute(jsonb_attribute, empty_store_key_attributes.merge(store_key_attributes))
+            # this maps attributes to values
+            value_with_named_keys = ::JsonbAccessor::QueryHelper.convert_store_keys_to_keys(value, names_to_store_keys)
 
-            empty_named_attributes.merge(value).each { |name, attribute_value| write_attribute(name, attribute_value) }
+            empty_named_attributes = names_to_store_keys.transform_values { nil }
+            empty_named_attributes.merge(value_with_named_keys).each do |name, attribute_value|
+              # Undefined keys: There might be things in the JSON that haven't been defined using jsonb_accessor
+              # It should still be possible to save arbitrary data in the JSON
+              next unless has_attribute? name
+
+              write_attribute(name, attribute_value)
+            end
           end
         end
         include setters
 
         # Makes sure new objects have the appropriate values in their jsonb fields.
         after_initialize do
-          if has_attribute?(jsonb_attribute)
-            jsonb_values = public_send(jsonb_attribute) || {}
-            jsonb_values.each do |store_key, value|
-              name = names_and_store_keys.key(store_key)
-              next unless name
-
-              write_attribute(name, value)
-              clear_attribute_change(name) if persisted?
-            end
+          next unless jsonb_attribute
+
+          jsonb_values = public_send(jsonb_attribute) || {}
+          jsonb_values.each do |store_key, value|
+            name = names_and_store_keys.key(store_key)
+            next unless name
+
+            write_attribute(name, value)
+            clear_attribute_change(name) if persisted?
           end
         end
 
-        # <jsonb_attribute>_where scope
-        scope("#{jsonb_attribute}_where", lambda do |attributes|
-          store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
-          jsonb_where(jsonb_attribute, store_key_attributes)
-        end)
-
-        # <jsonb_attribute>_where_not scope
-        scope("#{jsonb_attribute}_where_not", lambda do |attributes|
-          store_key_attributes = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
-          jsonb_where_not(jsonb_attribute, store_key_attributes)
-        end)
-
-        # <jsonb_attribute>_order scope
-        scope("#{jsonb_attribute}_order", lambda do |*args|
-          ordering_options = args.extract_options!
-          order_by_defaults = args.each_with_object({}) { |attribute, config| config[attribute] = :asc }
-          store_key_mapping = all.model.public_send(store_key_mapping_method_name)
-
-          order_by_defaults.merge(ordering_options).reduce(all) do |query, (name, direction)|
-            key = store_key_mapping[name.to_s]
-            order_query = jsonb_order(jsonb_attribute, key, direction)
-            query.merge(order_query)
-          end
-        end)
+        ::JsonbAccessor::AttributeQueryMethods.new(self).define(store_key_mapping_method_name, jsonb_attribute)
       end
     end
   end

data/lib/jsonb_accessor/query_builder.rb

@@ -61,9 +61,7 @@ module JsonbAccessor
         excludes_attributes = {}
 
         attributes.each do |name, value|
-          if value.is_a?(Range)
-            raise JsonbAccessor::QueryHelper::NotSupported, "`jsonb_where_not` scope does not accept ranges as arguments. Given `#{value}` for `#{name}` field"
-          end
+          raise JsonbAccessor::QueryHelper::NotSupported, "`jsonb_where_not` scope does not accept ranges as arguments. Given `#{value}` for `#{name}` field" if value.is_a?(Range)
 
           if JsonbAccessor::QueryHelper.number_query_arguments?(value)
             value.each { |operator, query_value| query = query.jsonb_number_where_not(column_name, name, operator, query_value) }

data/lib/jsonb_accessor/query_helper.rb

@@ -42,9 +42,7 @@ module JsonbAccessor
 
     class << self
       def validate_column_name!(query, column_name)
-        if query.model.columns.none? { |column| column.name == column_name.to_s }
-          raise InvalidColumnName, "a column named `#{column_name}` does not exist on the `#{query.model.table_name}` table"
-        end
+        raise InvalidColumnName, "a column named `#{column_name}` does not exist on the `#{query.model.table_name}` table" if query.model.columns.none? { |column| column.name == column_name.to_s }
       end
 
       def validate_field_name!(query, column_name, field_name)
@@ -56,18 +54,21 @@ module JsonbAccessor
       end
 
       def validate_direction!(option)
-        if ORDER_DIRECTIONS.exclude?(option)
-          raise InvalidDirection, "`#{option}` is not a valid direction for ordering, only `asc` and `desc` are accepted"
-        end
+        raise InvalidDirection, "`#{option}` is not a valid direction for ordering, only `asc` and `desc` are accepted" if ORDER_DIRECTIONS.exclude?(option)
       end
 
+      # Replaces all keys in `attributes` that have a defined store_key with the store_key
       def convert_keys_to_store_keys(attributes, store_key_mapping)
-        attributes.each_with_object({}) do |(name, value), new_attributes|
-          store_key = store_key_mapping[name.to_s]
-          new_attributes[store_key] = value
+        attributes.stringify_keys.transform_keys do |key|
+          store_key_mapping[key] || key
         end
       end
 
+      # Replaces all keys in `attributes` that have a defined store_key with the named key (alias)
+      def convert_store_keys_to_keys(attributes, store_key_mapping)
+        convert_keys_to_store_keys(attributes, store_key_mapping.invert)
+      end
+
       def number_query_arguments?(arg)
         arg.is_a?(Hash) && arg.keys.map(&:to_s).all? { |key| NUMBER_OPERATORS.include?(key) }
       end

data/lib/jsonb_accessor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.2.0"
+  VERSION = "1.3.3"
 end

data/lib/jsonb_accessor.rb

@@ -5,9 +5,11 @@ require "active_record"
 require "active_record/connection_adapters/postgresql_adapter"
 
 require "jsonb_accessor/version"
+require "jsonb_accessor/helpers"
 require "jsonb_accessor/macro"
 require "jsonb_accessor/query_helper"
 require "jsonb_accessor/query_builder"
+require "jsonb_accessor/attribute_query_methods"
 
 module JsonbAccessor
   extend ActiveSupport::Concern
@@ -15,6 +17,6 @@ module JsonbAccessor
 end
 
 ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.send(:include, JsonbAccessor)
-  ActiveRecord::Base.send(:include, JsonbAccessor::QueryBuilder)
+  ActiveRecord::Base.include JsonbAccessor
+  ActiveRecord::Base.include JsonbAccessor::QueryBuilder
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Michael Crismali
 - Joe Hirn
 - Jason Haruska
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,19 +69,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,19 +139,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,28 +186,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-- !ruby/object:Gem::Dependency
-  name: standalone_migrations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '1'
 description: Adds typed jsonb backed fields to your ActiveRecord models.
 email:
 - michael@crismali.com
@@ -217,13 +203,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -234,10 +222,15 @@ 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_6.1.0.gemfile
+- gemfiles/activerecord_7.0.1.gemfile
 - jsonb_accessor.gemspec
 - lib/jsonb_accessor.rb
+- lib/jsonb_accessor/attribute_query_methods.rb
+- lib/jsonb_accessor/helpers.rb
 - lib/jsonb_accessor/macro.rb
 - lib/jsonb_accessor/query_builder.rb
 - lib/jsonb_accessor/query_helper.rb
@@ -246,24 +239,23 @@ homepage: https://github.com/devmynd/jsonb_accessor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Adds typed jsonb backed fields to your ActiveRecord models.
 test_files: []

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-addons:
-  postgresql: "9.4"
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install bundler:2.1.4
-before_script:
-  - bundle exec rake db:create
-  - bundle exec rake db:migrate
-install: bundle _2.1.4_ install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-cache: bundler
-gemfile:
-  - gemfiles/activerecord_5.0.0.gemfile
-  - gemfiles/activerecord_5.1.0.gemfile