Merge branch 'master' of github.com:ryanb/private_pub

vic · Aug 20, 2012 · 122cb84 · 122cb84
2 parents 4ce7e5a + 189cbd8
commit 122cb84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/generators/private_pub/templates/private_pub.ru b/lib/generators/private_pub/templates/private_pub.ru
@@ -4,5 +4,7 @@ require "yaml"
 require "faye"
 require "private_pub"
 
+Faye::WebSocket.load_adapter('thin')
+
 PrivatePub.load_config(File.expand_path("../config/private_pub.yml", __FILE__), ENV["RAILS_ENV"] || "development")
 run PrivatePub.faye_app
diff --git a/lib/private_pub.rb b/lib/private_pub.rb
@@ -1,5 +1,6 @@
 require "digest/sha1"
 require "net/http"
+require "net/https"
 
 require "private_pub/faye_extension"
 require "private_pub/engine" if defined? Rails