umbrellio-sequel-plugins 0.4.0.81 → 0.4.0.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1506132f68e964f7e3f06370a9766cdad8b89d84ad4e810e73ab3225e6f1140b
-  data.tar.gz: 0f1774262d2a637abd9dfd8a5bd379a2a22cac5a0f0836c7c742e115657ff467
+  metadata.gz: 61fbe7c339511660a7a6797732df54b1215d84820ba80d97f434076b329ac2af
+  data.tar.gz: a4802265e7bd4ffe9c21b7eaa9ba7d071bf75b81f09d6198412201882f59ede5
 SHA512:
-  metadata.gz: 3c2f62536da956885da8d21c21ca9704925e85dce9de4eafd24948e30dea6b354281384529b80f7bd6f1076f17348bb58e2aff378ec6d8a54b285e367f26b7cb
-  data.tar.gz: 58e5e45610d3dd9746b17bef038fd4609634d1050ed5619766dd30eeecf8c1fa5dc64b710c0b1cfa2a2b0660786a01e3264c6f21334a935bbce0d4aef7415ff7
+  metadata.gz: 9ee225f47d644536885adf0f63569c64e0d079abb22faca00415c663ffdaafaf27679eb63af7206dabb4accdfa87fb025e8cacece1e59feaf8ce8bb96fce9d42
+  data.tar.gz: 4f65c05c159e82e6999e463bd2a5c10e1c37110b43d7cec383416c9d6acd90536777740c4b936186f4deade9ece47ef2542f1de63f0ac4620755682820120577

data/.gitignore

@@ -10,6 +10,4 @@
 # rspec failure tracking
 .rspec_status
 
-Gemfile.lock
-
 log

data/.travis.yml

@@ -1,25 +1,52 @@
 language: ruby
-matrix:
+
+os: linux
+dist: xenial
+
+jobs:
   fast_finish: true
   include:
-  - rvm: 2.4
   - rvm: 2.5
   - rvm: 2.6
+  - rvm: 2.7
   - rvm: ruby-head
   allow_failures:
   - rvm: ruby-head
-sudo: false
-cache: bundler
+
 services:
 - postgresql
+
 addons:
-  postgresql: 9.6
-before_install: gem install bundler
+  postgresql: 12
+  apt:
+    packages:
+    - postgresql-12
+    - postgresql-client-12
+    - postgresql-server-dev-12
+    - postgresql-client-common
+    - postgresql-common
+
+env:
+  global:
+  - PGPORT=5433
+
+cache: bundler
+
+before_install:
+- gem install bundler
+- sudo cp /etc/postgresql/9.6/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf
+- sudo service postgresql restart 12
+- sleep 1
+
+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:
@@ -28,3 +55,4 @@ deploy:
   on:
     repo: umbrellio/umbrellio-sequel-plugins
     branch: master
+    rvm: 2.7

data/Gemfile.lock

@@ -0,0 +1,117 @@
+PATH
+  remote: .
+  specs:
+    umbrellio-sequel-plugins (0.4.0)
+      sequel
+      symbiont-ruby (>= 0.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.2.2)
+      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)
+      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)
+      i18n (>= 0.6.4, <= 2)
+    parallel (1.19.1)
+    parser (2.7.1.0)
+      ast (~> 2.4.0)
+    pg (1.2.3)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.2)
+    rainbow (3.0.0)
+    rake (13.0.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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      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)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      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
+      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)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  coveralls (>= 0.8)
+  money
+  pg
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  simplecov
+  umbrellio-sequel-plugins!
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -13,28 +13,30 @@ gem 'umbrellio-sequel-plugins'
 
 And then execute:
 
-    $ bundle
+$ bundle
 
 # Extensions
 
