umbrellio-sequel-plugins 0.10.0.100 → 0.11.0.143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461c2e1edac7a90a93262bab9b44b28455d14db79872bd6b18a488da9d5f9afc
-  data.tar.gz: 2ea67f3af3a257f59018861b698b3c0dc7e950f7421f0db0b75c5d08081be0c2
+  metadata.gz: 4c7f90176d9dbae1bc7d18e1ad91f2755963a5c2c3dbe10fd5f8d3f96200c161
+  data.tar.gz: '057828ad853e3823e6e4a0da8981d531c1b880984fd74b3b3a6672a8db6e8141'
 SHA512:
-  metadata.gz: d0f60ef1050a1c2fd371b0525c9375ca275dd9cd2d1edff184c5df229063f24cd0dba7214cb65fe1a9380040b3ad6c226e29face260c303604087fcd9ab0dd7a
-  data.tar.gz: e5c02e8cd6d4c4afeb48ec2b4624fcb21d906cf40481f88a8cef556decca0e7adf3ec228b36edef23f972d50af5c5817678effb6df5dd27127f8c8ac4f3579c4
+  metadata.gz: 44bc22d1c7a37d0c7241c025eaa372ace531a52ca84dab3c8a191c0e4070ef0242b09e717a1a87accd6e8cc751511855a7b9bb6dd8ff26ead70ddd150002ca3c
+  data.tar.gz: 75691f50b458f276c5416b27d79b1ea2da4debbce8f3b4e18a58ef3e9ae0acaf3a5c525dd77f6d3c8eb4b96b78e71e8bb3761ce0f130fb6a8c1ac46a0bf9f9e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.10.0)
+    umbrellio-sequel-plugins (0.11.0)
       sequel
       symbiont-ruby
 

data/README.md

@@ -380,7 +380,7 @@ Example:
 
 ```ruby
 class User < Sequel::Model
-  store :data, :first_name
+  store :data, :first_name, :last_name
 end
 
 user = User.create(first_name: "John")

data/lib/sequel/extensions/migration_transaction_options.rb

@@ -27,10 +27,14 @@ module MigratorExtension
       if migration.use_transactions.nil?
         @db.supports_transactional_ddl?
       else
+        # :nocov:
         migration.use_transactions
+        # :nocov:
       end
     else
+      # :nocov:
       @use_transactions
+      # :nocov:
     end
   end
 

data/lib/sequel/plugins/store_accessors.rb

@@ -24,6 +24,10 @@ module Sequel::Plugins::StoreAccessors
       end
     end
 
+    def call(_)
+      super.tap(&:calculate_initial_store)
+    end
+
     private
 
     def include_accessors_module(column)
@@ -56,19 +60,93 @@ module Sequel::Plugins::StoreAccessors
   end
 
   module InstanceMethods
-    def before_update
+    def after_update
       super
-      return unless respond_to?(:store_columns)
-      send(:store_columns).each do |store_column|
-        json = Sequel[store_column].pg_jsonb.concat(send(store_column))
-        send("#{store_column}=", json) if changed_columns.include?(store_column)
+      refresh_initial_store
+    end
+
+    def after_create
+      super
+      refresh_initial_store
+    end
+
+    def calculate_initial_store
+      @store_values_hashes || refresh_initial_store
+    end
+
+    def changed_columns
+      changed = super
+      return changed unless respond_to?(:store_columns)
+      changed = changed.dup if frozen?
+      store_columns.each do |col|
+        match = patched(col).empty? && deleted(col).empty?
+        if changed.include?(col)
+          changed.delete(col) if match
+        else
+          changed << col unless match
+        end
       end
+      changed
     end
 
-    def after_update
+    private
+
+    def _update_without_checking(columns)
+      return super unless respond_to?(:store_columns)
+
+      mapped_columns = columns.to_h do |column, v|
+        next [column, v] unless store_columns.include?(column)
+
+        json = Sequel.pg_jsonb_op(
+          Sequel.function(:coalesce, Sequel[column], Sequel.pg_jsonb({})),
+        )
+        updated = deleted(column).inject(json) { |res, k| res.delete_path([k.to_s]) }
+        [column, updated.concat(patched(column))]
+      end
+
+      super(mapped_columns)
+    end
+
+    def patched(column)
+      initial_fields = initial_store_fields[column] || []
+      initial_hashes = store_values_hashes[column] || {}
+      current = @values[column] || {}
+
+      current.dup.delete_if do |k, v|
+        initial_fields.include?(k) && initial_hashes[k] == v.hash
+      end
+    end
+
+    def deleted(column)
+      initial_fields = initial_store_fields[column] || []
+      current = @values[column] || {}
+
+      initial_fields.dup - current.keys
+    end
+
+    def _refresh(dataset)
       super
+      refresh_initial_store
+    end
+
+    def _save_refresh
+      super
+      refresh_initial_store
+    end
+
+    def refresh_initial_store
       return unless respond_to?(:store_columns)
-      reload unless send(:store_columns).all?(Hash)
+      store_values = @values.slice(*store_columns)
+      @initial_store_fields = store_values.transform_values { |v| v.to_h.keys }
+      @store_values_hashes = store_values.transform_values { |v| v.to_h.transform_values(&:hash) }
+    end
+
+    def initial_store_fields
+      @initial_store_fields || {}
+    end
+
+    def store_values_hashes
+      @store_values_hashes || {}
     end
   end
 end

data/umbrellio-sequel-plugins.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.10.0"
+  gem_version = "0.11.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.10.0.100
+  version: 0.11.0.143
 platform: ruby
 authors:
 - Team Umbrellio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel