bigbluebutton_rails 2.1.0 → 2.2.0

data/lib/bigbluebutton_rails/rails/routes.rb

@@ -83,10 +83,10 @@ module ActionDispatch::Routing
 
     def bigbluebutton_routes_default(*params) #:nodoc:
       options = params.extract_options!
-      options_scope = options.has_key?(:scope) ? options[:scope] : BigbluebuttonRails.routing_scope
+      options_scope = options.has_key?(:scope) ? options[:scope] : BigbluebuttonRails.configuration.routing_scope
       options_as = options.has_key?(:as) ? options[:as] : options_scope
       options_only = options.has_key?(:only) ? options[:only] : ["servers", "rooms", "recordings", "playback_types"]
-      BigbluebuttonRails.set_controllers(options[:controllers])
+      BigbluebuttonRails.configuration.set_controllers(options[:controllers])
 
       scope options_scope, :as => options_as do
         add_routes_for_servers if options_only.include?("servers")
@@ -101,7 +101,7 @@ module ActionDispatch::Routing
     end
 
     def add_routes_for_rooms #:nodoc:
-      resources :rooms, :controller => BigbluebuttonRails.controllers[:rooms] do
+      resources :rooms, :controller => BigbluebuttonRails.configuration.controllers[:rooms] do
         member do
           get :join
           get :running
@@ -117,11 +117,12 @@ module ActionDispatch::Routing
     end
 
     def add_routes_for_servers #:nodoc:
-      resources :servers, :controller => BigbluebuttonRails.controllers[:servers] do
+      resources :servers, :controller => BigbluebuttonRails.configuration.controllers[:servers] do
         member do
           get :activity
           get :rooms
           get :recordings
+          get :check
           post :publish_recordings
           post :unpublish_recordings
           post :fetch_recordings
@@ -131,7 +132,7 @@ module ActionDispatch::Routing
 
     def add_routes_for_recordings #:nodoc:
       resources :recordings, :except => [:new, :create],
-                             :controller => BigbluebuttonRails.controllers[:recordings] do
+                             :controller => BigbluebuttonRails.configuration.controllers[:recordings] do
         member do
           get :play
           post :publish
@@ -142,7 +143,7 @@ module ActionDispatch::Routing
 
     def add_routes_for_playback_types #:nodoc:
       resources :playback_types, :only => [:update],
-                                 :controller => BigbluebuttonRails.controllers[:playback_types]
+                                 :controller => BigbluebuttonRails.configuration.controllers[:playback_types]
     end
   end
 end

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "2.1.0".freeze
+  VERSION = "2.2.0".freeze
 end

data/lib/generators/bigbluebutton_rails/install_generator.rb

@@ -18,11 +18,20 @@ module BigbluebuttonRails
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
 
+      def source_root
+        BigbluebuttonRails::Generators::InstallGenerator.source_root
+      end
+
       def create_migration_file
         if migrate_to_version.blank?
           migration_template "#{migration_path}/migration.rb", "db/migrate/create_bigbluebutton_rails.rb"
         else
-          migration_template "#{migration_path}/migration_#{version_filename}.rb", "db/migrate/bigbluebutton_rails_to_#{version_filename}.rb"
+          migrations = Dir.glob(File.join(source_root, migration_path, "migration_#{version_filename}*"))
+          migrations.sort.each do |path|
+            filename = File.basename(path)
+            target_filename = filename.gsub('migration', 'bigbluebutton_rails_to')
+            migration_template "#{migration_path}/#{filename}", "db/migrate/#{target_filename}"
+          end
         end
       end
 

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

@@ -11,7 +11,6 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
     end
 
     create_table :bigbluebutton_rooms do |t|
-      t.integer :server_id
       t.integer :owner_id
       t.string :owner_type
       t.string :meetingid
@@ -36,7 +35,6 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.boolean :allow_start_stop_recording, default: true
       t.timestamps
     end
-    add_index :bigbluebutton_rooms, :server_id
     add_index :bigbluebutton_rooms, :meetingid, :unique => true
 
     create_table :bigbluebutton_room_options do |t|
@@ -92,7 +90,6 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
     end
 
     create_table :bigbluebutton_meetings do |t|
-      t.integer :server_id
       t.string :server_url
       t.string :server_secret
       t.integer :room_id

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

