bigbluebutton_rails 2.0.0 → 2.1.0

data/spec/models/bigbluebutton_server_db_spec.rb

@@ -6,7 +6,7 @@ describe BigbluebuttonServer do
   context "db" do
     it { should have_db_column(:name).of_type(:string) }
     it { should have_db_column(:url).of_type(:string) }
-    it { should have_db_column(:salt).of_type(:string) }
+    it { should have_db_column(:secret).of_type(:string) }
     it { should have_db_column(:version).of_type(:string) }
     it { should have_db_column(:param).of_type(:string) }
     it { should have_db_column(:created_at).of_type(:datetime) }

data/spec/models/bigbluebutton_server_spec.rb

@@ -19,7 +19,7 @@ describe BigbluebuttonServer do
 
   it { should validate_presence_of(:name) }
   it { should validate_presence_of(:url) }
-  it { should validate_presence_of(:salt) }
+  it { should validate_presence_of(:secret) }
   it { should validate_presence_of(:param) }
 
   context "uniqueness of" do
@@ -49,7 +49,7 @@ describe BigbluebuttonServer do
 
   it { should ensure_length_of(:name).is_at_least(1).is_at_most(500) }
   it { should ensure_length_of(:url).is_at_most(500) }
-  it { should ensure_length_of(:salt).is_at_least(1).is_at_most(500) }
+  it { should ensure_length_of(:secret).is_at_least(1).is_at_most(500) }
   it { should ensure_length_of(:param).is_at_least(3) }
 
   context ".to_param" do
@@ -118,17 +118,21 @@ describe BigbluebuttonServer do
     it { server.api.should_not be_nil }
 
     context "with the correct attributes" do
-      let(:api) { BigBlueButton::BigBlueButtonApi.new(server.url, server.salt, server.version, false) }
+      let(:api) { BigBlueButton::BigBlueButtonApi.new(server.url, server.secret, server.version, false) }
       it { server.api.should == api }
 
-      # updating any of these attributes should update the api
-      { :url => 'http://anotherurl.com/bigbluebutton/api',
-        :salt => '12345-abcde-67890-fghijk', :version => '0.9' }.each do |k,v|
-        it {
-          server.send("#{k}=", v)
-          server.api.send(k).should == v
-        }
-      end
+      it {
+        server.url = 'http://anotherurl.com/bigbluebutton/api'
+        server.api.url.should eql('http://anotherurl.com/bigbluebutton/api')
+      }
+      it {
+        server.secret = '12345-abcde-67890-fghijk'
+        server.api.secret.should eql('12345-abcde-67890-fghijk')
+      }
+      it {
+        server.version = '0.9'
+        server.api.version.should eql('0.9')
+      }
     end
 
     context "returns the cached API object, if any" do
@@ -263,11 +267,29 @@ describe BigbluebuttonServer do
       let(:response) { { :recordings => [1, 2] } }
       before do
         @api_mock.should_receive(:get_recordings).with(params).and_return(response)
-        BigbluebuttonRecording.should_receive(:sync).with(server, response[:recordings])
+        BigbluebuttonRecording.should_receive(:sync).with(server, response[:recordings], false)
       end
       it { server.fetch_recordings(params) }
     end
 
+    context "calls get_recordings when `full_sync` is set" do
+      let(:response) { { :recordings => [1, 2] } }
+      before do
+        @api_mock.should_receive(:get_recordings).with(params).and_return(response)
+        BigbluebuttonRecording.should_receive(:sync).with(server, response[:recordings], true)
+      end
+      it { server.fetch_recordings(params, true) }
+    end
+
+    context "calls get_recordings when `filters` is not set" do
+      let(:response) { { :recordings => [1, 2] } }
+      before do
+        @api_mock.should_receive(:get_recordings).with({}).and_return(response)
+        BigbluebuttonRecording.should_receive(:sync).with(server, response[:recordings], false)
+      end
+      it { server.fetch_recordings }
+    end
+
     context "when the response is empty" do
       let(:response) { { :recordings => [1, 2] } }
       before do
@@ -339,9 +361,9 @@ describe BigbluebuttonServer do
         it { server.update_attributes(url: server.url + "-2") }
       end
 
-      context "if #salt changed" do
+      context "if #secret changed" do
         before { server.should_receive(:update_config).once }
-        it { server.update_attributes(salt: server.salt + "-2") }
+        it { server.update_attributes(secret: server.secret + "-2") }
       end
 
       context "if #version changed" do
@@ -374,9 +396,9 @@ describe BigbluebuttonServer do
         it { server.update_attributes(url: server.url + "-2") }
       end
 
-      context "if #salt changed" do
+      context "if #secret changed" do
         before { server.should_receive(:set_api_version_from_server).once }
