bigbluebutton_rails 1.3.0.mweb1 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,4 +1,4 @@
-== 1.3.0.beta1
+== 1.3.0
 
 * To learn how to migrate to 1.3.0 see: https://github.com/mconf/bigbluebutton_rails/wiki/Migrate-to-1.3.0
 

data/Gemfile

@@ -25,7 +25,6 @@ group :test do
   gem "capybara-mechanize" # for remote requests
   gem "launchy"
   gem "capybara-webkit" # best option found for js
-  gem "therubyracer"
 end
 
 # Gems used by the test application

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    bigbluebutton_rails (1.3.0.mweb1)
+    bigbluebutton_rails (1.3.0)
       bigbluebutton-api-ruby (~> 1.2.0)
       rails (>= 3.0.0)
 
@@ -115,7 +115,6 @@ GEM
       addressable (~> 2.3)
       ffi (~> 1.1.1)
       spoon (~> 0.0.1)
-    libv8 (3.16.14.7)
     libwebsocket (0.1.5)
       addressable
     mail (2.4.4)
@@ -172,7 +171,6 @@ GEM
     rake (10.0.1)
     rdoc (3.12)
       json (~> 1.4)
-    ref (1.0.5)
     rspec-core (2.12.0)
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
@@ -211,12 +209,9 @@ GEM
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
@@ -259,6 +254,5 @@ DEPENDENCIES
   shoulda-matchers
   simplecov (>= 0.4.0)
   sqlite3-ruby
-  therubyracer
   uglifier (>= 1.0.3)
   whenever

data/app/models/bigbluebutton_room.rb

@@ -23,6 +23,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
     :length => { :minimum => 1, :maximum => 150 }
   validates :welcome_msg, :length => { :maximum => 250 }
   validates :private, :inclusion => { :in => [true, false] }
+  validates :voice_bridge, :presence => true, :uniqueness => true
   validates :record, :inclusion => { :in => [true, false] }
 
   validates :duration,
@@ -146,7 +147,6 @@ class BigbluebuttonRoom < ActiveRecord::Base
     unless response.nil?
       self.attendee_password = response[:attendeePW]
       self.moderator_password = response[:moderatorPW]
-      self.voice_bridge = response[:voiceBridge] if response.has_key?(:voiceBridge)
       self.save unless self.new_record?
     end
 
@@ -275,6 +275,7 @@ class BigbluebuttonRoom < ActiveRecord::Base
 
   def init
     self[:meetingid] ||= unique_meetingid
+    self[:voice_bridge] ||= random_voice_bridge
 
     @request_headers = {}
 
@@ -288,6 +289,16 @@ class BigbluebuttonRoom < ActiveRecord::Base
     @attendees = []
   end
 
+  def random_voice_bridge
+    value = (70000 + SecureRandom.random_number(9999)).to_s
+    count = 1
+    while not BigbluebuttonRoom.find_by_voice_bridge(value).nil? and count < 10
+      count += 1
+      value = (70000 + SecureRandom.random_number(9999)).to_s
+    end
+    value
+  end
+
   def do_create_meeting(username=nil, userid=nil)
     opts = {
       :record => self.record,
@@ -297,15 +308,10 @@ class BigbluebuttonRoom < ActiveRecord::Base
       :welcome => self.welcome_msg.blank? ? default_welcome_message : self.welcome_msg,
       :dialNumber => self.dial_number,
       :logoutURL => self.full_logout_url || self.logout_url,
-      :maxParticipants => self.max_participants
+      :maxParticipants => self.max_participants,
+      :voiceBridge => self.voice_bridge
     }.merge(self.get_metadata_for_create)
 
-    # Set the voice bridge only if the gem is configured to do so and the voice bridge
-    # is not blank.
-    if BigbluebuttonRails.use_local_voice_bridges && !self.voice_bridge.blank?
-      opts.merge!({ :voiceBridge => self.voice_bridge })
-    end
-
     # Add information about the user that is creating the meeting (if any)
     opts.merge!({ "meta_#{BigbluebuttonRails.metadata_user_id}" => userid }) unless userid.nil?
     opts.merge!({ "meta_#{BigbluebuttonRails.metadata_user_name}" => username }) unless username.nil?

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "1.3.0.mweb1".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/bigbluebutton_rails.rb

