bigbluebutton_rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7aa314ce4ce2cd5647e00de7c1507a570cd2943
-  data.tar.gz: e79e43b6313f3f001d77c2e86fdaf1af2e196e26
+  metadata.gz: 44ffb5fae34d7b736ebf6c372c512b2b37d8f41f
+  data.tar.gz: 3446e484579e743d3f58b40bcfc06168f8062ac7
 SHA512:
-  metadata.gz: 6cc93453645452f995ce330a496cf00c3e60841709cf0345e62d0a365caf8c692f057f4226dc579ff493330d46cc4e2f8585b3b6a2867b88c2762c82cc34e29c
-  data.tar.gz: 923713967e60d3f4120590061fc266a4d296a605ecbdb94d4188a4856b83b83b8a1277407fda41f00396532bb51792264186ba8caef697dcfd45765b9acb2893
+  metadata.gz: 81ccfdd0a387e03d5d54ae67175eb77a1904e524e3f33b13b53a248f5bd7baebb6c0e4fa40317b50d776082fcf3f2ed0b23d33a7cb263f4630995a48bc8a40e6
+  data.tar.gz: c608a39eef0b90ce899f344f05b0d07433010375924de85ba19260d39ca11cacc0f7c365f8c6fb078706a985c0710a90921d1684bef7d444ecec18481c165894

data/.travis.yml

@@ -1,8 +1,11 @@
 sudo: false
 language: ruby
+services:
+  - redis-server
 bundler_args: "--without production development"
 before_script:
   - "cp spec/rails_app/config/database.yml.travis spec/rails_app/config/database.yml"
+  - "cp spec/rails_app/features/config.yml.example spec/rails_app/features/config.yml"
   - "mysql -e 'create database bigbluebutton_rails_test;'"
   - "mysql -e 'create database bigbluebutton_rails_dev;'"
 cache: bundler

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## [2.2.0] - 2017-10-04
+
+* Make only description editable in recordings, since all other attributes are taken from
+  the server and editing them won't change them in the server.
+* Fix possible error when joining as guest but with permissions to create the room.
+* Add action "check" to servers, redirects to the server's `/check`, an optional module in
+  BigBlueButton.
+* Remove db association between servers and rooms/meetings. Now servers are selected on the
+  fly for a room that needs one. There's no association between them in the database anymore.
+* Destroy recordings when their server is removed.
+* Don't require `Server#url` and `Server#name` to be unique.
+* Add `guest_support`, originally in Mconf-Web only. This feature is optional and disabled
+  by default. Only works in Mconf-Live at this point (future feature on BigBlueButton).
+* Fetch recordings of a server right after it is created.
+* Improve how the gem is configured, add BigbluebuttonRails::Configuration. Makes it clearer
+  how customizable variables and methods can be customized.
+* Create a config for servers not in the db yet, so that we can fetch configs for servers
+  not in the database.
+* Update how the welcome message is set when there's a dial number set.
+* Add helper methods to BigbluebuttonRecording. Used to calculate size and length of recordings.
+
 
 ## [2.1.0] - 2016-07-22
 

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
   gem "rdoc"
   gem "rails_best_practices"
 end
+gem "rspec-rails", '~> 2.99.0'
 
 group :test do
   if RUBY_VERSION >= "1.9"
@@ -24,7 +25,7 @@ group :test do
   gem "generator_spec"
   gem "rspec-rails", '~> 2.99.0'
   gem 'rspec-activemodel-mocks'
-  gem "bbbot-ruby", :git => "git://github.com/mconf/bbbot-ruby.git"
+  # gem "bbbot-ruby", :git => "git://github.com/mconf/bbbot-ruby.git"
   gem "capybara", "~> 2.2.0"
   gem "capybara-mechanize" # for remote requests
   gem "capybara-webkit" # best option found for js

data/Gemfile.lock

@@ -1,13 +1,7 @@
-GIT
-  remote: git://github.com/mconf/bbbot-ruby.git
-  revision: fcfd8c4c71371653335a46d7462ee14a9301f546
-  specs:
-    bbbot-ruby (0.0.1)
-
 PATH
   remote: .
   specs:
