bigbluebutton_rails 2.3.0 → 3.0.0

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

@@ -12,6 +12,6 @@ When /^the removed room should not be listed$/i do
   doesnt_have_content(@room.attendee_key)
   doesnt_have_content(@room.moderator_key)
   doesnt_have_content(@room.voice_bridge)
-  doesnt_have_content(@room.param)
+  doesnt_have_content(@room.slug)
 end
 

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

@@ -10,5 +10,5 @@ When /^the removed server should not be listed$/i do
   doesnt_have_content(@server.name)
   doesnt_have_content(@server.url)
   doesnt_have_content(@server.secret)
-  doesnt_have_content(@server.param)
+  doesnt_have_content(@server.slug)
 end

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

@@ -37,13 +37,13 @@ module TemplateHelpers
                 { :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("input#bigbluebutton_server_slug",
+                { :name => 'bigbluebutton_server[slug]', :type => 'text' })
     has_element("label", { :for => 'bigbluebutton_server_name' })
     has_element("label", { :for => 'bigbluebutton_server_url' })
     has_element("label", { :for => 'bigbluebutton_server_secret' })
     has_element("label", { :for => 'bigbluebutton_server_version' })
-    has_element("label", { :for => 'bigbluebutton_server_param' })
+    has_element("label", { :for => 'bigbluebutton_server_slug' })
     has_element("input", { :name => 'commit', :type => 'submit' })
   end
 
@@ -55,7 +55,7 @@ module TemplateHelpers
     page_has_content(server.url)
     page_has_content(server.secret)
     page_has_content(server.version)
-    page_has_content(server.param)
+    page_has_content(server.slug)
     has_element("a", { :href => edit_bigbluebutton_server_path(server) }) # edit
     has_element("a", { :href => activity_bigbluebutton_server_path(server) }) # activity
     has_element("a", { :href => rooms_bigbluebutton_server_path(server) }) # rooms
@@ -76,7 +76,7 @@ module TemplateHelpers
         has_content(server.url)
         has_content(server.secret)
         has_content(server.version)
-        has_content(server.param)
+        has_content(server.slug)
         has_content(server.url)
         # action links
         has_element("a", { :href => bigbluebutton_server_path(server) }) # show
@@ -149,8 +149,8 @@ module TemplateHelpers
                 { :name => 'bigbluebutton_room[max_participants]', :type => 'text' })
     has_element("input#bigbluebutton_room_external",
                 { :name => 'bigbluebutton_room[external]', :type => 'checkbox' })
-    has_element("input#bigbluebutton_room_param",
-                { :name => 'bigbluebutton_room[param]', :type => 'text' })
+    has_element("input#bigbluebutton_room_slug",
+                { :name => 'bigbluebutton_room[slug]', :type => 'text' })
     has_element("input#bigbluebutton_room_voice_bridge",
                 { :name => 'bigbluebutton_room[voice_bridge]', :type => 'text' })
     has_element("label", { :for => 'bigbluebutton_room_name' })
@@ -163,7 +163,7 @@ module TemplateHelpers
     has_element("label", { :for => 'bigbluebutton_room_dial_number' })
     has_element("label", { :for => 'bigbluebutton_room_max_participants' })
     has_element("label", { :for => 'bigbluebutton_room_external' })
-    has_element("label", { :for => 'bigbluebutton_room_param' })
+    has_element("label", { :for => 'bigbluebutton_room_slug' })
     has_element("label", { :for => 'bigbluebutton_room_voice_bridge' })
     has_element("input", { :name => 'commit', :type => 'submit' })
   end
@@ -183,7 +183,7 @@ module TemplateHelpers
     page_has_content(room.voice_bridge)
     page_has_content(room.max_participants)
     page_has_content(room.external)
-    page_has_content(room.param)
+    page_has_content(room.slug)
     # action links
     has_element("a", { :href => edit_bigbluebutton_room_path(room) }) # edit
     has_element("a", { :href => bigbluebutton_room_path(room) }) # show
@@ -224,7 +224,7 @@ module TemplateHelpers
         has_content(room.logout_url)
         has_content(room.dial_number)
         has_content(room.voice_bridge)
-        has_content(room.param)
+        has_content(room.slug)
         # action links
         unless room.server.nil?
           has_element("a", { :href => bigbluebutton_server_path(room.server) }) # show server

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

@@ -93,7 +93,6 @@ namespace :db do
               :end_time => meeting.create_time + rand(5).hours
             }
             time = params[:start_time]
-            params[:description] = I18n.t('bigbluebutton_rails.recordings.default.description', :time => time)
             puts "    - Creating recording #{params[:name]}"
             recording = BigbluebuttonRecording.create(params)
             recording.server = server