@@ -50,16 +50,6 @@ module BigbluebuttonRails
       @@metadata_user_id,
       @@metadata_user_name ]
 
-  # Whether or not the gem should pass the voice bridges set in the rooms when making
-  # API calls. By default it is false, meaning that the voice bridge will never be
-  # passed, so it will be generated by the web conference server. Setting it to true
-  # will make the voice bridge set locally in the room to be used in the web conference
-  # server. Notice that the voice bridge has to be unique in a web conference server, so
-  # if you are setting the voice bridges manually, you will also have to make sure that
-  # the voice bridges are unique (there's nothing in the gem to guarantee this uniqueness).
-  mattr_accessor :use_local_voice_bridges
-  @@use_local_voice_bridges = false
-
   # Finds the BigbluebuttonRoom associated with the recording data in 'data', if any.
   # TODO: if not found, remove the association or keep the old one?
   def self.match_room_recording(data)

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

@@ -32,6 +32,7 @@ class CreateBigbluebuttonRails < ActiveRecord::Migration
     end
     add_index :bigbluebutton_rooms, :server_id
     add_index :bigbluebutton_rooms, :meetingid, :unique => true
+    add_index :bigbluebutton_rooms, :voice_bridge, :unique => true
 
     create_table :bigbluebutton_recordings do |t|
       t.integer :server_id

data/spec/models/bigbluebutton_room_spec.rb

@@ -23,6 +23,9 @@ describe BigbluebuttonRoom do
   it { should validate_uniqueness_of(:meetingid) }
   it { should ensure_length_of(:meetingid).is_at_least(1).is_at_most(100) }
 
+  it { should validate_presence_of(:voice_bridge) }
+  it { should validate_uniqueness_of(:voice_bridge) }
+
   it { should validate_presence_of(:name) }
   it { should validate_uniqueness_of(:name) }
   it { should ensure_length_of(:name).is_at_least(1).is_at_most(150) }
@@ -143,6 +146,24 @@ describe BigbluebuttonRoom do
         b.meetingid.should == "user defined"
       }
     end
+
+    context "voice_bridge" do
+      it {
+        b = BigbluebuttonRoom.new(:voice_bridge => "user defined")
+        b.voice_bridge.should == "user defined"
+      }
+      context "with a random value" do
+        it { room.voice_bridge.should_not be_nil }
+        it { room.voice_bridge.should =~ /7[0-9]{4}/ }
+        it "tries to randomize 10 times if voice_bridge already exists" do
+          room = FactoryGirl.create(:bigbluebutton_room, :voice_bridge => "70000")
+          BigbluebuttonRoom.stub!(:find_by_voice_bridge).and_return(room)
+          SecureRandom.should_receive(:random_number).exactly(10).and_return(0000)
+          room2 = BigbluebuttonRoom.new # triggers the random_number calls
+          room2.voice_bridge.should == "70000"
+        end
+      end
+    end
   end
 
   context "#param format" do
@@ -313,13 +334,11 @@ describe BigbluebuttonRoom do
     describe "#send_create" do
       let(:attendee_password) { Forgery(:basic).password }
       let(:moderator_password) { Forgery(:basic).password }
