jsonb_accessor 1.0.0.beta.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5842d35872b7e0a4aae6cf87b7a58b32dc7c23
-  data.tar.gz: 74587e5629b53a1e34416e966527a59087a522d7
+  metadata.gz: 12a9ef2a6ecf012dd86338b0962ea0338ac8950f
+  data.tar.gz: ffb75c6ce59fa8eeb1a6917c822853f0aa63cead
 SHA512:
-  metadata.gz: 9fdafe03f73b4e9b002f592b2eccac07dee6db7e236285cbc4a7ddb7394f96a74e441d25f32397e1fe210631444d06fcdea25b416cd2849623a6db1ad8974787
-  data.tar.gz: 311f65d600e4e52ed56f1eb8412628821ff453266beebeb4045c665209c437690000beaa69d30f32c9439566f99df79e2d91b86eeae045099f365df653e8fb70
+  metadata.gz: ddb76f1639699f471680602e9d3f7601eca9666e7c3c03d2f3dce80d8e810a22940712668e0190f2469bccb54f9ae10a7f0b2fb7e763ea8818da32c34893ea91
+  data.tar.gz: 11e77edee1f60874eb313da3301483beb5cc4a962ad14b8f202e923511a1378a10b664fcb00fb4eae161e06f73b4f3c20878871753a693cc5fd733665a0dd2c4

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 gemfiles/.bundle
+gemfiles/*.gemfile.lock

data/.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
     - db/**/*
     - gemfiles/**/*
     - vendor/**/*
-Lint/SpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 Lint/UnusedBlockArgument:
   Enabled: false

data/.travis.yml

@@ -1,18 +1,33 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.3
-  - 2.4.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - 2.7.2
+  - 3.0.0
 addons:
-  postgresql: '9.4'
+  postgresql: "9.4"
 before_install:
   - gem update --system
   - gem --version
-  - gem install bundler
+  - 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
+  - gemfiles/activerecord_6.1.0.gemfile
+jobs:
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/activerecord_6.1.0.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/activerecord_6.1.0.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/activerecord_5.0.0.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/activerecord_5.1.0.gemfile

data/Appraisals

@@ -5,5 +5,9 @@ appraise "activerecord-5.0.0" do
 end
 
 appraise "activerecord-5.1.0" do
-  gem "activerecord", "~> 5.1.0"
+  gem "activerecord", "~> 5.1.3"
+end
+
+appraise "activerecord-6.1.0" do
+  gem "activerecord", "~> 6.1"
 end

data/README.md

@@ -1,17 +1,13 @@
 # JSONb Accessor
 
