bigbluebutton_rails 2.1.0 → 2.2.0

data/spec/models/bigbluebutton_server_spec.rb

@@ -6,9 +6,7 @@ describe BigbluebuttonServer do
     BigbluebuttonServer.new.should be_a_kind_of(ActiveRecord::Base)
   end
 
-  it { should have_many(:rooms).dependent(:nullify) }
-
-  it { should have_many(:recordings).dependent(:nullify) }
+  it { should have_many(:recordings).dependent(:destroy) }
 
   it { should have_one(:config).dependent(:destroy) }
   it { should delegate(:update_config).to(:config) }
@@ -24,27 +22,31 @@ describe BigbluebuttonServer do
 
   context "uniqueness of" do
     before(:each) { FactoryGirl.create(:bigbluebutton_server) }
-    it { should validate_uniqueness_of(:url) }
-    it { should validate_uniqueness_of(:name) }
     it { should validate_uniqueness_of(:param) }
   end
 
-  it "has associated rooms" do
+  it "has associated recordings" do
     server = FactoryGirl.create(:bigbluebutton_server)
-    server.rooms.should be_empty
+    server.recordings.should be_empty
 
-    r = FactoryGirl.create(:bigbluebutton_room, :server => server)
+    r = FactoryGirl.create(:bigbluebutton_recording, server: server)
     server = BigbluebuttonServer.find(server.id)
-    server.rooms.should == [r]
+    server.recordings.should == [r]
   end
 
-  it "has associated recordings" do
-    server = FactoryGirl.create(:bigbluebutton_server)
-    server.rooms.should be_empty
+  context "destroys associated recordings when destroyed" do
+    let!(:server) { FactoryGirl.create(:bigbluebutton_server) }
+    let!(:rec1) { FactoryGirl.create(:bigbluebutton_recording, server: server) }
+    let!(:rec2) { FactoryGirl.create(:bigbluebutton_recording, server: server) }
+    let!(:rec3) { FactoryGirl.create(:bigbluebutton_recording) }
 
-    r = FactoryGirl.create(:bigbluebutton_recording, :server => server)
-    server = BigbluebuttonServer.find(server.id)
-    server.recordings.should == [r]
+    it {
+      server.recordings.count.should eql(2)
+      server.destroy
+      BigbluebuttonRecording.find_by(recordid: rec1.recordid).should be_nil
+      BigbluebuttonRecording.find_by(recordid: rec2.recordid).should be_nil
+      BigbluebuttonRecording.find_by(recordid: rec3.recordid).should_not be_nil
+    }
   end
 
   it { should ensure_length_of(:name).is_at_least(1).is_at_most(500) }
@@ -170,8 +172,9 @@ describe BigbluebuttonServer do
 
   describe "#fetch_meetings" do
     let(:server) { FactoryGirl.create(:bigbluebutton_server) }
-    let(:room1) { FactoryGirl.create(:bigbluebutton_room, :server => server, :meetingid => "room1") }
-    let(:room2) { FactoryGirl.create(:bigbluebutton_room, :server => server, :meetingid => "room2") }
+    let(:room1) { FactoryGirl.create(:bigbluebutton_room, :meetingid => "room1") }
+    let(:room2) { FactoryGirl.create(:bigbluebutton_room, :meetingid => "room2") }
+    let!(:api) { double(BigBlueButton::BigBlueButtonApi) }
 
     # the hashes should be exactly as returned by bigbluebutton-api-ruby to be sure we are testing it right
     let(:meetings) {
@@ -188,9 +191,9 @@ describe BigbluebuttonServer do
     }
 
     before {
-      @api_mock = double(BigBlueButton::BigBlueButtonApi)
-      server.stub(:api).and_return(@api_mock)
-      @api_mock.should_receive(:get_meetings).and_return(hash)
+      server.stub(:api).and_return(api)
+      BigbluebuttonServer.any_instance.stub(:api).and_return(api)
+      api.should_receive(:get_meetings).and_return(hash)
       server.fetch_meetings
 
       # the keys are updated during fetch_meetings
@@ -205,7 +208,6 @@ describe BigbluebuttonServer do
     it { server.meetings[1].should have_same_attributes_as(room2) }
     it { server.meetings[2].meetingid.should == "im not in the db" }
     it { server.meetings[2].name.should == "im not in the db" }
-    it { server.meetings[2].server.should == server }
     it { server.meetings[2].attendee_api_password.should == "pass" }
     it { server.meetings[2].moderator_api_password.should == "pass" }
     it { server.meetings[2].running.should == true }
@@ -332,6 +334,7 @@ describe BigbluebuttonServer do
         @server.config # access it so the new obj is created
       }
       it { @server.config.should_not be_nil }
