active_record_encryption 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585c87bfd8ce7dc5dd9aa303a89f23b5f7f7060e53401538465214e717f4cf4e
-  data.tar.gz: adf27af387edb8ff6cac34ea735c8189e26889a59c22b8f0eb19fe190cc8f27f
+  metadata.gz: bc2770632c4ba57ce5f3b807e9fe4e45ef18e959176ae907635e65a0de4f686d
+  data.tar.gz: 7f98301e66f31aaa043cd5c3a2ab58e655d7da9023bd8fd1d6a310b938b642e6
 SHA512:
-  metadata.gz: '09cf19da814c601fafc4e5e05c64ac2eb6926f540e2116e2536c0eef1ef72529f1d2865403f2a7475ddd53b8de0ef5f1d42cfa8408b42fc48b0552ef74e8a569'
-  data.tar.gz: 9a6602b13e6ced26450cee8ed43feab631ecd1a2cb009ed26d7a0f0df9a3a482f34b2cc7f63dc52316574c7274680b8296be1c749df83c4387d8287da7e5f178
+  metadata.gz: 5884f04a7b4e6fab65ce2044502b5387c172917442c4d29715bd368c75cdecd9b49bb6862c8493bd7668bd3780c431d036fbd8dfac5a2cd9d6a12e33e2453790
+  data.tar.gz: 6f1c82c9b173fe8d6cdb19cf6a71e6dc9ef8be793028b27a5e230b0f885554c700f105f2354b1c74d905d49384afcb44480f3f9f5254c15867e0a8200ade8c0c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0
+
+- Support rails 6.1.0 #22
+- Ensure casting only when Rails less than 6.0 #21
+- Fix Ruby 2.7 keyword arguments warnings #20
+
 ## 0.2.1
 
 - Fixes #13 Add `:cipher` option to `active_support` encryptor to change cipher.

data/README.md

@@ -49,7 +49,7 @@ class PointLog < ActiveRecord::Base
   encrypted_attribute(:serialized_address, :string)
 
   # Change encryptor
-  encrypted_attribute(:name, :field, encryption: { encryptor: :active_support, key: ENV['ENCRYPTION_KEY'], salt: ['ENCRYPTION_SALT'] })
+  encrypted_attribute(:name, :field, encryption: { encryptor: :active_support, key: ENV['ENCRYPTION_KEY'], salt: ENV['ENCRYPTION_SALT'] })
 end
 ```
 

data/lib/active_record_encryption/encrypted_attribute.rb

@@ -6,7 +6,7 @@ module ActiveRecordEncryption
 
     module ClassMethods
       def encrypted_attribute(name, subtype, **options)
-        attribute(name, :encryption, options.merge(subtype: subtype))
+        attribute(name, :encryption, **options, subtype: subtype)
       end
     end
   end

data/lib/active_record_encryption/encryptor/base.rb

@@ -4,7 +4,7 @@ module ActiveRecordEncryption
   module Encryptor
     # Abstract interface of encryptor
     class Base
-      def initialize(*); end
+      def initialize(*, **); end
 
       def encrypt(value)
         value

data/lib/active_record_encryption/encryptor/registry.rb

@@ -2,32 +2,15 @@
 
 module ActiveRecordEncryption
   module Encryptor
-    class Registry
-      def initialize
-        @registrations = []
-      end
-
-      def register(encryptor_name, klass = nil, **options, &block)
-        block ||= proc { |_, *args| klass.new(*args) }
-        registrations << Registration.new(encryptor_name, block, **options)
-      end
-
-      def lookup(symbol, *args)
-        registration = find_registration(symbol, *args)
-
-        if registration
-          registration.call(self, symbol, *args)
-        else
-          raise ArgumentError, "Unknown encryptor #{symbol.inspect}"
-        end
-      end
-
+    class Registry < ActiveModel::Type::Registry
       private
 
-      attr_reader :registrations
+      def registration_klass
+        Registration
+      end
 
-      def find_registration(symbol, *args)
-        registrations.find { |registration| registration.matches?(symbol, *args) }
+      def find_registration(symbol, *args, **kwargs)
+        registrations.find { |r| r.matches?(symbol, *args, **kwargs) }
       end
     end
 

data/lib/active_record_encryption/serializer_with_cast.rb

@@ -15,15 +15,19 @@ module ActiveRecordEncryption
     #   User.attribute(:id, :boolean)
     #   User.where(id: 'string').to_sql #=> SELECT `users`.* FROM `users` WHERE `users`.`id` = TRUE
     #   User.where(id: true).to_sql     #=> SELECT `users`.* FROM `users` WHERE `users`.`id` = TRUE
-    refine ActiveModel::Type::Decimal do
-      def serialize(value)
-        cast(value)
+    if ActiveRecord.gem_version < Gem::Version.create('6.0')
+      # https://github.com/rails/rails/commit/a741208f80dd33420a56486bd9ed2b0b9862234a
+      refine ActiveModel::Type::Decimal do
+        def serialize(value)
+          cast(value)
+        end
       end
-    end
 
-    refine ActiveModel::Type::Boolean do
-      def serialize(value)
-        cast(value)
+      # https://github.com/rails/rails/commit/34cc301f03aea2e579d6687a9ea9782afc1089a0
+      refine ActiveModel::Type::Boolean do
+        def serialize(value)
+          cast(value)
+        end
       end
     end
 

data/lib/active_record_encryption/type.rb

@@ -57,7 +57,7 @@ module ActiveRecordEncryption
       if encryptor.is_a?(Symbol)
         ActiveRecordEncryption::Encryptor.lookup(encryptor, **options)
       elsif encryptor.is_a?(Class)
-        encryptor.new(options)
+        encryptor.new(**options)
       else
         encryptor
       end

data/lib/active_record_encryption/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordEncryption
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_encryption
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - alpaca-tc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +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: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +84,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +194,7 @@ homepage: https://github.com/alpaca-tc/active_record_encryption
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,9 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Transparent ActiveRecord encryption
 test_files: []