data/spec/routing/bigbluebutton/meetings_routing_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Bigbluebutton::MeetingsController do
+  include Shoulda::Matchers::ActionController
+
+  describe "routing", :type => :routing do
+		['bigbluebutton', 'webconference'].each do |prefix|
+	    it {
+	      {:delete => "/#{prefix}/meetings/1"}.
+	      should route_to(:controller => "bigbluebutton/meetings", :action => "destroy", :id => "1")
+	    }
+	  end
+	end
+end

data/spec/support/controllers/bigbluebutton/rooms_controller.rb

@@ -1,5 +1,9 @@
-def build_running_json(value, error=nil)
-  hash = { :running => "#{value}" }
+def build_running_json(value, qty, error=nil)
+  if error.nil?
+    hash = { :running => "#{value}", :participants_qty => qty }
+  else
+    hash = { :running => "#{value}"}
+  end
   hash[:error] = error unless error.nil?
   hash.to_json
 end

data/spec/support/mocked_server.rb

@@ -3,10 +3,10 @@ require "bigbluebutton_api"
 def mock_server_and_api
   # standard server mocks
   @api_mock = double(BigBlueButton::BigBlueButtonApi)
-  @server_mock = stub_model(BigbluebuttonServer, :id => 1, :param => "any")
+  @server_mock = stub_model(BigbluebuttonServer, id: 1, slug: "any")
   @server_mock.stub(:api) { @api_mock }
   BigbluebuttonServer.stub(:find) { @server_mock }
-  BigbluebuttonServer.stub(:find_by_param) { @server_mock }
+  BigbluebuttonServer.stub(:find_by) { @server_mock }
 
   # when testing rooms
   if defined?(room) and not room.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Mconf
@@ -122,6 +122,7 @@ files:
 - app/assets/images/badges/google_play_pt-br.png
 - app/assets/stylesheets/bigbluebutton_rails.css
 - app/controllers/bigbluebutton/api/rooms_controller.rb
+- app/controllers/bigbluebutton/meetings_controller.rb
 - app/controllers/bigbluebutton/playback_types_controller.rb
 - app/controllers/bigbluebutton/recordings_controller.rb
 - app/controllers/bigbluebutton/rooms_controller.rb
@@ -141,6 +142,8 @@ files:
 - app/views/bigbluebutton/api/rooms/index.rabl
 - app/views/bigbluebutton/api/rooms/join.rabl
 - app/views/bigbluebutton/api/rooms/running.rabl
+- app/views/bigbluebutton/meetings/_form.html.erb
+- app/views/bigbluebutton/meetings/edit.html.erb
 - app/views/bigbluebutton/recordings/_form.html.erb
 - app/views/bigbluebutton/recordings/_recordings.html.erb
 - app/views/bigbluebutton/recordings/edit.html.erb
@@ -202,12 +205,15 @@ files:
 - lib/generators/bigbluebutton_rails/templates/migration_2_2_0.rb
 - lib/generators/bigbluebutton_rails/templates/migration_2_2_0_b.rb
 - lib/generators/bigbluebutton_rails/templates/migration_2_3_0.rb
+- lib/generators/bigbluebutton_rails/templates/migration_2_4_0.rb
+- lib/generators/bigbluebutton_rails/templates/migration_2_5_0.rb
 - lib/generators/bigbluebutton_rails/views_generator.rb
 - lib/tasks/bigbluebutton_rails/meetings.rake
 - lib/tasks/bigbluebutton_rails/recordings.rake
 - lib/tasks/bigbluebutton_rails/server_configs.rake
 - spec/bigbluebutton_rails_spec.rb
 - spec/controllers/bigbluebutton/api/rooms_controller_spec.rb
+- spec/controllers/bigbluebutton/meetings_controller_spec.rb
 - spec/controllers/bigbluebutton/playback_types_controller_spec.rb
 - spec/controllers/bigbluebutton/recordings_controller_spec.rb
 - spec/controllers/bigbluebutton/rooms_controller_exception_handling_spec.rb
@@ -341,6 +347,7 @@ files:
 - spec/rails_app/script/rails
 - spec/rails_app/vendor/plugins/.gitkeep
 - spec/routing/bigbluebutton/custom_controllers_routing_spec.rb
+- spec/routing/bigbluebutton/meetings_routing_spec.rb
 - spec/routing/bigbluebutton/recordings_only_routing_spec.rb
 - spec/routing/bigbluebutton/recordings_routing_spec.rb
 - spec/routing/bigbluebutton/rooms_only_routing_spec.rb