-Created by &nbsp;&nbsp;&nbsp; [<img src="https://raw.githubusercontent.com/devmynd/jsonb_accessor/master/devmynd-logo.png" alt="DevMynd Logo" />](https://www.devmynd.com/)
+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/devmynd/jsonb_accessor.svg)](https://travis-ci.org/devmynd/jsonb_accessor) <img src="https://raw.githubusercontent.com/devmynd/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;[![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" />
 
-Adds typed `jsonb` backed fields as first class citizens to your `ActiveRecord` models. This gem is similar in spirit to [HstoreAccessor](https://github.com/devmynd/hstore_accessor), but the `jsonb` column in PostgreSQL has a few distinct advantages, mostly around nested documents and support for collections.
+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.
 
 It also adds generic scopes for querying `jsonb` columns.
 
-## 1.0 Beta
-
-This README reflects the most recent 1.0 beta. Method names and interfaces may still change.
-
 ## Table of Contents
 
 * [Installation](#installation)
@@ -29,7 +25,7 @@ This README reflects the most recent 1.0 beta. Method names and interfaces may s
 Add this line to your application's `Gemfile`:
 
 ```ruby
-gem "jsonb_accessor", "1.0.0.beta.6"
+gem "jsonb_accessor", "~> 1"
 ```
 
 And then execute:
@@ -313,7 +309,7 @@ From here any attributes specific to any sub-class can be stored in the
 individual fields in an `jsonb` column.
 
 This approach was originally conceived by Joe Hirn in [this blog
-post](http://www.devmynd.com/blog/2013-3-single-table-inheritance-hstore-lovely-combination).
+post](https://madeintandem.com/blog/2013-3-single-table-inheritance-hstore-lovely-combination/).
 
 ## Validations
 
@@ -338,7 +334,7 @@ Run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 
-1. [Fork it](https://github.com/devmynd/jsonb_accessor/fork)
+1. [Fork it](https://github.com/madeintandem/jsonb_accessor/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Add tests and changes (run the tests with `rake`)
 4. Commit your changes (`git commit -am 'Add some feature'`)

data/Rakefile

@@ -5,10 +5,26 @@ require "bundler/setup"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
-require "standalone_migrations"
-StandaloneMigrations::Tasks.load_tasks
 
 RSpec::Core::RakeTask.new
 RuboCop::RakeTask.new
 
+require "active_record"
+include ActiveRecord::Tasks
+
+root = File.expand_path "..", __FILE__
+db_dir = File.join(root, "db")
+DatabaseTasks.root = root
+DatabaseTasks.db_dir = db_dir
+DatabaseTasks.database_configuration = YAML.load(File.read(File.join(db_dir, "config.yml")))
+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/db/config.yml

@@ -1,9 +1,8 @@
 default: &default
   adapter: postgresql
   database: jsonb_accessor
-
-development:
-  <<: *default
+  host: 127.0.0.1
+  user: postgres
 
 test:
   <<: *default

data/db/schema.rb

@@ -2,15 +2,15 @@
 # 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 `rails
+# db:schema:load`. When creating a new database, `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: 20150407031737) 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"

data/gemfiles/activerecord_5.1.0.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "pg"
-gem "activerecord", "~> 5.1.0"
+gem "activerecord", "~> 5.1.3"
 
 gemspec path: "../"

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/jsonb_accessor.gemspec

@@ -15,7 +15,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 +27,12 @@ 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", "~> 1.9"
   spec.add_development_dependency "database_cleaner", "~> 1.6.0"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "rake", "~> 10.0"
+  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"
 end

data/lib/jsonb_accessor.rb

@@ -6,6 +6,7 @@ require "active_record/connection_adapters/postgresql_adapter"
 
 require "jsonb_accessor/version"
 require "jsonb_accessor/macro"
+require "jsonb_accessor/query_helper"
 require "jsonb_accessor/query_builder"
 
 module JsonbAccessor

data/lib/jsonb_accessor/macro.rb

@@ -11,7 +11,11 @@ module JsonbAccessor
 
         # Defines virtual attributes for each jsonb field.
         field_types.each do |name, type|
-          attribute 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
         end
 
         store_key_mapping_method_name = "jsonb_store_key_mapping_for_#{jsonb_attribute}"
@@ -34,7 +38,7 @@ module JsonbAccessor
         end
 
         # Get store keys to default values mapping
-        store_keys_and_defaults = ::JsonbAccessor::QueryBuilder.convert_keys_to_store_keys(names_and_defaults, public_send(store_key_mapping_method_name))
+        store_keys_and_defaults = ::JsonbAccessor::QueryHelper.convert_keys_to_store_keys(names_and_defaults, public_send(store_key_mapping_method_name))
 
         # Define jsonb_defaults_mapping_for_<jsonb_attribute>
         defaults_mapping_method_name = "jsonb_defaults_mapping_for_#{jsonb_attribute}"
@@ -46,7 +50,14 @@ module JsonbAccessor
         end
 
         all_defaults_mapping = public_send(defaults_mapping_method_name)
-        attribute jsonb_attribute, :jsonb, default: all_defaults_mapping if all_defaults_mapping.present?
+        # Fields may have procs as default value. This means `all_defaults_mapping` may contain procs as values. To make this work
+        # with the attributes API, we need to wrap `all_defaults_mapping` with a proc itself, making sure it returns a plain hash
+        # 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 }
+          end
+        attribute jsonb_attribute, :jsonb, default: all_defaults_mapping_proc if all_defaults_mapping_proc.present?
 
         # Setters are in a module to allow users to override them and still be able to use `super`.
         setters = Module.new do
@@ -67,7 +78,7 @@ module JsonbAccessor
             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 }
 
-            store_key_attributes = ::JsonbAccessor::QueryBuilder.convert_keys_to_store_keys(value, names_to_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))
 
             empty_named_attributes.merge(value).each { |name, attribute_value| write_attribute(name, attribute_value) }
@@ -81,21 +92,23 @@ module JsonbAccessor
             jsonb_values = public_send(jsonb_attribute) || {}
             jsonb_values.each do |store_key, value|
               name = names_and_store_keys.key(store_key)
-              write_attribute(name, value) if name
+              next unless name
+
+              write_attribute(name, value)
+              clear_attribute_change(name) if persisted?
             end
-            clear_changes_information if persisted?
           end
         end
 
         # <jsonb_attribute>_where scope
         scope("#{jsonb_attribute}_where", lambda do |attributes|
-          store_key_attributes = ::JsonbAccessor::QueryBuilder.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+          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::QueryBuilder.convert_keys_to_store_keys(attributes, all.model.public_send(store_key_mapping_method_name))
+          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)
 

data/lib/jsonb_accessor/query_builder.rb

@@ -1,147 +1,41 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  GREATER_THAN = ">"
-  GREATER_THAN_OR_EQUAL_TO = ">="
-  LESS_THAN = "<"
-  LESS_THAN_OR_EQUAL_TO = "<="
-
-  NUMBER_OPERATORS_MAP = {
-    GREATER_THAN => GREATER_THAN,
-    "greater_than" => GREATER_THAN,
-    "gt" => GREATER_THAN,
-    GREATER_THAN_OR_EQUAL_TO => GREATER_THAN_OR_EQUAL_TO,
-    "greater_than_or_equal_to" => GREATER_THAN_OR_EQUAL_TO,
-    "gte" => GREATER_THAN_OR_EQUAL_TO,
-    LESS_THAN => LESS_THAN,
-    "less_than" => LESS_THAN,
-    "lt" => LESS_THAN,
-    LESS_THAN_OR_EQUAL_TO => LESS_THAN_OR_EQUAL_TO,
-    "less_than_or_equal_to" => LESS_THAN_OR_EQUAL_TO,
-    "lte" => LESS_THAN_OR_EQUAL_TO
-  }.freeze
-
-  NUMBER_OPERATORS = NUMBER_OPERATORS_MAP.keys.freeze
-
-  TIME_OPERATORS_MAP = {
-    "after" => GREATER_THAN,
-    "before" => LESS_THAN
-  }.freeze
-
-  TIME_OPERATORS = TIME_OPERATORS_MAP.keys.freeze
-
-  IS_NUMBER_QUERY_ARGUMENTS = lambda do |arg|
-    arg.is_a?(Hash) &&
-      arg.keys.map(&:to_s).all? { |key| JsonbAccessor::NUMBER_OPERATORS.include?(key) }
-  end
-
-  IS_TIME_QUERY_ARGUMENTS = lambda do |arg|
-    arg.is_a?(Hash) &&
-      arg.keys.map(&:to_s).all? { |key| JsonbAccessor::TIME_OPERATORS.include?(key) }
-  end
-
-  CONVERT_NUMBER_RANGES = lambda do |attributes|
-    attributes.each_with_object({}) do |(name, value), new_attributes|
-      is_range = value.is_a?(Range)
-
-      new_attributes[name] = if is_range && value.first.is_a?(Numeric) && value.exclude_end?
-                               { greater_than_or_equal_to: value.first, less_than: value.end }
-                             elsif is_range && value.first.is_a?(Numeric)
-                               { greater_than_or_equal_to: value.first, less_than_or_equal_to: value.end }
-                             else
-                               value
-                             end
-    end
-  end
-
-  CONVERT_TIME_RANGES = lambda do |attributes|
-    attributes.each_with_object({}) do |(name, value), new_attributes|
-      is_range = value.is_a?(Range)
-
-      if is_range && (value.first.is_a?(Time) || value.first.is_a?(Date))
-        start_time = value.first
-        end_time = value.end
-        new_attributes[name] = { before: end_time, after: start_time }
-      else
-        new_attributes[name] = value
-      end
-    end
-  end
-
-  CONVERT_RANGES = lambda do |attributes|
-    [CONVERT_NUMBER_RANGES, CONVERT_TIME_RANGES].reduce(attributes) do |new_attributes, converter|
-      converter.call(new_attributes)
-    end
-  end
-
-  ORDER_DIRECTIONS = [:asc, :desc, "asc", "desc"].freeze
-
   module QueryBuilder
     extend ActiveSupport::Concern
-    InvalidColumnName = Class.new(StandardError)
-    InvalidFieldName = Class.new(StandardError)
-    InvalidDirection = Class.new(StandardError)
-    NotSupported = Class.new(StandardError)
-
-    def self.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
-    end
-
-    def self.validate_field_name!(query, column_name, field_name)
-      store_keys = query.model.public_send("jsonb_store_key_mapping_for_#{column_name}").values
-      if store_keys.exclude?(field_name.to_s)
-        valid_field_names = store_keys.map { |key| "`#{key}`" }.join(", ")
-        raise InvalidFieldName, "`#{field_name}` is not a valid field name, valid field names include: #{valid_field_names}"
-      end
-    end
-
-    def self.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
-    end
-
-    def self.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
-      end
-    end
 
     included do
       scope(:jsonb_contains, lambda do |column_name, attributes|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
         where("#{table_name}.#{column_name} @> (?)::jsonb", attributes.to_json)
       end)
 
       scope(:jsonb_excludes, lambda do |column_name, attributes|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
         where.not("#{table_name}.#{column_name} @> (?)::jsonb", attributes.to_json)
       end)
 
       scope(:jsonb_number_where, lambda do |column_name, field_name, given_operator, value|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
-        operator = JsonbAccessor::NUMBER_OPERATORS_MAP.fetch(given_operator.to_s)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
+        operator = JsonbAccessor::QueryHelper::NUMBER_OPERATORS_MAP.fetch(given_operator.to_s)
         where("(#{table_name}.#{column_name} ->> ?)::float #{operator} ?", field_name, value)
       end)
 
       scope(:jsonb_number_where_not, lambda do |column_name, field_name, given_operator, value|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
-        operator = JsonbAccessor::NUMBER_OPERATORS_MAP.fetch(given_operator.to_s)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
+        operator = JsonbAccessor::QueryHelper::NUMBER_OPERATORS_MAP.fetch(given_operator.to_s)
         where.not("(#{table_name}.#{column_name} ->> ?)::float #{operator} ?", field_name, value)
       end)
 
       scope(:jsonb_time_where, lambda do |column_name, field_name, given_operator, value|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
-        operator = JsonbAccessor::TIME_OPERATORS_MAP.fetch(given_operator.to_s)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
+        operator = JsonbAccessor::QueryHelper::TIME_OPERATORS_MAP.fetch(given_operator.to_s)
         where("(#{table_name}.#{column_name} ->> ?)::timestamp #{operator} ?", field_name, value)
       end)
 
       scope(:jsonb_time_where_not, lambda do |column_name, field_name, given_operator, value|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
-        operator = JsonbAccessor::TIME_OPERATORS_MAP.fetch(given_operator.to_s)
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
+        operator = JsonbAccessor::QueryHelper::TIME_OPERATORS_MAP.fetch(given_operator.to_s)
         where.not("(#{table_name}.#{column_name} ->> ?)::timestamp #{operator} ?", field_name, value)
       end)
 
@@ -149,11 +43,10 @@ module JsonbAccessor
         query = all
         contains_attributes = {}
 
-        JsonbAccessor::CONVERT_RANGES.call(attributes).each do |name, value|
-          case value
-          when IS_NUMBER_QUERY_ARGUMENTS
+        JsonbAccessor::QueryHelper.convert_ranges(attributes).each do |name, value|
+          if JsonbAccessor::QueryHelper.number_query_arguments?(value)
             value.each { |operator, query_value| query = query.jsonb_number_where(column_name, name, operator, query_value) }
-          when IS_TIME_QUERY_ARGUMENTS
+          elsif JsonbAccessor::QueryHelper.time_query_arguments?(value)
             value.each { |operator, query_value| query = query.jsonb_time_where(column_name, name, operator, query_value) }
           else
             contains_attributes[name] = value
@@ -169,13 +62,12 @@ module JsonbAccessor
 
         attributes.each do |name, value|
           if value.is_a?(Range)
-            raise NotSupported, "`jsonb_where_not` scope does not accept ranges as arguments. Given `#{value}` for `#{name}` field"
+            raise JsonbAccessor::QueryHelper::NotSupported, "`jsonb_where_not` scope does not accept ranges as arguments. Given `#{value}` for `#{name}` field"
           end
 
-          case value
-          when IS_NUMBER_QUERY_ARGUMENTS
+          if JsonbAccessor::QueryHelper.number_query_arguments?(value)
             value.each { |operator, query_value| query = query.jsonb_number_where_not(column_name, name, operator, query_value) }
-          when IS_TIME_QUERY_ARGUMENTS
+          elsif JsonbAccessor::QueryHelper.time_query_arguments?(value)
             value.each { |operator, query_value| query = query.jsonb_time_where_not(column_name, name, operator, query_value) }
           else
             excludes_attributes[name] = value
@@ -186,10 +78,10 @@ module JsonbAccessor
       end)
 
       scope(:jsonb_order, lambda do |column_name, field_name, direction|
-        JsonbAccessor::QueryBuilder.validate_column_name!(all, column_name)
-        JsonbAccessor::QueryBuilder.validate_field_name!(all, column_name, field_name)
-        JsonbAccessor::QueryBuilder.validate_direction!(direction)
-        order("(#{table_name}.#{column_name} -> '#{field_name}') #{direction}")
+        JsonbAccessor::QueryHelper.validate_column_name!(all, column_name)
+        JsonbAccessor::QueryHelper.validate_field_name!(all, column_name, field_name)
+        JsonbAccessor::QueryHelper.validate_direction!(direction)
+        order(Arel.sql("(#{table_name}.#{column_name} -> '#{field_name}') #{direction}"))
       end)
     end
   end

data/lib/jsonb_accessor/query_helper.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module JsonbAccessor
+  module QueryHelper
+    # Errors
+    InvalidColumnName = Class.new(StandardError)
+    InvalidFieldName = Class.new(StandardError)
+    InvalidDirection = Class.new(StandardError)
+    NotSupported = Class.new(StandardError)
+
+    # Constants
+    GREATER_THAN = ">"
+    GREATER_THAN_OR_EQUAL_TO = ">="
+    LESS_THAN = "<"
+    LESS_THAN_OR_EQUAL_TO = "<="
+
+    NUMBER_OPERATORS_MAP = {
+      GREATER_THAN => GREATER_THAN,
+      "greater_than" => GREATER_THAN,
+      "gt" => GREATER_THAN,
+      GREATER_THAN_OR_EQUAL_TO => GREATER_THAN_OR_EQUAL_TO,
+      "greater_than_or_equal_to" => GREATER_THAN_OR_EQUAL_TO,
+      "gte" => GREATER_THAN_OR_EQUAL_TO,
+      LESS_THAN => LESS_THAN,
+      "less_than" => LESS_THAN,
+      "lt" => LESS_THAN,
+      LESS_THAN_OR_EQUAL_TO => LESS_THAN_OR_EQUAL_TO,
+      "less_than_or_equal_to" => LESS_THAN_OR_EQUAL_TO,
+      "lte" => LESS_THAN_OR_EQUAL_TO
+    }.freeze
+
+    NUMBER_OPERATORS = NUMBER_OPERATORS_MAP.keys.freeze
+
+    TIME_OPERATORS_MAP = {
+      "after" => GREATER_THAN,
+      "before" => LESS_THAN
+    }.freeze
+
+    TIME_OPERATORS = TIME_OPERATORS_MAP.keys.freeze
+
+    ORDER_DIRECTIONS = [:asc, :desc, "asc", "desc"].freeze
+
+    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
+      end
+
+      def validate_field_name!(query, column_name, field_name)
+        store_keys = query.model.public_send("jsonb_store_key_mapping_for_#{column_name}").values
+        if store_keys.exclude?(field_name.to_s)
+          valid_field_names = store_keys.map { |key| "`#{key}`" }.join(", ")
+          raise InvalidFieldName, "`#{field_name}` is not a valid field name, valid field names include: #{valid_field_names}"
+        end
+      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
+      end
+
+      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
+        end
+      end
+
+      def number_query_arguments?(arg)
+        arg.is_a?(Hash) && arg.keys.map(&:to_s).all? { |key| NUMBER_OPERATORS.include?(key) }
+      end
+
+      def time_query_arguments?(arg)
+        arg.is_a?(Hash) && arg.keys.map(&:to_s).all? { |key| TIME_OPERATORS.include?(key) }
+      end
+
+      def convert_number_ranges(attributes)
+        attributes.each_with_object({}) do |(name, value), new_attributes|
+          is_range = value.is_a?(Range)
+
+          new_attributes[name] = if is_range && value.first.is_a?(Numeric) && value.exclude_end?
+                                   { greater_than_or_equal_to: value.first, less_than: value.end }
+                                 elsif is_range && value.first.is_a?(Numeric)
+                                   { greater_than_or_equal_to: value.first, less_than_or_equal_to: value.end }
+                                 else
+                                   value
+                                 end
+        end
+      end
+
+      def convert_time_ranges(attributes)
+        attributes.each_with_object({}) do |(name, value), new_attributes|
+          is_range = value.is_a?(Range)
+
+          if is_range && (value.first.is_a?(Time) || value.first.is_a?(Date))
+            start_time = value.first
+            end_time = value.end
+            new_attributes[name] = { before: end_time, after: start_time }
+          else
+            new_attributes[name] = value
+          end
+        end
+      end
+
+      def convert_ranges(attributes)
+        %i[convert_number_ranges convert_time_ranges].reduce(attributes) do |new_attributes, converter_method|
+          public_send(converter_method, new_attributes)
+        end
+      end
+    end
+  end
+end

data/lib/jsonb_accessor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.0.0.beta.6"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Crismali
 - Joe Hirn
 - Jason Haruska
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,20 +68,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -156,16 +142,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -194,20 +180,6 @@ dependencies:
     - - "~>"
       - !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
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
 description: Adds typed jsonb backed fields to your ActiveRecord models.
 email:
 - michael@crismali.com
@@ -235,36 +207,36 @@ files:
 - db/migrate/20150407031737_set_up_testing_db.rb
 - db/schema.rb
 - gemfiles/activerecord_5.0.0.gemfile
-- gemfiles/activerecord_5.0.0.gemfile.lock
 - gemfiles/activerecord_5.1.0.gemfile
-- gemfiles/activerecord_5.1.0.gemfile.lock
+- gemfiles/activerecord_6.1.0.gemfile
 - jsonb_accessor.gemspec
 - lib/jsonb_accessor.rb
 - lib/jsonb_accessor/macro.rb
 - lib/jsonb_accessor/query_builder.rb
+- lib/jsonb_accessor/query_helper.rb
 - lib/jsonb_accessor/version.rb
 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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.11
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Adds typed jsonb backed fields to your ActiveRecord models.
 test_files: []

data/gemfiles/activerecord_5.0.0.gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    jsonb_accessor (1.0.0.beta.6)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
-      pg (>= 0.18.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (7.1.4)
-    ast (2.3.0)
-    awesome_print (1.7.0)
-    builder (3.2.3)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.0)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    pg (0.20.0)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-doc (0.10.0)
-      pry (~> 0.9)
-      yard (~> 0.9)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    rack (2.0.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    slop (3.6.0)
-    standalone_migrations (5.2.1)
-      activerecord (>= 4.2.7, < 5.2.0)
-      railties (>= 4.2.7, < 5.2.0)
-      rake (~> 10.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
-    yard (0.9.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.0.0)
-  appraisal (~> 2.2.0)
-  awesome_print
-  bundler (~> 1.9)
-  database_cleaner (~> 1.6.0)
-  jsonb_accessor!
-  pg
-  pry
-  pry-doc
-  pry-nav
-  rake (~> 10.0)
-  rspec (~> 3.6.0)
-  rubocop (~> 0.48.1)
-  standalone_migrations (~> 5.2.0)
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/activerecord_5.1.0.gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    jsonb_accessor (1.0.0.beta.6)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
-      pg (>= 0.18.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.1.0)
-      actionview (= 5.1.0)
-      activesupport (= 5.1.0)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.0)
-      activesupport (= 5.1.0)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.1.0)
-      activesupport (= 5.1.0)
-    activerecord (5.1.0)
-      activemodel (= 5.1.0)
-      activesupport (= 5.1.0)
-      arel (~> 8.0)
-    activesupport (5.1.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (8.0.0)
-    ast (2.3.0)
-    awesome_print (1.7.0)
-    builder (3.2.3)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.0)
-    diff-lcs (1.3)
-    erubi (1.6.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    pg (0.20.0)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-doc (0.10.0)
-      pry (~> 0.9)
-      yard (~> 0.9)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.0)
-      actionpack (= 5.1.0)
-      activesupport (= 5.1.0)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    slop (3.6.0)
-    standalone_migrations (5.2.1)
-      activerecord (>= 4.2.7, < 5.2.0)
-      railties (>= 4.2.7, < 5.2.0)
-      rake (~> 10.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
-    yard (0.9.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.1.0)
-  appraisal (~> 2.2.0)
-  awesome_print
-  bundler (~> 1.9)
-  database_cleaner (~> 1.6.0)
-  jsonb_accessor!
-  pg
-  pry
-  pry-doc
-  pry-nav
-  rake (~> 10.0)
-  rspec (~> 3.6.0)
-  rubocop (~> 0.48.1)
-  standalone_migrations (~> 5.2.0)
-
-BUNDLED WITH
-   1.14.6