bigbluebutton_rails 0.0.2 → 0.0.3

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

@@ -3,6 +3,7 @@
 <% else %>
   <% url = bigbluebutton_server_room_path(@server, @room) %>
 <% end %>
+
 <%= form_for [@server, @room], :url => url do |f| %>
   <% if @room.errors.any? %>
     <div id="error_explanation">
@@ -15,26 +16,50 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <%= f.label :meeting_id %><br />
-    <%= f.text_field :meeting_id %>
-  </div>
   <div class="field">
     <%= f.label :name %><br />
     <%= f.text_field :name %>
   </div>
+  <div class="field">
+    <%= f.label :meetingid %><br />
+    <%= f.text_field :meetingid %>
+  </div>
+  <div class="field">
+    <%= f.label :randomize_meetingid %><br />
+    <%= f.check_box :randomize_meetingid %>
+  </div>
+  <div class="field">
+    <%= f.label :private %><br />
+    <%= f.check_box :private %>
+  </div>
   <div class="field">
     <%= f.label :attendee_password %><br />
-    <%= f.text_field :attendee_password %>
+    <%= f.password_field :attendee_password %>
   </div>
   <div class="field">
     <%= f.label :moderator_password %><br />
-    <%= f.text_field :moderator_password %>
+    <%= f.password_field :moderator_password %>
   </div>
   <div class="field">
     <%= f.label :welcome_msg %><br />
     <%= f.text_field :welcome_msg %>
   </div>
+  <div class="field">
+    <%= f.label :logout_url %><br />
+    <%= f.text_field :logout_url %>
+  </div>
+  <div class="field">
+    <%= f.label :dial_number %><br />
+    <%= f.text_field :dial_number %>
+  </div>
+  <div class="field">
+    <%= f.label :voice_bridge %><br />
+    <%= f.text_field :voice_bridge %>
+  </div>
+  <div class="field">
+    <%= f.label :max_participants %><br />
+    <%= f.text_field :max_participants %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

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

@@ -1,4 +1,4 @@
-<h1>Edit room:</h1>
+<h1>Edit <%= BigbluebuttonRoom.model_name.human %>:</h1>
 <%= render 'form' %>
 
 <%= link_to 'Show', bigbluebutton_server_room_path(@server, @room) %> |

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

@@ -1,13 +1,19 @@
-<h1>Listing rooms</h1>
+<h1>Listing <%= BigbluebuttonRoom.model_name.human %>:</h1>
 
 <table>
   <tr>
-    <th>Server ID</th>
-    <th>Meeting ID</th>
-    <th>Meeting Name</th>
-    <th>Attendee Password</th>
-    <th>Moderator Password</th>
-    <th>Welcome Message</th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:server_id) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:meetingid) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:randomize_meetingid) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:meeting_name) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:private) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:attendee_password) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:moderator_password) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:welcome_msg) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:logout_url) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:dial_number) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:voice_bridge) %></th>
+    <th><%= BigbluebuttonRoom.human_attribute_name(:max_participants) %></th>
     <th></th>
     <th></th>
     <th></th>
@@ -16,11 +22,17 @@
 <% @rooms.each do |room| %>
   <tr>
     <td><%= room.server.id %></td>
-    <td><%= room.meeting_id %></td>
+    <td><%= room.meetingid %></td>
+    <td><%= room.randomize_meetingid %></td>
     <td><%= room.name %></td>
+    <td><%= room.private %></td>
     <td><%= room.attendee_password %></td>
     <td><%= room.moderator_password %></td>
     <td><%= room.welcome_msg %></td>
+    <td><%= room.logout_url %></td>
+    <td><%= room.dial_number %></td>
+    <td><%= room.voice_bridge %></td>
+    <td><%= room.max_participants %></td>
     <td><%= link_to 'Show', bigbluebutton_server_room_path(@server, room) %></td>
     <td><%= link_to 'Edit', edit_bigbluebutton_server_room_path(@server, room) %></td>
     <td><%= link_to 'Destroy', bigbluebutton_server_room_path(@server, room), :confirm => 'Are you sure?', :method => :delete %></td>

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

