umbrellio-sequel-plugins 0.10.0.101 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa321f3720c745f853bf852f1fbfcb430b35391ff67d48284f051ff804c3e20
-  data.tar.gz: 0d1d70e9f8f05173b63b62db97dfa5f4e562527d7b9e87affdbd8f2151987757
+  metadata.gz: 87dd000032a7ff44d8bad71653d2663dcf1237ac0b57550542e99955f94ef089
+  data.tar.gz: a23cdcb226e924f641994e93b50e87e4f65d8f1af205b2437d548f93d04ebc3c
 SHA512:
-  metadata.gz: b40811232e8e9b6a711b134ae831cb05c04bc85553587bffa7bd65f0d77105ff12d0e739fa84e6048a02ca254e0782dd8bf200e488b7c9437d89c170f199862e
-  data.tar.gz: b8060ae4b412df5d1a459c19f5187aa27acddf8cc753465f1dd38844d8301e68e5a703a00de9530818f7d529757f4dc89aa592165542f542b3495676283c45ed
+  metadata.gz: 8766ab1dd01298493e86325b906dd905af008f091bb07ae8ed1017571dc66a80131e31345a03e3fd35f744456c7aa43ec17a66554be9f867742539c40687064a
+  data.tar.gz: a11d6c78ae9aaf33b88d74b97bfc6ab6e79497fa0ebcb8ef22dc0782303964c4f4683cde30f7c8679f0ceec48918720ad439c3f0da0467534f4fa3dbf4745f1d

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres:14
         env:
           POSTGRES_USER: root
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -30,12 +30,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
 
     name: ${{ matrix.ruby }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - uses: ruby/setup-ruby@v1
       with:
@@ -58,7 +58,7 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: umbrellio/publish-ruby-gem-action@v1.0.4
         with:

data/Gemfile

@@ -3,3 +3,12 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "money"
+gem "pg"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "rubocop-config-umbrellio"
+gem "simplecov"
+gem "simplecov-lcov"

data/Gemfile.lock

@@ -1,90 +1,95 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.10.0)
+    umbrellio-sequel-plugins (0.12.0)
       sequel
       symbiont-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     method_source (1.0.0)
