bigbluebutton_rails 2.3.0 → 3.0.0

data/lib/bigbluebutton_rails/configuration.rb

@@ -15,6 +15,7 @@ module BigbluebuttonRails
     attr_accessor :playback_url_authentication
     attr_accessor :playback_iframe
     attr_accessor :downloadable_playback_types
+    attr_accessor :debug
 
     # methods
     attr_accessor :select_server
@@ -32,6 +33,8 @@ module BigbluebuttonRails
       }
       @routing_scope = 'bigbluebutton'
 
+      @debug = false
+
       @metadata_room_id        = :'bbbrails-room-id'
       @metadata_user_id        = :'bbbrails-user-id'
       @metadata_user_name      = :'bbbrails-user-name'

data/lib/bigbluebutton_rails/rails/routes.rb

@@ -99,7 +99,7 @@ module ActionDispatch::Routing
       options = params.extract_options!
       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"]
+      options_only = options.has_key?(:only) ? options[:only] : ["servers", "rooms", "recordings", "playback_types", "meetings"]
       BigbluebuttonRails.configuration.set_controllers(options[:controllers])
 
       scope options_scope, :as => options_as do
@@ -107,6 +107,7 @@ module ActionDispatch::Routing
         add_routes_for_rooms if options_only.include?("rooms")
         add_routes_for_recordings if options_only.include?("recordings")
         add_routes_for_playback_types if options_only.include?("playback_types")
+        add_routes_for_meetings if options_only.include?("meetings")
       end
     end
 
@@ -159,5 +160,9 @@ module ActionDispatch::Routing
       resources :playback_types, :only => [:update],
                                  :controller => BigbluebuttonRails.configuration.controllers[:playback_types]
     end
+
+    def add_routes_for_meetings #:nodoc:
+      resources :meetings, :controller => 'bigbluebutton/meetings', :only => [:destroy, :update, :edit]
+    end
   end
 end

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "2.3.0".freeze
+  VERSION = "3.0.0".freeze
 end

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

@@ -6,7 +6,7 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.string :url
       t.string :secret
       t.string :version
-      t.string :param
+      t.string :slug
       t.timestamps
     end
 
@@ -24,7 +24,7 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.integer :max_participants
       t.boolean :private, :default => false
       t.boolean :external, :default => false
-      t.string :param
+      t.string :slug
       t.boolean :record_meeting, :default => false
       t.integer :duration, :default => 0
       t.string :attendee_api_password
@@ -59,7 +59,6 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.decimal :start_time, precision: 14, scale: 0
       t.decimal :end_time, precision: 14, scale: 0
       t.boolean :available, :default => true
-      t.string :description
       t.integer :size, limit: 8, default: 0
       t.text :recording_users
       t.timestamps
@@ -105,6 +104,7 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
       t.string :creator_name
       t.boolean :ended, :default => false
       t.string :got_stats
+      t.string :title, limit: 80
       t.timestamps
     end
     add_index :bigbluebutton_meetings, [:meetingid, :create_time], :unique => true

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

@@ -0,0 +1,18 @@
+class BigbluebuttonRailsTo240 < ActiveRecord::Migration
+  def self.up
+    add_column :bigbluebutton_meetings, :title, :string, limit: 80
+
+    BigbluebuttonMeeting.find_each do |meeting|
+      if meeting.recording.present?
+        meeting.update_attributes(title: meeting.recording.description)
+      end
+    end
+
+    remove_column :bigbluebutton_recordings, :description
+  end
+
+  def self.down
+    add_column :bigbluebutton_recordings, :description, :string
+    remove_column :bigbluebutton_meetings, :title
+  end
+end

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

@@ -0,0 +1,9 @@
+class BigbluebuttonRailsTo250 < ActiveRecord::Migration
+  def self.up
+    add_column :bigbluebutton_recordings, :state, :string
+  end
+
+  def self.down
+    remove_column :bigbluebutton_recordings, :state
+  end
+end

data/spec/controllers/bigbluebutton/api/rooms_controller_spec.rb