-    bigbluebutton_rails (2.1.0)
+    bigbluebutton_rails (2.2.0)
       bigbluebutton-api-ruby (~> 1.6)
       browser (~> 0.8.0)
       rails (>= 4.0.0)
@@ -181,7 +175,7 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     redis (3.1.0)
-    redis-namespace (1.5.2)
+    redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
     ref (1.0.5)
     require_all (1.3.2)
@@ -233,8 +227,8 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     spoon (0.0.4)
@@ -282,7 +276,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bbbot-ruby!
   bigbluebutton_rails!
   capybara (~> 2.2.0)
   capybara-mechanize

data/Rakefile

@@ -3,8 +3,8 @@ require 'bundler/setup'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
-require 'cucumber'
-require 'cucumber/rake/task'
+# require 'cucumber'
+# require 'cucumber/rake/task'
 
 desc 'Default: run specs and features.'
 task :default => [:spec]
@@ -24,7 +24,7 @@ end
 eval("$specification = begin; #{ IO.read('bigbluebutton_rails.gemspec')}; end")
 Gem::PackageTask.new $specification do |pkg|
   pkg.need_tar = true
-  pkg.need_zip = true
+  # pkg.need_zip = true
 end
 
 namespace :rails_app do
@@ -40,7 +40,7 @@ namespace :rails_app do
   task :db do
     cd File.join(File.dirname(__FILE__), "spec", "rails_app")
     sh "bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=development"
-    sh "bundle exec rake db:drop db:create db:migrate db:test:prepare RAILS_ENV=test"
+    sh "bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test"
     cd File.dirname(__FILE__)
   end
 
@@ -61,19 +61,19 @@ namespace :rails_app do
   end
 end
 
-task :cucumber do
-  # Disable all features that need the bot. It isn't working since BigBlueButton 0.81.
-  tags = "~@need-bot"
+# task :cucumber do
+#   # Disable all features that need the bot. It isn't working since BigBlueButton 0.81.
+#   tags = "~@need-bot"
 
-  puts "* Dummy app features"
-  cd File.join(File.dirname(__FILE__), "spec", "rails_app")
-  sh "bundle exec cucumber features/ --tags #{tags}"
-  cd File.dirname(__FILE__)
-end
+#   puts "* Dummy app features"
+#   cd File.join(File.dirname(__FILE__), "spec", "rails_app")
+#   sh "bundle exec cucumber features/ --tags #{tags}"
+#   cd File.dirname(__FILE__)
+# end
 
-task :notes do
-  puts `grep -r 'OPTIMIZE\\|FIXME\\|TODO' app/ public/ spec/`
-end
+# task :notes do
+#   puts `grep -r 'OPTIMIZE\\|FIXME\\|TODO' app/ public/ spec/`
+# end
 
 desc 'Setup the rails_app using the migration files created when upgrading the gem
       version, run all tests and destroys the generated files.'

data/app/controllers/bigbluebutton/recordings_controller.rb

@@ -148,7 +148,7 @@ class Bigbluebutton::RecordingsController < ApplicationController
   end
 
   def recording_allowed_params
-    [ :recordid, :meetingid, :name, :published, :start_time, :end_time, :available, :description ]
+    [ :description ]
   end
 
   protected

data/app/controllers/bigbluebutton/rooms_controller.rb

@@ -185,19 +185,17 @@ class Bigbluebutton::RoomsController < ApplicationController
   def fetch_recordings
     error = false
 
-    if @room.server.nil?
-      error = true
-      message = t('bigbluebutton_rails.rooms.errors.fetch_recordings.no_server')
-    else
-      begin
-        # filter only recordings created by this room
-        filter = { :meetingID => @room.meetingid }
-        @room.server.fetch_recordings(filter)
+    begin
+      result = @room.fetch_recordings
+      if result
         message = t('bigbluebutton_rails.rooms.notice.fetch_recordings.success')
-      rescue BigBlueButton::BigBlueButtonException => e
+      else
         error = true
-        message = e.to_s[0..200]
+        message = t('bigbluebutton_rails.rooms.errors.fetch_recordings.no_server')
       end
