umbrellio-sequel-plugins 0.4.0.134 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fbe7c339511660a7a6797732df54b1215d84820ba80d97f434076b329ac2af
-  data.tar.gz: a4802265e7bd4ffe9c21b7eaa9ba7d071bf75b81f09d6198412201882f59ede5
+  metadata.gz: 2bf5561f5521d95035e4c2c6eff801b27e2115e5e7b0dd72ea29d3a1585ba79d
+  data.tar.gz: 64f7d874e0acb664df12bd938714a90da117354b5c8ef72ed636f4d509711983
 SHA512:
-  metadata.gz: 9ee225f47d644536885adf0f63569c64e0d079abb22faca00415c663ffdaafaf27679eb63af7206dabb4accdfa87fb025e8cacece1e59feaf8ce8bb96fce9d42
-  data.tar.gz: 4f65c05c159e82e6999e463bd2a5c10e1c37110b43d7cec383416c9d6acd90536777740c4b936186f4deade9ece47ef2542f1de63f0ac4620755682820120577
+  metadata.gz: 61c1c97fd1e348a891a4e705e001fb7e9af1542eed57e7c0743dfc515152b605f0204285637f97e5d9adce264a4b1e32326b9df7b09e8c863077cdbb635d2c68
+  data.tar.gz: 024655212c2613e135764b680f0be5623a8012f764b208ca07ab1e4ecb4d66c5777bd9574804bb3fc9de8e0f09343b21b6726b53cf4a1576cdbe658c1f20c5a6

data/.github/workflows/ci.yml

@@ -0,0 +1,65 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/umbrellio-sequel-plugins'
+
+    services:
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_USER: root
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    env:
+      PGHOST: localhost
+      PGUSER: root
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
+
+    name: ${{ matrix.ruby }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - run: psql -c 'CREATE DATABASE sequel_plugins'
+    - run: bundle exec rake
+
+    - uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  deploy:
+    runs-on: ubuntu-latest
+
+    environment: Deploy
+
+    # Run on push to master branch
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: umbrellio/publish-ruby-gem-action@v1
+        with:
+          api-key: ${{secrets.RUBYGEMS_API_KEY}}

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 os: linux
+
 dist: xenial
 
 jobs:
@@ -43,10 +44,6 @@ install: bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 before_script:
 - psql -c 'create database sequel_plugins;' -U postgres
 
-script:
-- bundle exec rspec
-- bundle exec rubocop
-
 deploy:
   provider: rubygems
   api_key:

data/Gemfile.lock

@@ -1,109 +1,107 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.4.0)
+    umbrellio-sequel-plugins (0.5.0)
       sequel
