bigbluebutton_rails 0.1.0 → 0.1.1

data/spec/routing/bigbluebutton/custom_controllers_routing_spec.rb

@@ -34,51 +34,67 @@ describe ActionController do
       {:delete => "/custom/servers/1"}.
       should route_to(:controller => "custom_servers", :action => "destroy", :id => "1")
     }
+    it {
+      {:get => "/custom/servers/1/activity"}.
+      should route_to(:controller => "custom_servers", :action => "activity", :id => "1")
+    }
 
     # custom controllers - rooms
     it {
-      {:get => "/custom/servers/1/rooms"}.
-      should route_to(:controller => "custom_rooms", :action => "index", :server_id => "1")
+      {:get => "/custom/rooms"}.
+      should route_to(:controller => "custom_rooms", :action => "index")
+    }
+    it {
+      {:get => "/custom/rooms/new"}.
+      should route_to(:controller => "custom_rooms", :action => "new")
+    }
+    it {
+      {:get => "/custom/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "show", :id => "1")
+    }
+    it {
+      {:get => "/custom/rooms/1/edit"}.
+      should route_to(:controller => "custom_rooms", :action => "edit", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/new"}.
-      should route_to(:controller => "custom_rooms", :action => "new", :server_id => "1")
+      {:put => "/custom/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "update", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1/edit"}.
-      should route_to(:controller => "custom_rooms", :action => "edit", :server_id => "1", :id => "1")
+      {:delete => "/custom/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "destroy", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "show", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/external"}.
+      should route_to(:controller => "custom_rooms", :action => "external")
     }
     it {
-      {:put => "/custom/servers/1/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "update", :server_id => "1", :id => "1")
+      {:post => "/custom/rooms/external"}.
+      should route_to(:controller => "custom_rooms", :action => "external_auth")
     }
     it {
-      {:delete => "/custom/servers/1/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "destroy", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "join", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1/join"}.
-      should route_to(:controller => "custom_rooms", :action => "join", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/1/join_mobile"}.
+      should route_to(:controller => "custom_rooms", :action => "join_mobile" ,:id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1/running"}.
-      should route_to(:controller => "custom_rooms", :action => "running", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/1/running"}.
+      should route_to(:controller => "custom_rooms", :action => "running", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1/end"}.
-      should route_to(:controller => "custom_rooms", :action => "end", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/1/end"}.
+      should route_to(:controller => "custom_rooms", :action => "end", :id => "1")
     }
     it {
-      {:get => "/custom/servers/1/rooms/1/invite"}.
-      should route_to(:controller => "custom_rooms", :action => "invite", :server_id => "1", :id => "1")
+      {:get => "/custom/rooms/1/invite"}.
+      should route_to(:controller => "custom_rooms", :action => "invite", :id => "1")
     }
     it {
-      {:post => "/custom/servers/1/rooms/1/join"}.
-      should route_to(:controller => "custom_rooms", :action => "auth", :server_id => "1", :id => "1")
+      {:post => "/custom/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "auth", :id => "1")
     }
 
   end

data/spec/routing/bigbluebutton/rooms_routing_spec.rb

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

data/spec/routing/bigbluebutton/servers_routing_spec.rb

@@ -5,7 +5,7 @@ describe Bigbluebutton::ServersController do
 
   describe "routing" do
 
-    # normal and scoped routes
+    # default and scoped routes
     ['bigbluebutton', 'webconference'].each do |prefix|
       it {
         {:get => "/#{prefix}/servers"}.
@@ -35,6 +35,14 @@ 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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &82484000 !ruby/object:Gem::Requirement
+  requirement: &75116260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82484000
+  version_requirements: *75116260
 - !ruby/object:Gem::Dependency
   name: bigbluebutton-api-ruby
-  requirement: &82482980 !ruby/object:Gem::Requirement
+  requirement: &75115360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *82482980
+  version_requirements: *75115360
 description: It allows you to interact with BigBlueButton from your Ruby on Rails
   application
 email: mconf-dev@googlegroups.com
@@ -57,6 +57,7 @@ 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
@@ -71,6 +72,7 @@ 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
@@ -164,7 +166,6 @@ 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
@@ -172,6 +173,8 @@ 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
@@ -222,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1011782033
+      hash: -99991885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1011782033
+      hash: -99991885
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10