associate_jsonb 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861ea54462a02137ede260085fdb80e49d0ea3d4286d09d2367cfaa9d140dcc3
-  data.tar.gz: 1d6fd78832d2ddc7a3d503760b401ae97f453cd79f50dc1cd14314176d9d5fdb
+  metadata.gz: 847b6c8d5410dca5511a9ab2537ea3d2d9ba5c40e681ad42a63f0e752604d1ff
+  data.tar.gz: 935adff8c21a94b4d7593a236c9e56eec29c31340a897c82851b3662b0da880e
 SHA512:
-  metadata.gz: dd8af89295273155cff22563212369930c15ff8bdcfece98e18a8f4c990d25037da443e2c345a0da99bb12d0b9ef447f7435a2c75ae1d7c62bc9e9a09bb3bac4
-  data.tar.gz: 5e267f48ff719e521c7f04e7a702d807a43dacadff43223499fc3d9c638020730db6b3b3105f36b1e90d466689bf92ce3fcbdd5c78f5498ef95ce987164082bf
+  metadata.gz: c614936df446af3b0bd1301037954214e973cc4522637c3578f47f775065eb9085f08b668b11bf619ba3ca7968b14c078e192579be56eee489d5bf0780097552
+  data.tar.gz: 5243289a848da4cc15d03204a6d5bc6a502d810e6f839fb2b26aabc264bea63553b040a8508cf6f6d0722d82be5ea905c9bb75caa5e9ac1038b2e9d85e535122

data/lib/associate_jsonb.rb

@@ -20,64 +20,106 @@ loader.collapse("#{__dir__}/associate_jsonb/connection_adapters/schema_definitio
 loader.setup # ready!
 
 module AssociateJsonb
-  mattr_accessor :jsonb_hash_types, default: []
-  mattr_accessor :jsonb_set_removed, default: []
+  mattr_accessor :jsonb_hash_types,  default: []
+  mattr_accessor :jsonb_set_added,   default: [] # :nodoc:
+  mattr_accessor :jsonb_set_removed, default: [] # :nodoc:
   mattr_accessor :jsonb_set_enabled, default: false
-  mattr_accessor :jsonb_delete_nil, default: false
+  mattr_accessor :jsonb_delete_nil,  default: false
   private_class_method :jsonb_hash_types=
   private_class_method :jsonb_set_enabled=
 
+  def self.jsonb_oid_class # :nodoc:
+    :default
+  end
+  private_class_method :jsonb_oid_class
+
+  ##
+  # Enables the use of `jsonb_nested_set` for hash updates
+  #
+  # if passed a class, or a list of classes, those classes will be added todo
+  # the enabled classes. if no argument is given, and the enabled class list is
+  # empty, `ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb` is added
+  # to the list of enabled classes
   def self.enable_jsonb_set(klass = nil, *classes)
-    add_hash_type(*Array(klass), *classes) unless klass.nil?
+    if klass.nil?
+      add_hash_type jsonb_oid_class if jsonb_hash_types.empty?
+    else
+      add_hash_type(*Array(klass), *classes)
+    end
     self.jsonb_set_enabled = true
   end
 
+  ##
+  # Disables the use of `jsonb_nested_set` for hash updates
+  #
+  # if passed a class, or a list of classes, those classes will be removed from
+  # the list of enabled classes
   def self.disable_jsonb_set(klass = nil, *classes)
     remove_hash_type(*Array(klass), *classes) unless klass.nil?
     self.jsonb_set_enabled = false
   end
 
+  ##
+  # Add class(es) to the list of classes that are able to be upated when
+  # `jsonb_set_enabled` is true
   def self.add_hash_type(*classes)
-    self.jsonb_hash_types |= classes.flatten
+    self.jsonb_set_added |= classes.flatten
   end
 
+  ##
+  # Remove class(es) from the list of classes that are able to be upated when
+  # `jsonb_set_enabled` is true
   def self.remove_hash_type(*classes)
     self.jsonb_set_removed |= classes.flatten
   end
 
-  def self.merge_hash?(v)
-    return false unless jsonb_set_enabled && v
-    self.jsonb_hash_types.any? { |type| v.is_a?(type) }
+  ##
+  # Returns true if `jsonb_set_enabled` is true and the value is an enabled hash
+  # type
+  def self.merge_hash?(value)
+    !!jsonb_set_enabled && is_hash?(value)
   end
 
-  def self.is_hash?(v)
-    self.jsonb_hash_types.any? { |type| v.is_a?(type) }
+  ##
+  # Returns true if the given value is a descendant of any of the classes
+  # in `jsonb_hash_types`
+  def self.is_hash?(value)
+    !!value && self.jsonb_hash_types.any? { |type| value.is_a?(type) }
   end
 end
 
-
 # rubocop:disable Metrics/BlockLength
 ActiveSupport.on_load :active_record do
   loader.eager_load
-  AssociateJsonb.class_eval do
-    def self.enable_jsonb_set(klass = nil, *classes)
-      if klass.nil?
-        add_hash_type ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb if jsonb_hash_types.empty?
-      else
-        add_hash_type |= [*Array(klass), *classes].flatten
+  AssociateJsonb.module_eval do
+    redefine_method = proc {|name, hide = false, &block|
+      method(name).owner.remove_method name
+      if block
+        define_singleton_method(name, &block)
+        private_class_method name if hide
       end
-      self.jsonb_set_enabled = true
+    }
+
+    redefine_method.call(:jsonb_oid_class, true) do
+      ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
     end
 
-    self.enable_jsonb_set if jsonb_set_enabled
+    redefine_method.call(:add_hash_type) do |*classes|
+      self.jsonb_hash_types |= classes.flatten
+    end
 
-    def self.remove_hash_type(*classes)
+    redefine_method.call(:remove_hash_type) do |*classes|
       self.jsonb_hash_types -= classes.flatten
     end
-    removed = jsonb_set_removed
-    self.remove_hash_type removed
-    self.send :remove_method, :jsonb_set_removed
-    self.send :remove_method, :jsonb_set_removed=
+
+    self.add_hash_type jsonb_set_added.map {|k| (k == :default) ? self.jsonb_oid_class : k}
+    self.remove_hash_type jsonb_set_removed
+
+    redefine_method.call(:jsonb_set_added)
+    redefine_method.call(:jsonb_set_added=)
+    redefine_method.call(:jsonb_set_removed)
+    redefine_method.call(:jsonb_set_removed=)
+    redefine_method = nil
   end
 
 
@@ -145,9 +187,6 @@ ActiveSupport.on_load :active_record do
     AssociateJsonb::Associations::Preloader::Association
   )
 
-  # ActiveRecord::Associations::Preloader::HasMany.prepend(
-  #   AssociateJsonb::Associations::Preloader::HasMany
-  # )
   %i[
     AlterTable
     ConstraintDefinition

data/lib/associate_jsonb/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module AssociateJsonb
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associate_jsonb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,14 +96,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
 description: |
   This gem extends ActiveRecord to add additional functionality to JSONB
 
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Store database references in PostgreSQL Jsonb columns