bigbluebutton_rails 0.0.4 → 0.0.5

data/.gitignore

@@ -3,4 +3,5 @@ rdoc/*
 pkg
 *.sqlite3
 log
-*.gem
+*.gem
+spec/integration_conf.yml

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== 0.0.5
+
+* URLs for both servers and rooms are now defined with a string attribute (called "param") instead of the model ID.
+* New return values for bigbluebutton_role: :password and nil.
+* Private rooms now require a password to be valid.
+* New action "join_mobile" for rooms that renders a QR code to join the conference using the protocol "bigbluebutton://".
+* New action "activity" for servers that shows a view to monitors a BBB server.
+* Added json responses for most of the actions.
+* logout_url can be an incomplete url and it will be completed with the current domain/protocol when a room is created in the BBB server.
+* The generator bigbluebutton_rails:public was removed. It's features are now inside bigbluebutton_rails:install.
+* After fetch_meetings all rooms are automatically stored in the DB if they are not there yet.
+
 == 0.0.4
 
 * A random voice_bridge with 5 digits (recommended) is set when a room is created.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    bigbluebutton_rails (0.0.4)
+    bigbluebutton_rails (0.0.5)
       bigbluebutton-api-ruby (~> 0.0.10)
-      rails (~> 3.0.3)
+      rails (>= 3.0.3)
 
 GEM
   remote: http://rubygems.org/
@@ -39,16 +39,42 @@ GEM
     bigbluebutton-api-ruby (0.0.10)
       nokogiri (~> 1.4.0)
     builder (2.1.2)
+    capybara (1.0.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (0.10.7)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.5.2)
+      capybara (>= 1.0.0.rc1)
+      cucumber (>= 0.10.5)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.3)
+    ffi (1.0.9)
     forgery (0.3.7)
       nokogiri (~> 1.4)
     generator_spec (0.8.2)
       rails (~> 3.0)
       rspec-rails
+    gherkin (2.4.0)
+      json (>= 1.4.6)
     i18n (0.5.0)
+    json (1.5.2)
+    json_pure (1.5.2)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -57,7 +83,7 @@ GEM
     mime-types (1.16)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -76,36 +102,49 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rdoc (3.6.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.1)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
     shoulda-matchers (1.0.0.beta2)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.28)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bigbluebutton_rails!
+  cucumber-rails (~> 0.5.2)
+  database_cleaner (~> 0.6.7)
   factory_girl (~> 1.3.2)
   forgery (~> 0.3.7)
   generator_spec (~> 0.8.2)
-  rspec-rails (~> 2.5.0)
+  rdoc (~> 3.6.0)
+  rspec-rails (~> 2.6.0)
   shoulda-matchers (~> 1.0.0.beta)
   sqlite3-ruby (~> 1.3.3)

data/README.rdoc

@@ -4,19 +4,20 @@
 
 Features:
 * Allows multiple servers and multiple conference rooms
-* Full API access using bigbluebutton-api-ruby (https://github.com/mconf/bigbluebutton-api-ruby)
+* Full API access using {bigbluebutton-api-ruby}[https://github.com/mconf/bigbluebutton-api-ruby]
 * Easy way to join conferences: simply create a room and call the "join" action
 * Easy integration with authentication and authorization mechanisms, such as Devise and CanCan
 * Possibility to create private rooms, that require a password to join
 * Deals with visitors (users that are not logged), allowing (or forbidding) them to join rooms
 * Random meeting IDs to avoid problems with end_meeting, timeouts and reuse of URLs
+* Server activity monitor
 
 Planned features:
-* Friendly URLs (e.g. http://somewhere.com/my-server/my-room)
+* Friendly URLs (e.g. http://somewhere.com/my-server/my-room) (half way done)
 * Limit the number of users per room and rooms per server
 * Server administration (modify config.xml, use bbb-conf, etc.)
 * Load balancing
-* Dealing with rooms that exist in the BigBlueButton server but not in the DB
+* Decouple servers-rooms to allow server selection on-the-fly
 
 For more future features and issues check {our google code page}[http://code.google.com/p/mconf/issues/list?can=2&q=label%3AComponent%20label%3ABigBlueButtonRails].
 
@@ -34,8 +35,9 @@ After installing, you need to run the generator:
 
   rails generate bigbluebutton_rails:install
 
-This generator will create a migration file and a locale file in your application directories.
-Take a look at the migration to see how the models used by BigbluebuttonRails look like.
+This generator will create a migration file, a language file and some additional resources. These additional files are basically the JQuery library,
+a stylesheet and some images. They are only used in the *views* provided by this gem, so you may or may not use them. You can easily generate the views
+and modify them to use other resources.
 
 To now more about the generators see {How to: Generators}[https://github.com/mconf/bigbluebutton_rails/wiki/How-to:-Generators]
 
@@ -59,8 +61,8 @@ The first line generates the default routes. You need to call it at least once t
 It generates routes scoped with 'bigbluebutton'. These routes look like:
 
   /bigbluebutton/servers
-  /bigbluebutton/servers/1/rooms/2
-  /bigbluebutton/servers/2/rooms/3/join
+  /bigbluebutton/servers/default-server/rooms/my-room
+  /bigbluebutton/servers/default-server/rooms/his-room/join
 
 You can customize the scope name and also make the routes point to custom controllers.
 
@@ -74,13 +76,16 @@ You may also want shorter routes to access conference rooms. For that, use the o
 
   bigbluebutton_routes :room_matchers
 
-It creates routes to the actions used to access the conference room: "show", "join", "auth", "running", "end", and "invite".
+It creates routes to the actions used to access the conference room: "show", "join", "auth", "running", "end", "invite", and "join_mobile".
 So you can allow access to webconference rooms using URLs such as:
 
-  http://myserver.com/user-10/room-5/join
-  http://myserver.com/zaphod/public-room/join
+  http://myserver.com/server-name/room-name/join
+  http://myserver.com/user-name/public-room/join
+  http://myserver.com/ziltoid-room/join
 
-Obs: BigbluebuttonRails does not allows the room access using IDs such as "room-5" or "public-room" yet, but soon you it will.
+Obs: The URLs are not yet exactly like these, but soon they will be. But you can of course implement this in your application. Today they are like:
+
+  http://myserver.com/bigblugbutton/server-name/rooms/room-name/join
 
 === User authorization, permissions and assumptions
 
@@ -100,21 +105,6 @@ and you can reimplement them in your application controller to change their beha
 * {How to: Integrate with Devise}[https://github.com/mconf/bigbluebutton_rails/wiki/How-to:-Integrate-with-Devise]
 * {How to: Integrate with CanCan}[https://github.com/mconf/bigbluebutton_rails/wiki/How-to:-Integrate-with-CanCan]
 
-=== Dependencies
-
-For gem dependencies check the gemspec file.
-
-Files:
-
-* Javascripts:
-  * JQuery (jquery.min.js). See http://jquery.com
-* Images:
-  * loading.gif
-
-JQuery is used in the views <tt>join_wait</tt> and <tt>invite</tt> and can be copied into your application with:
-
-  rails generate bigbluebutton_rails:public
-
 == How it works
 
 === Overview
@@ -141,6 +131,12 @@ can throw a BigBlueButtonException.
 
 These are pretty simple actions. <tt>running</tt> returns a json indicating if the conference is running or not, while <tt>end</tt> ends the meeting.
 
+==== <tt>join_mobile</tt>
+
+This is an action that simply renders a view with a {QR code}[http://code.google.com/apis/chart/image/docs/gallery/qr_codes.html] and a link to join the
+conference from a mobile device. The link and the QR code point to links using the protocol "bigbluebutton://", so it can be associated with a native mobile
+application that will open the conference (such as the {Android client for BigBlueButton}[https://github.com/mconf/mconf-mobile]).
+
 ==== <tt>join</tt>, <tt>invite</tt> and <tt>auth</tt>
 
 The actions used to redirect a user to join a room are <tt>join</tt> and <tt>invite</tt>, while <tt>auth</tt> is used by <tt>invite</tt> to authenticate
@@ -164,21 +160,27 @@ Internally, they use the same algorithm:
 * If the user is not a moderator (a normal attendee):
   * If the meeting is running, redirects the user to the meeting as an attendee.
   * Otherwise:
-    * <tt>join</tt> redirects to <tt>join_wait</tt>, to wait for a moderator before joining the conference. The page will continuously pool the server to check if the meeting is running. When it starts, it redirects the user to the conference.
+    * <tt>join</tt> renders the join view, to wait for a moderator before joining the conference. The page will continuously pool the server to check if the meeting is running. When it starts, it redirects the user to the conference.
     * <tt>invite</tt> renders the invite view again and shows a warning informing that the meeting is not running. The user must re-submit the form to try again.
 
-== Development
+== Contributing/Development
 
-Install the dependencies:
+Fork this repository, clone your fork and start by installing the dependencies:
 
   bundle install
 
+Edit <tt>spec/integration_conf.yml.example</tt> and set values for an existent BigBlueButton server. Save it as <tt>spec/integration_conf.yml</tt>. You will need it to run the integration tests.
+
 Prepare the rails_app used for tests:
 
   rake setup:rails_app
+  rake setup:rails_app:db
 
 Run the tests:
 
   rake spec
+  rake cucumber
 
 Develop. :)
+
+If you want your code to be integrated in this repository, please create a branch with your modifications and submit a pull request.

data/Rakefile

@@ -1,16 +1,18 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rspec/core/rake_task'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
+require 'cucumber'
+require 'cucumber/rake/task'
 
-desc 'Default: run tests.'
-task :default => :spec
+desc 'Default: run specs and features.'
+task :default => [:spec, :cucumber]
 
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Generate documentation.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'BigBlueButton on Rails'
   rdoc.rdoc_files.include('README.rdoc')
@@ -20,19 +22,69 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 eval("$specification = begin; #{ IO.read('bigbluebutton_rails.gemspec')}; end")
-Rake::GemPackageTask.new $specification do |pkg|
+Gem::PackageTask.new $specification do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end
 
 desc 'Setup RailsApp used in tests.'
-namespace "setup" do
+namespace :setup do
   task :rails_app do |app|
-    cd 'spec/rails_app/'
-    sh "rake db:drop ENV=test"
+    cd "spec/rails_app/"
     sh "rails destroy bigbluebutton_rails:install"
     sh "rails generate bigbluebutton_rails:install"
-    sh "rake db:migrate ENV=test"
-    sh "rake db:test:prepare"
+  end
+
+  namespace :rails_app do |app|
+    task :db do
+      # base
+      cd "spec/rails_app/"
+      sh "rake db:drop:all"
+      sh "rake db:create:all"
+      # test
+      sh "rake db:migrate RAILS_ENV=test"
+      sh "rake db:test:prepare RAILS_ENV=test"
+      # development
+      sh "rake db:migrate RAILS_ENV=development"
+      sh "rake db:seed RAILS_ENV=development"
+    end
+  end
+end
+
+task :cucumber do
+  if File.exists? "features/"
+    puts "* Gem features"
+    sh %{ cucumber features/ }
+  end
+  puts "* Dummy app features"
+  sh %{ cd spec/rails_app; cucumber features/ }
+end
+
+task :notes do
+  puts `grep -r 'OPTIMIZE\\|FIXME\\|TODO' app/ public/ spec/`
+end
+
+# FIXME: not the best way to test these migrations, but works for now
+desc 'Setup the rails_app using the migration files created when upgrading the gem
+      version, run all tests and destroys the generated files.'
+namespace :spec do
+  task :migrations do |app|
+    cd "spec/rails_app/"
+    sh "rails destroy bigbluebutton_rails:install"
+    sh "rails generate bigbluebutton_rails:install 0.0.4"
+    sh "rails generate bigbluebutton_rails:install 0.0.5 --migration-only"
+
+    sh "rake db:drop RAILS_ENV=test"
+    sh "rake db:create RAILS_ENV=test"
+    sh "rake db:migrate RAILS_ENV=test"
+    sh "rake db:test:prepare RAILS_ENV=test"
+
+    cd "../.."
+    Rake::Task["spec"].invoke
+    Rake::Task["cucumber"].invoke
+
+    cd "spec/rails_app/"
+    sh "rails destroy bigbluebutton_rails:install 0.0.5 --migration-only"
+    sh "rails destroy bigbluebutton_rails:install 0.0.4"
   end
 end

data/app/controllers/bigbluebutton/rooms_controller.rb

@@ -4,7 +4,7 @@ class Bigbluebutton::RoomsController < ApplicationController
 
   before_filter :find_server
   respond_to :html, :except => :running
-  respond_to :json, :only => :running
+  respond_to :json, :only => [:running, :show, :new, :index, :create, :update, :end, :destroy]
 
   def index
     # TODO restrict to rooms belonging to the selected server
@@ -12,7 +12,7 @@ class Bigbluebutton::RoomsController < ApplicationController
   end
 
   def show
-    respond_with(@room = BigbluebuttonRoom.find(params[:id]))
+    respond_with(@room = BigbluebuttonRoom.find_by_param(params[:id]))
   end
 
   def new
@@ -20,7 +20,7 @@ class Bigbluebutton::RoomsController < ApplicationController
   end
 
   def edit
-    respond_with(@room = BigbluebuttonRoom.find(params[:id]))
+    respond_with(@room = BigbluebuttonRoom.find_by_param(params[:id]))
   end
 
   def create
@@ -35,11 +35,12 @@ class Bigbluebutton::RoomsController < ApplicationController
 
     respond_with @room do |format|
       if @room.save
+        message = t('bigbluebutton_rails.rooms.notice.create.success')
         format.html {
-          message = t('bigbluebutton_rails.rooms.notice.create.success')
           params[:redir_url] ||= bigbluebutton_server_room_path(@server, @room)
           redirect_to params[:redir_url], :notice => message
         }
+        format.json { render :json => { :message => message }, :status => :created }
       else
         format.html {
           unless params[:redir_url].blank?
@@ -49,12 +50,13 @@ class Bigbluebutton::RoomsController < ApplicationController
             render :action => "new"
           end
         }
+        format.json { render :json => @room.errors.full_messages, :status => :unprocessable_entity }
       end
     end
   end
 
   def update
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
     if !params[:bigbluebutton_room].has_key?(:meetingid) or
         params[:bigbluebutton_room][:meetingid].blank?
@@ -63,11 +65,12 @@ class Bigbluebutton::RoomsController < ApplicationController
 
     respond_with @room do |format|
       if @room.update_attributes(params[:bigbluebutton_room])
+        message = t('bigbluebutton_rails.rooms.notice.update.success')
         format.html {
-          message = t('bigbluebutton_rails.rooms.notice.update.success')
           params[:redir_url] ||= bigbluebutton_server_room_path(@server, @room)
           redirect_to params[:redir_url], :notice => message
         }
+        format.json { render :json => { :message => message } }
       else
         format.html {
           unless params[:redir_url].blank?
@@ -77,51 +80,74 @@ class Bigbluebutton::RoomsController < ApplicationController
             render :action => "edit"
           end
         }
+        format.json { render :json => @room.errors.full_messages, :status => :unprocessable_entity }
       end
     end
   end
 
   def destroy
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
     # TODO Destroy the room record even if end_meeting failed?
 
+    error = false
     begin
       @room.fetch_is_running?
       @room.send_end if @room.is_running?
     rescue BigBlueButton::BigBlueButtonException => e
-      flash[:error] = e.to_s
+      error = true
+      message = e.to_s
       # TODO Better error message: "Room destroyed in DB, but not in BBB..."
     end
 
     @room.destroy
-    params[:redir_url] ||= bigbluebutton_server_rooms_url
-    redirect_to params[:redir_url]
+
+    respond_with do |format|
+      format.html {
+        flash[:error] = message if error
+        params[:redir_url] ||= bigbluebutton_server_rooms_url
+        redirect_to params[:redir_url]
+      }
+      if error
+        format.json { render :json => { :message => message }, :status => :error }
+      else
+        message = t('bigbluebutton_rails.rooms.notice.destroy.success')
+        format.json { render :json => { :message => message } }
+      end
+    end
   end
 
-  # Used to join public rooms with a logged user.
+  # Used by logged users to join public rooms.
   def join
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
-    # anonymous users or users without a role join through #invite
     role = bigbluebutton_role(@room)
-    if bigbluebutton_user.nil? or role.nil?
+    if role.nil?
+      raise BigbluebuttonRails::RoomAccessDenied.new
+
+    # anonymous users or users with the role :password join through #invite
+    elsif bigbluebutton_user.nil? or role == :password
       redirect_to :action => :invite
+
     else
       join_internal(bigbluebutton_user.name, role, :join)
     end
-
   end
 
   # Used to join private rooms or to invited anonymous users (not logged)
   def invite
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
     respond_with @room do |format|
 
+      role = bigbluebutton_role(@room)
+      if role.nil?
+        raise BigbluebuttonRails::RoomAccessDenied.new
+
       # if there's already a logged user with a role in the room, join through #join
-      unless bigbluebutton_user.nil? or bigbluebutton_role(@room).nil?
+      elsif !bigbluebutton_user.nil? and role != :password
         format.html { redirect_to :action => :join }
+
       else
         format.html
       end
@@ -131,7 +157,9 @@ class Bigbluebutton::RoomsController < ApplicationController
 
   # Authenticates an user using name and password passed in the params from #invite
   def auth
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
+
+    raise BigbluebuttonRails::RoomAccessDenied.new if bigbluebutton_role(@room).nil?
 
     # if there's a user logged, use his name instead of the name in the params
     name = bigbluebutton_user.nil? ? params[:user][:name] : bigbluebutton_user.name
@@ -140,13 +168,13 @@ class Bigbluebutton::RoomsController < ApplicationController
     unless role.nil? or name.nil?
       join_internal(name, role, :invite)
     else
-      flash[:error] = t('bigbluebutton_rails.rooms.error.auth.failure')
+      flash[:error] = t('bigbluebutton_rails.rooms.errors.auth.failure')
       render :action => "invite", :status => :unauthorized
     end
   end
 
   def running
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
     begin
       @room.fetch_is_running?
@@ -160,30 +188,53 @@ class Bigbluebutton::RoomsController < ApplicationController
   end
 
   def end
-    @room = BigbluebuttonRoom.find(params[:id])
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
 
+    error = false
     begin
       @room.fetch_is_running?
       if @room.is_running?
         @room.send_end
         message = t('bigbluebutton_rails.rooms.notice.end.success')
       else
+        error = true
         message = t('bigbluebutton_rails.rooms.notice.end.not_running')
       end
     rescue BigBlueButton::BigBlueButtonException => e
-      flash[:error] = e.to_s
-      redirect_to request.referer
+      error = true
+      message = e.to_s
+    end
+
+    if error
+      respond_with do |format|
+        format.html {
+          flash[:error] = message
+          redirect_to request.referer
+        }
+        format.json { render :json => message, :status => :error }
+      end
     else
-      redirect_to(bigbluebutton_server_room_path(@server, @room), :notice => message)
+      respond_with do |format|
+        format.html {
+          redirect_to(bigbluebutton_server_room_path(@server, @room), :notice => message)
+        }
+        format.json { render :json => message }
+      end
     end
 
   end
 
+  def join_mobile
+    @room = BigbluebuttonRoom.find_by_param(params[:id])
+    @join_url = @room.join_url(bigbluebutton_user.name, bigbluebutton_role(@room))
+    @join_url.gsub!("http://", "bigbluebutton://")
+  end
+
   protected
 
   def find_server
     if params.has_key?(:server_id)
-      @server = BigbluebuttonServer.find(params[:server_id])
+      @server = BigbluebuttonServer.find_by_param(params[:server_id])
     else
       @server = BigbluebuttonServer.first
     end
@@ -197,6 +248,9 @@ class Bigbluebutton::RoomsController < ApplicationController
       # if the current user is a moderator, create the room (if needed)
       # and join it
       if role == :moderator
+
+        add_domain_to_logout_url(@room, request.protocol, request.host)
+
         @room.send_create unless @room.is_running?
         join_url = @room.join_url(username, role)
         redirect_to(join_url)
@@ -208,7 +262,7 @@ class Bigbluebutton::RoomsController < ApplicationController
           join_url = @room.join_url(username, role)
           redirect_to(join_url)
         else
-          flash[:error] = t('bigbluebutton_rails.rooms.error.not_running')
+          flash[:error] = t('bigbluebutton_rails.rooms.errors.auth.not_running')
           render :action => wait_action
         end
       end
@@ -219,4 +273,13 @@ class Bigbluebutton::RoomsController < ApplicationController
     end
   end
 
+  def add_domain_to_logout_url(room, protocol, host)
+    unless @room.logout_url.nil? or @room.logout_url =~ /^[a-z]+:\/\//  # matches the protocol
+      unless @room.logout_url =~ /^[a-z0-9]+([\-\.]{ 1}[a-z0-9]+)*/     # matches the host domain
+        @room.logout_url = host + @room.logout_url
+      end
+      @room.logout_url = protocol + @room.logout_url
+    end
+  end
+
 end