Permalink
Browse files

Fixing issue #5. The rack-flash gem was unhappy about newer rack vers…

…ions.

Swapping in sinatra-flash instead seems to have done the trick.
  • Loading branch information...
1 parent f4c5d22 commit fe386267ced45882c65de8d64db9d2b2c5880010 @futurechimp committed Jul 21, 2012
Showing with 2 additions and 5 deletions.
  1. +1 −2 Rakefile
  2. +1 −3 lib/enigmamachine.rb
View
@@ -16,7 +16,7 @@ begin
gem.add_dependency "dm-sqlite-adapter", ">=1.0.2"
gem.add_dependency "state_machine", ">=0.9.4"
gem.add_dependency "eventmachine", ">=0.12.10"
- gem.add_dependency "rack-flash"
+ gem.add_dependency "sinatra-flash"
gem.add_dependency "ruby-debug"
gem.add_dependency "sinatra", ">=1.0.0"
gem.add_dependency "streamio-ffmpeg", ">=0.7.3"
@@ -64,4 +64,3 @@ Rake::RDocTask.new do |rdoc|
rdoc.rdoc_files.include('README*')
rdoc.rdoc_files.include('lib/**/*.rb')
end
-
@@ -5,7 +5,7 @@
require 'data_mapper'
require 'ruby-debug'
require 'eventmachine'
-require 'rack-flash'
+require 'sinatra/flash'
require 'dm-validations'
require 'dm-migrations'
require 'state_machine'
@@ -91,7 +91,6 @@ class EnigmaMachine < Sinatra::Base
# Include flash notices
#
use Rack::Session::Cookie
- use Rack::Flash
use Rack::MethodOverride
# Starts the enigma encoding thread. The thread will be reabsorbed into the
@@ -293,4 +292,3 @@ class EnigmaMachine < Sinatra::Base
end
end
-

0 comments on commit fe38626

Please sign in to comment.