Skip to content
Draft
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
pkg
Gemfile.lock
coverage
/.idea
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not everybody uses Jetbrains editors.
While this does not hurt. its bad practice to clutter projects with local env settings.
best to put that in the home folder of the dev

$ grep ign ~/.gitconfig
        excludesfile = ~/.gitignore_global

my two cents on the topic

/gemfiles/*.gemfile.lock
38 changes: 38 additions & 0 deletions .travis.base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
os: linux
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

travis no longer offer supports for opensource project.
need to migrate this to Github Actions, or something else...

dist: xenial
language: ruby
cache: bundler
script: "bundle exec rake test"
rvm:
- 2.0
- 2.1
- 2.2
- 2.3
- 2.4
- 2.5
- 2.6
- 2.7
- 3.0
- head
- rbx
gemfile:
- gemfiles/rails_3.0.gemfile
- gemfiles/rails_3.1.gemfile
- gemfiles/rails_3.2.gemfile
- gemfiles/rails_4.0.gemfile
- gemfiles/rails_4.1.gemfile
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_6.0.gemfile
- gemfiles/rails_6.1.gemfile
- gemfiles/rails_7_edge.gemfile
- gemfiles/datamapper.gemfile
- gemfiles/sequel.gemfile
jobs:
allow_failures:
- rvm: head
- gemfile: gemfiles/rails_7_edge.gemfile
- rvm: rbx
fast_finish: false
210 changes: 154 additions & 56 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,158 @@
sudo: false
---
os: linux
dist: xenial
language: ruby
cache: bundler
script: bundle exec rake test
rvm:
- 2.0
- 2.1
- 2.2.2
- 2.3.0
- 2.4.0
- 2.5.0
- rbx
env:
- ACTIVERECORD=3.0.0
- ACTIVERECORD=3.1.0
- ACTIVERECORD=3.2.0
- ACTIVERECORD=4.0.0
- ACTIVERECORD=4.1.0
- ACTIVERECORD=4.2.0
- ACTIVERECORD=5.0.0
- ACTIVERECORD=5.1.1
matrix:
exclude:
- rvm: 2.0
env: ACTIVERECORD=5.0.0
- rvm: 2.0
env: ACTIVERECORD=5.1.1
- rvm: 2.1
env: ACTIVERECORD=5.0.0
- rvm: 2.1
env: ACTIVERECORD=5.1.1
- rvm: 2.4.0
env: ACTIVERECORD=3.0.0
- rvm: 2.4.0
env: ACTIVERECORD=3.1.0
- rvm: 2.4.0
env: ACTIVERECORD=3.2.0
- rvm: 2.4.0
env: ACTIVERECORD=4.0.0
- rvm: 2.4.0
env: ACTIVERECORD=4.1.0
- rvm: 2.5.0
env: ACTIVERECORD=3.0.0
- rvm: 2.5.0
env: ACTIVERECORD=3.1.0
- rvm: 2.5.0
env: ACTIVERECORD=3.2.0
- rvm: 2.5.0
env: ACTIVERECORD=4.0.0
- rvm: 2.5.0
env: ACTIVERECORD=4.1.0
- rvm: rbx
env: ACTIVERECORD=5.0.0
- rvm: rbx
env: ACTIVERECORD=5.1.1
- 2.0
- 2.1
- 2.2
- 2.3
- 2.4
- 2.5
- 2.6
- 2.7
- 3.0
- head
- rbx
gemfile:
- gemfiles/rails_3.0.gemfile
- gemfiles/rails_3.1.gemfile
- gemfiles/rails_3.2.gemfile
- gemfiles/rails_4.0.gemfile
- gemfiles/rails_4.1.gemfile
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_6.0.gemfile
- gemfiles/rails_6.1.gemfile
- gemfiles/rails_7_edge.gemfile
- gemfiles/datamapper.gemfile
- gemfiles/sequel.gemfile
jobs:
allow_failures:
- rvm: rbx
fast_finish: true
addons:
code_climate:
repo_token: a90435ed4954dd6e9f3697a20c5bc3754f67d94703f870e8fc7b00f69f5b2d06
- rvm: head
- gemfile: gemfiles/rails_7_edge.gemfile
- rvm: rbx
- gemfile: gemfiles/rails_4.2.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_4.2.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_4.2.gemfile
rvm: '2.2'
- gemfile: gemfiles/rails_4.2.gemfile
rvm: '2.3'
- gemfile: gemfiles/rails_4.2.gemfile
rvm: '2.4'
fast_finish: false
exclude:
- gemfile: gemfiles/rails_3.0.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_3.0.gemfile
rvm: '2.5'
- gemfile: gemfiles/rails_3.0.gemfile
rvm: '2.6'
- gemfile: gemfiles/rails_3.0.gemfile
rvm: '2.7'
- gemfile: gemfiles/rails_3.0.gemfile
rvm: '3.0'
- gemfile: gemfiles/rails_3.0.gemfile
rvm: head
- gemfile: gemfiles/rails_3.1.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_3.1.gemfile
rvm: '2.5'
- gemfile: gemfiles/rails_3.1.gemfile
rvm: '2.6'
- gemfile: gemfiles/rails_3.1.gemfile
rvm: '2.7'
- gemfile: gemfiles/rails_3.1.gemfile
rvm: '3.0'
- gemfile: gemfiles/rails_3.1.gemfile
rvm: head
- gemfile: gemfiles/rails_3.2.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_3.2.gemfile
rvm: '2.5'
- gemfile: gemfiles/rails_3.2.gemfile
rvm: '2.6'
- gemfile: gemfiles/rails_3.2.gemfile
rvm: '2.7'
- gemfile: gemfiles/rails_3.2.gemfile
rvm: '3.0'
- gemfile: gemfiles/rails_3.2.gemfile
rvm: head
- gemfile: gemfiles/rails_4.0.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_4.0.gemfile
rvm: '2.5'
- gemfile: gemfiles/rails_4.0.gemfile
rvm: '2.6'
- gemfile: gemfiles/rails_4.0.gemfile
rvm: '2.7'
- gemfile: gemfiles/rails_4.0.gemfile
rvm: '3.0'
- gemfile: gemfiles/rails_4.0.gemfile
rvm: head
- gemfile: gemfiles/rails_4.1.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_4.1.gemfile
rvm: '2.5'
- gemfile: gemfiles/rails_4.1.gemfile
rvm: '2.6'
- gemfile: gemfiles/rails_4.1.gemfile
rvm: '2.7'
- gemfile: gemfiles/rails_4.1.gemfile
rvm: '3.0'
- gemfile: gemfiles/rails_4.1.gemfile
rvm: head
- gemfile: gemfiles/rails_5.0.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_5.0.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_5.1.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_5.1.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_5.2.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_5.2.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_5.2.gemfile
rvm: '2.2'
- gemfile: gemfiles/rails_5.2.gemfile
rvm: '2.3'
- gemfile: gemfiles/rails_5.2.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_6.0.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_6.0.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_6.0.gemfile
rvm: '2.2'
- gemfile: gemfiles/rails_6.0.gemfile
rvm: '2.3'
- gemfile: gemfiles/rails_6.0.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_6.1.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_6.1.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_6.1.gemfile
rvm: '2.2'
- gemfile: gemfiles/rails_6.1.gemfile
rvm: '2.3'
- gemfile: gemfiles/rails_6.1.gemfile
rvm: '2.4'
- gemfile: gemfiles/rails_7_edge.gemfile
rvm: '2.0'
- gemfile: gemfiles/rails_7_edge.gemfile
rvm: '2.1'
- gemfile: gemfiles/rails_7_edge.gemfile
rvm: '2.2'
- gemfile: gemfiles/rails_7_edge.gemfile
rvm: '2.3'
- gemfile: gemfiles/rails_7_edge.gemfile
rvm: '2.4'
32 changes: 32 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

SUPPORTED_RAILS_VERSIONS = %w[3.0 3.1 3.2 4.0 4.1 4.2 5.0 5.1 5.2 6.0 6.1]
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably a good time to trash everything below 5.2


SUPPORTED_RAILS_VERSIONS.each do |rails_ver|
appraise "rails-#{rails_ver}" do
gem 'activerecord', "~> #{rails_ver}.x"
gem 'actionpack', "~> #{rails_ver}.x"

if %w[3.0 3.1 3.2].include?(rails_ver)
gem 'sqlite3'
#gem 'activerecord-sqlite3-adapter'
end

end
end

appraise 'rails-7-edge' do
gem 'activerecord', git: 'https://github.com/rails/rails', branch: 'main'
gem 'actionpack', git: 'https://github.com/rails/rails', branch: 'main'
end

appraise 'datamapper' do
gem 'datamapper'
gem 'dm-sqlite-adapter'
end

appraise 'sequel' do
gem 'sequel'
end



5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# attr_encrypted #

## 3.2.0 ##
* Added: Support Rails upto 6.2 and Ruby upto 3.0 (@mvastola)
* Added: `appraisal` gem to organize testing with different versions of dependencies (@mvastola)
* Changed: Outdated version dependencies in `gemspec` (@mvastola)

## 3.1.0 ##
* Added: Abitilty to encrypt empty values. (@tamird)
* Added: MIT license
Expand Down
17 changes: 17 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
source 'https://rubygems.org'

gemspec

gem 'sqlite3'

if RUBY_VERSION < '2.1.0'
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reallly ?

gem 'nokogiri'
gem 'public_suffix', '< 3.0.0'
end

platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jdbc-sqlite3', '< 3.8.7' # 3.8.7 is nice and broke
end

group :development do
gem 'wwtd', require: false
gem 'rubocop', require: false
end
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
## Maintainer(s) wanted!!!

**If you have an interest in maintaining this project... please see https://github.com/attr-encrypted/attr_encrypted/issues/379**

# 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)
Expand All @@ -10,7 +6,6 @@ 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`.


## Installation

Add attr_encrypted to your gemfile:
Expand Down
6 changes: 5 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require 'rake/testtask'
require 'rdoc/task'
require "bundler/gem_tasks"
require 'wwtd/tasks'

desc 'Test the attr_encrypted gem.'
Rake::TestTask.new(:test) do |t|
Expand All @@ -22,4 +23,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
end

desc 'Default: run unit tests.'
task :default => :test
if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
task :default => :appraisal
end
#task :default => :test
Loading