@@ -0,0 +1,56 @@
+<script type="text/javascript">
+
+function ajax_request() {
+  $.ajax({
+    url: "<%= running_bigbluebutton_server_room_url(@server, @room, :format => 'json') %>",
+    dataType: 'json',
+    error: function(xhr_data) {
+      $("#meeting_status").html("<request error>.");
+      setTimeout(function() { ajax_request(); }, 10000);
+    },
+    success: function(xhr_data) {
+      if (xhr_data.running == 'false') {
+        $("#meeting_status").html("not running.");
+      } else {
+        $("#meeting_status").html("running!");
+      }
+      setTimeout(function() { ajax_request(); }, 10000);
+    },
+    contentType: 'application/json'
+  });
+}
+
+$(document).ready(function(){
+  ajax_request();
+});
+
+</script>
+
+<h1>Invite to the meeting <%= @room.name %></h1>
+
+<p id="error"><%= flash[:error] %></p>
+
+<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_server_room_path(@server, @room) do %>
+
+  <div class="field">
+    Name:<br />
+    <% if bigbluebutton_user.nil? %>
+      <%= text_field_tag "user[name]", "" %>
+    <% else %>
+      <%= text_field_tag "user[name]", bigbluebutton_user.name %>
+    <% end %>
+  </div>
+  <div class="field">
+    Password:<br />
+    <% if @room.private %>
+      <%= password_field_tag "user[password]", "" %>
+    <% else %>
+      <%= password_field_tag "user[password]", @room.attendee_password %>
+    <% end %>
+  </div>
+
+  <%= submit_tag "Submit" %>
+<% end %>

data/app/views/bigbluebutton/rooms/{join_wait.html.erb → join.html.erb}

@@ -1,20 +1,24 @@
 <script type="text/javascript">
 
-function heartbeat_callback() {
-  // TODO Should parse the json to get the response
-  if ($("#room_heartbeat_div").text().search("true") > 0) {
-    window.location.reload();
-  }
+function ajax_request() {
+  $.ajax({
+    url: "<%= running_bigbluebutton_server_room_url(@server, @room, :format => 'json') %>",
+    dataType: 'json',
+    error: function(xhr_data) {
+      //
+    },
+    success: function(xhr_data) {
+      if (xhr_data.running == 'true') {
+        window.location.reload();
+      }
+      setTimeout(function() { ajax_request(); }, 3000);
+    },
+    contentType: 'application/json'
+  });
 }
 
 $(document).ready(function(){
-  $.jheartbeat.set({
-    url: "<%= running_bigbluebutton_server_room_url(@server, @room, :format => 'json') %>",
-    delay: 3000,
-    div_id: "room_heartbeat_div"
-  }, function () {
-    heartbeat_callback();
-  });
+  ajax_request();
 });
 
 </script>

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

@@ -1,4 +1,4 @@
-<h1>New room:</h1>
+<h1>New <%= BigbluebuttonRoom.model_name.human %>:</h1>
 
 <%= render 'form' %>
 

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

@@ -1,31 +1,55 @@
-<h1>Room:</h1>
+<h1><%= BigbluebuttonRoom.model_name.human %>:</h1>
 
 <p id="notice"><%= notice %></p>
 
 <p>
-  <b>Server ID:</b>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:name) %>:</b>
+  <%= @room.name %>
+</p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:server_id) %>:</b>
   <%= @room.server.id %>
 </p>
 <p>
-  <b>Meeting ID:</b>
-  <%= @room.meeting_id %>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:meetingid) %>:</b>
+  <%= @room.meetingid %>
 </p>
 <p>
-  <b>Meeting Name:</b>
-  <%= @room.name %>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:randomize_meetingid) %>:</b>
+  <%= @room.randomize_meetingid %>
 </p>
 <p>
-  <b>Attendee Password:</b>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:private) %>:</b>
+  <%= @room.private %>
+</p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:attendee_password) %>:</b>
   <%= @room.attendee_password %>
 </p>
 <p>
-  <b>Moderator Password:</b>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:moderator_password) %>:</b>
   <%= @room.moderator_password %>
 </p>
 <p>
-  <b>Welcome Message:</b>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:welcome_msg) %>:</b>
   <%= @room.welcome_msg %>
 </p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:logout_url) %>:</b>
+  <%= @room.logout_url %>
+</p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:dial_number) %>:</b>
+  <%= @room.dial_number %>
+</p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:voice_bridge) %>:</b>
+  <%= @room.voice_bridge %>
+</p>
+<p>
+  <b><%= BigbluebuttonRoom.human_attribute_name(:max_participants) %>:</b>
+  <%= @room.max_participants %>
+</p>
 
 <%= link_to 'Edit', edit_bigbluebutton_server_room_path(@room.server, @room) %> |
 <%= link_to 'Back', bigbluebutton_server_rooms_path(@room.server) %>

data/app/views/bigbluebutton/servers/edit.html.erb

@@ -1,4 +1,4 @@
-<h1>Edit server:</h1>
+<h1>Edit <%= BigbluebuttonServer.model_name.human %>:</h1>
 <%= render 'form' %>
 
 <%= link_to 'Show', @server %> |

