bigbluebutton_rails 1.1.0 → 1.2.0

data/.gitignore

@@ -7,3 +7,4 @@ log
 spec/rails_app/features/config.yml
 coverage/
 rails_best_practices_output.html
+bot.log

data/.rvmrc

@@ -2,5 +2,5 @@
 if [ -e '.rvmrc_custom' ]; then
   source .rvmrc_custom;
 else
-  rvm --create use 1.9.2@bigbluebutton_rails;
+  rvm --create use 1.9.3-p194@bigbluebutton_rails;
 fi

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 1.2.0
+
+* Updated ruby to 1.9.3-194.
+* Support to BigBlueButton 0.4 rc1.
+* Updated bigbluebutton-api-ruby to 1.1.0.
+
 == 1.1.0
 
 * Rooms are now decoupled from servers:

data/Gemfile.lock

@@ -7,8 +7,8 @@ GIT
 PATH
   remote: .
   specs:
-    bigbluebutton_rails (1.1.0)
-      bigbluebutton-api-ruby (~> 0.1.0)
+    bigbluebutton_rails (1.2.0)
+      bigbluebutton-api-ruby (~> 1.1.0)
       rails (>= 3.0.0)
 
 GEM
@@ -43,7 +43,7 @@ GEM
     activesupport (3.0.11)
     addressable (2.2.6)
     arel (2.0.10)
-    bigbluebutton-api-ruby (0.1.0)
+    bigbluebutton-api-ruby (1.1.0)
       xml-simple (>= 1.1.1)
     builder (2.1.2)
     capybara (1.1.2)
@@ -57,7 +57,7 @@ GEM
       capybara (~> 1.1.0)
       mechanize (~> 2.0.0)
     capybara-webkit (0.7.2)
-      capybara (< 1.2, >= 1.0.0)
+      capybara (>= 1.0.0, < 1.2)
     childprocess (0.2.3)
       ffi (~> 1.0.6)
     colored (1.2)
@@ -80,7 +80,7 @@ GEM
     ffi (1.0.11)
     forgery (0.5.0)
     generator_spec (0.8.4)
-      rails (< 4.0, >= 3.0)
+      rails (>= 3.0, < 4.0)
       rspec-rails
     gherkin (2.7.1)
       json (>= 1.4.6)
@@ -94,10 +94,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mechanize (2.0.1)
-      net-http-digest_auth (>= 1.1.1, ~> 1.1)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 1.8)
       nokogiri (~> 1.4)
-      webrobots (>= 0.0.9, ~> 0.0)
+      webrobots (~> 0.0, >= 0.0.9)
     mime-types (1.17.2)
     multi_json (1.0.4)
     net-http-digest_auth (1.2)

data/app/controllers/bigbluebutton/rooms_controller.rb

@@ -113,16 +113,16 @@ class Bigbluebutton::RoomsController < ApplicationController
 
   # Used by logged users to join public rooms.
   def join
-    role = bigbluebutton_role(@room)
-    if role.nil?
+    @user_role = bigbluebutton_role(@room)
+    if @user_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
+    elsif bigbluebutton_user.nil? or @user_role == :password
+      redirect_to :action => :invite, :mobile => params[:mobile]
 
     else
-      join_internal(bigbluebutton_user.name, role, :join)
+      join_internal(bigbluebutton_user.name, @user_role, :join)
     end
   end
 
@@ -130,14 +130,9 @@ class Bigbluebutton::RoomsController < ApplicationController
   def invite
     respond_with @room do |format|
 
-      role = bigbluebutton_role(@room)
-      if role.nil?
+      @user_role = bigbluebutton_role(@room)
+      if @user_role.nil?
         raise BigbluebuttonRails::RoomAccessDenied.new
-
-      # if there's already a logged user with a role in the room, join through #join
-      elsif !bigbluebutton_user.nil? and role != :password
-        format.html { redirect_to :action => :join }
-
       else
         format.html
       end