+      it { @server.config.server.should eql(@server) }
       it("is not promptly saved") {
         @server.config.new_record?.should be(true)
       }
@@ -447,4 +450,20 @@ describe BigbluebuttonServer do
     end
   end
 
+  describe "#check_url" do
+    let(:server) { FactoryGirl.create(:bigbluebutton_server) }
+
+    it { should respond_to(:check_url) }
+
+    context "returns what api.check_url returns" do
+      before do
+        @api_mock = double(BigBlueButton::BigBlueButtonApi)
+        server.stub(:api).and_return(@api_mock)
+        @api_mock.should_receive(:check_url).
+          and_return('http://test-server.com/check')
+      end
+      it { server.check_url.should eql('http://test-server.com/check') }
+    end
+  end
+
 end

data/spec/rails_app/db/seeds.rb

@@ -13,7 +13,7 @@ if File.exists?(file)
   else
     server = config['servers'][config['servers'].keys.first]
   end
-  server['version'] = '0.9' unless server.has_key?('version')
+  server['version'] = '1.0' unless server.has_key?('version')
   server['name'] = URI.parse(server['url']).host
 
   BigbluebuttonServer.create!(server)

data/spec/rails_app/features/config.yml.example

@@ -2,9 +2,9 @@
 timeout_bot_start: 60
 
 servers:
-  bbb-dev-07:
-    secret: 'your-secret'
-    url: 'http://your-server/bigbluebutton/api'
-  test-install-09:
+  test-install-10:
     secret: '8cd8ef52e8e101574e400365b55e11a6'
     url: 'http://test-install.blindsidenetworks.com/bigbluebutton/api'
+  bbb-dev-110:
+    secret: 'your-secret'
+    url: 'http://your-server/bigbluebutton/api'

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

@@ -1,6 +1,5 @@
 When /^registers a new room$/i do
   attrs = FactoryGirl.attributes_for(:bigbluebutton_room, :server => @server)
-  fill_in("bigbluebutton_room[server_id]", :with => attrs[:server_id])
   fill_in("bigbluebutton_room[name]", :with => attrs[:name])
   fill_in("bigbluebutton_room[meetingid]", :with => attrs[:meetingid])
   check("bigbluebutton_room[private]") if attrs[:private]

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

@@ -129,8 +129,6 @@ module TemplateHelpers
 
   # internal form in rooms/new and room/:id/edit
   def check_room_form
-    has_element("input#bigbluebutton_room_server_id",
-                { :name => 'bigbluebutton_room[server_id]', :type => 'text' })
     has_element("input#bigbluebutton_room_name",
                 { :name => 'bigbluebutton_room[name]', :type => 'text' })
     has_element("input#bigbluebutton_room_meetingid",
@@ -174,7 +172,6 @@ module TemplateHelpers
   def check_show_room(options)
     room = options[:room] || BigbluebuttonRoom.last
 
-    page_has_content(room.server_id)
     page_has_content(room.name)
     page_has_content(room.meetingid)
     page_has_content(room.private)
@@ -220,7 +217,6 @@ module TemplateHelpers
     rooms.each do |room|
       within(make_selector("ul#bbbrails_list>li:nth(#{n})")) do
         # room data
-        has_content(room.server_id) unless room.server.nil?
         has_content(room.name)
         has_content(room.meetingid)
         has_content(room.attendee_key)

data/spec/rails_app/lib/tasks/db/populate.rake

@@ -86,10 +86,10 @@ namespace :db do
           # Basic metadata the gem always adds and should always be there
           basic_metadata =
             [{
-               :name => BigbluebuttonRails.metadata_user_id,
+               :name => BigbluebuttonRails.configuration.metadata_user_id,
                :content => Forgery(:basic).number(:at_most => 1000)
              }, {
-               :name => BigbluebuttonRails.metadata_user_name,
+               :name => BigbluebuttonRails.configuration.metadata_user_name,
                :content => Forgery(:name).full_name
              }]
           basic_metadata.each do |meta_params|

data/spec/routing/bigbluebutton/servers_only_routing_spec.rb

@@ -37,7 +37,10 @@ describe ActionController do
       {:get => "/only-servers/bigbluebutton/servers/1/activity"}.
       should route_to(:controller => "bigbluebutton/servers", :action => "activity", :id => "1")
     }
