Skip to content

Commit

Permalink
Allowing persistence customization with environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
escowles committed Sep 7, 2017
1 parent 4827d1f commit e5bbf53
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ database:
post:
- "cd valkyrie && bundle exec rake db:create && bundle exec rake db:migrate"
test:
override:
- bundle exec rake multispec
post:
- "cd valkyrie && bundle exec rspec spec"
notify:
Expand Down
11 changes: 6 additions & 5 deletions config/valkyrie.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
development:
metadata_adapter: postgres
storage_adapter: disk
metadata_adapter: <%= ENV['VALKYRIE_METADATA'] || 'postgres' %>
storage_adapter: <%= ENV['VALKYRIE_STORAGE'] || 'disk' %>

test:
metadata_adapter: memory
storage_adapter: memory
metadata_adapter: <%= ENV['VALKYRIE_METADATA'] || 'memory' %>
storage_adapter: <%= ENV['VALKYRIE_STORAGE'] || 'memory' %>

production:
metadata_adapter: postgres
metadata_adapter: <%= ENV['VALKYRIE_METADATA'] || 'postgres' %>
storage_adapter: <%= ENV['VALKYRIE_STORAGE'] || 'disk' %>
15 changes: 15 additions & 0 deletions lib/tasks/multispec.rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# frozen_string_literal: true
desc "Runs tests with a variety of backends"
task :multispec do
# TODO: fix fedora/fedora
profiles = [
{ metadata: 'memory', storage: 'memory' },
{ metadata: 'postgres', storage: 'disk' }
]
profiles.each do |profile|
ENV['VALKYRIE_METADATA'] = profile[:metadata]
ENV['VALKYRIE_STORAGE'] = profile[:storage]
puts "\n\nProfile: metadata_adapter=#{profile[:metadata]}, storage_adapter=#{profile[:storage]}\n\n"
Rake::Task['spec'].execute
end
end
4 changes: 2 additions & 2 deletions spec/change_set_persisters/change_set_persister_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
output = change_set_persister.save(change_set: change_set)
members = query_service.find_members(resource: output)

expect(members.length).to eq 1
expect(members[0]).to be_kind_of FileSet
expect(members.to_a.length).to eq 1
expect(members.to_a[0]).to be_kind_of FileSet
end
end

Expand Down

0 comments on commit e5bbf53

Please sign in to comment.