@@ -0,0 +1,13 @@
+class BigbluebuttonRailsTo220 < ActiveRecord::Migration
+  def self.up
+    remove_column :bigbluebutton_meetings, :server_id
+    remove_column :bigbluebutton_rooms, :server_id
+    remove_index :bigbluebutton_rooms, :server_id
+  end
+
+  def self.down
+    add_column :bigbluebutton_meetings, :server_id, :integer
+    add_column :bigbluebutton_rooms, :server_id, :integer
+    add_index :bigbluebutton_rooms, :server_id
+  end
+end

data/spec/controllers/bigbluebutton/recordings_controller_json_responses_spec.rb

@@ -45,16 +45,15 @@ describe Bigbluebutton::RecordingsController do
       end
 
       context "on failure" do
+        before {
+          BigbluebuttonRecording.any_instance.should_receive(:update_attributes).and_return(false)
+        }
         before(:each) {
-          new_recording.recordid = nil # invalid
           put :update, :id => @recording.to_param, :bigbluebutton_recording => new_recording.attributes, :format => 'json'
         }
         it { should respond_with(:unprocessable_entity) }
         it { should respond_with_content_type('application/json') }
-        it {
-          new_recording.save # should fail
-          should respond_with_json(new_recording.errors.full_messages.to_json)
-        }
+        it { should respond_with_json([].to_json) }
       end
     end
 

data/spec/controllers/bigbluebutton/recordings_controller_spec.rb

@@ -72,7 +72,8 @@ describe Bigbluebutton::RecordingsController do
       }
       it {
         saved = BigbluebuttonRecording.find(recording)
-        saved.should have_same_attributes_as(new_recording, ['room_id', 'server_id', 'meeting_id', 'size'])
+        ignored = new_recording.attributes.keys - ['description'] # only description is editable
+        saved.should have_same_attributes_as(new_recording, ignored)
       }
       it { should set_the_flash.to(I18n.t('bigbluebutton_rails.recordings.notice.update.success')) }
     end