-      symbiont-ruby (>= 0.6)
+      symbiont-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ast (2.4.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (1.8.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
     method_source (1.0.0)
-    minitest (5.14.0)
-    money (6.13.7)
+    minitest (5.14.4)
+    money (6.14.1)
       i18n (>= 0.6.4, <= 2)
-    parallel (1.19.1)
-    parser (2.7.1.0)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (1.2.3)
-    pry (0.13.0)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-config-umbrellio (0.81.0.78)
-      rubocop (= 0.81.0)
-      rubocop-performance (= 1.5.2)
-      rubocop-rails (= 2.5.0)
-      rubocop-rspec (= 1.38.1)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.5.0)
-      activesupport
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-config-umbrellio (1.11.0.40)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.0)
+      rubocop-rails (= 2.9.1)
+      rubocop-rake (= 0.5.1)
+      rubocop-rspec (= 2.2.0)
+      rubocop-sequel (= 0.2.0)
+    rubocop-performance (1.10.0)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    sequel (5.31.0)
-    simplecov (0.16.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-sequel (0.2.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    sequel (5.42.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.2)
     symbiont-ruby (0.6.0)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tins (1.24.1)
-      sync
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  coveralls (>= 0.8)
   money
   pg
   pry
@@ -111,7 +109,8 @@ DEPENDENCIES
   rspec
   rubocop-config-umbrellio
   simplecov
+  simplecov-lcov
   umbrellio-sequel-plugins!
 
 BUNDLED WITH
-   2.1.4
+   2.2.11

data/README.md

@@ -21,8 +21,8 @@ $ bundle
 - [`PGTools`](#PGTools)
 - [`Slave`](#Slave)
 - [`Synchronize`](#Synchronize)
-- [`methods_in_migrations`](#methods_in_migrations)
-- [`deferrable_foreign_keys`](#deferrable_foreign_keys)
+- [`Methods in Migrations`](#Methods-in-Migrations)
+- [`Deferrable Foreign Keys`](#Deferrable-Foreign-Keys)
 
 # Plugins
 
@@ -225,7 +225,7 @@ end
 
 class Order < Sequel::Model
   attr_encrypted :first_name, :last_name, key: Settings.private_key
-  attr_encrypted :secret_data, key: Settings.another_private_key, json: true
+  attr_encrypted :secret_data, key: Settings.another_private_key
 end
 
 Order.create(first_name: "Ivan")
@@ -233,7 +233,6 @@ Order.create(first_name: "Ivan")
 
 order = Order.create(first_name: "Ivan", last_name: "Smith",
                       secret_data: { "some_key" => "Some Value" })
-order.reload
 order.first_name # => "Ivan"
 order.secret_data # => { "some_key" => "Some Value" }
 ```

data/Rakefile

@@ -2,7 +2,9 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:lint)
 
-task default: :spec
+task default: %i[lint spec]

data/lib/sequel/plugins/attr_encrypted.rb

@@ -3,13 +3,13 @@
 # Creates encrypted attribute storing
 module Sequel::Plugins::AttrEncrypted
   SEPARATOR = "$"
+  require "sequel/plugins/attr_encrypted/simple_crypt"
 
   module ClassMethods
     # Setup attr encrypted
     #
     # @param attrs [Array<Symbol>] column names
     # @param key [String] 32 bytes key
-    # @param json [Boolean] store attribute as json or not
     # @example
     #   Sequel.migration do
     #     change do
@@ -23,7 +23,7 @@ module Sequel::Plugins::AttrEncrypted
     #
     #   class Order < Sequel::Model
     #     attr_encrypted :first_name, :last_name, key: Settings.private_key
-    #     attr_encrypted :secret_data, key: Settings.another_private_key, json: true
+    #     attr_encrypted :secret_data, key: Settings.another_private_key
     #   end
 
     #   Order.create(first_name: "Ivan")
@@ -32,36 +32,37 @@ module Sequel::Plugins::AttrEncrypted
     #
     #   order = Order.create(first_name: "Ivan", last_name: "Smith",
     #                        secret_data: { "some_key" => "Some Value" })
-    #   order.reload
     #   order.first_name # => "Ivan"
+    #   order.last_name # => "Smith"
     #   order.secret_data # => { "some_key" => "Some Value" }
-    def attr_encrypted(*attrs, key:, json: false)
+    def attr_encrypted(*attrs, key:)
       include_encrypted_module!
       attrs.each do |attr|
-        define_encrypted_setter(attr, key, json)
-        define_encrypted_getter(attr, key, json)
+        define_encrypted_setter(attr, key)
+        define_encrypted_getter(attr, key)
+        @_encrypted_attributes << attr
       end
     end
 
     private
 
-    def define_encrypted_setter(attr, key, json)
+    def define_encrypted_setter(attr, key)
       @_attr_encrypted_module.module_eval do
         define_method("#{attr}=") do |value|
           instance_variable_set("@#{attr}", value)
 
-          send("encrypted_#{attr}=", SimpleCrypt.encrypt(json ? value.to_json : value, key))
+          send("encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
         end
       end
     end
 
-    def define_encrypted_getter(attr, key, json)
+    def define_encrypted_getter(attr, key)
       @_attr_encrypted_module.module_eval do
         define_method(attr.to_s) do
           instance_variable_get("@#{attr}") || begin
             decrypted = SimpleCrypt.decrypt(send("encrypted_#{attr}"), key)
 
-            result = json && !decrypted.nil? ? JSON.parse(decrypted) : decrypted
+            result = decrypted.nil? ? decrypted : JSON.parse(decrypted)
             instance_variable_set("@#{attr}", result)
           end
         end
@@ -71,8 +72,27 @@ module Sequel::Plugins::AttrEncrypted
     def include_encrypted_module!
       return if defined?(@_attr_encrypted_module)
 
+      @_encrypted_attributes ||= []
       @_attr_encrypted_module = Module.new
       prepend @_attr_encrypted_module
     end
   end
+
+  module InstanceMethods
+    def save(*)
+      super.tap { _reset_encrypted_attrs_ivars }
+    end
+
+    def refresh(*)
+      super.tap { _reset_encrypted_attrs_ivars }
+    end
+
+    private
+
+    def _reset_encrypted_attrs_ivars
+      self.class.instance_variable_get(:@_encrypted_attributes)&.each do |attr|
+        instance_variable_set("@#{attr}", nil)
+      end
+    end
+  end
 end

data/lib/sequel/plugins/attr_encrypted/simple_crypt.rb

@@ -30,7 +30,7 @@ module Sequel::Plugins::AttrEncrypted::SimpleCrypt
   private
 
   def new_cipher(key)
-    result = OpenSSL::Cipher::AES256.new(:gcm)
+    result = OpenSSL::Cipher.new("aes-256-gcm")
     yield(result)
     result.key = key
     result
@@ -41,6 +41,6 @@ module Sequel::Plugins::AttrEncrypted::SimpleCrypt
   end
 
   def dump(*values)
-    [*values].map { |x| Base64.strict_encode64(x) }.join(SEPARATOR)
+    Array(values).map { |x| Base64.strict_encode64(x) }.join(SEPARATOR)
   end
 end

data/lib/sequel/plugins/with_lock.rb

@@ -5,12 +5,12 @@ module Sequel::Plugins::WithLock
     # Execute block with lock
     #
     # @yield
-    def with_lock
+    def with_lock(savepoint: true)
       return yield if @__locked
       @__locked = true
 
       begin
-        db.transaction do
+        db.transaction(savepoint: savepoint) do
           lock!
           yield
         end

data/lib/sequel/timestamp_migrator_undo_extension.rb

@@ -8,10 +8,10 @@ module Sequel
     # Rollback a migration
     def undo(version)
       path = files.find { |file| migration_version_from_file(get_filename(file)) == version }
-      raise "Migration #{version} does not exist in the filesystem" unless path
+      error!("Migration #{version} does not exist in the filesystem") unless path
 
       filename = get_filename(path)
-      raise "Migration #{version} is not applied" unless applied_migrations.include?(filename)
+      error!("Migration #{version} is not applied") unless applied_migrations.include?(filename)
 
       migration = get_migration(path)
 
@@ -41,7 +41,7 @@ module Sequel
       end
     end
 
-    Sequel::TimestampMigrator.prepend TimestampMigratorLogger
+    Sequel::TimestampMigrator.prepend(TimestampMigratorLogger)
 
     private
 
@@ -57,6 +57,10 @@ module Sequel
     def get_filename(path)
       File.basename(path).downcase
     end
+
+    def error!(message)
+      raise Sequel::Migrator::Error, message
+    end
   end
 end
 # rubocop:enable Layout/ClassStructure

data/lib/umbrellio-sequel-plugins.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "umbrellio_sequel_plugins.rb"
+require_relative "umbrellio_sequel_plugins"

data/umbrellio-sequel-plugins.gemspec

@@ -4,11 +4,11 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.4.0"
-  release_version = ENV["TRAVIS"] ? "#{gem_version}.#{ENV["TRAVIS_BUILD_NUMBER"]}" : gem_version
+  gem_version = "0.5.1"
+  release_version = "#{gem_version}.#{ENV["GITHUB_RUN_NUMBER"]}" if ENV["GITHUB_ACTIONS"]
 
   spec.name = "umbrellio-sequel-plugins"
-  spec.version = release_version
+  spec.version = gem_version || release_version
   spec.required_ruby_version = ">= 2.4"
 
   spec.authors = ["nulldef"]
@@ -16,16 +16,15 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/umbrellio/umbrellio-sequel-plugins"
   spec.licenses = ["MIT"]
   spec.summary = "Sequel plugins"
-  spec.description = "Sequel plugins"
+  spec.description = "A colletion of sequel plugins by Umbrellio"
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sequel"
-  spec.add_runtime_dependency "symbiont-ruby", ">= 0.6"
+  spec.add_runtime_dependency "symbiont-ruby"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls", ">= 0.8"
   spec.add_development_dependency "money"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
@@ -33,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop-config-umbrellio"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-lcov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.4.0.134
+  version: 0.5.1
 platform: ruby
 authors:
 - nulldef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: money
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-config-umbrellio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Sequel plugins
+description: A colletion of sequel plugins by Umbrellio
 email:
 - nulldefiner@gmail.com
 - oss@umbrellio.biz
@@ -172,6 +172,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -226,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sequel plugins