@@ -142,9 +142,9 @@ describe Bigbluebutton::Api::RoomsController do
     end
 
     context "filtering" do
-      before { room.update_attributes(name: "La Lo", param: "lalo-1") }
-      let!(:room2) { FactoryGirl.create(:bigbluebutton_room, name: "La Le", param: "lale-2") }
-      let!(:room3) { FactoryGirl.create(:bigbluebutton_room, name: "Li Lo", param: "lilo") }
+      before { room.update_attributes(name: "La Lo", slug: "lalo-1") }
+      let!(:room2) { FactoryGirl.create(:bigbluebutton_room, name: "La Le", slug: "lale-2") }
+      let!(:room3) { FactoryGirl.create(:bigbluebutton_room, name: "Li Lo", slug: "lilo") }
 
       context "filters by terms" do
         before(:each) { get :index, filter: { terms: 'la' }, format: :json }

data/spec/controllers/bigbluebutton/meetings_controller_spec.rb

@@ -0,0 +1,199 @@
+require 'spec_helper'
+require 'bigbluebutton_api'
+
+# Some tests mock the server and its API object
+# We don't want to trigger real API calls here (this is done in the integration tests)
+
+describe Bigbluebutton::MeetingsController do
+  render_views
+  let!(:server) { FactoryGirl.create(:bigbluebutton_server) }
+  let!(:meeting) { FactoryGirl.create(:bigbluebutton_meeting) }
+  let!(:rec){ FactoryGirl.create(:bigbluebutton_recording, :published => false, :meeting => meeting) }
+
+  describe '#destroy' do
+    context "when meeting_ended == true" do
+      context "when meeting has no recordings" do
+        let!(:meeting) { FactoryGirl.create(:bigbluebutton_meeting, ended: true) }
+
+        context "when meeting.destroy == true" do
+          before {
+            request.env["HTTP_REFERER"] = '/any'
+            BigbluebuttonServer.any_instance.stub(:send_delete_recordings).and_return(true)
+            expect {
+              delete :destroy, :id => meeting.to_param
+            }.to change{ BigbluebuttonMeeting.count }.by(-1)
+          }
+          it("should decrease meetings count by -1") { }
+          it { should redirect_to '/any' }
+          it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.delete.success')) }
+        end
+
+        context "when meeting.destroy == false" do
+          before {
+            request.env["HTTP_REFERER"] = '/any'
+            BigbluebuttonMeeting.any_instance.stub(:destroy).and_return(false)
+            expect {
+              delete :destroy, :id => meeting.to_param
+            }.to change{ BigbluebuttonMeeting.count }.by(0)
+          }
+          it("should not decrease meetings count") { }
+          it { should redirect_to '/any' }
+          it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.notice.destroy.error_destroy')) }
+        end
+      end
+      context "when meeting has recordings" do
+        let!(:meeting) { FactoryGirl.create(:bigbluebutton_meeting, ended: true) }
+
+        context "when meeting.destroy == true" do
+          before {
+            BigbluebuttonServer.any_instance.stub(:send_delete_recordings).and_return(true)
+            request.env["HTTP_REFERER"] = '/any'
+            expect {
+              delete :destroy, :id => meeting.to_param
+            }.to change{ BigbluebuttonRecording.count }.by(-1)
+          }
+          it("should decrease recordings count by -1") { }
+          it { should redirect_to '/any' }
+          it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.delete.success')) }
+        end
+
+        context "when meeting.destroy == false" do
+          before {
+            request.env["HTTP_REFERER"] = '/any'
+            BigbluebuttonMeeting.any_instance.stub(:destroy).and_return(false)
+            expect {
+              delete :destroy, :id => meeting.to_param
+            }.to change{ BigbluebuttonRecording.count }.by(0)
+          }
+          it("should not decrease Recordings count") { }
+          it { should redirect_to '/any' }
+          it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.notice.destroy.error_destroy')) }
+        end
+      end
+    end
+
+    context "When meeting_ended == false" do
+      let!(:meeting) { FactoryGirl.create(:bigbluebutton_meeting, ended: false) }
+
+      before {
+          request.env["HTTP_REFERER"] = '/any'
+          BigbluebuttonMeeting.any_instance.stub(:destroy).and_return(false)
+          expect {
+            delete :destroy, :id => meeting.to_param
+          }.to change{ BigbluebuttonMeeting.count }.by(0)
+        }
+        it("should not decrease meetings count") { }
+        it { should redirect_to '/any' }
+        it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.notice.destroy.running.not_ended')) }
+    end
+
+  end
+
+  describe "#edit" do
+    context "basic" do
+      before(:each) { get :edit, :id => meeting.to_param }
+      it { should respond_with(:success) }
+      it { should assign_to(:meeting).with(meeting) }
+      it { should render_template(:edit) }
+    end
+
+    context "doesn't override @meeting" do
+      let!(:other_meeting) { FactoryGirl.create(:bigbluebutton_meeting) }
+      before { controller.instance_variable_set(:@meeting, other_meeting) }
+      before(:each) { get :edit, :id => meeting.to_param }
+      it { should assign_to(:meeting).with(other_meeting) }
+    end
+  end
+
+  describe "#update" do
+    let!(:new_meeting) { FactoryGirl.build(:bigbluebutton_meeting) }
+
+    context "on success" do
+      before(:each) {
+        expect {
+          put :update, :id => meeting.to_param, :bigbluebutton_meeting => new_meeting.attributes
+        }.not_to change{ BigbluebuttonMeeting.count }
+      }
+      it { should respond_with(:redirect) }
+      it {
+        saved = BigbluebuttonMeeting.find(meeting)
+        should redirect_to(bigbluebutton_meeting_path(saved))
+      }
+      it {
+        saved = BigbluebuttonMeeting.find(meeting)
+        ignored = new_meeting.attributes.keys - ['title'] # only description is editable
+        saved.should have_same_attributes_as(new_meeting, ignored)
+      }
+      it { should set_the_flash.to(I18n.t('bigbluebutton_rails.meetings.notice.update.success')) }
+    end
+
+    context "on failure" do
+      before(:each) {
+        BigbluebuttonMeeting.should_receive(:find_by).and_return(meeting)
+        meeting.should_receive(:update_attributes).and_return(false)
+        put :update, :id => meeting.to_param, :bigbluebutton_meeting => new_meeting.attributes
+      }
+      it { should render_template(:edit) }
+      it { should assign_to(:meeting).with(meeting) }
+    end
+
+    describe "params handling" do
+      let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_meeting) }
+      let(:params) { { :bigbluebutton_meeting => attrs } }
+      let(:allowed_params) {
+        [:title]
+      }
+      it {
+        # we just check that the rails method 'permit' is being called on the hash with the
+        # correct parameters
+        BigbluebuttonMeeting.stub(:find_by).and_return(meeting)
+        meeting.stub(:update_attributes).and_return(true)
+        attrs.stub(:permit).and_return(attrs)
+        controller.stub(:params).and_return(params)
+
+        put :update, :id => meeting.to_param, :bigbluebutton_meeting => attrs
+        # puts attrs.inspect
+        attrs.should have_received(:permit).with(*allowed_params)
+      }
+    end
+
+    # to make sure it doesn't break if the hash informed doesn't have the key :bigbluebutton_meeting
+    describe "if parameters are not informed" do
+      it {
+        put :update, :id => meeting.to_param
+        should redirect_to(bigbluebutton_meeting_path(meeting))
+      }
+    end
+
+    context "with :redir_url" do
+      context "on success" do
+        before(:each) {
+          put :update, :id => meeting.to_param, :bigbluebutton_meeting => new_meeting.attributes, :redir_url => '/any'
+        }
+        it { should respond_with(:redirect) }
+        it { should redirect_to "/any" }
+      end
+
+      context "on failure" do
+        before(:each) {
+          BigbluebuttonMeeting.should_receive(:find_by).and_return(meeting)
+          meeting.should_receive(:update_attributes).and_return(false)
+          put :update, :id => meeting.to_param, :bigbluebutton_meeting => new_meeting.attributes, :redir_url => '/any'
+        }
+        it { should respond_with(:redirect) }
+        it { should redirect_to "/any" }
+      end
+    end
+
+    context "doesn't override @meeting" do
+      let!(:other_meeting) { FactoryGirl.create(:bigbluebutton_meeting) }
+      before { controller.instance_variable_set(:@meeting, other_meeting) }
+      before(:each) { put :update, :id => meeting.to_param, :bigbluebutton_meeting => new_meeting.attributes }
+      it { should assign_to(:meeting).with(other_meeting) }
+    end
+  end
+
+
+
+
+end