-        it { server.update_attributes(salt: server.salt + "-2") }
+        it { server.update_attributes(secret: server.secret + "-2") }
       end
 
       context "if #version changed" do

data/spec/rails_app/db/seeds.rb

@@ -15,7 +15,6 @@ if File.exists?(file)
   end
   server['version'] = '0.9' unless server.has_key?('version')
   server['name'] = URI.parse(server['url']).host
-  server.delete('mobile_salt') if server.has_key?('mobile_salt')
 
   BigbluebuttonServer.create!(server)
 end

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

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

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

@@ -1,20 +1,18 @@
 When /^(\d+) meetings running in this server$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
   @rooms = []
   count.to_i.times do |i|
     room = FactoryGirl.create(:bigbluebutton_room, :server => @server)
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+    BigBlueButtonBot.new(@server.api, room.meetingid, nil, 1,
                          FeaturesConfig.root['timeout_bot_start'])
     @rooms << room
   end
 end
 
 When /^(\d+) meetings recently ended in this server$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
   @ended_rooms = []
   count.to_i.times do |i|
     room = FactoryGirl.create(:bigbluebutton_room, :server => @server)
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+    BigBlueButtonBot.new(@server.api, room.meetingid, nil, 1,
                          FeaturesConfig.root['timeout_bot_start'])
     BigBlueButtonBot.finalize(room.meetingid)
     sleep 1

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

@@ -102,8 +102,7 @@ When /^a meeting is running in this room$/ do
 end
 
 When /^a meeting is running in this room with (\d+) attendees$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
-  BigBlueButtonBot.new(@server.api, @room.meetingid, msalt,
+  BigBlueButtonBot.new(@server.api, @room.meetingid, nil,
                        count.to_i, FeaturesConfig.root['timeout_bot_start'])
 end
 

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

@@ -2,7 +2,7 @@ When /^registers a new server$/i do
   attrs = FactoryGirl.attributes_for(:bigbluebutton_server_integration)
   fill_in("bigbluebutton_server[name]", :with => attrs[:name])
   fill_in("bigbluebutton_server[url]", :with => attrs[:url])
-  fill_in("bigbluebutton_server[salt]", :with => attrs[:salt])
+  fill_in("bigbluebutton_server[secret]", :with => attrs[:secret])
   fill_in("bigbluebutton_server[version]", :with => attrs[:version])
   fill_in("bigbluebutton_server[param]", :with => attrs[:param])
   click_button("Create")
@@ -12,7 +12,7 @@ When /^registers a new server with a wrong URL$/i do
   attrs = FactoryGirl.attributes_for(:bigbluebutton_server_integration)
   fill_in("bigbluebutton_server[name]", :with => attrs[:name])
   fill_in("bigbluebutton_server[url]", :with => "invalid url")
-  fill_in("bigbluebutton_server[salt]", :with => attrs[:salt])
+  fill_in("bigbluebutton_server[secret]", :with => attrs[:secret])
   fill_in("bigbluebutton_server[version]", :with => attrs[:version])
   fill_in("bigbluebutton_server[param]", :with => attrs[:param])
   click_button("Create")

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

@@ -9,7 +9,6 @@ When /^the removed server should not be listed$/i do
   # check params that are specific for this server
   doesnt_have_content(@server.name)
   doesnt_have_content(@server.url)
-  doesnt_have_content(@server.salt)
+  doesnt_have_content(@server.secret)
   doesnt_have_content(@server.param)
 end
-

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

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

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

@@ -33,15 +33,15 @@ module TemplateHelpers
                 { :name => 'bigbluebutton_server[name]', :type => 'text' })
     has_element("input#bigbluebutton_server_url",
                 { :name => 'bigbluebutton_server[url]', :type => 'text' })
-    has_element("input#bigbluebutton_server_salt",
-                { :name => 'bigbluebutton_server[salt]', :type => 'text' })
+    has_element("input#bigbluebutton_server_secret",
+                { :name => 'bigbluebutton_server[secret]', :type => 'text' })
     has_element("input#bigbluebutton_server_version",
                 { :name => 'bigbluebutton_server[version]', :type => 'text' })
     has_element("input#bigbluebutton_server_param",
                 { :name => 'bigbluebutton_server[param]', :type => 'text' })
     has_element("label", { :for => 'bigbluebutton_server_name' })
     has_element("label", { :for => 'bigbluebutton_server_url' })
-    has_element("label", { :for => 'bigbluebutton_server_salt' })
+    has_element("label", { :for => 'bigbluebutton_server_secret' })
     has_element("label", { :for => 'bigbluebutton_server_version' })
     has_element("label", { :for => 'bigbluebutton_server_param' })
     has_element("input", { :name => 'commit', :type => 'submit' })