@@ -91,7 +92,7 @@ describe Bigbluebutton::RecordingsController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_recording) }
       let(:params) { { :bigbluebutton_recording => attrs } }
       let(:allowed_params) {
-        [ :recordid, :meetingid, :name, :published, :start_time, :end_time, :available, :description ]
+        [ :description ]
       }
       it {
         # we just check that the rails method 'permit' is being called on the hash with the

data/spec/controllers/bigbluebutton/rooms_controller_exception_handling_spec.rb

@@ -8,7 +8,7 @@ describe Bigbluebutton::RoomsController do
     let(:bbb_error_msg) { SecureRandom.hex(250) }
     let(:bbb_error) { BigBlueButton::BigBlueButtonException.new(bbb_error_msg) }
     let(:http_referer) { bigbluebutton_server_path(mocked_server) }
-    let(:room) { FactoryGirl.create(:bigbluebutton_room, :server => mocked_server) }
+    let(:room) { FactoryGirl.create(:bigbluebutton_room) }
     before {
       BigbluebuttonRoom.stub(:find_by_param) { room }
       BigbluebuttonRoom.stub(:find) { room }

data/spec/controllers/bigbluebutton/rooms_controller_json_responses_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Bigbluebutton::RoomsController do
   render_views
   let(:server) { FactoryGirl.create(:bigbluebutton_server) }
-  let(:room) { FactoryGirl.create(:bigbluebutton_room, :server => server) }
+  let(:room) { FactoryGirl.create(:bigbluebutton_room) }
   before do
     BigbluebuttonRoom.stub(:find_by_param) { room }
     BigbluebuttonRoom.stub(:find) { room }
@@ -13,8 +13,8 @@ describe Bigbluebutton::RoomsController do
 
     describe "#index" do
       before do
-        @room1 = FactoryGirl.create(:bigbluebutton_room, :server => server)
-        @room2 = FactoryGirl.create(:bigbluebutton_room, :server => server)
+        @room1 = FactoryGirl.create(:bigbluebutton_room)
+        @room2 = FactoryGirl.create(:bigbluebutton_room)
       end
       before(:each) { get :index, :format => 'json' }
       it { should respond_with(:success) }
@@ -41,7 +41,7 @@ describe Bigbluebutton::RoomsController do
     end
 
     describe "#create" do
-      let(:new_room) { FactoryGirl.build(:bigbluebutton_room, :server => server) }
+      let(:new_room) { FactoryGirl.build(:bigbluebutton_room) }
 
       context "on success" do
         before(:each) {

data/spec/controllers/bigbluebutton/rooms_controller_spec.rb

@@ -6,8 +6,8 @@ require 'bigbluebutton_api'
 
 describe Bigbluebutton::RoomsController do
   render_views
-  let(:server) { FactoryGirl.create(:bigbluebutton_server) }
-  let(:room) { FactoryGirl.create(:bigbluebutton_room, :server => server) }
+  let!(:server) { FactoryGirl.create(:bigbluebutton_server) }
+  let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
   let(:params_to_ignore) { ['moderator_api_password', 'attendee_api_password', 'create_time'] }
 
   describe "#index" do
@@ -86,7 +86,6 @@ describe Bigbluebutton::RoomsController do
       request.env["HTTP_REFERER"] = http_referer
       controller.should_receive(:set_request_headers)
       mock_server_and_api
-      room.server = mocked_server
       controller.stub(:bigbluebutton_user) { user }
     }
 
@@ -137,7 +136,7 @@ describe Bigbluebutton::RoomsController do
   end
 
   describe "#create" do
-    let(:new_room) { FactoryGirl.build(:bigbluebutton_room, :server => server) }
+    let(:new_room) { FactoryGirl.build(:bigbluebutton_room) }
 
     context "on success" do
       before :each do
@@ -206,7 +205,7 @@ describe Bigbluebutton::RoomsController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_room) }
       let(:params) { { :bigbluebutton_room => attrs } }
       let(: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,
@@ -247,21 +246,20 @@ describe Bigbluebutton::RoomsController do
 
   describe "#update" do
     let(:new_room) { FactoryGirl.build(:bigbluebutton_room) }
-    before { @room = room } # need this to trigger let(:room) and actually create the room
 
     context "on success" do
       before :each do
         expect {
-          put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes
+          put :update, :id => room.to_param, :bigbluebutton_room => new_room.attributes
         }.not_to change{ BigbluebuttonRoom.count }
       end
       it {
-        saved = BigbluebuttonRoom.find(@room)
+        saved = BigbluebuttonRoom.find(room)
         should respond_with(:redirect)
         should redirect_to bigbluebutton_room_path(saved)
       }
       it {
-        saved = BigbluebuttonRoom.find(@room)
+        saved = BigbluebuttonRoom.find(room)
         saved.should have_same_attributes_as(new_room, params_to_ignore)
       }
       it { should set_the_flash.to(I18n.t('bigbluebutton_rails.rooms.notice.update.success')) }
@@ -270,16 +268,16 @@ describe Bigbluebutton::RoomsController do
     context "on failure" do
       before :each do
         new_room.name = nil # invalid
-        put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes
+        put :update, :id => room.to_param, :bigbluebutton_room => new_room.attributes
       end
       it { should render_template(:edit) }
-      it { should assign_to(:room).with(@room) }
+      it { should assign_to(:room).with(room) }
     end
 
     context "with :redir_url" do
       context "on success" do
         before(:each) {
-          put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :redir_url => "/any"
+          put :update, :id => room.to_param, :bigbluebutton_room => new_room.attributes, :redir_url => "/any"
         }
         it { should respond_with(:redirect) }
         it { should redirect_to "/any" }
@@ -288,7 +286,7 @@ describe Bigbluebutton::RoomsController do
       context "on failure" do
         before(:each) {
           new_room.name = nil # invalid
-          put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :redir_url => "/any"
+          put :update, :id => room.to_param, :bigbluebutton_room => new_room.attributes, :redir_url => "/any"
         }
         it { should respond_with(:redirect) }
         it { should redirect_to "/any" }
@@ -299,7 +297,7 @@ describe Bigbluebutton::RoomsController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_room) }
       let(:params) { { :bigbluebutton_room => attrs } }
       let(: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,
@@ -309,12 +307,12 @@ describe Bigbluebutton::RoomsController do
       it {
         # we just check that the rails method 'permit' is being called on the hash with the
         # correct parameters
-        BigbluebuttonRoom.stub(:find_by_param).and_return(@room)
-        @room.stub(:update_attributes).and_return(true)
+        BigbluebuttonRoom.stub(:find_by_param).and_return(room)
+        room.stub(:update_attributes).and_return(true)
         attrs.stub(:permit).and_return(attrs)
         controller.stub(:params).and_return(params)
 
-        put :update, :id => @room.to_param, :bigbluebutton_room => attrs
+        put :update, :id => room.to_param, :bigbluebutton_room => attrs
         attrs.should have_received(:permit).with(*allowed_params)
       }
     end
@@ -323,15 +321,15 @@ describe Bigbluebutton::RoomsController do
     describe "if parameters are not informed" do
       before(:each) {}
       it {
-        put :update, :id => @room.to_param
-        should redirect_to(bigbluebutton_room_path(@room))
+        put :update, :id => room.to_param
+        should redirect_to(bigbluebutton_room_path(room))
       }
     end
 
     context "doesn't override @room" do
       let!(:other_room) { FactoryGirl.create(:bigbluebutton_room) }
       before { controller.instance_variable_set(:@room, other_room) }
-      before(:each) { put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes }
+      before(:each) { put :update, :id => room.to_param, :bigbluebutton_room => new_room.attributes }
       it { should assign_to(:room).with(other_room) }
     end
   end
@@ -817,7 +815,7 @@ describe Bigbluebutton::RoomsController do
 
     context "if the room has no server associated" do
       before(:each) {
-        room.stub(:server) { nil }
+        room.stub(:select_server) { nil }
         post :fetch_recordings, :id => room.to_param
       }
       it { should respond_with(:redirect) }
@@ -834,9 +832,10 @@ describe Bigbluebutton::RoomsController do
         it {should respond_with(:redirect) }
         it { should redirect_to "/any" }
       end
+
       context "on failure" do
         before(:each) {
-          room.stub(:server) { nil }
+          room.stub(:select_server) { nil }
           post :fetch_recordings, :id => room.to_param, :redir_url => "/any"
         }
         it {should respond_with(:redirect) }
@@ -848,7 +847,6 @@ describe Bigbluebutton::RoomsController do
       let!(:other_room) { FactoryGirl.create(:bigbluebutton_room) }
       before {
         controller.instance_variable_set(:@room, other_room)
-        other_room.server = nil
       }
       before(:each) { post :fetch_recordings, :id => room.to_param }
       it { should assign_to(:room).with(other_room) }
@@ -862,7 +860,7 @@ describe Bigbluebutton::RoomsController do
       FactoryGirl.create(:bigbluebutton_recording)
 
       # one that belongs to another room in the same server
-      room2 = FactoryGirl.create(:bigbluebutton_room, :server => room.server)
+      room2 = FactoryGirl.create(:bigbluebutton_room)
       FactoryGirl.create(:bigbluebutton_recording, :room => room2)
     end
     before(:each) { get :recordings, :id => room.to_param }
@@ -976,20 +974,23 @@ describe Bigbluebutton::RoomsController do
     }
 
     context "when the user has permission to create the meeting" do