@@ -156,15 +151,15 @@ class Bigbluebutton::RoomsController < ApplicationController
     end
 
     name = bigbluebutton_user.nil? ? params[:user][:name] : bigbluebutton_user.name
-    role = bigbluebutton_role(@room)
-    if role.nil?
+    @user_role = bigbluebutton_role(@room)
+    if @user_role.nil?
       raise BigbluebuttonRails::RoomAccessDenied.new
-    elsif role == :password
-      role = @room.user_role(params[:user])
+    elsif @user_role == :password
+      @user_role = @room.user_role(params[:user])
     end
 
-    unless role.nil? or name.nil? or name.empty?
-      join_internal(name, role, :invite)
+    unless @user_role.nil? or name.nil? or name.empty?
+      join_internal(name, @user_role, :invite)
     else
       flash[:error] = t('bigbluebutton_rails.rooms.errors.auth.failure')
       render :invite, :status => :unauthorized

data/app/helpers/bigbluebutton_rails_helper.rb

@@ -7,6 +7,11 @@ module BigbluebuttonRailsHelper
     "https://chart.googleapis.com/chart?cht=qr&chs=#{size}&chl=#{content}&choe=UTF-8"
   end
 
-end
-
+  # TODO: improve it, showing all flashes
+  def bbb_rails_error_explanation
+    if flash.has_key?(:error) and !flash[:error].blank?
+      content_tag(:div, flash[:error], { :id => "error_explanation" })
+    end
+  end
 
+end

data/app/models/bigbluebutton_room.rb

@@ -302,13 +302,24 @@ class BigbluebuttonRoom < ActiveRecord::Base
   end
 
   def do_create_meeting
-    opts = { :moderatorPW => self.moderator_password, :attendeePW => self.attendee_password,
-      :welcome => self.welcome_msg, :dialNumber => self.dial_number,
+    msg = (self.welcome_msg.nil? or self.welcome_msg.empty?) ? default_welcome_message : self.welcome_msg
+    opts = {
+      :moderatorPW => self.moderator_password, :attendeePW => self.attendee_password,
+      :welcome => msg, :dialNumber => self.dial_number,
       :logoutURL => self.full_logout_url || self.logout_url,
-      :maxParticipants => self.max_participants, :voiceBridge => self.voice_bridge }
+      :maxParticipants => self.max_participants, :voiceBridge => self.voice_bridge
+    }
     self.server.api.create_meeting(self.name, self.meetingid, opts)
   end
 
+  # Returns the default welcome message to be shown in a conference in case
+  # 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
+    I18n.t('bigbluebutton_rails.rooms.default_welcome_msg',
+           :name => self.name, :voice_number => self.voice_bridge)
+  end
+
   # if :param wasn't set, sets it as :name downcase and parameterized
   def set_param
     if self.param.blank?

data/app/views/bigbluebutton/rooms/invite.html.erb