+    rescue BigBlueButton::BigBlueButtonException => e
+      error = true
+      message = e.to_s[0..200]
     end
 
     respond_with do |format|
@@ -340,7 +338,7 @@ class Bigbluebutton::RoomsController < ApplicationController
         if bigbluebutton_can_create?(@room, role)
           user_opts = bigbluebutton_create_options(@room)
           if @room.create_meeting(bigbluebutton_user, request, user_opts)
-            logger.info "Meeting created: id: #{@room.meetingid}, name: #{@room.name}, created_by: #{bigbluebutton_user.username}, time: #{Time.now.iso8601}"
+            logger.info "Meeting created: id: #{@room.meetingid}, name: #{@room.name}, created_by: #{username}, time: #{Time.now.iso8601}"
           end
         else
           flash[:error] = t('bigbluebutton_rails.rooms.errors.join.cannot_create')
@@ -388,7 +386,7 @@ class Bigbluebutton::RoomsController < ApplicationController
   end
 
   def room_allowed_params
-    [ :name, :server_id, :meetingid, :attendee_key, :moderator_key, :welcome_msg,
+    [ :name, :meetingid, :attendee_key, :moderator_key, :welcome_msg,
       :private, :logout_url, :dial_number, :voice_bridge, :max_participants, :owner_id,
       :owner_type, :external, :param, :record_meeting, :duration, :default_layout, :presenter_share_only,
       :auto_start_video, :auto_start_audio, :background,

data/app/controllers/bigbluebutton/servers_controller.rb

@@ -106,11 +106,6 @@ class Bigbluebutton::ServersController < ApplicationController
     respond_with(@recordings)
   end
 
-  def rooms
-    @rooms ||= @server.rooms
-    respond_with(@rooms)
-  end
-
   def publish_recordings
     self.publish_unpublish(params[:recordings], true)
   end
@@ -157,6 +152,10 @@ class Bigbluebutton::ServersController < ApplicationController
     end
   end
 
+  def check
+    redirect_to @server.check_url
+  end
+
   protected
 
   def find_server

data/app/models/bigbluebutton_meeting.rb

@@ -1,7 +1,6 @@
 class BigbluebuttonMeeting < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
 
-  belongs_to :server, :class_name => 'BigbluebuttonServer'
   belongs_to :room, :class_name => 'BigbluebuttonRoom'
 
   has_one :recording,
@@ -19,7 +18,7 @@ class BigbluebuttonMeeting < ActiveRecord::Base
   # Whether the meeting was created by the `user` or not.
   def created_by?(user)
     unless user.nil?
-      userid = user.send(BigbluebuttonRails.user_attr_id)
+      userid = user.send(BigbluebuttonRails.configuration.user_attr_id)
       self.creator_id == userid
     else
       false

data/app/models/bigbluebutton_metadata.rb

@@ -21,7 +21,7 @@ class BigbluebuttonMetadata < ActiveRecord::Base
   # validates :name, :exclusion => {
   #   :in => lambda do |m|
   #     if m.owner_type == "BigbluebuttonRoom"
-  #       BigbluebuttonRails.metadata_invalid_keys.map(&:to_s)
+  #       BigbluebuttonRails.configuration.metadata_invalid_keys.map(&:to_s)
   #     else
   #       []
   #     end
@@ -29,7 +29,7 @@ class BigbluebuttonMetadata < ActiveRecord::Base
   # }
   def exclusion_of_name_in_reserved_metadata_keys
     keys = if owner_type == "BigbluebuttonRoom"
-             BigbluebuttonRails.metadata_invalid_keys.map(&:to_s)
+             BigbluebuttonRails.configuration.metadata_invalid_keys.map(&:to_s)
            else
              []
            end

data/app/models/bigbluebutton_recording.rb

@@ -1,9 +1,9 @@
 class BigbluebuttonRecording < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
 
-  belongs_to :server, :class_name => 'BigbluebuttonServer'
-  belongs_to :room, :class_name => 'BigbluebuttonRoom'
-  belongs_to :meeting, :class_name => 'BigbluebuttonMeeting'
+  belongs_to :server, class_name: 'BigbluebuttonServer'
+  belongs_to :room, class_name: 'BigbluebuttonRoom'
+  belongs_to :meeting, class_name: 'BigbluebuttonMeeting'
 
   validates :server, :presence => true
 
@@ -32,6 +32,21 @@ class BigbluebuttonRecording < ActiveRecord::Base
       .where("bigbluebutton_playback_types.default = ?", true).first
   end
 
+  # Returns the overall (i.e. for all recordings) average length of recordings in seconds
+  # Uses the length of the default playback format
+  def self.overall_average_length
+    avg = BigbluebuttonPlaybackFormat.joins(:playback_type)
+          .where("bigbluebutton_playback_types.default = ?", true).average(:length)
+    avg.nil? ? 0 : (avg.truncate(2) * 60)
+  end
+
+  # Returns the overall (i.e. for all recordings) average size of recordings in bytes
+  # Uses the length of the default playback format
+  def self.overall_average_size
+    avg = BigbluebuttonRecording.average(:size)
+    avg.nil? ? 0 : avg
+  end
+
   # Syncs the recordings in the db with the array of recordings in 'recordings',
   # as received from BigBlueButtonApi#get_recordings.
   # Will add new recordings that are not in the db yet and update the ones that
@@ -97,7 +112,7 @@ class BigbluebuttonRecording < ActiveRecord::Base
   # BigBlueButtonApi#get_recordings but with the keys already converted to our format.
   def self.update_recording(server, recording, data)
     recording.server = server
-    recording.room = BigbluebuttonRails.match_room_recording(data)
+    recording.room = BigbluebuttonRails.configuration.match_room_recording.call(data)
     recording.attributes = data.slice(:meetingid, :name, :published, :start_time, :end_time, :size)
     recording.available = true
     recording.save!
@@ -112,7 +127,7 @@ class BigbluebuttonRecording < ActiveRecord::Base
     filtered = data.slice(:recordid, :meetingid, :name, :published, :start_time, :end_time, :size)
     recording = BigbluebuttonRecording.create(filtered)
     recording.available = true
-    recording.room = BigbluebuttonRails.match_room_recording(data)
+    recording.room = BigbluebuttonRails.configuration.match_room_recording.call(data)
     recording.server = server
     recording.description = I18n.t('bigbluebutton_rails.recordings.default.description', :time => recording.start_time.utc.to_formatted_s(:long))
     recording.meeting = BigbluebuttonRecording.find_matching_meeting(recording)

data/app/models/bigbluebutton_room.rb

@@ -3,24 +3,22 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
   belongs_to :owner, polymorphic: true
 
-  belongs_to :server, class_name: 'BigbluebuttonServer'
-
   has_many :recordings,
-           :class_name => 'BigbluebuttonRecording',
-           :foreign_key => 'room_id',
-           :dependent => :nullify
+           class_name: 'BigbluebuttonRecording',
+           foreign_key: 'room_id',
+           dependent: :nullify
 
   has_many :metadata,
-           :class_name => 'BigbluebuttonMetadata',
-           :as => :owner,
-           :dependent => :destroy,
-           :inverse_of => :owner
+           class_name: 'BigbluebuttonMetadata',
+           as: :owner,
+           dependent: :destroy,
+           inverse_of: :owner
 
   has_one :room_options,
-          :class_name => 'BigbluebuttonRoomOptions',
-          :foreign_key => 'room_id',
-          :autosave => true,
-          :dependent => :destroy
+          class_name: 'BigbluebuttonRoomOptions',
+          foreign_key: 'room_id',
+          autosave: true,
+          dependent: :destroy
 
   delegate :default_layout, :default_layout=, :to => :room_options
   delegate :presenter_share_only, :presenter_share_only=, :to => :room_options
@@ -105,10 +103,9 @@ class BigbluebuttonRoom < ActiveRecord::Base
   #
   # Triggers API call: <tt>getMeetingInfo</tt>.
   def fetch_meeting_info
-    require_server :get_meeting_info
-
     begin
-      response = self.server.api.get_meeting_info(self.meetingid, self.moderator_api_password)
+      server = BigbluebuttonRails.configuration.select_server.call(self, :get_meeting_info)
+      response = server.api.get_meeting_info(self.meetingid, self.moderator_api_password)
 
       @participant_count = response[:participantCount]
       @moderator_count = response[:moderatorCount]
@@ -147,16 +144,16 @@ class BigbluebuttonRoom < ActiveRecord::Base
   #
   # Triggers API call: <tt>isMeetingRunning</tt>.
   def fetch_is_running?
-    require_server :is_meeting_running
-    @running = self.server.api.is_meeting_running?(self.meetingid)
+    server = BigbluebuttonRails.configuration.select_server.call(self, :is_meeting_running)
+    @running = server.api.is_meeting_running?(self.meetingid)
   end
 
   # Sends a call to the BBB server to end the meeting.
   #
   # Triggers API call: <tt>end</tt>.
   def send_end
-    require_server :end
-    response = self.server.api.end_meeting(self.meetingid, self.moderator_api_password)
+    server = BigbluebuttonRails.configuration.select_server.call(self, :end)
+    response = server.api.end_meeting(self.meetingid, self.moderator_api_password)
 
     # enqueue an update in the meeting to end it faster
     Resque.enqueue(::BigbluebuttonMeetingUpdater, self.id)
@@ -170,18 +167,12 @@ class BigbluebuttonRoom < ActiveRecord::Base
   #   request. Can be passed by the application to enforce some values over the values
   #   that are taken from the database.
   #
-  # Will trigger 'select_server' to select a server where the meeting
-  # will be created. If a server is selected, the model is saved.
-  #
   # With the response, updates the following attributes:
   # * <tt>attendee_api_password</tt>
   # * <tt>moderator_api_password</tt>
   #
   # Triggers API call: <tt>create</tt>.
   def send_create(user=nil, user_opts={})
-    # updates the server whenever a meeting will be created and guarantees it has a meetingid
-    require_server :create
-
     self.meetingid = unique_meetingid() if self.meetingid.blank?
     self.moderator_api_password = internal_password() if self.moderator_api_password.blank?
     self.attendee_api_password = internal_password() if self.attendee_api_password.blank?
@@ -217,17 +208,23 @@ class BigbluebuttonRoom < ActiveRecord::Base
   #
   # Uses the API but does not require a request to the server.
   def join_url(username, role, key=nil, options={})
-    require_server :join_meeting_url
-
-    case role
-    when :moderator
-      r = self.server.api.join_meeting_url(self.meetingid, username, self.moderator_api_password, options)
-    when :attendee
-      r = self.server.api.join_meeting_url(self.meetingid, username, self.attendee_api_password, options)
-    else
-      r = self.server.api.join_meeting_url(self.meetingid, username, map_key_to_internal_password(key), options)
-    end
-
+    server = BigbluebuttonRails.configuration.select_server.call(self, :join_meeting_url)
+
+    pass = case role
+           when :moderator
+             self.moderator_api_password
+           when :attendee
+             self.attendee_api_password
+           when :guest
+             if BigbluebuttonRails.configuration.guest_support
+               options = { guest: true }.merge(options)
+             end
+             self.attendee_api_password
+           else
+             map_key_to_internal_password(key)
+           end
+
+    r = server.api.join_meeting_url(self.meetingid, username, pass, options)
     r.strip! unless r.nil?
     r
   end
@@ -335,8 +332,8 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
       unless metadata.nil?
         begin
-          attrs[:creator_id] = metadata[BigbluebuttonRails.metadata_user_id].to_i
-          attrs[:creator_name] = metadata[BigbluebuttonRails.metadata_user_name]
+          attrs[:creator_id] = metadata[BigbluebuttonRails.configuration.metadata_user_id].to_i
+          attrs[:creator_name] = metadata[BigbluebuttonRails.configuration.metadata_user_name]
         rescue
           attrs[:creator_id] = nil
           attrs[:creator_name] = nil
@@ -356,11 +353,11 @@ class BigbluebuttonRoom < ActiveRecord::Base
         # has not yet been set as ended
         self.finish_meetings
 
+        server = BigbluebuttonRails.configuration.select_server.call(self)
         attrs = {
           room: self,
-          server: self.server,
-          server_url: self.server.url,
-          server_secret: self.server.secret,
+          server_url: server.url,
+          server_secret: server.secret,
           meetingid: self.meetingid,
           name: self.name,
           recorded: self.record_meeting,
@@ -371,8 +368,8 @@ class BigbluebuttonRoom < ActiveRecord::Base
         }
         unless metadata.nil?
           begin
-            attrs[:creator_id] = metadata[BigbluebuttonRails.metadata_user_id].to_i
-            attrs[:creator_name] = metadata[BigbluebuttonRails.metadata_user_name]
+            attrs[:creator_id] = metadata[BigbluebuttonRails.configuration.metadata_user_id].to_i
+            attrs[:creator_name] = metadata[BigbluebuttonRails.configuration.metadata_user_name]
           rescue
             attrs[:creator_id] = nil
             attrs[:creator_name] = nil
@@ -415,17 +412,18 @@ class BigbluebuttonRoom < ActiveRecord::Base
   # Triggers API call: <tt>setConfigXML</tt>.
   def fetch_new_token
     if self.room_options.is_modified?
+      server = BigbluebuttonRails.configuration.select_server.call(self, :set_config_xml)
 
       # get the default XML we will use to create a new one
-      config_xml = self.server.api.get_default_config_xml
+      config_xml = server.api.get_default_config_xml
 
       # set the options on the XML
       # returns true if something was changed
       config_xml = self.room_options.set_on_config_xml(config_xml)
       if config_xml
-        self.server.update_config(config_xml)
+        server.update_config(config_xml)
         # get the new token for the room, and return it
-        self.server.api.set_config_xml(self.meetingid, config_xml)
+        server.api.set_config_xml(self.meetingid, config_xml)
       else
         nil
       end
@@ -435,14 +433,17 @@ class BigbluebuttonRoom < ActiveRecord::Base
   end
 
   def available_layouts
+    server = BigbluebuttonRails.configuration.select_server.call(self)
     server.present? ? server.available_layouts : []
   end
 
   def available_layouts_names
+    server = BigbluebuttonRails.configuration.select_server.call(self)
     server.present? ? server.available_layouts_names : []
   end
 
   def available_layouts_for_select
+    server = BigbluebuttonRails.configuration.select_server.call(self)
     server.present? ? server.available_layouts_for_select : []
   end
 
@@ -461,52 +462,29 @@ class BigbluebuttonRoom < ActiveRecord::Base
     nil
   end
 
-  protected
-
-  def create_room_options
-    BigbluebuttonRoomOptions.create(:room => self)
+  def fetch_recordings(filter={})
+    server = BigbluebuttonRails.configuration.select_server.call(self, :get_recordings)
+    if server.present?
+      server.fetch_recordings(filter.merge({ meetingID: self.meetingid }))
+      true
+    else
+      false
+    end
   end
 
-  # Every room needs a server to be used.
-  # The server of a room can change during the room's lifespan, but
-  # it should not change if the room is running or if it was created
-  # but not yet ended.
-  # Any action that requires a server should call 'require_server' before
-  # anything else.
-  # This method will automatically select a server if the room has no server
-  # set on it yet.
-  def require_server(api_method=nil)
-    selected_server = select_server(api_method)
-    unless selected_server.nil?
-      self.server = selected_server
-      self.save if selected_server && !self.new_record?
-    end
-    if self.server.nil?
+  def select_server(api_method=nil)
+    server = BigbluebuttonServer.first
+    if server.nil?
       msg = I18n.t('bigbluebutton_rails.rooms.errors.server.nil')
       raise BigbluebuttonRails::ServerRequired.new(msg)
     end
+    server
   end
 
-  # Selects the server with less rooms in it in case this room has no server
-  # set to it yet. Returns nil if there are no servers to select or if the
-  # room already has a server associated to it.
-  #
-  # This method can be overridden to change the way the server is selected
-  # before a room is used. `api_method` contains the API method that is being
-  # called. Any server returned here will be used. If no server is returned, the
-  # room will continue with its current server (if any).
-  # One good example is to always select a new server when a meeting is being
-  # created (in case `api_method` is `:create`), making this a simple load
-  # balancing tool that can work well in simple cases.
-  def select_server(api_method=nil)
-    if self.server.nil?
-      BigbluebuttonServer.
-        select("bigbluebutton_servers.*, count(bigbluebutton_rooms.id) as room_count").
-        joins("LEFT JOIN bigbluebutton_rooms ON bigbluebutton_servers.id = bigbluebutton_rooms.server_id").
-        group(:server_id).order("room_count ASC").first
-    else
-      nil
-    end
+  protected
+
+  def create_room_options
+    BigbluebuttonRoomOptions.create(:room => self)
   end
 
   def init
@@ -541,7 +519,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
     # Set the voice bridge only if the gem is configured to do so and the voice bridge
     # is not blank.
-    if BigbluebuttonRails.use_local_voice_bridges && !self.voice_bridge.blank?
+    if BigbluebuttonRails.configuration.use_local_voice_bridges && !self.voice_bridge.blank?
       opts.merge!({ :voiceBridge => self.voice_bridge })
     end
 
@@ -549,20 +527,21 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
     # Add information about the user that is creating the meeting (if any)
     unless user.nil?
-      userid = user.send(BigbluebuttonRails.user_attr_id)
-      username = user.send(BigbluebuttonRails.user_attr_name)
-      opts.merge!({ "meta_#{BigbluebuttonRails.metadata_user_id}" => userid })
-      opts.merge!({ "meta_#{BigbluebuttonRails.metadata_user_name}" => username })
+      userid = user.send(BigbluebuttonRails.configuration.user_attr_id)
+      username = user.send(BigbluebuttonRails.configuration.user_attr_name)
+      opts.merge!({ "meta_#{BigbluebuttonRails.configuration.metadata_user_id}" => userid })
+      opts.merge!({ "meta_#{BigbluebuttonRails.configuration.metadata_user_name}" => username })
     end
 
     # Add the invitation URL, if any
-    invitation_url = self.try(BigbluebuttonRails.invitation_url_method)
-    unless invitation_url.nil?
-      opts.merge!({ "meta_#{BigbluebuttonRails.metadata_invitation_url}" => invitation_url })
+    url = BigbluebuttonRails.configuration.get_invitation_url.call(self)
+    unless url.nil?
+      opts.merge!({ "meta_#{BigbluebuttonRails.configuration.metadata_invitation_url}" => url })
     end
 
-    self.server.api.request_headers = @request_headers # we need the client's IP
-    response = self.server.api.create_meeting(self.name, self.meetingid, opts)
+    server = BigbluebuttonRails.configuration.select_server.call(self, :create)
+    server.api.request_headers = @request_headers # we need the client's IP
+    response = server.api.create_meeting(self.name, self.meetingid, opts)
 
     response
   end
@@ -571,10 +550,9 @@ class BigbluebuttonRoom < ActiveRecord::Base
   # there's no message set in this room.
   # Can be used to easily set a default message format for all rooms.
   def default_welcome_message
-    if self.dial_number.present?
-      I18n.t('bigbluebutton_rails.rooms.default_welcome_msg_dial_number')
-    else
-      I18n.t('bigbluebutton_rails.rooms.default_welcome_msg')
+    msg = I18n.t('bigbluebutton_rails.rooms.default_welcome_msg_dial_number').html_safe
+    if !self.dial_number.blank?
+      msg += I18n.t('bigbluebutton_rails.rooms.default_welcome_msg_dial_number').html_safe
     end
   end
 
@@ -602,9 +580,9 @@ class BigbluebuttonRoom < ActiveRecord::Base
       result["meta_#{meta.name}"] = meta.content; result
     }
 
-    dynamic_metadata = self.try(BigbluebuttonRails.dynamic_metadata_method)
+    dynamic_metadata = BigbluebuttonRails.configuration.get_dynamic_metadata.call(self)
     unless dynamic_metadata.blank?
-      metadata = self.dynamic_metadata.inject(metadata) { |result, meta|
+      metadata = dynamic_metadata.inject(metadata) { |result, meta|
         result["meta_#{meta[0]}"] = meta[1]; result
       }
     end