-      before {
-        room.should_receive(:fetch_is_running?).at_least(:once).and_return(false)
-        controller.stub(:bigbluebutton_can_create?).with(room, :attendee)
-          .and_return(true)
-        controller.stub(:bigbluebutton_create_options).with(room)
-          .and_return({ custom: true })
-        room.should_receive(:create_meeting)
-          .with(user, controller.request, { custom: true })
-        room.should_receive(:fetch_new_token).and_return(nil)
-        room.should_receive(:join_url).and_return("http://test.com/join/url/")
-      }
-      before(:each) { get :join, :id => room.to_param }
-      it { should respond_with(:redirect) }
-      it { should redirect_to("http://test.com/join/url/") }
+
+      context "in the standard case" do
+        before {
+          room.should_receive(:fetch_is_running?).at_least(:once).and_return(false)
+          controller.stub(:bigbluebutton_can_create?).with(room, :attendee)
+            .and_return(true)
+          controller.stub(:bigbluebutton_create_options).with(room)
+            .and_return({ custom: true })
+          room.should_receive(:create_meeting)
+            .with(user, controller.request, { custom: true }).and_return(true)
+          room.should_receive(:fetch_new_token).and_return(nil)
+          room.should_receive(:join_url).and_return("http://test.com/join/url/")
+        }
+        before(:each) { get :join, :id => room.to_param }
+        it { should respond_with(:redirect) }
+        it { should redirect_to("http://test.com/join/url/") }
+      end
     end
 
     context "when the user doesn't have permission to create the meeting" do
