talking_stick 0.0.1 → 1.0.0

data/app/views/talking_stick/rooms/new.html.erb

@@ -1,5 +1,7 @@
-<h1>New Room</h1>
+<div class="container"> 
 
-<%= render 'form' %>
+  <h1>New Room</h1>
 
-<%= link_to 'Back', rooms_path %>
+  <%= render 'form' %>
+
+</div>

data/app/views/talking_stick/rooms/show.html.erb

@@ -1,22 +1,48 @@
-<p id="notice"><%= notice %></p>
+<% content_for(:title) { "#{@room.name} Group Conversation" } %>
+<div class="container-fluid" role="main" id="room" data-room-name="<%= @room.name %>">
+  <div class="row">
+    <div class="col-xs-3">
+      <div class="row">
+        <div class="col-xs-12">
+          <div id="localvideo-container"></div>
+        </div>
+        <div class="col-xs-12">
+          <span class="navbar-brand"><%= @room.name %></span>
+        </div>
+      </div>
+    </div>
+    <div class="col-xs-9">
+      <div id="partnervideos"></div>
+    </div>
+  </div>
+</div>
 
-<p>
-  <strong>Name:</strong>
-  <%= @room.name %>
-</p>
-
-<p>
-  <button id="connect">Connect to room</button>
-</p>
-
-<video id="localvideo"></video>
-<div id="partnerVideos"></div>
-
-<%= link_to 'Edit', edit_room_path(@room) %> |
-<%= link_to 'Back', rooms_path %>
+<div class="modal fade" role="dialog" id="video-preview">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h3 class="modal-title"><%= t(:joining_room) %> "<%= @room.name %>"</h3>
+      </div>
+      <div class="modal-body">
+        <video id="localvideo" poster="<%= image_path 'talking_stick/line-spinner.svg' %>" autoplay=true></video>
+        <p id="preview_instructions"><%= t(:video_grant_access) %></p>
+      </div>
+      <div class="modal-footer">
+        <button id="connect" type="button" class="btn btn-default btn-primary" data-dismiss="modal" disabled>Join</button>
+        <%= link_to "Exit", :back, class: 'btn btn-default' %>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
 <script type="text/javascript">
 $(document).ready(function() {
+  $('#sim').click(sim);
+  // Attempt to keep the modal from scrolling vertically
+  // 300px is the approximate height of the modal, minus the video
+  $('#video-preview').find('video').height($(window).height() - 300);
+  $('#video-preview').modal({backdrop: 'static', keyboard: false, show: true});
   var myGuid = TalkingStick.generateGUID();
   // Use the least-common-denominator, Rails API, for WebRTC setup
   var options = {
@@ -27,14 +53,61 @@ $(document).ready(function() {
 
   var options = {
     guid: myGuid,
-    localVideo: $('#localvideo'),
     roomUrl: '<%= room_path %>',
     signalingEngine: signalingEngine,
-    logLevel: 'debug',
+    logLevel: 'trace',
   };
   TalkingStick.init(options);
 
-  $('#connect').click(TalkingStick.connect);
-  
+  $('#connect').click(startSession);
+  $(window).on('talking_stick.local_media_setup', function() {
+    $('#preview_instructions').html('<%= t(:video_intro) %>');
+    $('form#connect input[name="join"]').attr('disabled', false);
+  });
 });
+
+function startSession() {
+  $('#localvideo').detach().appendTo('#localvideo-container');
+  $('#localvideo').height('auto');
+  // Gotta restart and re-mute the video after moving it
+  $('#localvideo')[0].play();
+  TalkingStick.connect();
+};
+
+function resizeVideos() {
+  var videoCollection = $('#partnervideos video');
+  var numVideos = videoCollection.length;
+  var square = Math.sqrt(numVideos);
+  if (!isInt(square)) {
+    // Round up to the next square
+    square = parseInt(square) + 1;
+  }
+  console.log(square);
+  videoCollection.css('width', (100/square) + "%");
+};
+
+function cleanupPartner() {
+  resizeVideos();
+}
+
+function sim() {
+  var el = $(document.createElement('video'));
+  el.attr('poster', "<%= image_path 'talking_stick/line-spinner.svg' %>");
+  $('#partnervideos').append(el);
+  TalkingStick.localVideo = $('#localvideo');
+  TalkingStick.trigger('partner.media', el);
+}
+
+function isInt(value){
+  if((parseFloat(value) == parseInt(value)) && !isNaN(value)){
+    return true;
+  } else {
+    return false;
+  }
+}
+
+$(window).on('talking_stick.partner.media', resizeVideos);
+$(window).on('talking_stick.partner.cleanup', cleanupPartner);
+$(window).resize(resizeVideos);
+
 </script>

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  camera: camera
+  destroy: Destroy
+  edit: Edit
+  join: Join
+  last_used: Last Used
+  last_used_never: Never
+  listing_rooms: Listing Rooms
+  microphone: microphone
+  name: Name
+  new_room: New Room
+  show: Show
+  your_name: Your name
+  video_grant_access: To join this conversation you'll need to grant access to the camera and microphone.
+  video_intro: Put on pants (optional), check your hair (required), and press "Join" when you're ready to start!

data/config/locales/it.yml

@@ -0,0 +1,14 @@
+it:
+  camera: fotocamera
+  destroy: Distruggere
+  edit: Modifica
+  join: Unirsi
+  last_used: Ultimo Uso
+  listing_rooms: Lista Camere
+  microphone: microfono
+  name: Nome
+  new_room: Creo Camere
+  show: Mostrare
+  your_name: Il tuo nome
+  video_grant_access: Per partecipare a questa conversazione è necessario concedere l'accesso alla videocamera e al microfono.
+  video_intro: Indossare pantaloni (opzionale), controlla i tuoi capelli (richiesto), e premere "Unirsi" quando si è pronti per iniziare!

data/db/migrate/20150722200822_add_slug_to_talking_stick_rooms.rb

@@ -0,0 +1,11 @@
+class AddSlugToTalkingStickRooms < ActiveRecord::Migration
+  def up
+    add_column :talking_stick_rooms, :slug, :string
+    # Add slugs to the existing rooms
+    TalkingStick::Room.all.map &:save
+  end
+
+  def down
+    remove_column :talking_stick_rooms, :slug
+  end
+end

data/lib/generators/talking_stick/views/USAGE

@@ -0,0 +1,18 @@
+Description:
+  Creates default participant and room views available for customization
+
+Run:
+  rails generate talking_stick:views
+
+This will create the following default views:
+  app/views/talking_stick/participants/_form.html.erb
+  app/views/talking_stick/participants/edit.html.erb
+  app/views/talking_stick/participants/index.html.erb
+  app/views/talking_stick/participants/new.html.erb
+  app/views/talking_stick/participants/show.html.erb
+
+  app/views/talking_stick/rooms/_form.html.erb
+  app/views/talking_stick/rooms/edit.html.erb
+  app/views/talking_stick/rooms/index.html.erb
+  app/views/talking_stick/rooms/new.html.erb
+  app/views/talking_stick/rooms/show.html.erb

data/lib/generators/talking_stick/views/views_generator.rb

@@ -0,0 +1,18 @@
+class TalkingStick::ViewsGenerator < Rails::Generators::Base
+  source_root File.expand_path('../../../../../app/views/talking_stick', __FILE__)
+
+  def generate_participant_views
+    directory "participants", "#{paste_path}/participants"
+  end
+
+  def generate_room_views
+    directory "rooms", "#{paste_path}/rooms"
+  end
+
+private
+
+  def paste_path
+    'app/views/talking_stick'
+  end
+
+end

data/lib/talking_stick/version.rb

@@ -1,3 +1,3 @@
 module TalkingStick
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -11,3 +11,4 @@
 // about supported directives.
 //
 //= require_tree .
+//= require talking_stick/application.js

data/spec/dummy/app/assets/stylesheets/application.css

@@ -12,4 +12,5 @@
  *
  *= require_tree .
  *= require_self
+ *= require talking_stick/application
  */

data/spec/models/talking_stick/participant_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module TalkingStick
   RSpec.describe Participant, type: :model do

data/spec/models/talking_stick/room_spec.rb

@@ -1,7 +1,37 @@
-require 'rails_helper'
+require 'spec_helper'
 
 module TalkingStick
   RSpec.describe Room, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
+    describe "#validation" do
+      subject { described_class.new(name: "Test") }
+
+      it "automatically sluggifys the room name" do
+        expect {
+          subject.valid?
+        }.to change{ subject.slug }.from(nil).to("test")
+      end
+
+      it "allows the slug to be set by manually" do
+        subject.slug = "dont_touch"
+        expect {
+          subject.valid?
+        }.to_not change{ subject.slug }.from("dont_touch")
+      end
+    end
+
+    describe ".find_or_create" do
+      it "uses a room if it already exists" do
+        existing = described_class.create(name: "Test")
+
+        expect(described_class.find_or_create(slug: "test")).to eq existing
+        expect(described_class.count).to eq 1
+      end
+
+      it "creates a room if the slug doesn't exist" do
+        expect {
+          described_class.find_or_create(slug: "Test")
+        }.to change(described_class, :count).by(1)
+      end
+    end
   end
 end

data/talking_stick.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails', '~> 4.0'
 
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'factory_girl_rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talking_stick
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -104,13 +132,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- Changes.md
 - Gemfile
+- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
 - app/assets/images/talking_stick/.keep
+- app/assets/images/talking_stick/line-spinner.svg
+- app/assets/images/talking_stick/loading.gif
 - app/assets/javascripts/talking_stick/application.js
-- app/assets/javascripts/talking_stick/talking_stick.js
+- app/assets/javascripts/talking_stick/talking_stick.js.erb
 - app/assets/javascripts/talking_stick/talking_stick/partner.js
 - app/assets/javascripts/talking_stick/talking_stick/rails_signaling.js
 - app/assets/stylesheets/talking_stick/application.css
@@ -121,7 +153,6 @@ files:
 - app/models/talking_stick/participant.rb
 - app/models/talking_stick/room.rb
 - app/models/talking_stick/signal.rb
-- app/views/layouts/talking_stick/application.html.erb
 - app/views/talking_stick/participants/_form.html.erb
 - app/views/talking_stick/participants/edit.html.erb
 - app/views/talking_stick/participants/index.html.erb
@@ -133,10 +164,15 @@ files:
 - app/views/talking_stick/rooms/new.html.erb
 - app/views/talking_stick/rooms/show.html.erb
 - bin/rails
+- config/locales/en.yml
+- config/locales/it.yml
 - config/routes.rb
 - db/migrate/20150510181337_create_talking_stick_rooms.rb
 - db/migrate/20150510182258_create_talking_stick_participants.rb
 - db/migrate/20150511005922_create_talking_stick_signals.rb
+- db/migrate/20150722200822_add_slug_to_talking_stick_rooms.rb
+- lib/generators/talking_stick/views/USAGE
+- lib/generators/talking_stick/views/views_generator.rb
 - lib/talking_stick.rb
 - lib/talking_stick/engine.rb
 - lib/talking_stick/version.rb
@@ -207,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy group-based video conversations for Rails with WebRTC
@@ -256,3 +292,4 @@ test_files:
 - spec/models/talking_stick/participant_spec.rb
 - spec/models/talking_stick/room_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/app/assets/javascripts/talking_stick/talking_stick.js

@@ -1,141 +0,0 @@
-var TalkingStick = (function(self) {
-  self.guid         = undefined;
-  self.myStream     = undefined;
-  self.joinedAt     = undefined;
-  self._options = {
-    media: { audio: true, video: true },
-    localVideo: undefined, // Set this to the DOM element where video should be rendered
-    logLevel: 'error',
-  };
-
-  self.logLevels = [
-    'trace',
-    'debug',
-    'notice',
-    'warning',
-    'error',
-  ];
-
-  self.init = function(options) {
-    $.extend(self._options, options);
-
-    self.logLevelIdx = self.logLevels.indexOf(self._options.logLevel);
-    self.partners = {};
-    self.guid = self._options.guid || self.generateGUID();
-    self.signalingEngine = self._options.signalingEngine;
-    self.setupLocalVideo();
-    self.log('notice', 'TalkingStick initialized.');
-  };
-
-  self.log = function() {
-    var level = arguments[0];
-    var levelIdx = self.logLevels.indexOf(level);
-    if (levelIdx >= self.logLevelIdx) {
-      var args = Array.prototype.slice.call(arguments, 1);
-      args.unshift('[' + level + ']');
-      switch(levelIdx) {
-      case 4:
-        console.error.apply(console, args);
-        break;
-      case 3:
-        console.warn.apply(console, args);
-        break;
-      default:
-        console.log.apply(console, args);
-        break;
-      }
-    }
-  }
-
-  self.setupLocalVideo = function() {
-    var localVideo = $(self._options.localVideo);
-
-    self.prepareVideoElement(localVideo);
-
-    self.log('debug', 'Requesting user consent to access to input devices');
-    navigator.getUserMedia(self._options.media, function(stream) {
-      self.log('debug', 'User has granted access to input devices');
-      self.myStream = stream;
-
-      // The JS API requires the raw DOM element, not a jQuery wrapper
-      attachMediaStream(localVideo[0], stream);
-    }, self.errorCallback);
-  };
-
-  self.connect = function() {
-    // Tell the server we're ready to start contacting the other participants
-    var data = {
-      participant: {
-        guid: self.guid,
-      }
-    }
-    $.post(self._options.roomUrl + '/participants.json', data)
-    .success(function(data) {
-      self.log('notice', 'TalkingStick connected to the room.');
-      self.joinedAt = new Date(data.joined_at);
-      self.signalingEngine.connected();
-    })
-    .fail(function() { self.ajaxErrorLog('Error joining the room', arguments) });
-  };
-
-  
-  self.errorCallback = function(error) {
-    self.log('error', error);
-  };
-  
-  /*
-   * participant.guid
-   * participant.joined_at
-   */
-  self.addPartner = function(participant) {
-    self.log('debug', 'Adding new partner to this conversation', participant);
-    var partnerVideo = document.createElement('video');
-    self.prepareVideoElement(partnerVideo);
-    $('#partnerVideos').append(partnerVideo);
-    var options = {
-      videoElement: partnerVideo,
-      signalingEngine: self.signalingEngine,
-    }
-
-    partner = new TalkingStick.Partner(participant, options);
-    self.partners[participant.guid] = partner;
-
-    partner.connect(self.myStream);
-
-    if (partner.joinedAt < TalkingStick.joinedAt) {
-      self.log('trace', 'Sending Offer to', partner.guid);
-      // Send Offers to partners who joined before us.
-      // Expect partners who join after us to send us Offers.
-      partner.sendOffer();
-    }
-
-    return partner;
-  };
-
-  self.prepareVideoElement = function(el) {
-    el = $(el);
-
-    // Ensure video streams play as soon as they are attached
-    el.attr('autoplay', true);
-
-    // Prevent local audio feedback
-    el.attr('muted', true);
-  };
-
-  self.generateGUID = function () {
-    function s4() {
-      return Math.floor((1 + Math.random()) * 0x10000)
-        .toString(16)
-        .substring(1);
-    }
-    return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
-      s4() + '-' + s4() + s4() + s4();
-  };
-
-  self.ajaxErrorLog = function(message, ajaxFailArgs) {
-    // ajaxFailArgs: 0: jqXHR; 1: textStatus; 2: errorThrown
-    self.log('error', message + ':', ajaxFailArgs[2]);
-  }
-
-  return self;
-}(TalkingStick || {}));