@@ -28,27 +28,39 @@ $(document).ready(function(){
 
 <h1>Invite to the meeting <%= @room.name %></h1>
 
-<div id="error_explanation"><%= flash[:error] %></div>
+<%= bbb_rails_error_explanation %>
 
 <p>Meeting status: <span id="meeting_status">-</span> (<a href="javascript:ajax_request();">refresh</a>)</p>
-<p><%= @room.name %> requires a name and/or password to join:</p>
 
-<%= form_tag join_bigbluebutton_room_path(@room) do %>
+<div class="bbbrails_invite_device_type">
+  <% if params[:mobile] %>
+    In this page you can join the conference from a <b>mobile device</b>.
+    To join from a desktop <%= link_to "click here", invite_bigbluebutton_room_path(@room) %>.
+  <% else %>
+    In this page you can join the conference from a <b>desktop</b>.
+    To join from a mobile device <%= link_to "click here", invite_bigbluebutton_room_path(@room, :mobile => true) %>.
+  <% end %>
+</div>
+
+<p><%= @room.name %> requires a name and/or password to join:</p>
+<%= form_tag join_bigbluebutton_room_path(@room, :mobile => params[:mobile]) do %>
 
   <div class="field">
     <label for="user_name">Name:</label><br />
     <% if bigbluebutton_user.nil? %>
       <%= text_field_tag "user[name]", "" %>
     <% else %>
-      <%= text_field_tag "user[name]", bigbluebutton_user.name %>
+      <%= text_field_tag "user[name]", bigbluebutton_user.name, :readonly => true %>
     <% end %>
   </div>
   <div class="field">
     <label for="user_password">Password:</label><br />
-    <% if @room.private %>
-      <%= password_field_tag "user[password]", "" %>
+    <% if @user_role == :attendee %>
+      <%= password_field_tag "user[password]", @room.attendee_password, :readonly => true %>
+    <% elsif @user_role == :moderator %>
+      <%= password_field_tag "user[password]", @room.moderator_password, :readonly => true %>
     <% else %>
-      <%= password_field_tag "user[password]", @room.attendee_password %>
+      <%= password_field_tag "user[password]", "" %>
     <% end %>
   </div>
 

data/bigbluebutton_rails.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("rails", ">= 3.0.0")
-  s.add_dependency("bigbluebutton-api-ruby", "~> 0.1.0")
+  s.add_dependency("bigbluebutton-api-ruby", "~> 1.1.0")
 end

data/config/locales/en.yml

@@ -11,6 +11,7 @@ en:
         param_format: 'you can only use letters, numbers and the symbols "-" or "_" (not at the begin or end)'
         url_format: 'should use the pattern http://<server>/bigbluebutton/api'
     rooms:
+      default_welcome_msg: "Welcome to the conference <b>%{name}!</b><br/><br/>To join the audio conference from a SIP phone, dial %{voice_number}.<br/><br/>If you need help using the conference client <u><a href=\"http://www.bigbluebutton.org/videos/\">check out these videos</a></u>."
       notice:
         create:
           success: "Your room was successfully created."

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "1.1.0".freeze
+  VERSION = "1.2.0".freeze
 end

data/public/stylesheets/bigbluebutton_rails.css

@@ -136,3 +136,13 @@
   margin-right: 10px;
   clear: both;
 }
+
+/*
+ * Used in bigbluebutton_rooms/invite
+ */
+
+.bbbrails_invite_device_type {
+  background: #f6f6f6;
+  border: 1px solid #ddd;
+  padding: 5px;
+}

data/spec/controllers/bigbluebutton/rooms_controller_spec.rb

@@ -238,12 +238,11 @@ describe Bigbluebutton::RoomsController do
 
     context "for an anonymous user" do
       before { controller.stub(:bigbluebutton_user) { nil } }
-      before { controller.stub(:bigbluebutton_role) { :moderator } }
+      before { controller.stub(:bigbluebutton_role) { :password } }
       before(:each) { get :join, :id => room.to_param }
-      it {
-        should respond_with(:redirect)
-        should redirect_to(invite_bigbluebutton_room_path(room))
-      }
+      it { should assign_to(:user_role).with(:password) }
+      it { should respond_with(:redirect) }
+      it { should redirect_to(invite_bigbluebutton_room_path(room)) }
     end
 
     context "when the user's role" do
@@ -253,6 +252,7 @@ describe Bigbluebutton::RoomsController do
         before { controller.stub(:bigbluebutton_role) { :password } }
         before(:each) { get :join, :id => room.to_param }
         it { should respond_with(:redirect) }
+        it { should assign_to(:user_role).with(:password) }
         it { should redirect_to(invite_bigbluebutton_room_path(room)) }
       end
 
@@ -316,68 +316,36 @@ describe Bigbluebutton::RoomsController do
   describe "#invite" do
     before { mock_server_and_api }
     let(:user) { Factory.build(:user) }
+    before { controller.stub(:bigbluebutton_user).and_return(user) }
 
-    context "for an anonymous user" do
-      before { controller.stub(:bigbluebutton_user).and_return(nil) }
+    context "when the user has a role defined" do
+      before { controller.stub(:bigbluebutton_role).and_return(:attendee) }
+      before(:each) { get :invite, :id => room.to_param }
+      it { should respond_with(:success) }
+      it { should render_template(:invite) }
+      it { should assign_to(:room).with(room) }
+      it { should assign_to(:user_role).with(:attendee) }
+    end
 
-      context "with a role defined" do
-        before { controller.stub(:bigbluebutton_role).and_return(:attendee) }
+    context "when the user's role" do
+      context "should be defined with a password" do
+        before { controller.stub(:bigbluebutton_role) { :password } }
         before(:each) { get :invite, :id => room.to_param }
         it { should respond_with(:success) }
         it { should render_template(:invite) }
         it { should assign_to(:room).with(room) }
+        it { should assign_to(:user_role).with(:password) }
       end
 
-      context "when the user's role" do
-        context "should be defined with a password" do
-          before { controller.stub(:bigbluebutton_role) { :password } }
-          before(:each) { get :invite, :id => room.to_param }
-          it { should respond_with(:success) }
-          it { should render_template(:invite) }
-          it { should assign_to(:room).with(room) }
-        end
-
-        context "is undefined, the access should be blocked" do
-          before { controller.stub(:bigbluebutton_role) { nil } }
-          it {
-            lambda {
-              get :invite, :id => room.to_param
-            }.should raise_error(BigbluebuttonRails::RoomAccessDenied)
-          }
-        end
-      end
-    end
-
-    context "for a logged user" do
-      before { controller.stub(:bigbluebutton_user).and_return(user) }
-
-      context "with a role defined" do
-        before { controller.stub(:bigbluebutton_role).and_return(:attendee) }
-        before(:each) { get :invite, :id => room.to_param }
-        it { should respond_with(:redirect) }
-        it { should redirect_to(join_bigbluebutton_room_path(room)) }
-      end
-
-      context "when the user's role" do
-        context "should be defined with a password" do
-          before { controller.stub(:bigbluebutton_role) { :password } }
-          before(:each) { get :invite, :id => room.to_param }
-          it { should respond_with(:success) }
-          it { should render_template(:invite) }
-          it { should assign_to(:room).with(room) }
-        end
-
-        context "is undefined, the access should be blocked" do
-          before { controller.stub(:bigbluebutton_role) { nil } }
-          it {
-            lambda {
-              get :invite, :id => room.to_param
-            }.should raise_error(BigbluebuttonRails::RoomAccessDenied)
-          }
-        end
+      context "is undefined, the access should be blocked" do
+        before { controller.stub(:bigbluebutton_role) { nil } }
+        it {
+          lambda {
+            get :invite, :id => room.to_param
+          }.should raise_error(BigbluebuttonRails::RoomAccessDenied)
+        }
       end
     end
-
   end
 
   describe "#auth" do
@@ -441,7 +409,7 @@ describe Bigbluebutton::RoomsController do
       should redirect_to("http://test.com/attendee/join")
     end
 
-    it "use bigbluebutton_role when the return is diferent of password" do
+    it "uses bigbluebutton_role when the return is not :password" do
       controller.stub(:bigbluebutton_role) { :attendee }
       hash = { :name => "Elftor", :password => nil }
       mocked_api.should_receive(:is_meeting_running?).and_return(true)
@@ -451,6 +419,7 @@ describe Bigbluebutton::RoomsController do
       post :auth, :id => room.to_param, :user => hash
       should respond_with(:redirect)
       should redirect_to("http://test.com/attendee/join")
+      should assign_to(:user_role).with(:attendee)
     end
 
     context "validates user input and shows error" do
@@ -461,6 +430,7 @@ describe Bigbluebutton::RoomsController do
         let(:user_hash) { { :password => room.moderator_password } }
         it { should respond_with(:unauthorized) }
         it { should assign_to(:room).with(room) }
+        it { should assign_to(:user_role).with(:moderator) }
         it { should render_template(:invite) }
         it { should set_the_flash.to(I18n.t('bigbluebutton_rails.rooms.errors.auth.failure')) }
       end
@@ -469,6 +439,7 @@ describe Bigbluebutton::RoomsController do
         let(:user_hash) { { :password => room.moderator_password, :name => "" } }
         it { should respond_with(:unauthorized) }
         it { should assign_to(:room).with(room) }
+        it { should assign_to(:user_role).with(:moderator) }
         it { should render_template(:invite) }
         it { should set_the_flash.to(I18n.t('bigbluebutton_rails.rooms.errors.auth.failure')) }
       end
@@ -476,6 +447,7 @@ describe Bigbluebutton::RoomsController do
       context "when the password is wrong" do
         let(:user_hash) { { :name => "Elftor", :password => nil } }
         it { should respond_with(:unauthorized) }
+        it { should assign_to(:user_role).with(nil) }
         it { should assign_to(:room).with(room) }
         it { should render_template(:invite) }
         it { should set_the_flash.to(I18n.t('bigbluebutton_rails.rooms.errors.auth.failure')) }

data/spec/factories/bigbluebutton_room.rb

@@ -1,14 +1,16 @@
-Factory.define :bigbluebutton_room do |r|
-  # meetingid with a random factor to avoid duplicated ids in consecutive test runs
-  r.sequence(:meetingid) { |n| "meeting-#{n}-" + SecureRandom.hex(4) }
+FactoryGirl.define do
+  factory  :bigbluebutton_room do |r|
+    # meetingid with a random factor to avoid duplicated ids in consecutive test runs
+    r.sequence(:meetingid) { |n| "meeting-#{n}-" + SecureRandom.hex(4) }
 
-  r.association :server, :factory => :bigbluebutton_server
-  r.sequence(:name) { |n| "Name#{n}" }
-  r.attendee_password { Forgery(:basic).password :at_least => 10, :at_most => 16 }
-  r.moderator_password { Forgery(:basic).password :at_least => 10, :at_most => 16 }
-  r.welcome_msg { Forgery(:lorem_ipsum).sentences(2) }
-  r.private false
-  r.randomize_meetingid false
-  r.sequence(:param) { |n| "meeting-#{n}" }
-  r.external false
+    r.association :server, :factory => :bigbluebutton_server
+    r.sequence(:name) { |n| "Name#{n}" }
+    r.attendee_password { Forgery(:basic).password :at_least => 10, :at_most => 16 }
+    r.moderator_password { Forgery(:basic).password :at_least => 10, :at_most => 16 }
+    r.welcome_msg { Forgery(:lorem_ipsum).sentences(2) }
+    r.private false
+    r.randomize_meetingid false
+    r.sequence(:param) { |n| "meeting-#{n}" }
+    r.external false
+  end
 end

data/spec/factories/bigbluebutton_server.rb

@@ -1,7 +1,9 @@
-Factory.define :bigbluebutton_server do |s|
-  s.sequence(:name) { |n| "Server #{n}" }
-  s.sequence(:url) { |n| "http://bigbluebutton#{n}.test.com/bigbluebutton/api" }
-  s.salt { Forgery(:basic).password :at_least => 30, :at_most => 40 }
-  s.version '0.7'
-  s.sequence(:param) { |n| "server-#{n}" }
+FactoryGirl.define do
+  factory :bigbluebutton_server do |s|
+    s.sequence(:name) { |n| "Server #{n}" }
+    s.sequence(:url) { |n| "http://bigbluebutton#{n}.test.com/bigbluebutton/api" }
+    s.salt { Forgery(:basic).password :at_least => 30, :at_most => 40 }
+    s.version '0.7'
+    s.sequence(:param) { |n| "server-#{n}" }
+  end
 end

data/spec/factories/user.rb

@@ -1,3 +1,5 @@
-Factory.define :user do |u|
-  u.name { Forgery(:name).full_name }
+FactoryGirl.define do
+  factory :user do |u|
+    u.name { Forgery(:name).full_name }
+  end
 end

data/spec/models/bigbluebutton_room_spec.rb

@@ -302,9 +302,29 @@ describe BigbluebuttonRoom do
           :hasBeenForciblyEnded => "false", :messageKey => {}, :message => {}
         }
       }