@@ -1190,6 +1191,20 @@ describe Bigbluebutton::RoomsController do
       it { should set_the_flash.to(bbb_error_msg[0..200]) }
     end
 
+    context "doesn't break if a guest user has permission to create a meeting" do
+      before {
+        room.stub(:fetch_is_running?).and_return(false)
+        controller.stub(:bigbluebutton_create_options).and_return({ custom: true })
+        controller.stub(:bigbluebutton_can_create?).and_return(true)
+        room.stub(:create_meeting).and_return(true)
+        controller.stub(:bigbluebutton_user).and_return(nil)
+        room.stub(:join_url).and_return("http://test.com/join/url/")
+      }
+      before(:each) { get :join, :id => room.to_param, :user => { :name => "Elftor" } }
+      it { should respond_with(:redirect) }
+      it { should redirect_to("http://test.com/join/url/") }
+    end
+
   end
 
 end

data/spec/controllers/bigbluebutton/servers_controller_json_responses_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 
 describe Bigbluebutton::ServersController do
   render_views
-  let(:server) { FactoryGirl.create(:bigbluebutton_server) }
+  let!(:server) { FactoryGirl.create(:bigbluebutton_server) }
 
   context "json responses for" do
 
     describe "#index" do
       before do
+        BigbluebuttonServer.destroy_all
         @server1 = FactoryGirl.create(:bigbluebutton_server)
         @server2 = FactoryGirl.create(:bigbluebutton_server)
       end
@@ -66,12 +67,11 @@ describe Bigbluebutton::ServersController do
 
     describe "#update" do
       let(:new_server) { FactoryGirl.build(:bigbluebutton_server) }
-      before { @server = server }
 
       context "on success" do
         before(:each) {
           BigbluebuttonServer.any_instance.stub(:set_api_version_from_server)
-          put :update, :id => @server.to_param, :bigbluebutton_server => new_server.attributes, :format => 'json'
+          put :update, :id => server.to_param, :bigbluebutton_server => new_server.attributes, :format => 'json'
         }
         it { should respond_with(:success) }
         it { should respond_with_content_type('application/json') }
@@ -81,7 +81,7 @@ describe Bigbluebutton::ServersController do
       context "on failure" do
         before(:each) {
           new_server.url = nil # invalid
-          put :update, :id => @server.to_param, :bigbluebutton_server => new_server.attributes, :format => 'json'
+          put :update, :id => server.to_param, :bigbluebutton_server => new_server.attributes, :format => 'json'
         }
         it { should respond_with(:unprocessable_entity) }
         it { should respond_with_content_type('application/json') }
@@ -94,8 +94,7 @@ describe Bigbluebutton::ServersController do
 
     describe "#destroy" do
       before :each do
-        @server = server
-        delete :destroy, :id => @server.to_param, :format => 'json'
+        delete :destroy, :id => server.to_param, :format => 'json'
       end
       it { should respond_with(:success) }
       it { should respond_with_content_type('application/json') }
@@ -103,8 +102,8 @@ describe Bigbluebutton::ServersController do
     end
 
     describe "#activity" do
-      let(:room1) { FactoryGirl.create(:bigbluebutton_room, :server => server) }
-      let(:room2) { FactoryGirl.create(:bigbluebutton_room, :server => server) }
+      let(:room1) { FactoryGirl.create(:bigbluebutton_room) }
+      let(:room2) { FactoryGirl.create(:bigbluebutton_room) }
       before do
         # so we return our mocked server
         BigbluebuttonServer.stub(:find_by_param).with(server.to_param).
@@ -154,17 +153,6 @@ describe Bigbluebutton::ServersController do
 
     end
 
-    describe "#rooms" do
-      before do
-        @room1 = FactoryGirl.create(:bigbluebutton_room, :server => server)
-        @room2 = FactoryGirl.create(:bigbluebutton_room, :server => server)
-      end
-      before(:each) { get :rooms, :id => server.to_param, :format => 'json' }
-      it { should respond_with(:success) }
-      it { should respond_with_content_type('application/json') }
-      it { should respond_with_json([@room1, @room2].to_json) }
-    end
-
     describe "#fetch_recordings" do
       it "on success"
       it "on error"