remove branching on Rails.env for faye urls

kandanapp · Mar 13, 2013 · c592bef · c592bef
1 parent 74967a7
commit c592bef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee.erb b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee.erb
@@ -1,11 +1,10 @@
 class Kandan.Broadcasters.FayeBroadcaster
 
   constructor: ()->
+    @fayeClient = new Faye.Client("http://<%= ActionMailer::Base.default_url_options[:host] %>/remote/faye")
+
     <% if Rails.env == "test" %>
-    @fayeClient = new Faye.Client("http://localhost:9292/remote/faye")
     @fayeClient.setHeader('Access-Control-Allow-Origin', '*');
-    <% else %>
-    @fayeClient = new Faye.Client("/remote/faye")
     <% end %>
 
     @fayeClient.disable('websocket')

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -39,5 +39,6 @@
   config.logger.level = Logger.const_get(
     ENV['LOG_LEVEL'] ? ENV['LOG_LEVEL'].upcase : 'DEBUG'
   )
-
+
+  config.action_mailer.default_url_options = { :host => "localhost:3000" }
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -34,4 +34,6 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = { :host => "localhost:9292" }
 end
diff --git a/lib/broadcasters/faye.rb b/lib/broadcasters/faye.rb
@@ -13,11 +13,7 @@ def broadcast(channel, message)
       end
 
       def assets
-        if Rails.env == "test"
-          ["http://localhost:9292/remote/faye.js"]
-        else
-          ['remote/faye']
-        end
+        ["http://#{ActionMailer::Base.default_url_options[:host]}/remote/faye.js"]
       end
     end
   end