data/app/views/bigbluebutton/servers/index.html.erb

@@ -1,10 +1,11 @@
-<h1>Listing servers</h1>
+<h1>Listing <%= BigbluebuttonServer.model_name.human %>:</h1>
 
 <table>
   <tr>
-    <th>Name</th>
-    <th>Url</th>
-    <th>Salt</th>
+    <th><%= BigbluebuttonServer.human_attribute_name(:name) %></th>
+    <th><%= BigbluebuttonServer.human_attribute_name(:url) %></th>
+    <th><%= BigbluebuttonServer.human_attribute_name(:salt) %></th>
+    <th><%= BigbluebuttonServer.human_attribute_name(:version) %></th>
     <th></th>
     <th></th>
     <th></th>
@@ -15,6 +16,7 @@
     <td><%= server.name %></td>
     <td><%= server.url %></td>
     <td><%= server.salt %></td>
+    <td><%= server.version %></td>
     <td><%= link_to 'Show', server %></td>
     <td><%= link_to 'Edit', edit_bigbluebutton_server_path(server) %></td>
     <td><%= link_to 'Destroy', server, :confirm => 'Are you sure?', :method => :delete %></td>

data/app/views/bigbluebutton/servers/new.html.erb

@@ -1,4 +1,4 @@
-<h1>New server:</h1>
+<h1>New <%= BigbluebuttonServer.model_name.human %>:</h1>
 
 <%= render 'form' %>
 

data/app/views/bigbluebutton/servers/show.html.erb

@@ -1,24 +1,24 @@
-<h1>Server:</h1>
+<h1><%= BigbluebuttonServer.model_name.human %>:</h1>
 
 <p id="notice"><%= notice %></p>
 
 <p>
-  <b>Name:</b>
+  <b><%= BigbluebuttonServer.human_attribute_name(:name) %>:</b>
   <%= @server.name %>
 </p>
 
 <p>
-  <b>Url:</b>
+  <b><%= BigbluebuttonServer.human_attribute_name(:url) %>:</b>
   <%= @server.url %>
 </p>
 
 <p>
-  <b>Salt:</b>
+  <b><%= BigbluebuttonServer.human_attribute_name(:salt) %>:</b>
   <%= @server.salt %>
 </p>
 
 <p>
-  <b>Version:</b>
+  <b><%= BigbluebuttonServer.human_attribute_name(:version) %>:</b>
   <%= @server.version %>
 </p>
 

data/bigbluebutton_rails.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("rails", "~> 3.0.3")
-  s.add_runtime_dependency("bigbluebutton-api-ruby", "~> 0.0.9")
+  s.add_runtime_dependency("bigbluebutton-api-ruby", "~> 0.0.10")
 
   s.add_development_dependency("rspec-rails", "~> 2.5.0")
   s.add_development_dependency("factory_girl", "~> 1.3.2")

data/config/locales/en.yml

@@ -11,8 +11,39 @@ en:
       notice:
         create:
           success: "Your room was successfully created."
+          failure: "Your room could not be created."
         update:
           success: "Your room was successfully updated."
+          failure: "Your room could not be updated."
         end:
           success: "The meeting was successfully ended."
           not_running: "The meeting could not be ended because it is not running."
+      error:
+        auth:
+          failure: "Authentication failure."
+          not_running: "The meeting is not running. You must wait for a moderator to join."
+
+  activerecord:
+    models:
+      bigbluebutton_server: "BigBlueButton Server"
+      bigbluebutton_room: "BigBlueButton Room"
+    attributes: 
+      bigbluebutton_server:
+        name: "Name"
+        url: "URL"
+        salt: "Security Salt"
+        version: "Version"
+      bigbluebutton_room:
+        server_id: "Server ID"
+        meetingid: "Meeting ID"
+        randomize_meetingid: "Randomize Meeting ID"
+        private: "Private"
+        name: "Name"
+        attendee_password: "Attendee Password"
+        moderator_password: "Moderator Password"
+        welcome_msg: "Welcome Message"
+        logout_url: "Logout URL"
+        dial_number: "Dial Number"
+        voice_bridge: "Voice Bridge"
+        max_participants: "Maximum Number of Participants"
+

data/lib/bigbluebutton_rails/controller_methods.rb

@@ -6,6 +6,8 @@ module BigbluebuttonRails
     def self.included(base)
       base.class_eval do
 
+        helper_method :bigbluebutton_user, :bigbluebutton_role
+
         # Method used to acquire the user for which the BigBlueButton actions are being
         # called (e.g. the user creating or joining the room).
         # Defaults to the user currently logged in, using the method current_user.
