attr_encrypted 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ebe1f889eadcc15b60089547792d023a5b32e4877a17789da28bc2ca33b3c1
-  data.tar.gz: 54540410056e0b49d7cc6af2077af4e45cf06aef354e0780757b93ff4af1e134
+  metadata.gz: 9f575e6c6da0da72cae27e9cdf4032e895005775ea44e15f33f2ff461b54e90b
+  data.tar.gz: c3a80d92586c59dac539d6bd7136249d53c7e022e6624c9c5c34035f7a6079f9
 SHA512:
-  metadata.gz: 55a0639ffee8def55645e2444d063ab18df7030f74404289735b2e9329ff65461ac0af3dab29248c337f9b5344aeb7c78d72f3d9155edabde689997c519c88b2
-  data.tar.gz: 22af4440292a3950cb2ca1ab4ed795972626fb974b962d5dc86ebec5492fb7f3a83b691d2432d691d39de66df0a244bfce31576af0b58ab65881b8faf1db8323
+  metadata.gz: 6389590ba9c038c2c9ea6fef5dd5766f406b1a9d6fdaf711209d977981bea4476605a5b89b2c37c83d5adfd11d733fef56994f4d0843011b6dbd25290d753d08
+  data.tar.gz: 4472de6edcd25f0ac3742d33d54afb8fa3fd6ffb11a8c0ae06982734e699dd49591e464899c641c26fc28b5ef36ad9c12107634e43c59817fe41f7e41cd1f397