data/spec/controllers/bigbluebutton/recordings_controller_spec.rb

@@ -92,7 +92,7 @@ describe Bigbluebutton::RecordingsController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_recording) }
       let(:params) { { :bigbluebutton_recording => attrs } }
       let(:allowed_params) {
-        [ :description ]
+        []
       }
       it {
         # we just check that the rails method 'permit' is being called on the hash with the
@@ -165,7 +165,7 @@ describe Bigbluebutton::RecordingsController do
       before(:each) {
         expect {
           delete :destroy, :id => recording.to_param
-        }.to change{ BigbluebuttonRecording.count }.by(-1)
+        }.to change{ BigbluebuttonRecording.count }.by(0)
       }
       it { should respond_with(:redirect) }
       it { should redirect_to bigbluebutton_recordings_url }
@@ -202,7 +202,7 @@ describe Bigbluebutton::RecordingsController do
         mocked_server.should_not_receive(:send_delete_recordings)
         expect {
           delete :destroy, :id => recording.to_param
-        }.to change{ BigbluebuttonRecording.count }.by(-1)
+        }.to change{ BigbluebuttonRecording.count }.by(0)
       }
       it { should respond_with(:redirect) }
       it { should redirect_to bigbluebutton_recordings_url }

data/spec/controllers/bigbluebutton/rooms_controller_exception_handling_spec.rb