+      before { room.update_attributes(:welcome_msg => "Anything") }
 
       it { should respond_to(:send_create) }
 
+      context "calls #default_welcome_msg if welcome_msg is" do
+        before do
+          room.should_receive(:default_welcome_message).and_return("Hi!")
+          mocked_api.should_receive(:create_meeting).
+            with(anything, anything, hash_including(:welcome  => "Hi!"))
+          room.stub(:select_server).and_return(mocked_server)
+          room.server = mocked_server
+        end
+
+        context "nil" do
+          before { room.welcome_msg = nil }
+          it { room.send_create }
+        end
+        context "empty" do
+          before { room.welcome_msg = "" }
+          it { room.send_create }
+        end
+      end
+
       context "sends create_meeting" do
 
         context "for a stored room" do

data/spec/rails_app/features/activity_monitor_servers.feature

@@ -34,8 +34,6 @@ Feature: Monitor the active in the webconference servers
     When he goes to the server activity monitor page
     Then he should see the external room in the list
 
-  # Note: This will only work for bbb servers with removeMeetingWhenEnded=false
-  # See: http://code.google.com/p/bigbluebutton/issues/detail?id=980
   @need-bot
   Scenario: Contains a link to partially refresh the meeting list
     Given an anonymous user
@@ -46,8 +44,6 @@ Feature: Monitor the active in the webconference servers
       And he clicks in the link to update the meeting list
     Then he should see one meeting running and the other meeting not running
 