-      let(:voice_bridge) { SecureRandom.random_number(99999) }
       let(:hash_create) {
         {
           :returncode => "SUCCESS", :meetingID => "test_id",
           :attendeePW => attendee_password, :moderatorPW => moderator_password,
-          :voiceBridge => voice_bridge, :hasBeenForciblyEnded => "false",
-          :messageKey => {}, :message => {}
+          :hasBeenForciblyEnded => "false", :messageKey => {}, :message => {}
         }
       }
       before {
@@ -364,7 +383,6 @@ describe BigbluebuttonRoom do
           end
           it { room.attendee_password.should be(attendee_password) }
           it { room.moderator_password.should be(moderator_password) }
-          it { room.voice_bridge.should be(voice_bridge) }
           it { room.changed?.should be_false }
         end
 
@@ -380,7 +398,6 @@ describe BigbluebuttonRoom do
           end
           it { new_room.attendee_password.should be(attendee_password) }
           it { new_room.moderator_password.should be(moderator_password) }
-          it { new_room.voice_bridge.should be(voice_bridge) }
           it("and do not save the record") { new_room.new_record?.should be_true }
         end
 
@@ -398,62 +415,6 @@ describe BigbluebuttonRoom do
           it { room.moderator_password.should be(moderator_password) }
           it { room.changed?.should be_false }
         end
-
-        context "when the call to create doesn't return a voice bridge" do
-          before do
-            hash_create.delete(:voiceBridge)
-            mocked_api.should_receive(:create_meeting)
-              .with(room.name, room.meetingid, get_create_params(room))
-              .and_return(hash_create)
-            room.stub(:select_server).and_return(mocked_server)
-            room.server = mocked_server
-            room.send_create
-          end
-          it { room.voice_bridge.should be_nil }
-          it { room.changed?.should be_false }
-        end
-
-        context "when it's set to use local voice bridges" do
-          before {
-            @use_local_voice_bridges = BigbluebuttonRails.use_local_voice_bridges
-            BigbluebuttonRails.use_local_voice_bridges = true
-          }
-          after {
-            BigbluebuttonRails.use_local_voice_bridges = @use_local_voice_bridges
-          }
-
-          context "sets the voice bridge in the params if there's a voice bridge" do
-            let(:voice_bridge) { SecureRandom.random_number(99999) }
-            before do
-              room.update_attributes(:voice_bridge => voice_bridge)
-              create_params = get_create_params(room)
-              create_params.merge!({ :voiceBridge => voice_bridge })
-
-              mocked_api.should_receive(:create_meeting)
-                .with(room.name, room.meetingid, create_params)
-                .and_return(hash_create)
-              room.stub(:select_server).and_return(mocked_server)
-              room.server = mocked_server
-              room.send_create
-            end
-            it { room.changed?.should be_false }
-          end
-
-          context "doesn't set the voice bridge if it's blank" do
-            let(:voice_bridge) { SecureRandom.random_number(99999) }
-            before do
-              room.update_attributes(:voice_bridge => "")
-
-              mocked_api.should_receive(:create_meeting)
-                .with(room.name, room.meetingid, get_create_params(room))
-                .and_return(hash_create)
-              room.stub(:select_server).and_return(mocked_server)
-              room.server = mocked_server
-              room.send_create
-            end
-            it { room.changed?.should be_false }
-          end
-        end
       end
 
       context "generates a meetingid if nil" do
@@ -713,7 +674,7 @@ def get_create_params(room, username=nil, userid=nil)
     :dialNumber => room.dial_number,
     :logoutURL => room.logout_url,
     :maxParticipants => room.max_participants,
-    #:voiceBridge => room.voice_bridge,
+    :voiceBridge => room.voice_bridge,
     :record => room.record,
     :duration => room.duration
   }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0.mweb1
-  prerelease: 6
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Mconf
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,6 @@ files:
 - lib/generators/bigbluebutton_rails/templates/migration_0_0_5.rb
 - lib/generators/bigbluebutton_rails/templates/migration_1_3_0.rb
 - lib/generators/bigbluebutton_rails/templates/migration_1_3_0_b.rb
-- lib/generators/bigbluebutton_rails/templates/migration_1_3_0_mweb1.rb
 - lib/generators/bigbluebutton_rails/views_generator.rb
 - lib/tasks/bigbluebutton_rails/recordings.rake
 - spec/bigbluebutton_rails_spec.rb
@@ -259,13 +258,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2534555688455246723
+      hash: 4548361948436062604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 4548361948436062604
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

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

@@ -1,9 +0,0 @@
-class BigbluebuttonRailsTo130Mweb1 < ActiveRecord::Migration
-  def self.up
-    remove_index :bigbluebutton_rooms, :voice_bridge
-  end
-
-  def self.down
-    add_index :bigbluebutton_rooms, :voice_bridge, :unique => true
-  end
-end