Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to activesupport 4.2 #94

Merged
merged 1 commit into from
Feb 2, 2015
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ gemfile:
- gemfiles/activerecord_3_2.gemfile
- gemfiles/activerecord_4_0.gemfile
- gemfiles/activerecord_4_1.gemfile
- gemfiles/activerecord_4_2.gemfile

matrix:
include:
- rvm: 2.2.0
gemfile: gemfiles/activerecord_4_2.gemfile

addons:
postgresql: 9.3
Expand Down
5 changes: 5 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ appraise "activerecord_4_1" do
gem 'activerecord', '~> 4.1.0'
gem 'activesupport', '~> 4.1.0'
end

appraise "activerecord_4_2" do
gem 'activerecord', '~> 4.2.0'
gem 'activesupport', '~> 4.2.0'
end
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ end

## Requirements

CryptKeeper has been tested against ActiveRecord 3.1, 3.2, 4.0, 4.1 using ruby
CryptKeeper has been tested against ActiveRecord 3.1, 3.2, 4.0, 4.1, 4.2 using ruby
1.9.3, 2.0.0 and 2.1.1

ActiveRecord 4.0 is supported starting with v0.11.0.
Expand Down
4 changes: 2 additions & 2 deletions crypt_keeper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.version = CryptKeeper::VERSION

gem.add_runtime_dependency 'activerecord', '>= 3.1', '< 4.2'
gem.add_runtime_dependency 'activesupport', '>= 3.1', '< 4.2'
gem.add_runtime_dependency 'activerecord', '>= 3.1', '<= 4.2'
gem.add_runtime_dependency 'activesupport', '>= 3.1', '<= 4.2'
Copy link
Owner

Choose a reason for hiding this comment

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

@Ch4s3 is there a specific reason you went with <= over < 4.3? If not, I'm going to change that in master after merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No specific reason, but I'm not sure if 4.3 will be a thing or if they're jumping straight to 5.0, I haven't been following AR/Rails too closely lately.

gem.add_runtime_dependency 'aes', '~> 0.5.0'
gem.add_runtime_dependency 'armor', '~> 0.0.2'

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/activerecord_3_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: ../
specs:
crypt_keeper (0.18.4)
activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2)
activerecord (>= 3.1, <= 4.2)
activesupport (>= 3.1, <= 4.2)
aes (~> 0.5.0)
armor (~> 0.0.2)

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/activerecord_3_2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: ../
specs:
crypt_keeper (0.18.4)
activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2)
activerecord (>= 3.1, <= 4.2)
activesupport (>= 3.1, <= 4.2)
aes (~> 0.5.0)
armor (~> 0.0.2)

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/activerecord_4_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: ../
specs:
crypt_keeper (0.18.4)
activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2)
activerecord (>= 3.1, <= 4.2)
activesupport (>= 3.1, <= 4.2)
aes (~> 0.5.0)
armor (~> 0.0.2)

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/activerecord_4_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: ../
specs:
crypt_keeper (0.18.4)
activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2)
activerecord (>= 3.1, <= 4.2)
activesupport (>= 3.1, <= 4.2)
aes (~> 0.5.0)
armor (~> 0.0.2)

Expand Down
8 changes: 8 additions & 0 deletions gemfiles/activerecord_4_2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "~> 4.2.0"
gem "activesupport", "~> 4.2.0"

gemspec :path => "../"
123 changes: 123 additions & 0 deletions gemfiles/activerecord_4_2.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
PATH
remote: ../
specs:
crypt_keeper (0.18.4)
activerecord (>= 3.1, <= 4.2)
activesupport (>= 3.1, <= 4.2)
aes (~> 0.5.0)
armor (~> 0.0.2)

GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
aes (0.5.0)
appraisal (1.0.2)
bundler
rake
thor (>= 0.14.0)
arel (6.0.0)
armor (0.0.3)
builder (3.2.2)
celluloid (0.16.0)
timers (~> 4.0.0)
coderay (1.1.0)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
diff-lcs (1.2.5)
docile (1.1.5)
ffi (1.9.6)
formatador (0.2.5)
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.2.10)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
hitimes (1.2.2)
i18n (0.7.0)
json (1.8.1)
listen (2.8.4)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
method_source (0.8.2)
mime-types (2.4.3)
minitest (5.5.0)
multi_json (1.10.1)
mysql2 (0.3.17)
netrc (0.10.2)
pg (0.17.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rake (10.3.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
sqlite3 (1.3.10)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
timers (4.0.1)
hitimes
tins (1.3.3)
tzinfo (1.2.2)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
activerecord (~> 4.2.0)
activesupport (~> 4.2.0)
appraisal (~> 1.0.0)
coveralls
crypt_keeper!
guard (~> 2.6.1)
guard-rspec (~> 4.2.9)
mysql2 (~> 0.3.11)
pg (~> 0.17.1)
rake (~> 10.3.1)
rb-fsevent (~> 0.9.1)
rspec (~> 2.14.0)
sqlite3
2 changes: 1 addition & 1 deletion lib/crypt_keeper/provider/mysql_aes_new.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def decrypt(value)
#
# Returns an Enumerable
def search(records, field, criteria)
records.where(field.to_sym => encrypt(criteria))
records.where("#{field} = ?", encrypt(criteria))
end
end
end
Expand Down