-  # Note: This will only work for bbb servers with removeMeetingWhenEnded=false
-  #       Also defaultMeetingExpireDuration should be >= 2
   @need-bot @webkit
   Scenario: Partially refresh the meeting list periodically
     Given an anonymous user

data/spec/rails_app/features/join_rooms.feature

@@ -10,8 +10,8 @@ Feature: Join webconference rooms
   #   :moderator
   # end
 
-  # First we check the behaviour of BigbluebuttonRoom#join and the redirects to
-  # BigbluebuttonRoom#invite
+  # First the scenarios for BigbluebuttonRoom#join (and the redirects to
+  # BigbluebuttonRoom#invite)
 
   @mechanize
   Scenario: Joining a public room
@@ -21,14 +21,6 @@ Feature: Join webconference rooms
     When the user goes to the join room page
     Then he should join the conference room
 
-  Scenario: Joining a public room as an anonymous user
-    Given an anonymous user
-      And a real server
-      And a public room in this server
-    When the user goes to the join room page
-    Then he should be at the invite room URL
-      And the password field was pre-filled with the attendee password
-
   Scenario: Joining a private room requires a password
     Given a user named "test user"
       And a real server
@@ -96,19 +88,62 @@ Feature: Join webconference rooms
     Then he should see his name in the user name input
 
 
