bigbluebutton_rails 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.0.4
+
+* A random voice_bridge with 5 digits (recommended) is set when a room is created.
+* Routes generators now allow specifying custom controllers instead of the defaults Bigbluebutton::ServersController and Bigbluebutton::RoomsController.
+* Some bug fixes (including fixes for ruby 1.8).
+
 == 0.0.3
 
 * Rooms can be public or private

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigbluebutton_rails (0.0.3)
+    bigbluebutton_rails (0.0.4)
       bigbluebutton-api-ruby (~> 0.0.10)
       rails (~> 3.0.3)
 

data/README.rdoc

@@ -7,18 +7,22 @@ Features:
 * 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
 
-Future:
-* Private room and invitations to allow visitants to join conferences (using a password or not).
+Planned features:
 * Friendly URLs (e.g. http://somewhere.com/my-server/my-room)
-* Random meeting IDs to avoid problems with end_meeting and timeouts
+* 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
 
 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].
 
 == Installation
 
-You can install the latest version of bigbluebutton_rails using RubyGems:
+You can install the latest version of BigbluebuttonRails using RubyGems:
 
   gem install bigbluebutton_rails
 
@@ -31,24 +35,13 @@ 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 bigbluebutton_rails look like.
+Take a look at the migration to see how the models used by BigbluebuttonRails look like.
 