data/.github/workflows/CI.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }} / ActiveRecord ${{ matrix.active_record }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { active_record: '5.1', ruby: '2.7' }
+          - { active_record: '5.2', ruby: '2.7' }
+          - { active_record: '6.0', ruby: '2.7' }
+          - { active_record: '6.0', ruby: '3.0' }
+          - { active_record: '6.0', ruby: '3.1' }
+          - { active_record: '6.0', ruby: '3.2' }
+          - { active_record: '6.1', ruby: '2.7' }
+          - { active_record: '6.1', ruby: '3.0' }
+          - { active_record: '6.1', ruby: '3.1' }
+          - { active_record: '6.1', ruby: '3.2' }
+          - { active_record: '7.0', ruby: '2.7' }
+          - { active_record: '7.0', ruby: '3.0' }
+          - { active_record: '7.0', ruby: '3.1' }
+          - { active_record: '7.0', ruby: '3.2' }
+          - { active_record: '7.1', ruby: '2.7' }
+          - { active_record: '7.1', ruby: '3.0' }
+          - { active_record: '7.1', ruby: '3.1' }
+          - { active_record: '7.1', ruby: '3.2' }
+          - { active_record: '7.1', ruby: '3.3' }
+          - { active_record: '7.2', ruby: '3.1' }
+          - { active_record: '7.2', ruby: '3.2' }
+          - { active_record: '7.2', ruby: '3.3' }
+          - { active_record: '7.2', ruby: '3.4' }
+          - { active_record: '8.0', ruby: '3.2' }
+          - { active_record: '8.0', ruby: '3.3' }
+          - { active_record: '8.0', ruby: '3.4' }
+    env:
+      ACTIVERECORD: ${{ matrix.active_record }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: |
+        bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # attr_encrypted
 
+## 4.2.0
+
+* Changed: Set minimum Ruby version as 2.7.
+* Added: Rails 7.2 and 8.0 support.
+* Fixed: Further removal of `datamapper` support.
+
+## 4.1.1
+
+* Fixed: Fix SystemStackError when extending the reload method with Module#prepend.
+
+## 4.1.0
+
+* Changed: Dropped support for `datamapper` which has not had a release since October 2011. This is in an attempt to make
+  maintenance and testing easier moving forward.
+
 ## 4.0.0
 
 * Added: Support for Ruby >= 3.0.

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "concurrent-ruby", "< 1.3.5"

data/README.md

@@ -1,11 +1,10 @@
 # attr_encrypted
 
-[![Build Status](https://secure.travis-ci.org/attr-encrypted/attr_encrypted.svg)](https://travis-ci.org/attr-encrypted/attr_encrypted) [![Test Coverage](https://codeclimate.com/github/attr-encrypted/attr_encrypted/badges/coverage.svg)](https://codeclimate.com/github/attr-encrypted/attr_encrypted/coverage) [![Code Climate](https://codeclimate.com/github/attr-encrypted/attr_encrypted/badges/gpa.svg)](https://codeclimate.com/github/attr-encrypted/attr_encrypted) [![Gem Version](https://badge.fury.io/rb/attr_encrypted.svg)](https://badge.fury.io/rb/attr_encrypted) [![security](https://hakiri.io/github/attr-encrypted/attr_encrypted/master.svg)](https://hakiri.io/github/attr-encrypted/attr_encrypted/master)
+![workflow](https://github.com/attr-encrypted/attr_encrypted/actions/workflows/CI.yml/badge.svg) [![Gem Version](https://badge.fury.io/rb/attr_encrypted.svg)](https://badge.fury.io/rb/attr_encrypted)
 
 Generates attr_accessors that transparently encrypt and decrypt attributes.
 
-It works with ANY class, however, you get a few extra features when you're using it with `ActiveRecord`, `DataMapper`, or `Sequel`.
-
+It works with ANY class, however, you get a few extra features when you're using it with `ActiveRecord` or `Sequel`.
 
 ## Installation
 
@@ -23,7 +22,7 @@ Then install the gem:
 
 ## Usage
 
-If you're using an ORM like `ActiveRecord`, `DataMapper`, or `Sequel`, using attr_encrypted is easy:
+If you're using an ORM like `ActiveRecord` or `Sequel`, using attr_encrypted is easy:
 
 ```ruby
   class User
@@ -364,7 +363,7 @@ NOTE: This only works if all records are encrypted with the same encryption key
 __NOTE: This feature is deprecated and will be removed in the next major release.__
 
 
-### DataMapper and Sequel
+### Sequel
 
 #### Default options
 

data/attr_encrypted.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.summary     = 'Encrypt and decrypt attributes'
   s.description = 'Generates attr_accessors that encrypt and decrypt attributes transparently'
 
-  s.authors   = ['Sean Huber', 'S. Brent Faulkner', 'William Monk', 'Stephen Aghaulor']
-  s.email    = ['seah@shuber.io', 'sbfaulkner@gmail.com', 'billy.monk@gmail.com', 'saghaulor@gmail.com']
+  s.authors   = ['Sean Huber', 'S. Brent Faulkner', 'William Monk', 'Stephen Aghaulor', 'Josh Branham', 'Mike Vastola']
+  s.email    = ['seah@shuber.io', 'sbfaulkner@gmail.com', 'billy.monk@gmail.com', 'saghaulor@gmail.com', 'josh.php@gmail.com', 'Mike@Vasto.la']
   s.homepage = 'http://github.com/attr-encrypted/attr_encrypted'
   s.license = 'MIT'
 
@@ -24,18 +24,17 @@ Gem::Specification.new do |s|
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
   s.add_dependency('encryptor', ['~> 3.0.0'])
   # support for testing with specific active record version
   activerecord_version = if ENV.key?('ACTIVERECORD')
-    "~> #{ENV['ACTIVERECORD']}"
+    "~> #{ENV['ACTIVERECORD']}.0"
   else
-    '>= 2.0.0'
+    '>= 6.0.0'
   end
   s.add_development_dependency('activerecord', activerecord_version)
   s.add_development_dependency('actionpack', activerecord_version)
-  s.add_development_dependency('datamapper')
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest')
   s.add_development_dependency('sequel')
@@ -43,9 +42,12 @@ Gem::Specification.new do |s|
     s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
     s.add_development_dependency('jdbc-sqlite3', '< 3.8.7') # 3.8.7 is nice and broke
   else
-    s.add_development_dependency('sqlite3', '= 1.5.4')
+    if ENV['ACTIVERECORD'] && Gem::Version.new(ENV['ACTIVERECORD']) >= Gem::Version.new('8.0')
+      s.add_development_dependency('sqlite3', '> 2.1.0')
+    else
+      s.add_development_dependency('sqlite3', '= 1.5.4')
+    end
   end
-  s.add_development_dependency('dm-sqlite-adapter')
   s.add_development_dependency('pry')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('simplecov-rcov')

data/lib/attr_encrypted/adapters/active_record.rb

@@ -6,19 +6,18 @@ if defined?(ActiveRecord::Base)
       module ActiveRecord
         RAILS_VERSION = Gem::Version.new(::ActiveRecord::VERSION::STRING).freeze
 
-        def self.extended(base) # :nodoc:
-          base.class_eval do
-
-            # https://github.com/attr-encrypted/attr_encrypted/issues/68
-            alias_method :reload_without_attr_encrypted, :reload
-            def reload(*args, &block)
-              result = reload_without_attr_encrypted(*args, &block)
-              self.class.attr_encrypted_encrypted_attributes.keys.each do |attribute_name|
-                instance_variable_set("@#{attribute_name}", nil)
-              end
-              result
+        module Reload
+          def reload(...)
+            result = super
+            self.class.attr_encrypted_encrypted_attributes.keys.each do |attribute_name|
+              instance_variable_set("@#{attribute_name}", nil)
             end
+            result
+          end
+        end
 
+        def self.extended(base) # :nodoc:
+          base.class_eval do
             attr_encrypted_options[:encode] = true
 
             class << self
@@ -148,5 +147,6 @@ if defined?(ActiveRecord::Base)
   ActiveSupport.on_load(:active_record) do
     extend AttrEncrypted
     extend AttrEncrypted::Adapters::ActiveRecord
+    prepend AttrEncrypted::Adapters::ActiveRecord::Reload
   end
 end

data/lib/attr_encrypted/version.rb

@@ -4,7 +4,7 @@ module AttrEncrypted
   # Contains information about this gem's version
   module Version
     MAJOR = 4
-    MINOR = 0
+    MINOR = 2
     PATCH = 0
 
     # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>

data/lib/attr_encrypted.rb

@@ -54,7 +54,7 @@ module AttrEncrypted
   #                         string instead of just 'true'. See
   #                         http://www.ruby-doc.org/core/classes/Array.html#M002245
   #                         for more encoding directives.
-  #                         Defaults to false unless you're using it with ActiveRecord, DataMapper, or Sequel.
+  #                         Defaults to false unless you're using it with ActiveRecord or Sequel.
   #
   #   encode_iv:            Defaults to true.
 

data/test/legacy_active_record_test.rb

@@ -29,9 +29,15 @@ class LegacyPerson < ActiveRecord::Base
   attr_encrypted :email, :key => 'a secret key'
   attr_encrypted :credentials, :key => Proc.new { |user| Encryptor.encrypt(:value => user.salt, :key => 'some private key', insecure_mode: true, algorithm: 'aes-256-cbc') }, :marshal => true
 
-  ActiveSupport::Deprecation.silenced = true
-  def after_initialize; end
-  ActiveSupport::Deprecation.silenced = false
+  if ActiveRecord.respond_to?(:deprecator)
+    ActiveRecord.deprecator.silence do
+      def after_initialize; end
+    end
+  else
+    ActiveSupport::Deprecation.silenced = true
+    def after_initialize; end
+    ActiveSupport::Deprecation.silenced = false
+  end
 
   after_initialize :initialize_salt_and_credentials
 

data/test/test_helper.rb

@@ -16,17 +16,15 @@ SimpleCov.start do
 end
 
 require 'minitest/autorun'
-
-# Rails 4.0.x pins to an old minitest
-unless defined?(MiniTest::Test)
-  MiniTest::Test = MiniTest::Unit::TestCase
-end
-
 require 'active_record'
-require 'data_mapper'
 require 'digest/sha2'
 require 'sequel'
-ActiveSupport::Deprecation.behavior = :raise
+
+if ActiveRecord.respond_to?(:deprecator)
+  ActiveRecord.deprecator.behavior = :raise
+else
+  ActiveSupport::Deprecation.behavior = :raise
+end
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(File.dirname(__FILE__))

metadata

@@ -1,17 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: attr_encrypted
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Sean Huber
 - S. Brent Faulkner
 - William Monk
 - Stephen Aghaulor
-autorequire: 
+- Josh Branham
+- Mike Vastola
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -33,42 +35,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: datamapper
-  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'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,20 +113,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.4
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  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
@@ -187,12 +161,14 @@ email:
 - sbfaulkner@gmail.com
 - billy.monk@gmail.com
 - saghaulor@gmail.com
+- josh.php@gmail.com
+- Mike@Vasto.la
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/CI.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -211,17 +187,14 @@ files:
 - checksum/attr_encrypted-3.1.0.gem.sha512
 - lib/attr_encrypted.rb
 - lib/attr_encrypted/adapters/active_record.rb
-- lib/attr_encrypted/adapters/data_mapper.rb
 - lib/attr_encrypted/adapters/sequel.rb
 - lib/attr_encrypted/version.rb
 - test/active_record_test.rb
 - test/attr_encrypted_test.rb
 - test/compatibility_test.rb
-- test/data_mapper_test.rb
 - test/legacy_active_record_test.rb
 - test/legacy_attr_encrypted_test.rb
 - test/legacy_compatibility_test.rb
-- test/legacy_data_mapper_test.rb
 - test/legacy_sequel_test.rb
 - test/run.sh
 - test/sequel_test.rb
@@ -245,27 +218,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Encrypt and decrypt attributes
 test_files:
 - test/active_record_test.rb
 - test/attr_encrypted_test.rb
 - test/compatibility_test.rb
-- test/data_mapper_test.rb
 - test/legacy_active_record_test.rb
 - test/legacy_attr_encrypted_test.rb
 - test/legacy_compatibility_test.rb
-- test/legacy_data_mapper_test.rb
 - test/legacy_sequel_test.rb
 - test/run.sh
 - test/sequel_test.rb
 - test/test_helper.rb
+...

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-dist: focal
-os: linux
-cache: bundler
-rvm:
-  - 2.6.10
-  - 2.7.6
-env:
-  - ACTIVERECORD=5.1.1
-  - ACTIVERECORD=5.2.8
-  - ACTIVERECORD=6.0.6
-  - ACTIVERECORD=6.1.7
-  - ACTIVERECORD=7.0.4
-jobs:
-  fast_finish: false
-  exclude:
-    - rvm: 2.6.10
-      env: ACTIVERECORD=7.0.4
-
-addons:
-  code_climate:
-    repo_token: a90435ed4954dd6e9f3697a20c5bc3754f67d94703f870e8fc7b00f69f5b2d06

data/lib/attr_encrypted/adapters/data_mapper.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(DataMapper)
-  module AttrEncrypted
-    module Adapters
-      module DataMapper
-        def self.extended(base) # :nodoc:
-          class << base
-            alias_method :included_without_attr_encrypted, :included
-            alias_method :included, :included_with_attr_encrypted
-          end
-        end
-
-        def included_with_attr_encrypted(base)
-          included_without_attr_encrypted(base)
-          base.extend AttrEncrypted
-          base.attr_encrypted_options[:encode] = true
-        end
-      end
-    end
-  end
-
-  DataMapper::Resource.extend AttrEncrypted::Adapters::DataMapper
-end

data/test/data_mapper_test.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'test_helper'
-
-DataMapper.setup(:default, 'sqlite3::memory:')
-
-class Client
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :encrypted_email, String
-  property :encrypted_email_iv, String
-  property :encrypted_email_salt, String
-
-  property :encrypted_credentials, Text
-  property :encrypted_credentials_iv, Text
-  property :encrypted_credentials_salt, Text
-
-  self.attr_encrypted_options[:mode] = :per_attribute_iv_and_salt
-
-  attr_encrypted :email, :key => SECRET_KEY
-  attr_encrypted :credentials, :key => SECRET_KEY, :marshal => true
-
-  def initialize(attrs = {})
-    super attrs
-    self.credentials ||= { :username => 'example', :password => 'test' }
-  end
-end
-
-DataMapper.auto_migrate!
-
-class DataMapperTest < Minitest::Test
-
-  def setup
-    Client.all.each(&:destroy)
-  end
-
-  def test_should_encrypt_email
-    @client = Client.new :email => 'test@example.com'
-    assert @client.save
-    refute_nil @client.encrypted_email
-    refute_equal @client.email, @client.encrypted_email
-    assert_equal @client.email, Client.first.email
-  end
-
-  def test_should_marshal_and_encrypt_credentials
-    @client = Client.new
-    assert @client.save
-    refute_nil @client.encrypted_credentials
-    refute_equal @client.credentials, @client.encrypted_credentials
-    assert_equal @client.credentials, Client.first.credentials
-    assert Client.first.credentials.is_a?(Hash)
-  end
-
-  def test_should_encode_by_default
-    assert Client.attr_encrypted_options[:encode]
-  end
-
-end

data/test/legacy_data_mapper_test.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'test_helper'
-
-DataMapper.setup(:default, 'sqlite3::memory:')
-
-class LegacyClient
-  include DataMapper::Resource
-  self.attr_encrypted_options[:insecure_mode] = true
-  self.attr_encrypted_options[:algorithm] = 'aes-256-cbc'
-  self.attr_encrypted_options[:mode] = :single_iv_and_salt
-
-  property :id, Serial
-  property :encrypted_email, String
-  property :encrypted_credentials, Text
-  property :salt, String
-
-  attr_encrypted :email, :key => 'a secret key', mode: :single_iv_and_salt
-  attr_encrypted :credentials, :key => Proc.new { |client| Encryptor.encrypt(:value => client.salt, :key => 'some private key', insecure_mode: true, algorithm: 'aes-256-cbc') }, :marshal => true, mode: :single_iv_and_salt
-
-  def initialize(attrs = {})
-    super attrs
-    self.salt ||= Digest::SHA1.hexdigest((Time.now.to_i * rand(5)).to_s)
-    self.credentials ||= { :username => 'example', :password => 'test' }
-  end
-end
-
-DataMapper.auto_migrate!
-
-class LegacyDataMapperTest < Minitest::Test
-
-  def setup
-    LegacyClient.all.each(&:destroy)
-  end
-
-  def test_should_encrypt_email
-    @client = LegacyClient.new :email => 'test@example.com'
-    assert @client.save
-    refute_nil @client.encrypted_email
-    refute_equal @client.email, @client.encrypted_email
-    assert_equal @client.email, LegacyClient.first.email
-  end
-
-  def test_should_marshal_and_encrypt_credentials
-    @client = LegacyClient.new
-    assert @client.save
-    refute_nil @client.encrypted_credentials
-    refute_equal @client.credentials, @client.encrypted_credentials
-    assert_equal @client.credentials, LegacyClient.first.credentials
-    assert LegacyClient.first.credentials.is_a?(Hash)
-  end
-
-  def test_should_encode_by_default
-    assert LegacyClient.attr_encrypted_options[:encode]
-  end
-
-end