-  # For the BigbluebuttonRoom#invite action we only check that it can be used by logged
-  # or anonymous users. Other cases were already tested above
+  # Scenarios for BigbluebuttonRoom#invite
 
-  @mechanize
-  Scenario: A logged user may join the meeting through the invite page
+  # The pre-filling depends on the role of the user, that's defined
+  # by bigbluebutton_role(), see the comment on the top of this file.
+
+  Scenario: The invite view shows a link to join from a mobile device when joining from a desktop
     Given a user named "test user"
       And a real server
       And a public room in this server
+    When the user goes to the invite room page
+    Then he should see a link to join the conference from a mobile device
+
+  # Test the invite view with a user logged
+
+  Scenario: The invite page is pre-filled with the user name and moderator password
+    Given a user named "test user"
+      And a real server
+      # Public room = user is a moderator
+      And a public room in this server
+    When the user goes to the invite room page (no view check)
+    Then he should be at the invite room URL
+      And the read-only name field was pre-filled with "test user"
+      And the read-only password field was pre-filled with the moderator password
+
+  Scenario: The invite page is pre-filled with the user name only
+    Given a user named "test user"
+      And a real server
+      # Private room = ask for a password
+      And a private room in this server
     When the user goes to the invite room page (no view check)
+    Then the read-only name field was pre-filled with "test user"
+      And the password field was NOT pre-filled
+
+  # Test the invite view without a user logged
+
+  Scenario: The invite page is not pre-filled when there's no user logged
+    Given an anonymous user
+      And a real server
+      And a public room in this server
+    When the user goes to the invite room page
+    Then the name field was NOT pre-filled
+      And the password field was NOT pre-filled
+
+  # Test if the user can actually join the conference
+
+  @mechanize
+  Scenario: A logged user may join the meeting using the invite page
+    Given a user named "test user"
+      And a real server
+      And a public room in this server
+    When the user goes to the invite room page
+      And clicks in the button "Submit"
     Then he should join the conference room
 
   @mechanize
