talking_stick 1.0.0 → 2.0.0

data/Changes.md

@@ -1,3 +1,11 @@
+# develop
+
+# [2.0.0](https://github.com/mojolingo/talking_stick/compare/v1.0.0...v2.0.0) - [2017-10-11](https://rubygems.org/gems/talking_stick/versions/2.0.0)
+* *Breaking* HTML elements prefixed with `talking-stick-`
+* Improve ability to embed this engine into existing Rails applications by disabling `isolate_engine`
+* We dropped support for Rails < 4.2
+* Support for Rails 4.2 and Rails 5.0
+
 # [1.0.0](https://github.com/mojolingo/talking_stick/compare/v0.0.1...v1.0.0) - [2016-01-02](https://rubygems.org/gems/talking_stick/versions/1.0.0)
 * First stable version of Talking Stick - see [README](https://github.com/mojolingo/talking_stick/blob/v1.0.0/README.md) for details
 

data/Gemfile

@@ -13,3 +13,4 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -2,6 +2,7 @@
 
 This gem provides easy [WebRTC](https://webrtc.org) communication in any Rails app.
 
+[![Code Climate](https://codeclimate.com/github/mojolingo/talking_stick/badges/gpa.svg)](https://codeclimate.com/github/mojolingo/talking_stick)
 
 ## Goals
 
@@ -9,7 +10,7 @@ This gem provides easy [WebRTC](https://webrtc.org) communication in any Rails a
 * Allow selecting audio or audio+video
 * Pluggable signaling delivery technology
 * Plug & Play functionality - works out of the box
-* Focus on simplicity at the API level, while maximizing the possibilites of integrating communication into existing Rails apps
+* Focus on simplicity at the API level, while maximizing the possibilities of integrating communication into existing Rails apps
 
 ## Installation
 
@@ -33,7 +34,7 @@ TalkingStick is built as a Rails Engine, and so follows those conventions.
 3. Install and Run migration
     To add the required models to your application, the migrations must be copied and run:
     ```
-    $ rake railties:install:migrations db:migrate
+    $ rake talking_stick:install:migrations db:migrate
     ```
 
 4. Import Assets
@@ -42,9 +43,9 @@ TalkingStick is built as a Rails Engine, and so follows those conventions.
     ```javascript
     //= require talking_stick/application
     ```
-    
+
     And the following to your application's `assets/stylesheets/application.scss`:
-    
+
     ```css
     *= require talking_stick/application
     ```
@@ -139,8 +140,8 @@ The Talking Stick is a tradition among Native American (and other) cultures whic
 
 This project is licensed under the MIT License. This project incorporates [Adapter.js from the WebRTC.org team](https://github.com/webrtc/adapter), which is licensed under the Apache license.
 
-Copyright 2015 Mojo Lingo LLC
+Copyright 2015-2016 Mojo Lingo LLC
 
-Portions copyright 2014 The WebRTC project authors
+Portions copyright 2014-2016 The WebRTC project authors
 
 [Flikr2005](https://www.flickr.com/photos/flikr/371850310/) loading image courtesy Flickr user [Flikr](https://www.flickr.com/photos/flikr/)

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

@@ -105,9 +105,13 @@ TalkingStick.Partner.prototype.handleAnswer = function(answer) {
 };
 
 TalkingStick.Partner.prototype.handleRemoteICECandidate = function(candidate) {
+  var self = this;
   candidate = new RTCIceCandidate(candidate);
-  this.log('trace', 'Adding remote ICE candidate', candidate);
-  this.peerConnection.addIceCandidate(candidate);
+
+  this.peerConnection.addIceCandidate(candidate)
+    .then(function() { self.log('trace', 'Added remote ICE candidate', candidate) })
+    .catch(function(reason) { self.log('error', 'Error adding remote ICE candidate: ', reason) } )
+
 };
 
 TalkingStick.Partner.prototype.handleLocalICECandidate = function(event) {
@@ -141,7 +145,8 @@ TalkingStick.Partner.prototype.disconnect = function() {
 
 TalkingStick.Partner.prototype._attachMediaStream = function(stream) {
   this.log('trace', 'Attaching media stream');
-  var el = attachMediaStream(this.videoElement[0], stream);
+  var el = this.videoElement[0];
+  el.srcObject = stream;
   if (el) {
     // Compatibility with Temasys plugin
     // See https://temasys.atlassian.net/wiki/display/TWPP/How+to+integrate+the+Temasys+WebRTC+Plugin+into+your+website - "Attach streams"
@@ -158,4 +163,3 @@ TalkingStick.Partner._checkForConnection = function() {
     this.trigger('connection_timeout');
   }
 };
-

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

@@ -2,7 +2,7 @@ TalkingStick.RailsSignaling = function(options) {
   this.options = options;
   this.roomUrl = options.url;
   var self = this;
-  $('#localvideo').on('talking_stick.connected', function() { self.connected.apply(self)} );
+  $('#talking-stick-localvideo').on('talking_stick.connected', function() { self.connected.apply(self)} );
 }
 
 TalkingStick.RailsSignaling.prototype.connected = function() {
@@ -12,7 +12,7 @@ TalkingStick.RailsSignaling.prototype.connected = function() {
   var pollingInterval = setInterval(function() {
     signaling._updateRoom.apply(signaling);
   }, 3000);
-  $('#localvideo').on('talking_stick.disconnected', function() { clearInterval(pollingInterval); });
+  $('#talking-stick-localvideo').on('talking_stick.disconnected', function() { clearInterval(pollingInterval); });
 }
 
 TalkingStick.RailsSignaling.prototype.sendICECandidate = function(to, candidate) {

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

@@ -7,8 +7,8 @@ var TalkingStick = (function(self) {
   self.partners     = {};
   self._options = {
     media: { audio: true, video: true },
-    localVideo: '#localvideo',
-    partnerVideos: '#partnervideos',
+    localVideo: '#talking-stick-localvideo',
+    partnerVideos: '#talking-stick-partnervideos',
     connectionTimeout: 60000,
     logLevel: 'error',
     iceServers: [],
@@ -68,10 +68,10 @@ var TalkingStick = (function(self) {
   };
 
   self.detectDevices = function() {
-    if (typeof MediaStreamTrack === 'undefined' || typeof MediaStreamTrack.getSources === 'undefined') {
+    if (typeof navigator.mediaDevices === 'undefined' || typeof navigator.mediaDevices.enumerateDevices === 'undefined') {
       self.log('warning', 'MediaStreamTrack is not defined.  We will not be able to offer device selection.');
     } else {
-      MediaStreamTrack.getSources(self.handleDevices);
+      navigator.mediaDevices.enumerateDevices().then(self.handleDevices);
     }
   };
 
@@ -82,8 +82,8 @@ var TalkingStick = (function(self) {
       // Devices (SourceInfo) objects are read-only
       // Make a copy of the data here so we can apply default labels
       var tsDevice = {
-        id: "" + device.id,
-        label: "" + device.label,
+        id: "" + device.deviceId,
+        label: "" + (device.label || device.kind),
         facing: "" + device.facing,
         kind: "" + device.kind,
       }
@@ -135,7 +135,7 @@ var TalkingStick = (function(self) {
     self.localVideo[0].muted = true;
 
     self.log('debug', 'Requesting user consent to access to input devices');
-    getUserMedia(self._options.media, self._handleUserMedia, self._handleUserMediaFailure);
+    navigator.getUserMedia(self._options.media, self._handleUserMedia, self._handleUserMediaFailure);
   };
 
   self.muteAudio = function() {
@@ -166,12 +166,22 @@ var TalkingStick = (function(self) {
     return !self.myStream.getVideoTracks()[0].enabled;
   }
 
+  self.toggleAudio = function () {
+    self.audioMuted() ? self.unmuteAudio() : self.muteAudio();
+    return self.audioMuted();
+  }
+
+  self.toggleVideo = function () {
+    self.videoMuted() ? self.unmuteVideo() : self.muteVideo();
+    return self.videoMuted();
+  }
+
   self._handleUserMedia = 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(self.localVideo[0], stream);
+    self.localVideo[0].srcObject = stream;
 
     self.trigger('local_media_setup');
   };
@@ -189,7 +199,7 @@ var TalkingStick = (function(self) {
   self.connect = function(name) {
     // Tell the server we're ready to start contacting the other participants
     var data = {
-      participant: {
+      talking_stick_participant: {
         guid: self.guid,
         name: name
       }

data/app/controllers/talking_stick/application_controller.rb

@@ -1,6 +1,5 @@
 module TalkingStick
-  class ApplicationController < ActionController::Base
-    layout 'application'
+  class ApplicationController < ::ApplicationController
     before_action :set_locale
 
     def set_locale

data/app/controllers/talking_stick/participants_controller.rb

@@ -31,7 +31,6 @@ module TalkingStick
 
       respond_to do |format|
         if @participant.save
-          format.html { redirect_to [@room, @participant], notice: 'Participant was successfully created.' }
           format.json { render json: @participant }
         else
           render :new
@@ -42,7 +41,7 @@ module TalkingStick
     # PATCH/PUT /participants/1
     def update
       if @participant.update(participant_params)
-        redirect_to [@room, @participant], notice: 'Participant was successfully updated.'
+        redirect_to talking_stick.room_path(@room), notice: 'Participant was successfully updated.'
       else
         render :edit
       end
@@ -51,7 +50,7 @@ module TalkingStick
     # DELETE /participants/1
     def destroy
       @participant.destroy
-      redirect_to participants_url, notice: 'Participant was successfully destroyed.'
+      redirect_to talking_stick.room_path(@room), notice: 'Participant was successfully destroyed.'
     end
 
     private
@@ -66,7 +65,7 @@ module TalkingStick
 
       # Only allow a trusted parameter "white list" through.
       def participant_params
-        params.require(:participant).permit(:name, :ip, :guid)
+        params.require(:talking_stick_participant).permit(:name, :ip, :guid)
       end
   end
 end

data/app/controllers/talking_stick/rooms_controller.rb

@@ -50,7 +50,7 @@ module TalkingStick
       @room = Room.new(room_params)
 
       if @room.save
-        redirect_to @room, notice: 'Room was successfully created.'
+        redirect_to talking_stick.room_path(@room), url: talking_stick.room_path(@room), notice: 'Room was successfully created.'
       else
         render :new
       end
@@ -59,7 +59,7 @@ module TalkingStick
     # PATCH/PUT /rooms/1
     def update
       if @room.update(room_params)
-        redirect_to @room, notice: 'Room was successfully updated.'
+        redirect_to talking_stick.room_path(@room), notice: 'Room was successfully updated.'
       else
         render :edit
       end
@@ -68,7 +68,7 @@ module TalkingStick
     # DELETE /rooms/1
     def destroy
       @room.destroy
-      redirect_to rooms_url, notice: 'Room was successfully destroyed.'
+      redirect_to talking_stick.rooms_url, notice: 'Room was successfully destroyed.'
     end
 
     def signal
@@ -81,7 +81,8 @@ module TalkingStick
     end
 
     def deliver_signals!
-      data = TalkingStick::Signal.where recipient: @participant
+      return [] unless @participant
+      data = TalkingStick::Signal.where recipient_id: @participant.id
 
       # Destroy the signals as we return them, since they have been delivered
       result = []
@@ -115,7 +116,7 @@ module TalkingStick
 
       # Only allow a trusted parameter "white list" through.
       def room_params
-        params.require(:room).permit(:name, :last_used)
+        params.require(:talking_stick_room).permit(:name, :last_used)
       end
 
       def signal_params

data/app/models/talking_stick/application_record.rb

@@ -0,0 +1,5 @@
+module TalkingStick
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/talking_stick/participant.rb

@@ -1,5 +1,5 @@
 module TalkingStick
-  class Participant < ActiveRecord::Base
+  class Participant < ApplicationRecord
     belongs_to :room
     has_many :signals_sent, class_name: 'Signal', foreign_key: 'sender_id', dependent: :destroy
     has_many :signals_received, class_name: 'Signal', foreign_key: 'recipient_id', dependent: :destroy
@@ -12,7 +12,7 @@ module TalkingStick
 
     class << self
       def remove_stale!(room)
-        self.where(room: room).where('last_seen < ?', Time.now - 15.seconds).destroy_all
+        self.where(room_id: room.id).where('last_seen < ?', Time.now - 15.seconds).destroy_all
       end
     end
   end

data/app/models/talking_stick/room.rb

@@ -1,5 +1,5 @@
 module TalkingStick
-  class Room < ActiveRecord::Base
+  class Room < ApplicationRecord
     has_many :participants, dependent: :destroy
     has_many :signals, dependent: :destroy
 
@@ -7,7 +7,7 @@ module TalkingStick
 
     def self.find_or_create(slug:)
       slug = slug.parameterize
-      find_by(slug: slug) || create(name: slug.titleize, slug: slug)
+      where(slug: slug).first || create(name: slug.titleize, slug: slug)
     end
 
     def to_param

data/app/models/talking_stick/signal.rb

@@ -1,5 +1,5 @@
 module TalkingStick
-  class Signal < ActiveRecord::Base
+  class Signal < ApplicationRecord
     belongs_to :room
     belongs_to :sender, class_name: "TalkingStick::Participant"
     belongs_to :recipient, class_name: "TalkingStick::Participant"

data/app/views/talking_stick/participants/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([@room, @participant]) do |f| %>
+<%= form_for([@room, @participant], path: talking_stick.room_participant_path(@room, @participant)) do |f| %>
   <% if @participant.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@participant.errors.count, "error") %> prohibited this participant from being saved:</h2>

data/app/views/talking_stick/participants/edit.html.erb

@@ -3,4 +3,4 @@
 <%= render 'form' %>
 
 <%= link_to 'Show', [@room, @participant] %> |
-<%= link_to 'Back', room_participants_path %>
+<%= link_to 'Back', talking_stick.room_participants_path %>

data/app/views/talking_stick/participants/index.html.erb

@@ -17,7 +17,7 @@
         <td><%= participant.name %></td>
         <td><%= participant.ip %></td>
         <td><%= link_to 'Show', [@room, participant] %></td>
-        <td><%= link_to 'Edit', edit_room_participant_path(@room, participant) %></td>
+        <td><%= link_to 'Edit', talking_stick.edit_room_participant_path(@room, participant) %></td>
         <td><%= link_to 'Destroy', [@room, participant], method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
@@ -26,4 +26,4 @@
 
 <br>
 
-<%= link_to 'New Participant', new_room_participant_path(@room) %>
+<%= link_to 'New Participant', talking_stick.new_room_participant_path(@room) %>

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

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', room_participants_path %>
+<%= link_to 'Back', talking_stick.room_participants_path %>

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

@@ -10,5 +10,5 @@
   <%= @participant.ip %>
 </p>
 
-<%= link_to 'Edit', edit_room_participant_path(@room, @participant) %> |
-<%= link_to 'Back', room_participants_path %>
+<%= link_to 'Edit', talking_stick.edit_room_participant_path(@room, @participant) %> |
+<%= link_to 'Back', talking_stick.room_participants_path %>

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

@@ -1,4 +1,4 @@
-<%= form_for(@room) do |f| %>
+<%= form_for(@room, url: talking_stick.rooms_path) do |f| %>
   <% if @room.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@room.errors.count, "error") %> prohibited this room from being saved:</h2>
@@ -20,7 +20,7 @@
   <div class="form-group">
     <div id="form-submit-buttons" class="actions">
       <p><%= f.submit "Save", class: 'btn btn-success' %>
-        <span><%= link_to 'Back', rooms_path, class: 'btn btn-default pull-right' %></span>
+        <span><%= link_to 'Back', talking_stick.rooms_path, class: 'btn btn-default pull-right' %></span>
       </p>
     </div>
 

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

@@ -1,7 +1,7 @@
 <div class="container">
   <p id="notice"><%= notice %></p>
 
-  <%= link_to t(:new_room), new_room_path, class: 'btn btn-success pull-right' %>
+  <%= link_to t(:new_room), talking_stick.new_room_path, class: 'btn btn-success pull-right' %>
 
   <h1><%= t(:listing_rooms) %></h1>
 
@@ -22,9 +22,9 @@
         <tr>
           <td><%= room.name %></td>
           <td><%= room.last_used.try(:strftime, "%b %d, %l:%M %P") || t(:last_used_never) %></td>
-          <td><%= link_to 'Enter', room %></td>
-          <td><%= link_to t(:edit), edit_room_path(room) %></td>
-          <td><%= link_to t(:destroy), room, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          <td><%= link_to 'Enter', talking_stick.room_path(room) %></td>
+          <td><%= link_to t(:edit), talking_stick.edit_room_path(room) %></td>
+          <td><%= link_to t(:destroy), talking_stick.room_path(room), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -1,10 +1,10 @@
 <% content_for(:title) { "#{@room.name} Group Conversation" } %>
-<div class="container-fluid" role="main" id="room" data-room-name="<%= @room.name %>">
+<div class="container-fluid" role="main" id="talking-stick-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 id="talking-stick-localvideo-container"></div>
         </div>
         <div class="col-xs-12">
           <span class="navbar-brand"><%= @room.name %></span>
@@ -12,12 +12,12 @@
       </div>
     </div>
     <div class="col-xs-9">
-      <div id="partnervideos"></div>
+      <div id="talking-stick-partnervideos"></div>
     </div>
   </div>
 </div>
 
-<div class="modal fade" role="dialog" id="video-preview">
+<div class="modal fade" role="dialog" id="talking-stick-video-preview">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -25,12 +25,12 @@
         <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>
+        <video id="talking-stick-localvideo" poster="<%= image_path 'talking_stick/line-spinner.svg' %>" autoplay=true></video>
+        <p id="talking-stick-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' %>
+        <button id="talking-stick-connect" type="button" class="btn btn-default btn-primary" data-dismiss="modal" disabled>Join</button>
+        <%= link_to "Exit", "history.back()", class: 'btn btn-default' %>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
@@ -38,44 +38,43 @@
 
 <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});
+  $('#talking-stick-video-preview').find('video').height($(window).height() - 300);
+  $('#talking-stick-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 = {
-    url: '<%= room_path %>',
+    url: '<%= talking_stick.room_path %>',
     myGuid: myGuid,
   };
   var signalingEngine = new TalkingStick.RailsSignaling(options);
 
   var options = {
     guid: myGuid,
-    roomUrl: '<%= room_path %>',
+    roomUrl: '<%= talking_stick.room_path %>',
     signalingEngine: signalingEngine,
     logLevel: 'trace',
   };
   TalkingStick.init(options);
 
-  $('#connect').click(startSession);
+  $('#talking-stick-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);
+    $('#talking-stick-preview-instructions').html('<%= t(:video_intro) %>');
+    $('#talking-stick-connect').attr('disabled', false);
   });
 });
 
 function startSession() {
-  $('#localvideo').detach().appendTo('#localvideo-container');
-  $('#localvideo').height('auto');
+  $('#talking-stick-localvideo').detach().appendTo('#talking-stick-localvideo-container');
+  $('#talking-stick-localvideo').height('auto');
   // Gotta restart and re-mute the video after moving it
-  $('#localvideo')[0].play();
+  $('#talking-stick-localvideo')[0].play();
   TalkingStick.connect();
 };
 
 function resizeVideos() {
-  var videoCollection = $('#partnervideos video');
+  var videoCollection = $('#talking-stick-partnervideos video');
   var numVideos = videoCollection.length;
   var square = Math.sqrt(numVideos);
   if (!isInt(square)) {
@@ -93,8 +92,8 @@ function cleanupPartner() {
 function sim() {
   var el = $(document.createElement('video'));
   el.attr('poster', "<%= image_path 'talking_stick/line-spinner.svg' %>");
-  $('#partnervideos').append(el);
-  TalkingStick.localVideo = $('#localvideo');
+  $('#talking-stick-partnervideos').append(el);
+  TalkingStick.localVideo = $('#talking-stick-localvideo');
   TalkingStick.trigger('partner.media', el);
 }
 
@@ -106,6 +105,9 @@ function isInt(value){
   }
 }
 
+$(window).on('talking_stick.new_partner', function(ev, partner) {
+  $('#talking-stick-partnervideos').append(partner.videoElement);
+});
 $(window).on('talking_stick.partner.media', resizeVideos);
 $(window).on('talking_stick.partner.cleanup', cleanupPartner);
 $(window).resize(resizeVideos);

data/config/routes.rb

@@ -1,7 +1,7 @@
 TalkingStick::Engine.routes.draw do
-  resources :rooms do
-    resources :participants do
-      post 'signals', to: 'rooms#signal'
+  resources :rooms, controller: 'talking_stick/rooms' do
+    resources :participants, controller: 'talking_stick/participants' do
+      post 'signals', to: 'talking_stick/rooms#signal'
     end
   end
 end

data/db/migrate/20150510181337_create_talking_stick_rooms.rb

@@ -1,4 +1,4 @@
-class CreateTalkingStickRooms < ActiveRecord::Migration
+class CreateTalkingStickRooms < ActiveRecord::Migration[4.2]
   def change
     create_table :talking_stick_rooms do |t|
       t.string :name

data/db/migrate/20150510182258_create_talking_stick_participants.rb

@@ -1,4 +1,4 @@
-class CreateTalkingStickParticipants < ActiveRecord::Migration
+class CreateTalkingStickParticipants < ActiveRecord::Migration[4.2]
   def change
     create_table :talking_stick_participants do |t|
       t.string :name

data/db/migrate/20150511005922_create_talking_stick_signals.rb

@@ -1,4 +1,4 @@
-class CreateTalkingStickSignals < ActiveRecord::Migration
+class CreateTalkingStickSignals < ActiveRecord::Migration[4.2]
   def change
     create_table :talking_stick_signals do |t|
       t.belongs_to :room

data/db/migrate/20150722200822_add_slug_to_talking_stick_rooms.rb

@@ -1,4 +1,4 @@
-class AddSlugToTalkingStickRooms < ActiveRecord::Migration
+class AddSlugToTalkingStickRooms < ActiveRecord::Migration[4.2]
   def up
     add_column :talking_stick_rooms, :slug, :string
     # Add slugs to the existing rooms

data/lib/talking_stick/engine.rb

@@ -1,12 +1,18 @@
+require "jquery-rails"
+
 module TalkingStick
   class Engine < ::Rails::Engine
-    isolate_namespace TalkingStick
+    engine_name "talking_stick"
 
     config.generators do |g|
       g.test_framework      :rspec,        :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-      g.assets false
+      g.assets true
       g.helper false
     end
+
+    initializer "talking_stick.assets.precompile" do |app|
+      app.config.assets.precompile += %w( application.js application.css )
+    end
   end
 end

data/lib/talking_stick/version.rb

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

data/lib/talking_stick.rb

@@ -1,4 +1,8 @@
 require "talking_stick/engine"
 
 module TalkingStick
+  # Used to isolate Engine models by namespacing them
+  def self.table_name_prefix
+    "#{Engine.engine_name}_"
+  end
 end

data/spec/dummy/config/application.rb

@@ -24,9 +24,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
-

data/talking_stick.gemspec

@@ -17,13 +17,14 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency 'rails', '~> 4.0'
-  s.add_dependency 'jquery-rails', '~> 4.0'
+  s.add_dependency 'rails', '>= 4.2', '< 5.1'
+  s.add_dependency 'jquery-rails', '>= 4.2'
 
   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 'byebug'
   s.add_development_dependency 'factory_girl_rails'
 end