-    minitest (5.16.3)
+    minitest (5.18.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pg (1.4.3)
-    pry (0.14.1)
+      racc
+    pg (1.5.3)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (3.0.0)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.35.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-config-umbrellio (1.35.0.69)
-      rubocop (~> 1.35.0)
-      rubocop-performance (~> 1.14.0)
-      rubocop-rails (~> 2.15.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-config-umbrellio (1.50.0.85)
+      rubocop (~> 1.50.0)
+      rubocop-performance (~> 1.17.0)
+      rubocop-rails (~> 2.19.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.12.0)
+      rubocop-rspec (~> 2.20.0)
       rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.14.3)
+    rubocop-performance (1.17.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
-    sequel (5.61.0)
-    simplecov (0.21.2)
+    ruby-progressbar (1.13.0)
+    sequel (5.70.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -92,15 +97,14 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     symbiont-ruby (0.7.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   money
   pg
   pry
@@ -112,4 +116,4 @@ DEPENDENCIES
   umbrellio-sequel-plugins!
 
 BUNDLED WITH
-   2.3.23
+   2.4.15

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

@@ -16,7 +16,7 @@ module Sequel::Plugins::StoreAccessors
     #   user.first_name # => "John"
     #   user.data # => {"first_name": "John"}
     def store(column, *fields)
-      include_accessors_module
+      include_accessors_module(column)
 
       fields.each do |field|
         define_store_getter(column, field)
@@ -24,12 +24,22 @@ module Sequel::Plugins::StoreAccessors
       end
     end
 
+    def call(_)
+      super.tap(&:calculate_initial_store)
+    end
+
     private
 
-    def include_accessors_module
-      return if defined?(@_store_accessors_module)
-      @_store_accessors_module = Module.new
-      include @_store_accessors_module
+    def include_accessors_module(column)
+      unless defined?(@_store_accessors_module)
+        @_store_accessors_module = Module.new
+        include @_store_accessors_module
+      end
+
+      prev_columns = @_store_accessors_module.instance_variable_get(:@_store_columns) || []
+      new_columns = [*prev_columns, column]
+      @_store_accessors_module.instance_variable_set(:@_store_columns, new_columns)
+      @_store_accessors_module.define_method(:store_columns) { new_columns }
     end
 
     def define_store_getter(column, field)
@@ -48,4 +58,95 @@ module Sequel::Plugins::StoreAccessors
       end
     end
   end
+
+  module InstanceMethods
+    def after_update
+      super
+      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
+
+    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)
+      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/lib/tasks/sequel/rollback_archived_migrations.rake

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "sequel/timestamp_migrator_undo_extension"
+
+namespace :sequel do
+  desc "Rollback migrations that were applied earlier but are not present in current release"
+  task rollback_archived_migrations: :environment do
+    DB.log_info("Finding applied migrations not present in current release...")
+
+    archive_path = Pathname.new(ENV.fetch("ARCHIVE_PATH")).expand_path.join("db/migrate")
+    migrator = Sequel::TimestampMigrator.new(DB, archive_path, allow_missing_migration_files: true)
+
+    applied_migrations = migrator.applied_migrations.map(&:to_i)
+    filesystem_migrations = Rails.root.glob("db/migrate/*.rb").map { |x| File.basename(x).to_i }
+    missing_migrations = applied_migrations - filesystem_migrations
+
+    if missing_migrations.any?
+      missing_migrations.each do |migration|
+        DB.log_info("Rolling back migration #{migration}...")
+        migrator.undo(migration)
+      end
+    else
+      DB.log_info("No migrations found")
+    end
+  end
+end

data/lib/tasks/sequel/rollback_missing_migrations.rake

@@ -3,15 +3,14 @@
 require "sequel/timestamp_migrator_undo_extension"
 
 namespace :sequel do
-  # Rollback migrations that are absent in revision when deploying on staging
+  desc "Rollback migrations that are absent in revision when deploying on staging"
   task rollback_missing_migrations: :environment do
-    # Extract migrations
-    def extract_migrations(path)
+    extract_migrations = lambda do |path|
       Dir.glob("#{path}/db/migrate/*.rb").map { |filename| File.basename(filename).to_i }
     end
 
-    old_migrations = extract_migrations(ENV.fetch("OLD_RELEASE"))
-    new_migrations = extract_migrations(ENV.fetch("NEW_RELEASE"))
+    old_migrations = extract_migrations.call(ENV.fetch("OLD_RELEASE"))
+    new_migrations = extract_migrations.call(ENV.fetch("NEW_RELEASE"))
     migrations_to_rollback = old_migrations - new_migrations
 
     next if migrations_to_rollback.empty?
@@ -19,7 +18,7 @@ namespace :sequel do
     puts "Rolling back migrations:"
     puts migrations_to_rollback
 
-    path = ::Rails.root.join("db/migrate")
+    path = Rails.root.join("db/migrate")
     migrator = Sequel::TimestampMigrator.new(DB, path, allow_missing_migration_files: true)
     applied_migrations = migrator.applied_migrations.map(&:to_i)
     migrations = applied_migrations.select { |m| m.in?(migrations_to_rollback) }.sort.reverse

data/lib/tasks/sequel/undo.rake

@@ -3,12 +3,12 @@
 require "sequel/timestamp_migrator_undo_extension"
 
 namespace :sequel do
-  # Rollback a specific migration
+  desc "Rollback a specific migration"
   task undo: :environment do
-    version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+    version = ENV["VERSION"]&.to_i
     raise "VERSION is required" unless version
 
-    path = ::Rails.root.join("db/migrate")
+    path = Rails.root.join("db/migrate")
     migrator = Sequel::TimestampMigrator.new(DB, path, allow_missing_migration_files: true)
     migrator.undo(version)
   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.12.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"
@@ -26,14 +26,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "sequel"
   spec.add_runtime_dependency "symbiont-ruby"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "money"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop-config-umbrellio"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-lcov"
 end

data/utils/database.rb

@@ -2,7 +2,7 @@
 
 require "logger"
 
-DB = Sequel.connect(ENV.fetch("DB_URL", "postgres://localhost/sequel_plugins"))
+DB = Sequel.connect(ENV.fetch("DB_URL", "postgres:///sequel_plugins"))
 DB.logger = Logger.new("log/db.log")
 
 Sequel::Model.db = DB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.10.0.101
+  version: 0.12.0
 platform: ruby
 authors:
 - Team Umbrellio
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -38,132 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-lcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A colletion of sequel plugins by Umbrellio
 email:
 - oss@umbrellio.biz
@@ -201,6 +75,7 @@ files:
 - lib/sequel/plugins/upsert.rb
 - lib/sequel/plugins/with_lock.rb
 - lib/sequel/timestamp_migrator_undo_extension.rb
+- lib/tasks/sequel/rollback_archived_migrations.rake
 - lib/tasks/sequel/rollback_missing_migrations.rake
 - lib/tasks/sequel/undo.rake
 - lib/umbrellio-sequel-plugins.rb
@@ -213,7 +88,7 @@ homepage: https://github.com/umbrellio/umbrellio-sequel-plugins
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.15
+signing_key:
 specification_version: 4
 summary: Sequel plugins
 test_files: []