-
+    it {
+      {:get => "/only-servers/bigbluebutton/servers/1/check"}.
+        should route_to(:controller => "bigbluebutton/servers", :action => "check", :id => "1")
+    }
   end
 
 end

data/spec/routing/bigbluebutton/servers_routing_spec.rb

@@ -59,6 +59,10 @@ describe Bigbluebutton::ServersController do
         {:post => "/#{prefix}/servers/server-1/fetch_recordings"}.
         should route_to(:controller => "bigbluebutton/servers", :action => "fetch_recordings", :id => "server-1")
       }
+      it {
+        {:get => "/#{prefix}/servers/server-1/check"}.
+          should route_to(:controller => "bigbluebutton/servers", :action => "check", :id => "server-1")
+      }
     end
 
   end

data/spec/spec_helper.rb

@@ -47,4 +47,8 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.include RSpec::Rails::ViewRendering
   config.include FactoryGirl::Syntax::Methods
+
+  config.before(:each) do
+    BigbluebuttonRails.reset
+  end
 end

data/spec/support/mocked_server.rb

@@ -10,7 +10,7 @@ def mock_server_and_api
 
   # when testing rooms
   if defined?(room) and not room.nil?
-    room.stub(:server) { @server_mock }
+    room.stub(:select_server) { @server_mock }
     BigbluebuttonRoom.stub(:find_by_param) { room }
     BigbluebuttonRoom.stub(:find) { room }
   end

data/spec/workers/bigbluebutton_meeting_updater_spec.rb

@@ -31,7 +31,7 @@ describe BigbluebuttonMeetingUpdater do
 
       before {
         expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
-        room.server.stub(:api) { api }
+        expect_any_instance_of(BigbluebuttonServer).to receive(:api).and_return(api)
         expect(api).to receive(:get_meeting_info).once { raise exception }
         expect(room).to receive(:finish_meetings).once
       }
@@ -48,7 +48,7 @@ describe BigbluebuttonMeetingUpdater do
 
       before {
         expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
-        room.server.stub(:api) { api }
+        expect_any_instance_of(BigbluebuttonServer).to receive(:api).and_return(api)
         expect(api).to receive(:get_meeting_info).once { raise exception }
         expect(room).to receive(:finish_meetings)
       }
@@ -65,7 +65,7 @@ describe BigbluebuttonMeetingUpdater do
 
       before {
         expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
-        room.server.stub(:api) { api }
+        expect_any_instance_of(BigbluebuttonServer).to receive(:api).and_return(api)
         expect(api).to receive(:get_meeting_info).once { raise exception }
         expect(room).to receive(:finish_meetings)
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Mconf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,7 @@ files:
 - config/resque/workers_schedule.yml
 - lib/bigbluebutton_rails.rb
 - lib/bigbluebutton_rails/background_tasks.rb
+- lib/bigbluebutton_rails/configuration.rb
 - lib/bigbluebutton_rails/controller_methods.rb
 - lib/bigbluebutton_rails/dial_number.rb
 - lib/bigbluebutton_rails/exceptions.rb
@@ -173,6 +174,7 @@ files:
 - lib/generators/bigbluebutton_rails/templates/migration_1_4_0.rb
 - lib/generators/bigbluebutton_rails/templates/migration_2_0_0.rb
 - lib/generators/bigbluebutton_rails/templates/migration_2_1_0.rb
+- lib/generators/bigbluebutton_rails/templates/migration_2_2_0.rb
 - lib/generators/bigbluebutton_rails/views_generator.rb
 - lib/tasks/bigbluebutton_rails/meetings.rake
 - lib/tasks/bigbluebutton_rails/recordings.rake