-All models, controllers and views used are embedded in the gem, but you can replace or extend them if you need to.
-There is one generator to help you with that:
-
-  rails generate bigbluebutton_rails:views
-
-It copies all bigbluebutton_rails views into your application, so you can customize them as you wish.
-
-There is yet another generator that copies the public files (javascripts, images and stylesheets) used by bigbluebutton_rails:
-
-  rails generate bigbluebutton_rails:public
-
-For more information see the section Dependencies below.
+To now more about the generators see {How to: Generators}[https://github.com/mconf/bigbluebutton_rails/wiki/How-to:-Generators]
 
 === Routes
 
-The routes to bigbluebutton_rails can be generated with the helper <tt>bigbluebutton_routes</tt>. See the example below:
+The routes to BigbluebuttonRails can be generated with the helper <tt>bigbluebutton_routes</tt>. See the example below:
 
   bigbluebutton_routes :default
 
@@ -63,42 +56,49 @@ The first line generates the default routes. You need to call it at least once t
 
   bigbluebutton_routes :default
 
-To have your rooms beloging to a model other than servers, use the room_matchers:
+It generates routes scoped with 'bigbluebutton'. These routes look like:
+
+  /bigbluebutton/servers
+  /bigbluebutton/servers/1/rooms/2
+  /bigbluebutton/servers/2/rooms/3/join
+
+You can customize the scope name and also make the routes point to custom controllers.
+
+  bigbluebutton_routes :default, :scope => 'webconference', :controllers => { :servers => 'custom_servers', :rooms => 'custom_rooms' }
+  bigbluebutton_routes :default, :scope => '' # to remove the scope
+
+If you customize the controllers as in the first line in the example above, be warned that every route generated after this will
+be using these controllers!
+
+You may also want shorter routes to access conference rooms. For that, use the option <tt>room_matchers</tt>:
 
   bigbluebutton_routes :room_matchers
 
-It creates routes to the actions "show", "running", "end", and "join".
+It creates routes to the actions used to access the conference room: "show", "join", "auth", "running", "end", and "invite".
 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
 
-Obs: bigbluebutton_rails does not allows the room access using IDs such as "room-5" or "public-room" yet, but soon you it will.
+Obs: BigbluebuttonRails does not allows the room access using IDs such as "room-5" or "public-room" yet, but soon you it will.
 
 === User authorization, permissions and assumptions
 
-There are some basic assumptions made by bigbluebutton_rails:
+There are some basic assumptions made by BigbluebuttonRails:
 
 * You have a method called <tt>current_user</tt> that returns the current user;
 * The <tt>current_user</tt> has an attribute or method called "name" that returns his/her fullname.
 
 If you don't, you can change this behaviour easily, keep reading.
 
-bigbluebutton_rails uses the methods <tt>bigbluebutton_user</tt> and <tt>bigbluebutton_role(room)</tt> to get the current user and to get the permission that the current
-user has in the <tt>room</tt>, respectively. These methods are defined in <tt>lib/bigbluebutton_rails/controller_methods.rb</tt> and you can reimplement them in your
-application controller to change their behaviour.
-
-Although this is the general rule, the permission checking is different for public or private rooms. Check the <tt>How it Works</tt>
-section below for more details.
-
-
-==== Integration with Devise
-
-To be written...
+BigbluebuttonRails uses the methods <tt>bigbluebutton_user</tt> and <tt>bigbluebutton_role(room)</tt> to get the current user and to get the permission that the current
+user has in the <tt>room</tt>, respectively. These methods are defined in {lib/bigbluebutton_rails/controller_methods.rb}[https://github.com/mconf/bigbluebutton_rails/blob/master/lib/bigbluebutton_rails/controller_methods.rb]
+and you can reimplement them in your application controller to change their behaviour.
 
-==== Integration with CanCan
+==== See also
 
-To be written...
+* {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
 
@@ -119,7 +119,7 @@ JQuery is used in the views <tt>join_wait</tt> and <tt>invite</tt> and can be co
 
 === Overview
 
-bigbluebutton_rails has two entities: servers and rooms. Servers can have multiple rooms, that belong to a server and can also belong to any other model.
+BigbluebuttonRails has two entities: servers and rooms. Servers can have multiple rooms, that belong to a server and can also belong to any other model.
 You can make a room belong to a user, for example.
 
 Every server has an associated API object (using the gem bigbluebutton-api-ruby) used to access the BigBlueButton server.
@@ -130,7 +130,7 @@ These extra actions will be explained bellow.
 
 A room model has methods to fetch and send information to the BBB server. They are simple API calls, but the "fetch" methods check the response and store
 data from it, while the "send" methods just make the API call. You can, for example, use <tt>fetch_meeting_info</tt> to get information about the meeting
-(will trigger the API call <tt>getMeetingInfo</tt>). The data parsed from the response wil be stored in the model and can be accessed using it's attributes. 
+(will trigger the API call <tt>getMeetingInfo</tt>). The data parsed from the response wil be stored in the model and can be accessed using it's attributes.
 
 All methods in the models that trigger any API call are documented with "Triggers API call" and the API functions that are called. Be aware that they
 can throw a BigBlueButtonException.
@@ -148,9 +148,11 @@ the user. Basic differences:
 
 * <tt>invite</tt> renders a view to ask for a user name and a password. It is used to enable <b>anonymous users</b> to join a room or
   to define the user role using the <b>room password</b> instead of the <tt>bigbluebutton_role</tt> method.
-  * It first checks <tt>bigbluebutton_role</tt> to see if the current user already has a role in the target room. In case it has, redirects to <tt>join</tt>.
-  * If there is a user logged, uses <tt>bigbluebutton_user().name</tt> as the user name. Otherwise, ask the user to type a name.
-* <tt>join</tt> requires a <b>logged user</b> and uses <tt>bigbluebutton_role</tt> to get the role of this user.
+  * It first checks <tt>bigbluebutton_role</tt> to see if the current user already has a role in the target room.
+    * In case it has (see {controller_methods.rb}[https://github.com/mconf/bigbluebutton_rails/blob/master/lib/bigbluebutton_rails/controller_methods.rb] for more info), redirects to <tt>join</tt>.
+    * Otherwise:
+      * If there is a user logged, uses <tt>bigbluebutton_user().name</tt> as the user name. Otherwise, ask the user to type a name.
+* <tt>join</tt> requires a <b>logged user</b> and uses <tt>bigbluebutton_role</tt> to get the role for this user
   * It redirects the user straight to the meeting if the join is successful.
   * In case there's no role associated with the current user, falls back to <tt>invite</tt> to ask for a password.
 
@@ -159,11 +161,11 @@ Internally, they use the same algorithm:
 * If the user is a moderator:
   * If the room is not created yet, creates it.
   * Redirects the user to the meeting as a moderator.
-* If the user is a normal attendee:
+* 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.
-    * <tt>invite</tt> renders the invite view again and shows a warning that the metting is not running.
+    * <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>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
 

data/app/controllers/bigbluebutton/rooms_controller.rb

@@ -26,7 +26,7 @@ class Bigbluebutton::RoomsController < ApplicationController
   def create
     @room = BigbluebuttonRoom.new(params[:bigbluebutton_room])
     @room.server = @server
-    
+
     # TODO Generate a random meetingid everytime a room is created
     if !params[:bigbluebutton_room].has_key?(:meetingid) or
         params[:bigbluebutton_room][:meetingid].blank?
@@ -152,9 +152,9 @@ class Bigbluebutton::RoomsController < ApplicationController
       @room.fetch_is_running?
     rescue BigBlueButton::BigBlueButtonException => e
       flash[:error] = e.to_s
-      render :json => { running: "false", error: "#{e.to_s}" }
+      render :json => { :running => "false", :error => "#{e.to_s}" }
     else
-      render :json => { running: "#{@room.is_running?}" }
+      render :json => { :running => "#{@room.is_running?}" }
     end
 
   end

data/app/models/bigbluebutton_room.rb

@@ -12,6 +12,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
   validates :welcome_msg, :length => { :maximum => 250 }
   validates :private, :inclusion => { :in => [true, false] }
   validates :randomize_meetingid, :inclusion => { :in => [true, false] }
+  validates :voice_bridge, :presence => true, :uniqueness => true
 
   # Passwords are 16 character strings
   # See http://groups.google.com/group/bigbluebutton-dev/browse_thread/thread/9be5aae1648bcab?pli=1
@@ -62,7 +63,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
     response[:attendees].each do |att|
       attendee = BigbluebuttonAttendee.new
       attendee.from_hash(att)
-      @attendees << attendee 
+      @attendees << attendee
     end
 
     response
@@ -158,6 +159,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
   def init
     self[:meetingid] ||= random_meetingid
+    self[:voice_bridge] ||= random_voice_bridge
 
     # fetched attributes
     @participant_count = 0
@@ -179,6 +181,16 @@ class BigbluebuttonRoom < ActiveRecord::Base
     end
   end
 
+  def random_voice_bridge
+    value = (70000 + ActiveSupport::SecureRandom.random_number(9999)).to_s
+    count = 0
+    while not BigbluebuttonRoom.find_by_voice_bridge(value).nil? and count < 10
+      count += 1
+      value = (70000 + ActiveSupport::SecureRandom.random_number(9999)).to_s
+    end
+    value
+  end
+
   def do_create_meeting
     self.server.api.create_meeting(self.name, self.meetingid, self.moderator_password,
                                    self.attendee_password, self.welcome_msg, self.dial_number,

data/app/models/bigbluebutton_server.rb

@@ -14,6 +14,11 @@ class BigbluebuttonServer < ActiveRecord::Base
 
   validates :version, :presence => true, :inclusion => { :in => ['0.64', '0.7'] }
 
+  # Array of <tt>BigbluebuttonMeeting</tt>
+  attr_reader :meetings
+
+  after_initialize :init
+
   # Returns the API object (<tt>BigBlueButton::BigBlueButtonAPI</tt> defined in
   # <tt>bigbluebutton-api-ruby</tt>) associated with this server.
   def api
@@ -24,9 +29,6 @@ class BigbluebuttonServer < ActiveRecord::Base
     @api
   end
 
-  # Array of <tt>BigbluebuttonMeeting</tt>
-  attr_reader :meetings
-
   # Fetches the meetings currently created in the server (running or not).
   #
   # Using the response, updates <tt>meetings</tt> with a list of <tt>BigbluebuttonMeeting</tt>
@@ -41,9 +43,8 @@ class BigbluebuttonServer < ActiveRecord::Base
     response[:meetings].each do |attr|
       room = BigbluebuttonRoom.find_by_server_id_and_meetingid(self.id, attr[:meetingID])
       if room.nil?
-        room = BigbluebuttonRoom.new(:server => self, :meetingid => attr[:meetingID],
-                                     :attendee_password => attr[:attendeePW],
-                                     :moderator_password => attr[:moderatorPW])
+        room = BigbluebuttonRoom.new(:server => self, :meetingid => attr[:meetingID], :name => attr[:meetingID],
+                                     :attendee_password => attr[:attendeePW], :moderator_password => attr[:moderatorPW])
         room.running = attr[:running]
       else
         room.update_attributes(:attendee_password => attr[:attendeePW],
@@ -55,4 +56,11 @@ class BigbluebuttonServer < ActiveRecord::Base
     end
   end
 
+  protected
+
+  def init
+    # fetched attributes
+    @meetings = []
+  end
+
 end

data/bigbluebutton_rails.gemspec

@@ -4,11 +4,11 @@ require "bigbluebutton_rails/version"
 Gem::Specification.new do |s|
   s.name        = "bigbluebutton_rails"
   s.version     = BigbluebuttonRails::VERSION.dup
-  s.platform    = Gem::Platform::RUBY  
+  s.platform    = Gem::Platform::RUBY
   s.summary     = "BigBlueButton integration for Ruby on Rails"
   s.email       = "mconf@googlegroups.com"
   s.homepage    = "http://github.com/mconf/bigbluebutton_rails"
-  s.description = "BigBlueButton integration for Ruby on Rails"
+  s.description = "It allows you to interact with a BigBlueButton server from your Ruby on Rails web application"
   s.authors     = ['Leonardo Crauss Daronco']
 
   s.files         = `git ls-files`.split("\n")

data/lib/bigbluebutton_rails/rails/routes.rb

@@ -28,21 +28,14 @@ module ActionDispatch::Routing
     #   running_bigbluebutton_server_room  GET    /bigbluebutton/servers/:server_id/rooms/:id/running(.:format)
     #                                             { :action=>"running", :controller=>"bigbluebutton/rooms" }
     #
-    # The controllers used will always be bigbluebutton/servers and bigbluebutton/rooms,
-    # but you can change the url using the scope option:
+    # The routes point by default to the controllers Bigbluebutton::ServersController and Bigbluebutton::RoomsController
+    # and the the routes are scoped (namespaced) with 'bigbluebutton'. You can change the namespace with:
     #
     #    bigbluebutton_routes :default, :scope => "webconference"
     #
-    # This will generate routes such as:
+    # You can also change the controllers with:
     #
-    #   webconference_server               GET    /webconference/servers/:id(.:format)
-    #                                             { :action=>"show", :controller=>"bigbluebutton/servers" }
-    #                                      POST   /webconference/servers/:id(.:format)
-    #                                             { :action=>"update", :controller=>"bigbluebutton/servers" }
-    #   join_webconference_server_room     GET    /webconference/servers/:server_id/rooms/:id/join(.:format)
-    #                                             { :action=>"join", :controller=>"bigbluebutton/rooms" }
-    #   running_webconference_server_room  GET    /webconference/servers/:server_id/rooms/:id/running(.:format)
-    #                                             { :action=>"running", :controller=>"bigbluebutton/rooms" }
+    #    bigbluebutton_routes :default, :controllers { :servers => "custom_servers", :rooms => "custom_rooms" }
     #
     # ==== Room matchers
     #
@@ -81,11 +74,12 @@ module ActionDispatch::Routing
 
     def bigbluebutton_routes_default(*params) #:nodoc:
       options = params.extract_options!
-      options_scope = options.has_key?(:scope) ? options[:scope] : 'bigbluebutton'
+      options_scope = options.has_key?(:scope) ? options[:scope] : BigbluebuttonRails.routing_scope
+      BigbluebuttonRails.set_controllers(options[:controllers])
 
       scope options_scope, :as => options_scope do
-        resources :servers, :controller => 'bigbluebutton/servers' do
-          resources :rooms, :controller => 'bigbluebutton/rooms' do
+        resources :servers, :controller => BigbluebuttonRails.controllers[:servers] do
+          resources :rooms, :controller => BigbluebuttonRails.controllers[:rooms] do
             get :join, :on => :member
             get :running, :on => :member
             get :end, :on => :member
@@ -98,12 +92,12 @@ module ActionDispatch::Routing
 
     def bigbluebutton_routes_room_matchers(*params) #:nodoc:
       # TODO This is generating helpers like "user_running_room" instead of "running_user_room"
-      get 'room/:id' => 'bigbluebutton/rooms#show', :as => 'room'
-      get 'room/:id/join' => 'bigbluebutton/rooms#join', :as => 'join_room'
-      post 'room/:id/join' => 'bigbluebutton/rooms#auth', :as => 'join_room'
-      get 'room/:id/running' => 'bigbluebutton/rooms#running', :as => 'running_room'
-      get 'room/:id/end' => 'bigbluebutton/rooms#end', :as => 'end_room'
-      get 'room/:id/invite' => 'bigbluebutton/rooms#invite', :as => 'invite_room'
+      get 'room/:id' => "#{BigbluebuttonRails.controllers[:rooms]}#show", :as => 'room'
+      get 'room/:id/join' => "#{BigbluebuttonRails.controllers[:rooms]}#join", :as => 'join_room'
+      post 'room/:id/join' => "#{BigbluebuttonRails.controllers[:rooms]}#auth", :as => 'join_room'
+      get 'room/:id/running' => "#{BigbluebuttonRails.controllers[:rooms]}#running", :as => 'running_room'
+      get 'room/:id/end' => "#{BigbluebuttonRails.controllers[:rooms]}#end", :as => 'end_room'
+      get 'room/:id/invite' => "#{BigbluebuttonRails.controllers[:rooms]}#invite", :as => 'invite_room'
     end
 
   end

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

data/lib/bigbluebutton_rails.rb

@@ -6,4 +6,17 @@ module BigbluebuttonRails
   require 'bigbluebutton_rails/rails'
   require 'bigbluebutton_rails/controller_methods'
   require 'bigbluebutton_rails/rails/routes'
+
+  # Default controllers to generate the routes
+  mattr_accessor :controllers
+  @@controllers = { :servers => 'bigbluebutton/servers', :rooms => 'bigbluebutton/rooms' }
+
+  # Default scope for routes
+  mattr_accessor :routing_scope
+  @@routing_scope = 'bigbluebutton'
+
+  def self.set_controllers(options)
+    @@controllers.merge!(options).slice!(:servers, :rooms) unless options.nil?
+  end
+
 end

data/lib/classes/bigbluebutton_attendee.rb

@@ -7,7 +7,7 @@ class BigbluebuttonAttendee
   def from_hash(hash)
     self.user_id = hash[:userID].to_s
     self.full_name = hash[:fullName].to_s
-    self.role = hash[:role].downcase == "moderator" ? :moderator : :attendee
+    self.role = hash[:role].to_s.downcase == "moderator" ? :moderator : :attendee
   end
 
   def ==(other)

data/lib/generators/bigbluebutton_rails/templates/migration.rb

@@ -27,6 +27,7 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
     end
     add_index :bigbluebutton_rooms, :server_id
     add_index :bigbluebutton_rooms, :meetingid, :unique => true
+    add_index :bigbluebutton_rooms, :voice_bridge, :unique => true
   end
 
   def self.down

data/spec/models/bigbluebutton_room_spec.rb

@@ -23,11 +23,12 @@ describe BigbluebuttonRoom do
     it { should have_db_column(:randomize_meetingid).of_type(:boolean) }
     it { should have_db_index(:server_id) }
     it { should have_db_index(:meetingid).unique(true) }
-    it { 
+    it { should have_db_index(:voice_bridge).unique(true) }
+    it {
       room = BigbluebuttonRoom.new
       room.private.should be_false
     }
-    it { 
+    it {
       room = BigbluebuttonRoom.new
       room.randomize_meetingid.should be_true
     }
@@ -44,6 +45,7 @@ describe BigbluebuttonRoom do
 
     it { should validate_presence_of(:server_id) }
     it { should validate_presence_of(:meetingid) }
+    it { should validate_presence_of(:voice_bridge) }
     it { should validate_presence_of(:name) }
 
     it { should be_boolean(:private) }
@@ -59,6 +61,7 @@ describe BigbluebuttonRoom do
 
     it { should validate_uniqueness_of(:meetingid) }
     it { should validate_uniqueness_of(:name) }
+    it { should validate_uniqueness_of(:voice_bridge) }
 
     it {
       room = Factory.create(:bigbluebutton_room)
@@ -103,11 +106,83 @@ describe BigbluebuttonRoom do
         room.attendees.should == []
       end
 
-      it "meetingid if it's nil" do
-        room.meetingid.should_not be_nil
+      context "meetingid" do
+        it { room.meetingid.should_not be_nil }
+        it {
+          b = BigbluebuttonRoom.new(:meetingid => "user defined")
+          b.meetingid.should == "user defined"
+        }
+      end
+
+      context "voice_bridge" do
+        it { room.voice_bridge.should_not be_nil }
+        it { room.voice_bridge.length.should == 5 }
+        it { room.voice_bridge[0].should == '7' }
+        it {
+          b = BigbluebuttonRoom.new(:voice_bridge => "user defined")
+          b.voice_bridge.should == "user defined"
+        }
       end
     end
 
+
+
+=begin
+        context "randomizes meetingid" do
+          let(:fail_hash) { { :returncode => true, :meetingID => "new id",
+                              :messageKey => "duplicateWarning" } }
+          let(:success_hash) { { :returncode => true, :meetingID => "new id",
+                                 :messageKey => "" } }
+          let(:new_id) { "new id" }
+          before {
+            room.randomize_meetingid = true
+            room.server = mocked_server
+          }
+
+          it "before calling create" do
+            room.should_receive(:random_meetingid).and_return(new_id)
+            mocked_api.should_receive(:create_meeting).
+              with(room.name, new_id, room.moderator_password,
+                   room.attendee_password, room.welcome_msg, room.dial_number,
+                   room.logout_url, room.max_participants, room.voice_bridge)
+            room.send_create
+          end
+
+          it "and tries again on error" do
+            # fails twice and them succeds
+            room.should_receive(:random_meetingid).exactly(3).times.and_return(new_id)
+            mocked_api.should_receive(:create_meeting).
+              with(room.name, new_id, room.moderator_password,
+                   room.attendee_password, room.welcome_msg, room.dial_number,
+                   room.logout_url, room.max_participants, room.voice_bridge).
+              twice.
+              and_return(fail_hash)
+            mocked_api.should_receive(:create_meeting).
+              with(room.name, new_id, room.moderator_password,
+                   room.attendee_password, room.welcome_msg, room.dial_number,
+                   room.logout_url, room.max_participants, room.voice_bridge).
+              once.
+              and_return(success_hash)
+            room.send_create
+          end
+
+          it "and limits to 10 tries" do
+            room.should_receive(:random_meetingid).exactly(11).times.and_return(new_id)
+            mocked_api.should_receive(:create_meeting).
+              with(room.name, new_id, room.moderator_password,
+                   room.attendee_password, room.welcome_msg, room.dial_number,
+                   room.logout_url, room.max_participants, room.voice_bridge).
+              exactly(10).times.
+              and_return(fail_hash)
+            room.send_create
+          end
+        end
+
+      end
+=end
+
+
+
     context "using the api" do
       before { mock_server_and_api }
       let(:room) { Factory.create(:bigbluebutton_room) }
@@ -137,13 +212,13 @@ describe BigbluebuttonRoom do
       describe "#fetch_meeting_info" do
 
         # these hashes should be exactly as returned by bigbluebutton-api-ruby to be sure we are testing it right
-        let(:hash_info) { 
+        let(:hash_info) {
           { :returncode=>true, :meetingID=>"test_id", :attendeePW=>"1234", :moderatorPW=>"4321",
             :running=>false, :hasBeenForciblyEnded=>false, :startTime=>nil, :endTime=>nil,
             :participantCount=>0, :moderatorCount=>0, :attendees=>[], :messageKey=>"", :message=>""
           }
         }
-        let(:users) { 
+        let(:users) {
           [
            {:userID=>"ndw1fnaev0rj", :fullName=>"House M.D.", :role=>:moderator},
            {:userID=>"gn9e22b7ynna", :fullName=>"Dexter Morgan", :role=>:moderator},
@@ -151,7 +226,7 @@ describe BigbluebuttonRoom do
            {:userID=>"rbepbovolsxt", :fullName=>"Trinity", :role=>:viewer}
           ]
         }
-        let(:hash_info2) { 
+        let(:hash_info2) {
           { :returncode=>true, :meetingID=>"test_id", :attendeePW=>"1234", :moderatorPW=>"4321",
             :running=>true, :hasBeenForciblyEnded=>false, :startTime=>DateTime.parse("Wed Apr 06 17:09:57 UTC 2011"),
             :endTime=>nil, :participantCount=>4, :moderatorCount=>2,
@@ -214,7 +289,7 @@ describe BigbluebuttonRoom do
         let(:attendee_password) { Forgery(:basic).password }
         let(:moderator_password) { Forgery(:basic).password }
         let(:hash_create) {
-          {                                                                                                                                                                         
+          {
             :returncode => "SUCCESS", :meetingID => "test_id",
             :attendeePW => attendee_password, :moderatorPW => moderator_password,
             :hasBeenForciblyEnded => "false", :messageKey => {}, :message => {}

data/spec/models/bigbluebutton_server_spec.rb

@@ -44,8 +44,8 @@ describe BigbluebuttonServer do
       server = Factory.create(:bigbluebutton_server)
       Factory.create(:bigbluebutton_room, :server => server)
       Factory.create(:bigbluebutton_room, :server => server)
-      expect { 
-        expect { 
+      expect {
+        expect {
           server.destroy
         }.to change{ BigbluebuttonServer.count }.by(-1)
       }.to change{ BigbluebuttonRoom.count }.by(-2)
@@ -90,6 +90,14 @@ describe BigbluebuttonServer do
       end
     end
 
+    context "initializes" do
+      let(:server) { BigbluebuttonServer.new }
+
+      it "fetched attributes before they are fetched" do
+        server.meetings.should == []
+      end
+    end
+
     context "fetching info from bbb" do
       let(:server) { Factory.create(:bigbluebutton_server) }
       let(:room1) { Factory.create(:bigbluebutton_room, :server => server, :meetingid => "room1") }
@@ -107,7 +115,7 @@ describe BigbluebuttonServer do
          { :meetingID => "im not in the db", :attendeePW=>"pass", :moderatorPW=>"pass", :hasBeenForciblyEnded => true, :running => true}
         ]
       }
-      let(:hash) { 
+      let(:hash) {
         { :returncode => true,
           :meetings => meetings
         }

data/spec/rails_app/app/controllers/custom_rooms_controller.rb

@@ -0,0 +1,8 @@
+class CustomRoomsController < ApplicationController
+  def index
+  end
+
+  def show
+  end
+
+end

data/spec/rails_app/app/controllers/custom_servers_controller.rb

@@ -0,0 +1,8 @@
+class CustomServersController < ApplicationController
+  def index
+  end
+
+  def show
+  end
+
+end

data/spec/rails_app/config/routes.rb

@@ -11,4 +11,7 @@ RailsApp::Application.routes.draw do
     end
   end
 
+  # note: controllers modified here will be used in the routes added after this (if any)
+  bigbluebutton_routes :default, :scope => "custom", :controllers => { :servers => 'custom_servers', :rooms => 'custom_rooms' }
+
 end

data/spec/routing/bigbluebutton/custom_controllers_routing_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe ActionController do
+  include Shoulda::Matchers::ActionController
+
+  describe "routing" do
+
+    # custom controllers - servers
+    it {
+      {:get => "/custom/servers"}.
+      should route_to(:controller => "custom_servers", :action => "index")
+    }
+    it {
+      {:post => "/custom/servers"}.
+      should route_to(:controller => "custom_servers", :action => "create")
+    }
+    it {
+      {:get => "/custom/servers/new"}.
+      should route_to(:controller => "custom_servers", :action => "new")
+    }
+    it {
+      {:get => "/custom/servers/1/edit"}.
+      should route_to(:controller => "custom_servers", :action => "edit", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1"}.
+      should route_to(:controller => "custom_servers", :action => "show", :id => "1")
+    }
+    it {
+      {:put => "/custom/servers/1"}.
+      should route_to(:controller => "custom_servers", :action => "update", :id => "1")
+    }
+    it {
+      {:delete => "/custom/servers/1"}.
+      should route_to(:controller => "custom_servers", :action => "destroy", :id => "1")
+    }
+
+    # custom controllers - rooms
+    it {
+      {:get => "/custom/servers/1/rooms"}.
+      should route_to(:controller => "custom_rooms", :action => "index", :server_id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/new"}.
+      should route_to(:controller => "custom_rooms", :action => "new", :server_id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1/edit"}.
+      should route_to(:controller => "custom_rooms", :action => "edit", :server_id => "1", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "show", :server_id => "1", :id => "1")
+    }
+    it {
+      {:put => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "update", :server_id => "1", :id => "1")
+    }
+    it {
+      {:delete => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "destroy", :server_id => "1", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "join", :server_id => "1", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1/running"}.
+      should route_to(:controller => "custom_rooms", :action => "running", :server_id => "1", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1/end"}.
+      should route_to(:controller => "custom_rooms", :action => "end", :server_id => "1", :id => "1")
+    }
+    it {
+      {:get => "/custom/servers/1/rooms/1/invite"}.
+      should route_to(:controller => "custom_rooms", :action => "invite", :server_id => "1", :id => "1")
+    }
+    it {
+      {:post => "/custom/servers/1/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "auth", :server_id => "1", :id => "1")
+    }
+
+  end
+
+end
+

data/spec/routing/bigbluebutton/servers_routing_spec.rb

@@ -4,34 +4,39 @@ describe Bigbluebutton::ServersController do
   include Shoulda::Matchers::ActionController
 
   describe "routing" do
-    it {
-      should route(:get, "/bigbluebutton/servers").
-      to(:action => :index)
-    }
-    it {
-      should route(:post, "/bigbluebutton/servers").
-      to(:action => :create)
-    }
-    it {
-      should route(:get, "/bigbluebutton/servers/new").
-      to(:action => :new)
-    }
-    it {
-      should route(:get, "/bigbluebutton/servers/1/edit").
-      to(:action => :edit, :id => 1)
-    }
-    it {
-      should route(:get, "/bigbluebutton/servers/1").
-      to(:action => :show, :id => 1)
-    }
-    it {
-      should route(:put, "/bigbluebutton/servers/1").
-      to(:action => :update, :id => 1)
-    }
-    it {
-      should route(:delete, "/bigbluebutton/servers/1").
-      to(:action => :destroy, :id => 1)
-    }
+
+    # normal and scoped routes
+    ['bigbluebutton', 'webconference'].each do |prefix|
+      it {
+        {:get => "/#{prefix}/servers"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "index")
+      }
+      it {
+        {:post => "/#{prefix}/servers"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "create")
+      }
+      it {
+        {:get => "/#{prefix}/servers/new"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "new")
+      }
+      it {
+        {:get => "/#{prefix}/servers/1/edit"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "edit", :id => "1")
+      }
+      it {
+        {:get => "/#{prefix}/servers/1"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "show", :id => "1")
+      }
+      it {
+        {:put => "/#{prefix}/servers/1"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "update", :id => "1")
+      }
+      it {
+        {:delete => "/#{prefix}/servers/1"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "destroy", :id => "1")
+      }
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-28 00:00:00.000000000Z
+date: 2011-05-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73818420 !ruby/object:Gem::Requirement
+  requirement: &87438090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *73818420
+  version_requirements: *87438090
 - !ruby/object:Gem::Dependency
   name: bigbluebutton-api-ruby
-  requirement: &73814520 !ruby/object:Gem::Requirement
+  requirement: &87437620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *73814520
+  version_requirements: *87437620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73814050 !ruby/object:Gem::Requirement
+  requirement: &87437220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *73814050
+  version_requirements: *87437220
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &73813560 !ruby/object:Gem::Requirement
+  requirement: &87436820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *73813560
+  version_requirements: *87436820
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &73813050 !ruby/object:Gem::Requirement
+  requirement: &87436290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *73813050
+  version_requirements: *87436290
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &73812640 !ruby/object:Gem::Requirement
+  requirement: &87435880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *73812640
+  version_requirements: *87435880
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &73812110 !ruby/object:Gem::Requirement
+  requirement: &87435530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *73812110
+  version_requirements: *87435530
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &73811720 !ruby/object:Gem::Requirement
+  requirement: &87435160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,8 +98,9 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *73811720
-description: BigBlueButton integration for Ruby on Rails
+  version_requirements: *87435160
+description: It allows you to interact with a BigBlueButton server from your Ruby
+  on Rails web application
 email: mconf@googlegroups.com
 executables: []
 extensions: []
@@ -157,6 +158,8 @@ files:
 - spec/rails_app/.gitignore
 - spec/rails_app/Rakefile
 - spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/custom_rooms_controller.rb
+- spec/rails_app/app/controllers/custom_servers_controller.rb
 - spec/rails_app/app/controllers/space_controller.rb
 - spec/rails_app/app/controllers/user_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
@@ -199,6 +202,7 @@ files:
 - spec/rails_app/public/stylesheets/scaffold.css
 - spec/rails_app/script/rails
 - spec/rails_app/vendor/plugins/.gitkeep
+- spec/routing/bigbluebutton/custom_controllers_routing_spec.rb
 - spec/routing/bigbluebutton/rooms_routing_spec.rb
 - spec/routing/bigbluebutton/servers_routing_spec.rb
 - spec/spec_helper.rb
@@ -219,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1022773263
+      hash: 986260833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1022773263
+      hash: 986260833
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.7.2