-- `CurrencyRates`
-- `PGTools`
-- `Slave`
-- `Synchronize`
-- `methods_in_migrations`
-- `deferrable_foreign_keys`
+- [`CurrencyRates`](#CurrencyRates)
+- [`PGTools`](#PGTools)
+- [`Slave`](#Slave)
+- [`Synchronize`](#Synchronize)
+- [`methods_in_migrations`](#methods_in_migrations)
+- [`deferrable_foreign_keys`](#deferrable_foreign_keys)
 
 # Plugins
 
-- `Duplicate`
-- `GetColumnValue`
-- `StoreAccessors`
-- `Synchronize`
-- `Upsert`
-- `WithLock`
+- [`AttrEncrypted`](#AttrEncrypted)
+- [`Duplicate`](#Duplicate)
+- [`GetColumnValue`](#GetColumnValue)
+- [`MoneyAccessors`](#MoneyAccessors)
+- [`StoreAccessors`](#StoreAccessors)
+- [`Synchronize`](#Synchronize)
+- [`Upsert`](#Upsert)
+- [`WithLock`](#WithLock)
 
 # Tools
-- `TimestampMigratorUndoExtension`
+- [`TimestampMigratorUndoExtension`](#TimestampMigratorUndoExtension)
 
 ## CurrencyRates
 
@@ -202,6 +204,40 @@ end
 #   => <Husband @attributes={id:1, wife_id: 1}>
 ```
 
+## AttrEncrypted
+
+Enable: `Sequel::Model.plugin :attr_encrypted`
+
+Plugin for storing encrypted model attributes.
+
+Example:
+
+```ruby
+Sequel.migration do
+  change do
+    alter_table :orders do
+      add_column :encrypted_first_name, :text
+      add_column :encrypted_last_name, :text
+      add_column :encrypted_secret_data, :text
+    end
+  end
+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
+end
+
+Order.create(first_name: "Ivan")
+# => INSERT INTO "orders" ("encrypted_first_name") VALUES ('/sTi9Q==$OTpuMRq5k8R3JayQ$WjSManQGP9UaZ3C40yDjKg==')
+
+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" }
+```
+
 ## Duplicate
 
 Enable: `Sequel::Model.plugin :duplicate`
@@ -237,6 +273,60 @@ item.price # => #
 item.get_column_value(:amount) # => 0.5e2
 ```
 
+## MoneyAccessors
+
+**Important:** requires `money` gem described below.
+
+Plugin for using money field keys as model properties.
+
+Enable:
+
+```ruby
+gem "money"
+Sequel::Model.plugin :money_accessors
+````
+
+Examples of usage:
+
+##### Money accessor
+
+```ruby
+class Order < Sequel::Model
+  money_accessor :amount, :currency
+end
+
+order = Order.create(amount: 200, currency: "EUR")
+order.amount # => #<Money fractional:20000.0 currency:EUR>
+order.currency # => "EUR"
+
+order.amount = Money.new(150, "RUB")
+order.amount # => #<Money fractional:150.0 currency:RUB>
+```
+
+##### Money setter
+
+```ruby
+class Order < Sequel::Model
+  money_setter :amount, :currency
+end
+
+order = Order.create(amount: 200, currency: "EUR")
+order.amount = Money.new(150, "RUB")
+order.currency # => "RUB"
+```
+
+##### Money getter
+
+```ruby
+class Order < Sequel::Model
+  money_getter :amount, :currency
+end
+
+order = Order.create(amount: 200, currency: "EUR")
+order.amount # => #<Money fractional:20000.0 currency:EUR>
+order.currency # => "EUR"
+```
+
 ## StoreAccessors
 
 Enable: `Sequel::Model.plugin :store_accessors`
@@ -247,7 +337,7 @@ Example:
 
 ```ruby
 class User < Sequel::Model
-   store :data, :first_name
+  store :data, :first_name
 end
 
 user = User.create(first_name: "John")
@@ -257,7 +347,7 @@ user.data # => {"first_name": "John"}
 
 ## Synchronize
 
-**Important:** requires a `synchronize` extension described above.
+**Important:** requires a `synchronize` extension described below.
 
 Same as `DB#synchronize_with`
 
@@ -299,7 +389,7 @@ Example:
 ```ruby
 user = User.first
 user.with_lock do
-    user.update(name: "James")
+  user.update(name: "James")
 end
 ```
 

data/lib/sequel/plugins/attr_encrypted.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Creates encrypted attribute storing
+module Sequel::Plugins::AttrEncrypted
+  SEPARATOR = "$"
+
+  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
+    #       alter_table :orders do
+    #         add_column :encrypted_first_name, :text
+    #         add_column :encrypted_last_name, :text
+    #         add_column :encrypted_secret_data, :text
+    #       end
+    #     end
+    #   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
+    #   end
+
+    #   Order.create(first_name: "Ivan")
+    #   # => INSERT INTO "orders" ("encrypted_first_name")
+    #               VALUES ('/sTi9Q==$OTpuMRq5k8R3JayQ$WjSManQGP9UaZ3C40yDjKg==')
+    #
+    #   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" }
+    def attr_encrypted(*attrs, key:, json: false)
+      include_encrypted_module!
+      attrs.each do |attr|
+        define_encrypted_setter(attr, key, json)
+        define_encrypted_getter(attr, key, json)
+      end
+    end
+
+    private
+
+    def define_encrypted_setter(attr, key, json)
+      @_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))
+        end
+      end
+    end
+
+    def define_encrypted_getter(attr, key, json)
+      @_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
+            instance_variable_set("@#{attr}", result)
+          end
+        end
+      end
+    end
+
+    def include_encrypted_module!
+      return if defined?(@_attr_encrypted_module)
+
+      @_attr_encrypted_module = Module.new
+      prepend @_attr_encrypted_module
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Sequel::Plugins::AttrEncrypted::SimpleCrypt
+  extend self
+  require "base64"
+
+  SEPARATOR = "$"
+
+  def encrypt(string, key)
+    return unless string.is_a?(String) && !string.empty?
+
+    encryptor = new_cipher(key, &:encrypt)
+    iv = encryptor.random_iv
+
+    encrypted = encryptor.update(string) + encryptor.final
+    dump(encrypted, iv, encryptor.auth_tag)
+  end
+
+  def decrypt(string, key)
+    encrypted, iv, auth_tag = parse(string) if string.is_a?(String)
+    return if [encrypted, iv, auth_tag].any?(&:nil?)
+
+    decryptor = new_cipher(key, &:decrypt)
+    decryptor.iv = iv
+    decryptor.auth_tag = auth_tag
+
+    decryptor.update(encrypted) + decryptor.final
+  end
+
+  private
+
+  def new_cipher(key)
+    result = OpenSSL::Cipher::AES256.new(:gcm)
+    yield(result)
+    result.key = key
+    result
+  end
+
+  def parse(string)
+    string.split(SEPARATOR).map { |x| Base64.strict_decode64(x) }
+  end
+
+  def dump(*values)
+    [*values].map { |x| Base64.strict_encode64(x) }.join(SEPARATOR)
+  end
+end

data/lib/sequel/plugins/money_accessors.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "money"
+
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
+
+# Creates accessors for money values
+module Sequel::Plugins::MoneyAccessors
+  MoneyClassRequired = Class.new(StandardError)
+
+  module ClassMethods
+    # Setup money accessor
+    #
+    # @param amount_column [Symbol] amount column
+    # @param currency_column [Symbol] currency column
+    # @example
+    #   class Order < Sequel::Model
+    #     money_accessor :amount, :currency
+    #   end
+    #
+    #   order = Order.create(amount: 200, currency: "EUR")
+    #   order.amount # => #<Money fractional:20000.0 currency:RUB>
+    #   order.currency # => "EUR"
+    def money_accessor(amount_column, currency_column)
+      money_getter(amount_column, currency_column)
+      money_setter(amount_column, currency_column)
+    end
+
+    def money_getter(amount_column, currency_column)
+      include_accessors_module!
+      @_money_accessors_module.module_eval do
+        define_method(amount_column) do
+          amount, currency = super(), send(currency_column)
+          return unless amount && currency
+          Money.from_amount(amount.to_d, currency)
+        end
+      end
+    end
+
+    def money_setter(amount_column, currency_column)
+      include_accessors_module!
+      @_money_accessors_module.module_eval do
+        define_method("#{amount_column}=") do |value|
+          case value
+          when Money
+            amount = value.to_d
+            currency = value.currency.to_s
+          when nil
+            amount = currency = nil
+          else
+            raise MoneyClassRequired, "#{amount_column} value must be either Money instance or nil"
+          end
+
+          super(amount)
+          send("#{currency_column}=", currency)
+        end
+      end
+    end
+
+    private
+
+    def include_accessors_module!
+      return if defined?(@_money_accessors_module)
+      @_money_accessors_module = Module.new
+      prepend @_money_accessors_module
+    end
+  end
+end

data/lib/sequel/plugins/upsert.rb

@@ -39,7 +39,7 @@ module Sequel::Plugins::Upsert
     # @see #upsert_dataset
     def multi_upsert(rows, **options)
       rows = rows.map { |row| sequel_values(row) }
-      upsert_dataset(options).multi_insert(rows)
+      upsert_dataset(**options).multi_insert(rows)
     end
 
     # Returns formatted row values

data/lib/sequel/timestamp_migrator_undo_extension.rb

@@ -23,7 +23,7 @@ module Sequel
         ds.filter(column => filename).delete
       end
 
-      elapsed = format("%0.6f", Time.now - time)
+      elapsed = format("%<time>0.6f", time: Time.now - time)
       db.log_info("Finished undoing migration #{filename}, took #{elapsed} seconds")
     end
 

data/umbrellio-sequel-plugins.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sequel"
+  spec.add_runtime_dependency "sequel"
   spec.add_runtime_dependency "symbiont-ruby", ">= 0.6"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls", ">= 0.8"
+  spec.add_development_dependency "money"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"

data/utils/database.rb

@@ -22,8 +22,10 @@ Sequel.extension :pg_array_ops
 Sequel.extension :pg_json_ops
 Sequel.extension :pg_range_ops
 
+Sequel::Model.plugin :attr_encrypted
 Sequel::Model.plugin :duplicate
 Sequel::Model.plugin :get_column_value
+Sequel::Model.plugin :money_accessors
 Sequel::Model.plugin :store_accessors
 Sequel::Model.plugin :synchronize
 Sequel::Model.plugin :upsert

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.4.0.81
+  version: 0.4.0.134
 platform: ruby
 authors:
 - nulldef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +178,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -175,8 +190,11 @@ files:
 - lib/sequel/extensions/pg_tools.rb
 - lib/sequel/extensions/slave.rb
 - lib/sequel/extensions/synchronize.rb
+- lib/sequel/plugins/attr_encrypted.rb
+- lib/sequel/plugins/attr_encrypted/simple_crypt.rb
 - lib/sequel/plugins/duplicate.rb
 - lib/sequel/plugins/get_column_value.rb
+- lib/sequel/plugins/money_accessors.rb
 - lib/sequel/plugins/store_accessors.rb
 - lib/sequel/plugins/synchronize.rb
 - lib/sequel/plugins/upsert.rb
@@ -208,7 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sequel plugins