associate_jsonb 0.0.1 → 0.0.7

data/lib/associate_jsonb/supported_rails_version.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  SUPPORTED_RAILS_VERSION = "6.0.3.2"
+end

data/lib/associate_jsonb/version.rb

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

data/lib/associate_jsonb/with_store_attribute.rb

@@ -12,18 +12,29 @@ module AssociateJsonb
         @names_list ||= {}
       end
 
-      def add_name(name, store, key)
-        @names_list ||= {}
-        @names_list[name.to_s.freeze] = { store: store, key: key }
+      def add_name(name, store, key, cast)
+        names_list[name.to_s.freeze] = { store: store, key: key, cast: cast }
       end
 
       def has_name?(name)
         names_list.key? name.to_s
       end
+
+      def get(name)
+        names_list[name.to_s]
+      end
+
+      def store_for(name)
+        (get(name) || {})[:store]
+      end
+
+      def key_for(name)
+        (get(name) || {})[:key]
+      end
     end
 
     included do
-      instance_eval <<-CODE, __FILE__, __LINE__ + 1
+      instance_eval <<~CODE, __FILE__, __LINE__ + 1
         initialize_store_column_attribute_tracker
 
         after_initialize &set_store_column_attribute_values_on_init
@@ -37,6 +48,10 @@ module AssociateJsonb
         super
       end
 
+      def arel_table
+        super.with_store_tracker(store_column_attribute_tracker)
+      end
+
       def initialize_store_column_attribute_tracker
         @store_column_attribute_tracker = const_set(:StoreColumnAttributeTracker, StoreColumnAttributeTracker.new)
         private_constant :StoreColumnAttributeTracker
@@ -56,9 +71,9 @@ module AssociateJsonb
         end
       end
 
-      def add_store_column_attribute_name(name, store, key)
+      def add_store_column_attribute_name(name, store, key, cast_opts)
         store_column_attribute_tracker.synchronize do
-          store_column_attribute_tracker.add_name(name, store, key)
+          store_column_attribute_tracker.add_name(name, store, key, cast_opts)
         end
       end
 
@@ -83,16 +98,16 @@ module AssociateJsonb
         store_column_attribute :data, *args, **opts
       end
 
-      def store_column_attribute(store, attr, *opts, key: nil, **attribute_opts)
+      def store_column_attribute(store, attr, cast_type = ActiveRecord::Type::Value.new, sql_type: nil, key: nil, **attribute_opts)
         store = store.to_sym
         attr = attr.to_sym
         key ||= attr
         key = key.to_s
         array = attribute_opts[:array]
-        attribute attr, *opts, **attribute_opts
+        attribute attr, cast_type, **attribute_opts
 