-  Scenario: An anonymous user may join the meeting through the invite page
+  Scenario: An anonymous user may join the meeting using the invite page
     Given an anonymous user
       And a real server
       And a public room in this server
@@ -116,3 +151,29 @@ Feature: Join webconference rooms
       And enters his name and the moderator password
       And clicks in the button "Submit"
     Then he should join the conference room
+
+  # Tests when the user is accessing from a mobile client
+
+  Scenario: Accessing from a mobile device the invite form should point to the join with mobile=true
+    Given a user named "test user"
+      And a real server
+      And a public room in this server
+    When the user goes to the invite room with mobile page
+    Then the action in the form should point to the mobile join
+
+  @mechanize
+  Scenario: Accessing from a mobile device the user should be redirected to the url
+    Given a user named "test user"
+      And a real server
+      And a public room in this server
+    When the user goes to the invite room with mobile page
+      And enters his name and the moderator password
+      And clicks in the button to join the conference from a mobile device
+    Then he should be redirected to the conference using the "bigbluebutton://" protocol
+
+  Scenario: The invite view shows a link to join from a desktop when joining from a mobile
+    Given a user named "test user"
+      And a real server
+      And a public room in this server
+    When the user goes to the invite room with mobile page
+    Then he should see a link to join the conference from a desktop

data/spec/rails_app/features/step_definitions/activity_monitor_servers_step.rb

@@ -53,6 +53,9 @@ When /^he should see one meeting running and the other meeting not running$/ do
   @rooms.last.fetch_is_running?
   @rooms.last.is_running?.should be_true
 
+  # the ended meeting won't appear in the list in BBB 0.8
+  @rooms.delete(@rooms.first) if @server.version >= "0.8"
+
   check_server_activity_monitor_rooms(@rooms)
 end
 

data/spec/rails_app/features/step_definitions/join_rooms_steps.rb

@@ -40,6 +40,44 @@ When /^enters only the user name$/ do
   fill_in("user[name]", :with => name)
 end
 
