bigbluebutton_rails 0.1.1 → 1.0.0

data/spec/routing/bigbluebutton/rooms_routing_spec.rb

@@ -5,211 +5,127 @@ describe Bigbluebutton::RoomsController do
 
   describe "routing" do
 
-    # default and scoped routes
+    # normal and scoped routes
     ['bigbluebutton', 'webconference'].each do |prefix|
 
       it {
-        {:get => "/#{prefix}/rooms"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "index")
+        {:get => "/#{prefix}/servers/server-1/rooms"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "index", :server_id => "server-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/new"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "new")
+        {:get => "/#{prefix}/servers/server-1/rooms/new"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "new", :server_id => "server-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "show", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/external"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "external", :server_id => "server-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/edit"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "edit", :id => "room-1")
+        {:post => "/#{prefix}/servers/server-1/rooms/external"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "external_auth", :server_id => "server-1")
       }
       it {
-        {:put => "/#{prefix}/rooms/room-1"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "update", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/edit"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "edit", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:delete => "/#{prefix}/rooms/room-1"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "destroy", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "show", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/external"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "external")
+        {:put => "/#{prefix}/servers/server-1/rooms/room-1"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "update", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:post => "/#{prefix}/rooms/external"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "external_auth")
+        {:delete => "/#{prefix}/servers/server-1/rooms/room-1"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "destroy", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/join"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "join", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/join"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "join", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/join_mobile"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "join_mobile" ,:id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/join_mobile"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "join_mobile", :server_id => "server-1" ,:id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/running"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "running", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/running"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "running", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/end"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "end", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/end"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "end", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:get => "/#{prefix}/rooms/room-1/invite"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "invite", :id => "room-1")
+        {:get => "/#{prefix}/servers/server-1/rooms/room-1/invite"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "invite", :server_id => "server-1", :id => "room-1")
       }
       it {
-        {:post => "/#{prefix}/rooms/room-1/join"}.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "auth", :id => "room-1")
+        {:post => "/#{prefix}/servers/server-1/rooms/room-1/join"}.
+        should route_to(:controller => "bigbluebutton/rooms", :action => "auth", :server_id => "server-1", :id => "room-1")
       }
 
     end
 
     # room matchers inside users
     it {
-      { :get => "/users/1/rooms" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "index",
-                      :user_id => "1")
+      should route(:get, "/users/1/room/room-1").
+        to(:action => :show, :user_id => "1", :id => "room-1")
     }
     it {
-      { :get => "/users/1/rooms/new" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "new",
-                      :user_id => "1")
+      should route(:get, "/users/1/room/room-1/join").
+        to(:action => :join, :user_id => "1", :id => "room-1")
     }
     it {
-      { :get => "/users/1/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "show",
-                      :user_id => "1", :id => "room-1")
+      should route(:get, "/users/1/room/room-1/join_mobile").
+        to(:action => :join_mobile, :user_id => "1", :id => "room-1")
     }
     it {
-      { :get => "/users/1/rooms/room-1/edit" }.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "edit",
-                        :user_id => "1", :id => "room-1")
+      should route(:get, "/users/1/room/room-1/running").
+        to(:action => :running, :user_id => "1", :id => "room-1")
     }
     it {
-      { :put => "/users/1/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "update",
-                      :user_id => "1", :id => "room-1")
+      should route(:get, "/users/1/room/room-1/end").
+        to(:action => :end, :user_id => "1", :id => "room-1")
     }
     it {
-      { :delete => "/users/1/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "destroy",
-                      :user_id => "1", :id => "room-1")
+      should route(:get, "/users/1/room/room-1/invite").
+        to(:action => :invite, :user_id => "1", :id => "room-1")
     }
     it {
-      { :get => "/users/1/rooms/external" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "external",
-                      :user_id => "1")
+      should route(:post, "/users/1/room/room-1/join").
+        to(:action => :auth, :user_id => "1", :id => "room-1")
     }
-    it {
-      { :post => "/users/1/rooms/external" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "external_auth",
-                      :user_id => "1")
-    }
-    it {
-      { :get => "/users/1/rooms/room-1/join" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "join",
-                      :user_id => "1", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/rooms/room-1/join_mobile" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "join_mobile",
-                      :user_id => "1", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/rooms/room-1/running" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "running",
-                      :user_id => "1", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/rooms/room-1/end" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "end",
-                      :user_id => "1", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/rooms/room-1/invite" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "invite",
-                      :user_id => "1", :id => "room-1")
-    }
-    it {
-      { :post => "/users/1/rooms/room-1/join" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "auth",
-                      :user_id => "1", :id => "room-1")
-    }
-
 
     # room matchers inside users/spaces
