lib/murlsh/dispatch.rb in murlsh-0.7.0 vs lib/murlsh/dispatch.rb in murlsh-0.8.0

- old
+ new

@@ -19,16 +19,18 @@ db = ActiveRecord::Base.connection.instance_variable_get(:@connection) url_server = Murlsh::UrlServer.new(@config, db) flickr_server = Murlsh::FlickrServer.new(@config) + twitter_server = Murlsh::TwitterServer.new root_path = URI(@config.fetch('root_url')).path @dispatch = [ - [/^GET #{root_path}(url)?$/, url_server.method(:get)], - [/^POST #{root_path}(url)?$/, url_server.method(:post)], - [/^GET \/flickr$/, flickr_server.method(:get)], + [%r{^GET #{root_path}(url)?$}, url_server.method(:get)], + [%r{^POST #{root_path}(url)?$}, url_server.method(:post)], + [%r{^GET /flickr$}, flickr_server.method(:get)], + [%r{^GET /twitter/.+$}, twitter_server.method(:get)], ] end # Figure out which method will handle request. def dispatch(req)