@@ -37,10 +37,12 @@ describe Bigbluebutton::RoomsController do
     end
 
     describe "#running" do
-      before { mocked_api.should_receive(:is_meeting_running?) { raise bbb_error } }
+      before {
+        mocked_api.should_receive(:is_meeting_running?) { raise bbb_error }
+      }
       before(:each) { get :running, :id => room.to_param }
       it { should respond_with(:success) }
-      it { response.body.should == build_running_json(false, bbb_error_msg[0..200]) }
+      it { response.body.should == build_running_json(false,{}, bbb_error_msg[0..200]) }
       it { should set_the_flash.to(bbb_error_msg[0..200]) }
     end
 

data/spec/controllers/bigbluebutton/rooms_controller_spec.rb

@@ -207,7 +207,7 @@ describe Bigbluebutton::RoomsController do
       let(:allowed_params) {
         [ :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,
+          :owner_type, :external, :slug, :record_meeting, :duration, :default_layout, :presenter_share_only,
           :auto_start_video, :auto_start_audio, :background,
           :moderator_only_message, :auto_start_recording, :allow_start_stop_recording,
           :metadata_attributes => [ :id, :name, :content, :_destroy, :owner_id ] ]
@@ -299,7 +299,7 @@ describe Bigbluebutton::RoomsController do
       let(:allowed_params) {
         [ :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,
+          :owner_type, :external, :slug, :record_meeting, :duration, :default_layout, :presenter_share_only,
           :auto_start_video, :auto_start_audio, :background,
           :moderator_only_message, :auto_start_recording, :allow_start_stop_recording,
           :metadata_attributes => [ :id, :name, :content, :_destroy, :owner_id ] ]
@@ -408,18 +408,24 @@ describe Bigbluebutton::RoomsController do
     }
 
     context "room is running" do
-      before { @api_mock.should_receive(:is_meeting_running?).and_return(true) }
+      before {
+        @api_mock.should_receive(:is_meeting_running?).and_return(true)
+        @api_mock.should_receive(:get_meeting_info).and_return({running: true, participantCount: 12})
+      }
       before(:each) { get :running, :id => room.to_param }
       it { should respond_with(:success) }
       it { should respond_with_content_type('application/json') }
       it { should assign_to(:room).with(room) }
-      it { response.body.should == build_running_json(true) }
+      it { response.body.should == build_running_json(true,{running: true, participantCount: 12}) }
     end
 
     context "room is not running" do
-      before { mocked_api.should_receive(:is_meeting_running?).and_return(false) }
+      before { 
+        mocked_api.should_receive(:is_meeting_running?).and_return(false)
+        @api_mock.should_receive(:get_meeting_info).and_return({running: false})
+      }
       before(:each) { get :running, :id => room.to_param }
-      it { response.body.should == build_running_json(false) }
+      it { response.body.should == build_running_json(false,{running: false}) }
     end
 
     context "on failure" do

data/spec/controllers/bigbluebutton/servers_controller_spec.rb

@@ -88,7 +88,7 @@ describe Bigbluebutton::ServersController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_server) }
       let(:params) { { :bigbluebutton_server => attrs } }
       let(:allowed_params) {
-        [ :name, :url, :secret, :param ]
+        [ :name, :url, :secret, :slug ]
       }
 
       it {
@@ -178,13 +178,13 @@ describe Bigbluebutton::ServersController do
       let(:attrs) { FactoryGirl.attributes_for(:bigbluebutton_server) }
       let(:params) { { :bigbluebutton_server => attrs } }
       let(:allowed_params) {
-        [ :name, :url, :secret, :param ]
+        [ :name, :url, :secret, :slug ]
       }
 
       it {
         # we just check that the rails method 'permit' is being called on the hash with the
         # correct parameters
-        BigbluebuttonServer.stub(:find_by_param).and_return(server)
+        BigbluebuttonServer.stub(:find_by).and_return(server)
         server.stub(:update_attributes).and_return(true)
         attrs.stub(:permit).and_return(attrs)
         controller.stub(:params).and_return(params)
@@ -269,7 +269,7 @@ describe Bigbluebutton::ServersController do
     let(:room2) { FactoryGirl.create(:bigbluebutton_room) }
     before do
       # return our mocked server
-      BigbluebuttonServer.stub(:find_by_param).with(server.to_param).
+      BigbluebuttonServer.stub(:find_by).with(slug: server.to_param).
         and_return(server)
     end
 
@@ -338,7 +338,7 @@ describe Bigbluebutton::ServersController do
     let(:recording_ids) { "id1,id2,id3" }
     before do
       # return our mocked server
-      BigbluebuttonServer.stub(:find_by_param).with(server.to_param).and_return(server)
+      BigbluebuttonServer.stub(:find_by).with(slug: server.to_param).and_return(server)
     end
 
     context "on success" do
@@ -398,7 +398,7 @@ describe Bigbluebutton::ServersController do
     let(:recording_ids) { "id1,id2,id3" }
     before do
       # return our mocked server
-      BigbluebuttonServer.stub(:find_by_param).with(server.to_param).and_return(server)
+      BigbluebuttonServer.stub(:find_by).with(slug: server.to_param).and_return(server)
     end
 
     context "on success" do
@@ -456,7 +456,7 @@ describe Bigbluebutton::ServersController do
   describe "#fetch_recordings" do
     before do
       # return our mocked server
-      BigbluebuttonServer.stub(:find_by_param).with(server.to_param).and_return(server)
+      BigbluebuttonServer.stub(:find_by).with(slug: server.to_param).and_return(server)
     end
 
     context "on success" do
@@ -560,7 +560,7 @@ describe Bigbluebutton::ServersController do
   describe "#check" do
     before do
       # return our mocked server
-      BigbluebuttonServer.stub(:find_by_param).with(server.to_param).and_return(server)
+      BigbluebuttonServer.stub(:find_by).with(slug: server.to_param).and_return(server)
     end
 
     context "on success" do