-        instance_eval <<-CODE, __FILE__, __LINE__ + 1
-          add_store_column_attribute_name("#{attr}", :#{store}, "#{key}")
+        instance_eval <<~CODE, __FILE__, __LINE__ + 1
+          add_store_column_attribute_name("#{attr}", :#{store}, "#{key}", { sql_type: sql_type, type: cast_type, opts: attribute_opts })
         CODE
 
         include WithStoreAttribute::InstanceMethodsOnActivation.new(self, store, attr, key, array)
@@ -102,31 +117,52 @@ module AssociateJsonb
     class InstanceMethodsOnActivation < Module
       def initialize(mixin, store, attribute, key, is_array)
         is_array = !!(is_array && attribute.to_s =~ /_ids$/)
-        on_attr_change =
-           is_array \
-            ? "write_attribute(:#{attribute}, Array(given))" \
-            : "super(given)"
+
+        array_or_attr = ->(value) {
+          is_array \
+           ? %Q(Array(#{value})) \
+           : %Q(#{value})
+         }
+
+        on_store_change = "_write_attribute(:#{attribute}, #{array_or_attr.call %Q(#{store}["#{key}"])})"
+        on_attr_change = "super(#{array_or_attr.call %Q(given)})"
+
         if is_array
-          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          mixin.class_eval <<~CODE, __FILE__, __LINE__ + 1
             def #{attribute}
               _read_attribute(:#{attribute}) || []
             end
           CODE
         end
 
-        mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        mixin.class_eval <<~CODE, __FILE__, __LINE__ + 1
           def #{store}=(given)
-            given = super((given || {}).with_indifferent_access)
-            write_attribute(:#{attribute}, given["#{key}"])
-            given["#{key}"] = #{attribute} unless #{attribute}.nil?
-            super(given)
+            if given.is_a?(::String)
+              given = ActiveSupport::JSON.decode(given) rescue nil
+            end
+
+            if AssociateJsonb.merge_hash?(self.class.attribute_types["#{store}"])
+              if !given
+                given = {}
+                #{store}.keys.each do |k|
+                  given[k] = nil
+                end
+              end
+              super(#{store}.deep_merge(given.deep_stringify_keys))
+
+              self.#{attribute}= #{store}["#{key}"] if #{store}.key?("#{key}")
+            else
+              super given || {}
+              self.#{attribute}= #{store}["#{key}"]
+            end
+
+            #{store}
           end
 
           def #{attribute}=(given)
             #{on_attr_change}
-            value = #{store}["#{key}"] = #{attribute}
-            #{store}.delete("#{key}") if value.nil?
-            _write_attribute(:#{store}, #{store})
+            value = #{store}["#{key}"] = #{attribute}.presence
+            #{store}.delete("#{key}") unless !value.nil? || AssociateJsonb.merge_hash?(self.class.attribute_types["#{store}"])
             value
           end
         CODE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associate_jsonb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.7
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: 6.0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: 6.0.3.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +104,18 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
-description: |2
-      This gem extends ActiveRecord to let you use PostgreSQL JSONB data for associations
+description: |
+  This gem extends ActiveRecord to add additional functionality to JSONB
 
-      Inspired by activerecord-jsonb-associations, but for use in Rails 6+ and
-      ruby 2.7+ and with some unnecessary options and features (HABTM) removed
+  - use PostgreSQL JSONB data for associations
+  - thread-safe single-key updates to JSONB columns using `jsonb_set`
+  - extended `table#references` for easy migrations and indexes
+  - virtual JSONB foreign keys using check constraints
+    (NOTE: real foreign key constraints are not possible with PostgreSQL JSONB)
 
-      BONUS: extended `table#references` for easy migrations and indexes
-      (NOTE: real foreign key constraints are not possible with PostgreSQL JSONB)
+  Inspired by activerecord-jsonb-associations, but for use in Rails 6+ and
+  ruby 2.7+ and with some unnecessary options and features (HABTM) removed
+  and some additional features added
 email:
 - sampsonsprojects@gmail.com
 executables: []
@@ -122,15 +126,22 @@ files:
 - README.md
 - Rakefile
 - lib/associate_jsonb.rb
-- lib/associate_jsonb/arel_node_extensions/binary.rb
+- lib/associate_jsonb/arel_extensions/nodes/binary.rb
+- lib/associate_jsonb/arel_extensions/nodes/table_alias.rb
+- lib/associate_jsonb/arel_extensions/table.rb
+- lib/associate_jsonb/arel_extensions/visitors/postgresql.rb
+- lib/associate_jsonb/arel_extensions/visitors/visitor.rb
 - lib/associate_jsonb/arel_nodes/jsonb/at_arrow.rb
+- lib/associate_jsonb/arel_nodes/jsonb/attribute.rb
 - lib/associate_jsonb/arel_nodes/jsonb/bindable_operator.rb
 - lib/associate_jsonb/arel_nodes/jsonb/dash_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/dash_double_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/double_pipe.rb
 - lib/associate_jsonb/arel_nodes/jsonb/hash_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/operator.rb
+- lib/associate_jsonb/arel_nodes/sql_casted_binary.rb
 - lib/associate_jsonb/arel_nodes/sql_casted_equality.rb
+- lib/associate_jsonb/associations/alias_tracker.rb
 - lib/associate_jsonb/associations/association.rb
 - lib/associate_jsonb/associations/association_scope.rb
 - lib/associate_jsonb/associations/belongs_to_association.rb
@@ -139,11 +150,25 @@ files:
 - lib/associate_jsonb/associations/builder/has_one.rb
 - lib/associate_jsonb/associations/conflicting_association.rb
 - lib/associate_jsonb/associations/has_many_association.rb
+- lib/associate_jsonb/associations/join_dependency.rb
 - lib/associate_jsonb/associations/preloader/association.rb
+- lib/associate_jsonb/attribute_methods.rb
+- lib/associate_jsonb/attribute_methods/read.rb
 - lib/associate_jsonb/connection_adapters.rb
-- lib/associate_jsonb/connection_adapters/reference_definition.rb
+- lib/associate_jsonb/connection_adapters/schema_creation.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/add_jsonb_foreign_key_function.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/add_jsonb_nested_set_function.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/alter_table.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/constraint_definition.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/reference_definition.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/table.rb
+- lib/associate_jsonb/connection_adapters/schema_definitions/table_definition.rb
+- lib/associate_jsonb/connection_adapters/schema_statements.rb
+- lib/associate_jsonb/persistence.rb
+- lib/associate_jsonb/predicate_builder.rb
 - lib/associate_jsonb/reflection.rb
 - lib/associate_jsonb/relation/where_clause.rb
+- lib/associate_jsonb/supported_rails_version.rb
 - lib/associate_jsonb/version.rb
 - lib/associate_jsonb/with_store_attribute.rb
 homepage: https://github.com/SampsonCrowley/associate_jsonb

data/lib/associate_jsonb/arel_node_extensions/binary.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module AssociateJsonb
-  module ArelNodeExtensions
-    module Binary
-      def original_left
-        left
-      end
-    end
-  end
-end

data/lib/associate_jsonb/connection_adapters/reference_definition.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module AssociateJsonb
-  module ConnectionAdapters
-    module ReferenceDefinition #:nodoc:
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(
-        name,
-        store: false,
-        **options
-      )
-        @store = store && store.to_sym
-
-        super(name, **options)
-      end
-      # rubocop:enable Metrics/ParameterLists
-
-      def add_to(table)
-        return super unless store
-
-        should_add_col = false
-        if table.respond_to? :column_exists?
-          should_add_col = !table.column_exists?(store)
-        elsif table.respond_to? :columns
-          should_add_col = table.columns.none? {|col| col.name.to_sym == store}
-        end
-
-        table.column(store, :jsonb, null: false, default: {}) if should_add_col
-
-        return unless index
-
-        # should_add_idx = false
-        # if table.respond_to? :index_exists?
-        #   should_add_idx = !table.index_exists?([ store ], using: :gin)
-        # elsif table.respond_to? :indexes
-        #   should_add_idx = table.indexes.none? do |idx, opts|
-        #     (idx == [ store ]) \
-        #     && (opts == { using: :gin })
-        #   end
-        # end
-        #
-        # table.index([ store ], using: :gin) if should_add_idx
-
-        column_names.each do |column_name|
-          table.index(
-            "CAST (\"#{store}\"->'#{column_name}' AS #{@type || :bigint})",
-            using: :btree,
-            name: "index_#{table.name}_on_#{store}_#{column_name}"
-          )
-
-          table.index(
-            "(#{store}->>'#{column_name}')",
-            using: :btree,
-            name: "index_#{table.name}_on_#{store}_#{column_name}_text"
-          )
-        end
-      end
-
-      protected
-
-      attr_reader :store
-    end
-  end
-end