+    # FIXME shoulda-matcher is not working here, why?
     it {
-      { :get => "/users/1/spaces/2/rooms" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "index",
-                      :user_id => "1", :space_id => "2")
-    }
-    it {
-      { :get => "/users/1/spaces/2/rooms/new" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "new",
-                      :user_id => "1", :space_id => "2")
-    }
-    it {
-      { :get => "/users/1/spaces/2/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "show",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/spaces/2/rooms/room-1/edit" }.
-        should route_to(:controller => "bigbluebutton/rooms", :action => "edit",
-                        :user_id => "1", :space_id => "2", :id => "room-1")
-    }
-    it {
-      { :put => "/users/1/spaces/2/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "update",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
-    }
-    it {
-      { :delete => "/users/1/spaces/2/rooms/room-1" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "destroy",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
-    }
-    it {
-      { :get => "/users/1/spaces/2/rooms/external" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "external",
-                      :user_id => "1", :space_id => "2")
-    }
-    it {
-      { :post => "/users/1/spaces/2/rooms/external" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "external_auth",
-                      :user_id => "1", :space_id => "2")
+      { :get => "/users/1/spaces/2/room/room-1" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "show", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :get => "/users/1/spaces/2/rooms/room-1/join" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "join",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :get => "/users/1/spaces/2/room/room-1/join" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "join", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :get => "/users/1/spaces/2/rooms/room-1/join_mobile" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "join_mobile",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :get => "/users/1/spaces/2/room/room-1/join_mobile" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "join_mobile", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :get => "/users/1/spaces/2/rooms/room-1/running" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "running",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :get => "/users/1/spaces/2/room/room-1/running" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "running", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :get => "/users/1/spaces/2/rooms/room-1/end" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "end",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :get => "/users/1/spaces/2/room/room-1/end" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "end", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :get => "/users/1/spaces/2/rooms/room-1/invite" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "invite",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :get => "/users/1/spaces/2/room/room-1/invite" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "invite", :user_id => "1", :space_id => "2", :id => "room-1")
     }
     it {
-      { :post => "/users/1/spaces/2/rooms/room-1/join" }.
-      should route_to(:controller => "bigbluebutton/rooms", :action => "auth",
-                      :user_id => "1", :space_id => "2", :id => "room-1")
+      { :post => "/users/1/spaces/2/room/room-1/join" }.
+      should route_to(:controller => "bigbluebutton/rooms", :action => "auth", :user_id => "1", :space_id => "2", :id => "room-1")
     }
  end
 

data/spec/routing/bigbluebutton/servers_routing_spec.rb

@@ -5,7 +5,7 @@ describe Bigbluebutton::ServersController do
 
   describe "routing" do
 
-    # default and scoped routes
+    # normal and scoped routes
     ['bigbluebutton', 'webconference'].each do |prefix|
       it {
         {:get => "/#{prefix}/servers"}.
@@ -35,14 +35,6 @@ describe Bigbluebutton::ServersController do
         {:delete => "/#{prefix}/servers/server-1"}.
         should route_to(:controller => "bigbluebutton/servers", :action => "destroy", :id => "server-1")
       }
-      it {
-        {:get => "/#{prefix}/servers/server-1/activity"}.
-        should route_to(:controller => "bigbluebutton/servers", :action => "activity", :id => "server-1")
-      }
-      it {
-        {:get => "/#{prefix}/servers/server-1/rooms"}.
-        should route_to(:controller => "bigbluebutton/servers", :action => "rooms", :id => "server-1")
-      }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigbluebutton_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-05-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75116260 !ruby/object:Gem::Requirement
+  requirement: &82688600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *75116260
+  version_requirements: *82688600
 - !ruby/object:Gem::Dependency
   name: bigbluebutton-api-ruby
-  requirement: &75115360 !ruby/object:Gem::Requirement
+  requirement: &82686790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75115360
+  version_requirements: *82686790
 description: It allows you to interact with BigBlueButton from your Ruby on Rails
   application
 email: mconf-dev@googlegroups.com
@@ -57,7 +57,6 @@ files:
 - app/models/bigbluebutton_room.rb
 - app/models/bigbluebutton_server.rb
 - app/views/bigbluebutton/rooms/_form.html.erb
-- app/views/bigbluebutton/rooms/_rooms.html.erb
 - app/views/bigbluebutton/rooms/edit.html.erb
 - app/views/bigbluebutton/rooms/external.html.erb
 - app/views/bigbluebutton/rooms/index.html.erb
@@ -72,7 +71,6 @@ files:
 - app/views/bigbluebutton/servers/edit.html.erb
 - app/views/bigbluebutton/servers/index.html.erb
 - app/views/bigbluebutton/servers/new.html.erb
-- app/views/bigbluebutton/servers/rooms.html.erb
 - app/views/bigbluebutton/servers/show.html.erb
 - bigbluebutton_rails.gemspec
 - config/locales/en.yml
@@ -166,6 +164,7 @@ files:
 - spec/rails_app/features/step_definitions/list_and_show_rooms_steps.rb
 - spec/rails_app/features/step_definitions/list_and_show_servers_steps.rb
 - spec/rails_app/features/step_definitions/web_steps.rb
+- spec/rails_app/features/support/application_controller.rb
 - spec/rails_app/features/support/configurations.rb
 - spec/rails_app/features/support/content.rb
 - spec/rails_app/features/support/env.rb
@@ -173,8 +172,6 @@ files:
 - spec/rails_app/features/support/factories/bigbluebutton_server_integration.rb
 - spec/rails_app/features/support/hooks.rb
 - spec/rails_app/features/support/locales.rb
-- spec/rails_app/features/support/patches/application_controller.rb
-- spec/rails_app/features/support/patches/bigbluebutton_room.rb
 - spec/rails_app/features/support/paths.rb
 - spec/rails_app/features/support/selectors.rb
 - spec/rails_app/features/support/templates.rb
@@ -225,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -99991885
+      hash: -350868175
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -99991885
+      hash: -350868175
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/views/bigbluebutton/rooms/_rooms.html.erb

@@ -1,37 +0,0 @@
-<div id="bbbrails_rooms_links">
-  <%= link_to('View servers list', bigbluebutton_servers_path) %><br/>
-  <%= link_to('New room', new_bigbluebutton_room_path) %>
-</div>
-
-<ul id="bbbrails_rooms_list">
-  <% @rooms.each do |room| %>
-    <li>
-      <div class="field">
-        <label><%= BigbluebuttonRoom.human_attribute_name(:server_id) %></label> <%= room.server_id %>
-        <%= link_to('(view server)', bigbluebutton_server_path(room.server)) unless room.server.nil? %>
-      </div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:meetingid) %></label> <%= room.meetingid %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:randomize_meetingid) %></label> <%= room.randomize_meetingid %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:name) %></label> <%= room.name %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:private) %></label> <%= room.private %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:attendee_password) %></label> <%= room.attendee_password %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:moderator_password) %></label> <%= room.moderator_password %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:welcome_msg) %></label> <%= room.welcome_msg %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:logout_url) %></label> <%= room.logout_url %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:dial_number) %></label> <%= room.dial_number %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:voice_bridge) %></label> <%= room.voice_bridge %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:max_participants) %></label> <%= room.max_participants %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:external) %></label> <%= room.external %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:param) %></label> <%= room.param %></div>
-      <div class="field"><label>Access</label>
-        <%= link_to 'Show', bigbluebutton_room_path(room) %> |
-        <%= link_to 'Join', join_bigbluebutton_room_path(room) %> |
-        <%= link_to 'Invite', invite_bigbluebutton_room_path(room) %> |
-        <%= link_to 'Mobile Join', join_mobile_bigbluebutton_room_path(room) %> |
-        <%= link_to 'Edit', edit_bigbluebutton_room_path(room) %> |
-        <%= link_to 'End', end_bigbluebutton_room_path(room), :confirm => 'Are you sure?' %> |
-        <%= link_to 'Destroy', bigbluebutton_room_path(room), :confirm => 'Are you sure?', :method => :delete %>
-      </div>
-    </li>
-  <% end %>
-</ul>

data/app/views/bigbluebutton/servers/rooms.html.erb

@@ -1,2 +0,0 @@
-<h1>Listing rooms for the server <%= @server.name %>:</h1>
-<%= render 'bigbluebutton/rooms/rooms' %>

data/spec/rails_app/features/support/patches/bigbluebutton_room.rb

@@ -1,9 +0,0 @@
-class BigbluebuttonRoom < ActiveRecord::Base
-
-  protected
-
-  def select_server
-    self.server
-  end
-
-end