@@ -41,7 +43,11 @@ module BigbluebuttonRails
         #   end
         #
         def bigbluebutton_role(room)
-          :moderator
+          if room.private or current_user.nil?
+            nil # ask for a password
+          else
+            :moderator
+          end
         end
 
       end

data/lib/bigbluebutton_rails/rails/routes.rb

@@ -47,7 +47,7 @@ module ActionDispatch::Routing
     # ==== Room matchers
     #
     # Generates matchers to access a room from a different url or inside another resource.
-    # It creates routes to the actions #show, #join, #running, and #end.
+    # It creates routes to the actions #show, #join, #running, #end, #invite, and #auth.
     #
     #    bigbluebutton_routes :room_matchers
     #
@@ -63,10 +63,14 @@ module ActionDispatch::Routing
     #                           { :controller=>"bigbluebutton/rooms", :action=>"show" }
     #   user_join_room     GET  /users/:user_id/room/:id/join(.:format)
     #                           { :controller=>"bigbluebutton/rooms", :action=>"join" }
+    #   user_auth_room     POST /users/:user_id/room/:id/join(.:format)
+    #                           { :controller=>"bigbluebutton/rooms", :action=>"auth" }
     #   user_running_room  GET  /users/:user_id/room/:id/running(.:format)
     #                           { :controller=>"bigbluebutton/rooms", :action=>"running" }
     #   user_end_room      GET  /users/:user_id/room/:id/end(.:format)
     #                           { :controller=>"bigbluebutton/rooms", :action=>"end" }
+    #   user_invite_room   GET  /users/:user_id/room/:id/invite(.:format)
+    #                           { :controller=>"bigbluebutton/rooms", :action=>"invite" }
     #
     def bigbluebutton_routes(*params)
       options = params.extract_options!
@@ -85,16 +89,21 @@ module ActionDispatch::Routing
             get :join, :on => :member
             get :running, :on => :member
             get :end, :on => :member
+            get :invite, :on => :member
+            post :join, :on => :member, :action => :auth
           end
         end
       end
     end
 
     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'
     end
 
   end

data/lib/bigbluebutton_rails/version.rb

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

data/lib/bigbluebutton_rails.rb

@@ -1,7 +1,6 @@
 require 'rails'
 
 require 'classes/bigbluebutton_attendee'
-require 'classes/bigbluebutton_meeting'
 
 module BigbluebuttonRails
   require 'bigbluebutton_rails/rails'

data/lib/classes/bigbluebutton_attendee.rb

@@ -1,3 +1,5 @@
+# Used to store the attendees of a meeting as returned by BigBlueButton in
+# <tt>get_meeting_info</tt>.
 class BigbluebuttonAttendee
 
   attr_accessor :user_id, :full_name, :role

data/lib/generators/bigbluebutton_rails/install_generator.rb

@@ -9,7 +9,8 @@ module BigbluebuttonRails
       desc "Creates the initializer, initial migration and locale files."
 
       def copy_locale
-        copy_file "../../../../config/locales/en.yml", "config/locales/bigbluebutton_rails.en.yml"
+        # uses bigbluebutton_rails/config to avoid using the local application en.yml
+        copy_file "../../../../../bigbluebutton_rails/config/locales/en.yml", "config/locales/bigbluebutton_rails.en.yml"
       end
 
       def self.next_migration_number(dirname)

data/lib/generators/bigbluebutton_rails/public_generator.rb

@@ -7,7 +7,6 @@ module BigbluebuttonRails
       desc "Copies all bigbluebutton_rails public files (javascripts and images) to your application."
 
       def copy_files
-        copy_file "javascripts/heartbeat.js", "public/javascripts/heartbeat.js"
         copy_file "javascripts/jquery.min.js", "public/javascripts/jquery.min.js"
         copy_file "images/loading.gif", "public/images/loading.gif"
       end

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

@@ -12,15 +12,21 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.integer :server_id
       t.integer :owner_id
       t.string :owner_type
-      t.string :meeting_id
+      t.string :meetingid
       t.string :name
       t.string :attendee_password
       t.string :moderator_password
       t.string :welcome_msg
+      t.string :logout_url
+      t.string :voice_bridge
+      t.string :dial_number
+      t.integer :max_participants
+      t.boolean :private, :default => false
+      t.boolean :randomize_meetingid, :default => true
       t.timestamps
     end
     add_index :bigbluebutton_rooms, :server_id
-    add_index :bigbluebutton_rooms, :meeting_id, :unique => true
+    add_index :bigbluebutton_rooms, :meetingid, :unique => true
   end
 
   def self.down