@@ -53,7 +53,7 @@ module TemplateHelpers
 
     page_has_content(server.name)
     page_has_content(server.url)
-    page_has_content(server.salt)
+    page_has_content(server.secret)
     page_has_content(server.version)
     page_has_content(server.param)
     has_element("a", { :href => edit_bigbluebutton_server_path(server) }) # edit
@@ -74,7 +74,7 @@ module TemplateHelpers
         # server data
         has_content(server.name)
         has_content(server.url)
-        has_content(server.salt)
+        has_content(server.secret)
         has_content(server.version)
         has_content(server.param)
         has_content(server.url)

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

@@ -27,7 +27,7 @@ namespace :db do
       params = {
         :name => "Server #{n1}",
         :url => "http://bigbluebutton#{n1}.test.com/bigbluebutton/api",
-        :salt => Forgery(:basic).password(:at_least => 30, :at_most => 40),
+        :secret => Forgery(:basic).password(:at_least => 30, :at_most => 40),
         :version => '0.9',
         :param => "server-#{n1}"
       }

data/spec/workers/bigbluebutton_meeting_updater_spec.rb

@@ -1,9 +1,90 @@
 require 'spec_helper'
 
 describe BigbluebuttonMeetingUpdater do
-  it "waits the amount of time specified before starting"
-  it "calls fetch_meeting_info in the target room"
-  it "calls finish_meetings if fetch_meeting_info throws an exception"
-  it "calls update_current_meetings if fetch_meeting_info is successful"
-  it "doesn't break if the room is not found"
+
+  it "uses the queue :bigbluebutton_rails" do
+    BigbluebuttonMeetingUpdater.instance_variable_get(:@queue).should eql(:bigbluebutton_rails)
+  end
+
+  describe "#perform" do
+    let!(:api) { double(BigBlueButton::BigBlueButtonApi) }
+
+    it "waits the amount of time specified before starting"
+
+    context "calls fetch_meeting_info in the target room" do
+      let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
+
+      before {
+        expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
+        expect(room).to receive(:fetch_meeting_info).once
+      }
+      it { BigbluebuttonMeetingUpdater.perform(room.id) }
+    end
+
+    context "calls finish_meetings if an exception 'notFound' is raised" do
+      let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
+      let!(:exception) {
+        e = BigBlueButton::BigBlueButtonException.new('Test error')
+        e.key = 'notFound'
+        e
+      }
+
+      before {
+        expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
+        room.server.stub(:api) { api }
+        expect(api).to receive(:get_meeting_info).once { raise exception }
+        expect(room).to receive(:finish_meetings).once
+      }
+      it { expect { BigbluebuttonMeetingUpdater.perform(room.id) }.not_to raise_exception }
+    end
+
+    context "calls finish_meetings if an exception other than 'notFound' is raised" do
+      let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
+      let!(:exception) {
+        e = BigBlueButton::BigBlueButtonException.new('Test error')
+        e.key = 'anythingElse'
+        e
+      }
+
+      before {
+        expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
+        room.server.stub(:api) { api }
+        expect(api).to receive(:get_meeting_info).once { raise exception }
+        expect(room).to receive(:finish_meetings)
+      }
+      it { expect { BigbluebuttonMeetingUpdater.perform(room.id) }.not_to raise_exception }
+    end
+
+    context "calls finish_meetings if an exception with a blank key is raised" do
+      let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
+      let!(:exception) {
+        e = BigBlueButton::BigBlueButtonException.new('Test error')
+        e.key = ''
+        e
+      }
+
+      before {
+        expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(room)
+        room.server.stub(:api) { api }
+        expect(api).to receive(:get_meeting_info).once { raise exception }
+        expect(room).to receive(:finish_meetings)
+      }
+      it { expect { BigbluebuttonMeetingUpdater.perform(room.id) }.not_to raise_exception }
+    end
+
+    context "doesn't break if the room is not found" do
+      let!(:room) { FactoryGirl.create(:bigbluebutton_room) }
+      let!(:exception) {
+        e = BigBlueButton::BigBlueButtonException.new('Test error')
+        e.key = ''
+      }
+
+      before {
+        expect(BigbluebuttonRoom).to receive(:find).with(room.id).and_return(nil)
+        expect(room).not_to receive(:fetch_meeting_info)
+        expect(room).not_to receive(:finish_meetings)
+      }
+      it { BigbluebuttonMeetingUpdater.perform(room.id) }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mconf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/generators/bigbluebutton_rails/templates/migration_1_3_0_b.rb
 - 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/views_generator.rb
 - lib/tasks/bigbluebutton_rails/meetings.rake
 - lib/tasks/bigbluebutton_rails/recordings.rake