-When /^the password field was pre-filled with the attendee password$/ do
-  has_element("input", { :name => 'user[password]', :type => 'password', :value => @room.attendee_password })
+When /^the read-only password field was pre-filled with the moderator password$/ do
+  has_element("input", { :name => 'user[password]', :type => 'password', :value => @room.moderator_password, :readonly => 'readonly' })
+end
+
+When /^the password field was not pre-filled$/i do
+  has_element("input", { :name => 'user[password]', :type => 'password', :value => '' })
+end
+
+When /^the read-only name field was pre-filled with "(.+)"$/ do |name|
+  has_element("input", { :name => 'user[name]', :type => 'text', :value => name, :readonly => 'readonly' })
+end
+
+When /^the name field was not pre-filled$/i do
+  has_element("input", { :name => 'user[name]', :type => 'text', :value => ''})
+end
+
+When /^the action in the form should point to the mobile join$/i do
+  action = join_bigbluebutton_room_path(@room, :mobile => true)
+  has_element("form", { :action => action, :method => 'post' })
+end
+
+When /^he should see a link to join the conference from a desktop$/i do
+  has_element("a", { :href => invite_bigbluebutton_room_path(@room) })
+end
+
+When /^he should see a link to join the conference from a mobile device$/i do
+  has_element("a", { :href => invite_bigbluebutton_room_path(@room, :mobile => true) })
+end
+
+# Joining a conference with mobile=true will redirect the user to a url
+# using the protocol "bigbluebutton://" and Mechanize will throw an exception
+# because it doesn't know the protocol. So we check the url using this exception.
+When /^clicks in the button to join the conference from a mobile device$/i do
+  begin
+    click_button("Submit")
+  rescue Exception => @exception
+  end
+end
+When /^he should be redirected to the conference using the "bigbluebutton:\/\/" protocol$/i do
+  @exception.message.should match(/bigbluebutton:\/\//)
 end

data/spec/rails_app/features/support/factories/bigbluebutton_server_integration.rb

@@ -1,5 +1,7 @@
-Factory.define :bigbluebutton_server_integration, :parent => :bigbluebutton_server do |s|
-  s.url { FeaturesConfig.server["url"] }
-  s.salt { FeaturesConfig.server["salt"] }
-  s.version { FeaturesConfig.server["version"] }
+FactoryGirl.define do
+  factory :bigbluebutton_server_integration, :parent => :bigbluebutton_server do |s|
+    s.url { FeaturesConfig.server["url"] }
+    s.salt { FeaturesConfig.server["salt"] }
+    s.version { FeaturesConfig.server["version"] }
+  end
 end

data/spec/rails_app/features/support/paths.rb

@@ -5,9 +5,7 @@ module NavigationHelpers
   #
   # step definition in web_steps.rb
   #
-  def path_to(page_name, params=nil)
-    params = "?" + params.map{ |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&") if params
-
+  def path_to(page_name, params={})
     case page_name
 
     when /^home\s?$/
@@ -40,8 +38,12 @@ module NavigationHelpers
       p = bigbluebutton_room_path(@room)
     when /join room/i
       p = join_bigbluebutton_room_path(@room)
-    when /invite room/i
+    when /invite room$/i
+      p = invite_bigbluebutton_room_path(@room)
+    when /invite room with mobile$/i
       p = invite_bigbluebutton_room_path(@room)
+      params = {} if params.nil?
+      params[:mobile] = true
     when /mobile join/i
       p = join_mobile_bigbluebutton_room_path(@room)
 
@@ -56,7 +58,10 @@ module NavigationHelpers
       end
     end
 
-    p += params if params
+    unless params.nil? or params.empty?
+      params = "?" + params.map{ |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&")
+      p += params
+    end
     p
   end
 end

data/spec/rails_app/public/stylesheets/bigbluebutton_rails.css

@@ -136,3 +136,13 @@
   margin-right: 10px;
   clear: both;
 }
+
+/*
+ * Used in bigbluebutton_rooms/invite
+ */
+
+.bbbrails_invite_device_type {
+  background: #f6f6f6;
+  border: 1px solid #ddd;
+  padding: 5px;
+}

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ Dir["#{ File.dirname(__FILE__)}/factories/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
+  config.include FactoryGirl::Syntax::Methods
 end
 
 # To test generators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &82282620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,18 +22,28 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82282620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bigbluebutton-api-ruby
-  requirement: &82280890 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *82280890
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: It allows you to interact with BigBlueButton from your Ruby on Rails
   application
 email: mconf-dev@googlegroups.com
@@ -225,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 483068541
+      hash: 342654963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,10 +244,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 483068541
+      hash: 342654963
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BigBlueButton integration for Ruby on Rails