From 758740b69892c539c4bd0bcfe63cf7c38c617375 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:03:23 +0100
Subject: [PATCH 01/11] Update rails 4.1.6 -> 4.2.3

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 2534e5a..dc11743 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rails-assets.org'
 ruby '2.1.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.6'
+gem 'rails', '4.2.3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
 # Use Uglifier as compressor for JavaScript assets

From 777fc11c5633f8e2815ef4462e55778375f76b57 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:03:45 +0100
Subject: [PATCH 02/11] Add actioncable & puma

---
 Gemfile      |   2 +
 Gemfile.lock | 147 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/Gemfile b/Gemfile
index dc11743..1fa31fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,8 @@ gem 'spring',        group: :development
 gem "autoprefixer-rails"
 gem 'rails-assets-angular', "1.3.0.rc.4"
 gem 'pusher'
+gem 'actioncable', github: "rails/actioncable"
+gem 'puma'
 
 group :production, :staging do
   gem 'pg'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9eaced5..1f7f6fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,34 +1,56 @@
+GIT
+  remote: git://github.com/rails/actioncable.git
+  revision: c7dc339b1dbdb1982d82536d87b6e654e7b7108d
+  specs:
+    actioncable (0.1.0)
+      actionpack (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      celluloid (~> 0.16.0)
+      em-hiredis (~> 0.3.0)
+      faye-websocket (~> 0.9.2)
+      redis (~> 3.0)
+      websocket-driver (= 0.5.4)
+
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     autoprefixer-rails (2.2.0.20140727)
       execjs
     better_errors (1.0.1)
@@ -37,6 +59,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -51,56 +75,84 @@ GEM
     dotenv-deployment (0.0.2)
     dotenv-rails (0.11.1)
       dotenv (= 0.11.1)
+    em-hiredis (0.3.0)
+      eventmachine (~> 1.0)
+      hiredis (~> 0.5.0)
     erubis (2.7.0)
+    eventmachine (1.0.7)
     execjs (2.2.1)
+    faye-websocket (0.9.2)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
+    hiredis (0.5.2)
+    hitimes (1.2.2)
     httpclient (2.4.0)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jbuilder (2.1.3)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.6.1)
+    json (1.8.3)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.3)
-    minitest (5.4.2)
-    multi_json (1.10.1)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.2)
     mysql2 (0.3.16)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     pg (0.17.0)
+    puma (2.11.3)
+      rack (>= 1.1, < 2.0)
     pusher (0.14.1)
       httpclient (~> 2.3)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.3)
+      sprockets-rails
     rails-assets-angular (1.3.0.rc.4)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (4.1.2)
       json (~> 1.4)
+    redis (3.2.1)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -117,13 +169,15 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
     turbolinks (2.4.0)
       coffee-rails
     tzinfo (1.2.2)
@@ -131,11 +185,15 @@ GEM
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    websocket-driver (0.5.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actioncable!
   autoprefixer-rails
   better_errors
   binding_of_caller
@@ -145,8 +203,9 @@ DEPENDENCIES
   jquery-rails
   mysql2
   pg
+  puma
   pusher
-  rails (= 4.1.6)
+  rails (= 4.2.3)
   rails-assets-angular (= 1.3.0.rc.4)
   rails_12factor
   sass-rails (~> 4.0.3)

From 28e6b5f392ce57e1a7ce9fa524b5e213eab35d6b Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:04:05 +0100
Subject: [PATCH 03/11] Add cable bin file and config

---
 bin/cable       | 2 ++
 cable/config.ru | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100755 bin/cable
 create mode 100755 cable/config.ru

diff --git a/bin/cable b/bin/cable
new file mode 100755
index 0000000..8a08d0c
--- /dev/null
+++ b/bin/cable
@@ -0,0 +1,2 @@
+#!/bin/bash
+bundle exec puma -p 28080 cable/config.ru
diff --git a/cable/config.ru b/cable/config.ru
new file mode 100755
index 0000000..c92045b
--- /dev/null
+++ b/cable/config.ru
@@ -0,0 +1,6 @@
+require ::File.expand_path('../../config/environment',  __FILE__)
+Rails.application.eager_load!
+
+require 'action_cable/process/logging'
+
+run ActionCable.server

From 7dc41146cb6716d63f6ccb54e218f9ec1aba85eb Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:04:12 +0100
Subject: [PATCH 04/11] Configure redis

---
 config/redis/cable.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 config/redis/cable.yml

diff --git a/config/redis/cable.yml b/config/redis/cable.yml
new file mode 100644
index 0000000..100b16e
--- /dev/null
+++ b/config/redis/cable.yml
@@ -0,0 +1,8 @@
+local: &local
+  :url: redis://localhost:6379
+  :host: localhost
+  :port: 6379
+  :timeout: 1
+  :inline: true
+development: *local
+test: *local

From b7c4f2b3b289d80b4b4a28be4eb30a05cca1530e Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:04:36 +0100
Subject: [PATCH 05/11] Setup channel and connection

---
 app/channels/application_cable/channel.rb    | 4 ++++
 app/channels/application_cable/connection.rb | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100755 app/channels/application_cable/channel.rb
 create mode 100755 app/channels/application_cable/connection.rb

diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100755
index 0000000..d672697
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100755
index 0000000..614e681
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,7 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+    def connect
+      true
+    end
+  end
+end

From a888ec5004518f6b69a1ba4cacef29961824fbdf Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:05:21 +0100
Subject: [PATCH 06/11] Allow votes to be followed & unfollowed

---
 app/channels/votes_channel.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 app/channels/votes_channel.rb

diff --git a/app/channels/votes_channel.rb b/app/channels/votes_channel.rb
new file mode 100644
index 0000000..d6c4c45
--- /dev/null
+++ b/app/channels/votes_channel.rb
@@ -0,0 +1,11 @@
+class VotesChannel < ApplicationCable::Channel
+  def follow(data)
+    stop_all_streams
+    Rails.logger.debug "question:#{data['question_id']}:vote"
+    stream_from "question:#{data['question_id']}:vote"
+  end
+
+  def unfollow
+    stop_all_streams
+  end
+end

From 504e84aac06fe8174a2266224105321316d0df96 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:06:01 +0100
Subject: [PATCH 07/11] Remove pusher trigger and broadcast a vote with an
 empty hash.

---
 app/controllers/votes_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
index 1e854ff..7dafce0 100644
--- a/app/controllers/votes_controller.rb
+++ b/app/controllers/votes_controller.rb
@@ -11,7 +11,8 @@ def update
     vote.question_id = question.id unless vote.question_id
     vote.option_id = Option.find(params[:vote][:option_id]).id
 
-    Pusher[question_id].trigger("vote", {})
+    Rails.logger.debug "question:#{question.id}:vote"
+    ActionCable.server.broadcast "question:#{question.id}:vote", {}
 
     if vote.save!
       cookies.permanent["vote_#{question.secret}"] = vote.secret

From 2887ff6b1559cb871a1cbab2d79819755372fe73 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:06:21 +0100
Subject: [PATCH 08/11] Setup cable js

---
 app/assets/javascripts/channels/index.coffee | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 app/assets/javascripts/channels/index.coffee

diff --git a/app/assets/javascripts/channels/index.coffee b/app/assets/javascripts/channels/index.coffee
new file mode 100644
index 0000000..255891a
--- /dev/null
+++ b/app/assets/javascripts/channels/index.coffee
@@ -0,0 +1,6 @@
+#= require cable
+#= require_self
+#= require_tree .
+
+@App = {}
+App.cable = Cable.createConsumer 'ws://localhost:28080'

From e989c07ddba75b270edca3515d2cbf3c8d084a42 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Sun, 12 Jul 2015 22:06:43 +0100
Subject: [PATCH 09/11] Follow channel and log received data

---
 app/assets/javascripts/channels/votes.coffee | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 app/assets/javascripts/channels/votes.coffee

diff --git a/app/assets/javascripts/channels/votes.coffee b/app/assets/javascripts/channels/votes.coffee
new file mode 100644
index 0000000..07ad589
--- /dev/null
+++ b/app/assets/javascripts/channels/votes.coffee
@@ -0,0 +1,12 @@
+console.log "OK"
+
+App.votes = App.cable.subscriptions.create "VotesChannel",
+  connected: ->
+    console.log "Connected"
+    setTimeout =>
+      @perform 'follow', question_id: 5
+    , 1000
+
+  received: (data) ->
+    console.log "Received"
+    console.log data

From 67902c623433ee75a9fb92f909e176369c1be183 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Mon, 13 Jul 2015 23:09:47 +0100
Subject: [PATCH 10/11] Use AMS in favour of jbuilder

---
 Gemfile                                   |  3 +--
 app/controllers/application_controller.rb |  4 ++++
 app/controllers/questions_controller.rb   |  4 ++++
 app/serializers/option_serializer.rb      | 11 +++++++++++
 app/serializers/question_serializer.rb    |  3 +++
 app/views/questions/results.json.jbuilder |  4 ----
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 app/serializers/option_serializer.rb
 create mode 100644 app/serializers/question_serializer.rb
 delete mode 100644 app/views/questions/results.json.jbuilder

diff --git a/Gemfile b/Gemfile
index 1fa31fc..a58341f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,8 +17,6 @@ gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0',          group: :doc
 
@@ -42,6 +40,7 @@ gem 'rails-assets-angular', "1.3.0.rc.4"
 gem 'pusher'
 gem 'actioncable', github: "rails/actioncable"
 gem 'puma'
+gem "active_model_serializers"
 
 group :production, :staging do
   gem 'pg'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9942dc7..0b64619 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,4 +10,8 @@ class ApplicationController < ActionController::Base
   def allow_iframe
     response.headers.except! 'X-Frame-Options'
   end
+
+  def default_serializer_options
+    { root: false }
+  end
 end
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index f99a709..b8afbea 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -32,6 +32,10 @@ def show
 
   def results
     @options = @question.options
+    respond_to do |format|
+      format.html
+      format.json { render json: @options }
+    end
   end
 
   def check_secret_availability
diff --git a/app/serializers/option_serializer.rb b/app/serializers/option_serializer.rb
new file mode 100644
index 0000000..08883bd
--- /dev/null
+++ b/app/serializers/option_serializer.rb
@@ -0,0 +1,11 @@
+class OptionSerializer < ActiveModel::Serializer
+  attributes :value, :label
+
+  def value
+    object.votes
+  end
+
+  def label
+    object.title
+  end
+end
diff --git a/app/serializers/question_serializer.rb b/app/serializers/question_serializer.rb
new file mode 100644
index 0000000..2d0d09a
--- /dev/null
+++ b/app/serializers/question_serializer.rb
@@ -0,0 +1,3 @@
+class QuestionSerializer < ActiveModel::Serializer
+  has_many :options
+end
diff --git a/app/views/questions/results.json.jbuilder b/app/views/questions/results.json.jbuilder
deleted file mode 100644
index 66f1b59..0000000
--- a/app/views/questions/results.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@options) do |option|
-  json.value option.votes
-  json.label option[:title]
-end

From 83d7d8cac248dbd20f9497e21480349708b239e7 Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@lab.io>
Date: Mon, 13 Jul 2015 23:10:26 +0100
Subject: [PATCH 11/11] Swap pusher to use cable

---
 .env.example                                  | 12 ----
 Gemfile                                       |  1 -
 Gemfile.lock                                  | 14 +----
 README.md                                     |  3 -
 .../controllers/result_controller.js.coffee   | 56 ++++++++++---------
 .../angular/factories/Pusher.coffee.erb       | 18 ------
 app/assets/javascripts/application.js         |  2 -
 app/assets/javascripts/channels/votes.coffee  | 12 ----
 app/controllers/votes_controller.rb           |  6 +-
 app/views/layouts/application.html.erb        | 10 +---
 app/views/questions/results.html.erb          |  2 +-
 config/initializers/pusher.rb                 |  7 ---
 vendor/assets/javascripts/pusher.js           | 48 ----------------
 13 files changed, 40 insertions(+), 151 deletions(-)
 delete mode 100644 app/assets/javascripts/angular/factories/Pusher.coffee.erb
 delete mode 100644 app/assets/javascripts/channels/votes.coffee
 delete mode 100644 config/initializers/pusher.rb
 delete mode 100644 vendor/assets/javascripts/pusher.js

diff --git a/.env.example b/.env.example
index 436cbac..9653160 100644
--- a/.env.example
+++ b/.env.example
@@ -1,14 +1,2 @@
-PUSHER_APP_ID=12345
-
-PUSHER_KEY=abc
-PUSHER_SECRET=123
-
-PUSHER_CLIENT_PORT=80
-PUSHER_CLIENT_PORT_SSL=443
-PUSHER_CLIENT_HOST=ws.pusherapp.com
-
-PUSHER_API_HOST=api.pusherapp.com
-PUSHER_API_PORT=80
-
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=secret
diff --git a/Gemfile b/Gemfile
index a58341f..bd5f940 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,6 @@ gem 'spring',        group: :development
 
 gem "autoprefixer-rails"
 gem 'rails-assets-angular', "1.3.0.rc.4"
-gem 'pusher'
 gem 'actioncable', github: "rails/actioncable"
 gem 'puma'
 gem "active_model_serializers"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1f7f6fe..a08f393 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    active_model_serializers (0.9.3)
+      activemodel (>= 3.2)
     activejob (4.2.3)
       activesupport (= 4.2.3)
       globalid (>= 0.3.0)
@@ -89,11 +91,7 @@ GEM
     hike (1.2.3)
     hiredis (0.5.2)
     hitimes (1.2.2)
-    httpclient (2.4.0)
     i18n (0.7.0)
-    jbuilder (2.1.3)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -112,10 +110,6 @@ GEM
     pg (0.17.0)
     puma (2.11.3)
       rack (>= 1.1, < 2.0)
-    pusher (0.14.1)
-      httpclient (~> 2.3)
-      multi_json (~> 1.0)
-      signature (~> 0.1.6)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -162,7 +156,6 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    signature (0.1.7)
     spring (1.1.3)
     sprockets (2.11.0)
       hike (~> 1.2)
@@ -194,17 +187,16 @@ PLATFORMS
 
 DEPENDENCIES
   actioncable!
+  active_model_serializers
   autoprefixer-rails
   better_errors
   binding_of_caller
   coffee-rails (~> 4.0.0)
   dotenv-rails
-  jbuilder (~> 2.0)
   jquery-rails
   mysql2
   pg
   puma
-  pusher
   rails (= 4.2.3)
   rails-assets-angular (= 1.3.0.rc.4)
   rails_12factor
diff --git a/README.md b/README.md
index 52862b5..72f3e04 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,6 @@ $ rake db:migrate
 $ cp .env.example .env
 ```
 
-Modify the `.env` file to match with your [Pusher](http://pusher.com) application credentials or setup [Slanger](https://github.com/stevegraham/slanger) (perhaps with [docker-slanger](https://github.com/adambutler/docker-slanger))
-
-
 ## Contributing
 
 Contributions are welcome, please follow [GitHub Flow](https://guides.github.com/introduction/flow/index.html)
diff --git a/app/assets/javascripts/angular/controllers/result_controller.js.coffee b/app/assets/javascripts/angular/controllers/result_controller.js.coffee
index f17e14d..f3602e0 100644
--- a/app/assets/javascripts/angular/controllers/result_controller.js.coffee
+++ b/app/assets/javascripts/angular/controllers/result_controller.js.coffee
@@ -1,6 +1,6 @@
 angular
   .module("Poll")
-  .controller "ResultController", ["$scope", "$interval", "Pusher", ($scope, $interval, Pusher) ->
+  .controller "ResultController", ["$scope", "$interval", ($scope, $interval) ->
 
       $scope.ctx = $('canvas')[0].getContext("2d")
 
@@ -11,38 +11,44 @@ angular
         animationSteps: 45
       }
 
+      $scope.render = (data) ->
+        $scope.$apply ->
+          if $scope.chartData.length != data.length
+            colors = color.randomColors(data.length)
+            $scope.chartData = $.extend true, data, colors
+          else
+            $scope.chartData = $.extend true, $scope.chartData, data
+
+          total = 0
+          for datum, index in data
+            total += datum.value
+
+          if $scope.chart?
+            for datum, index in data
+              $scope.chart.segments[index].value = datum.value
+            $scope.chart.update()
+          else if total > 0
+            $scope.chart = new Chart($scope.ctx).Doughnut($scope.chartData, $scope.chartOptions)
+
       $scope.updateChart = ->
         $.ajax
           url: "/#{$scope.question}/results.json"
           success: (data) ->
-            $scope.$apply ->
-              if $scope.chartData.length != data.length
-                colors = color.randomColors(data.length)
-                $scope.chartData = $.extend true, data, colors
-              else
-                $scope.chartData = $.extend true, $scope.chartData, data
-
-              total = 0
-              for datum, index in data
-                total += datum.value
-
-              console.log "Total = #{total}"
-
-              if $scope.chart?
-                console.log 'a'
-                for datum, index in data
-                  $scope.chart.segments[index].value = datum.value
-                $scope.chart.update()
-              else if total > 0
-                console.log 'b'
-                $scope.chart = new Chart($scope.ctx).Doughnut($scope.chartData, $scope.chartOptions)
+            $scope.render(data)
 
 
       $scope.setQuestion = (question) ->
         $scope.question = question
         $scope.updateChart()
-        channel = Pusher.subscribe(question)
-        channel.bind "vote", ->
-          $scope.updateChart()
+
+        App.votes = App.cable.subscriptions.create "VotesChannel",
+          connected: ->
+            setTimeout =>
+              @perform 'follow', question_id: $("[data-question-secret]").data("question-secret")
+            , 500
+
+          received: (data) ->
+            $scope.render(data)
+
 
   ]
diff --git a/app/assets/javascripts/angular/factories/Pusher.coffee.erb b/app/assets/javascripts/angular/factories/Pusher.coffee.erb
deleted file mode 100644
index 563de46..0000000
--- a/app/assets/javascripts/angular/factories/Pusher.coffee.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-angular
-  .module("Poll")
-  .factory "Pusher", ->
-
-    config = {
-      key: document.getElementsByTagName('html')[0].getAttribute('data-pusher-key')
-      host: document.getElementsByTagName('html')[0].getAttribute('data-pusher-host')
-      port: document.getElementsByTagName('html')[0].getAttribute('data-pusher-port')
-      portSSL: document.getElementsByTagName('html')[0].getAttribute('data-pusher-port-ssl')
-    }
-
-    Pusher.host = config.host
-    Pusher.ws_port = config.port
-    Pusher.wss_port = config.portSSL
-
-    console.log config
-
-    new Pusher(config.key)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 50199cb..7ebd712 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,10 +18,8 @@
 //= require tinycolor
 //= require angles
 //= require nanobar
-//= require pusher
 
 //= require_tree ./angular/modules
-//= require_tree ./angular/factories
 //= require_tree ./angular/directives
 //= require_tree ./angular/controllers
 
diff --git a/app/assets/javascripts/channels/votes.coffee b/app/assets/javascripts/channels/votes.coffee
deleted file mode 100644
index 07ad589..0000000
--- a/app/assets/javascripts/channels/votes.coffee
+++ /dev/null
@@ -1,12 +0,0 @@
-console.log "OK"
-
-App.votes = App.cable.subscriptions.create "VotesChannel",
-  connected: ->
-    console.log "Connected"
-    setTimeout =>
-      @perform 'follow', question_id: 5
-    , 1000
-
-  received: (data) ->
-    console.log "Received"
-    console.log data
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
index 7dafce0..323fec4 100644
--- a/app/controllers/votes_controller.rb
+++ b/app/controllers/votes_controller.rb
@@ -11,12 +11,12 @@ def update
     vote.question_id = question.id unless vote.question_id
     vote.option_id = Option.find(params[:vote][:option_id]).id
 
-    Rails.logger.debug "question:#{question.id}:vote"
-    ActionCable.server.broadcast "question:#{question.id}:vote", {}
-
     if vote.save!
       cookies.permanent["vote_#{question.secret}"] = vote.secret
 
+      serialized_options = question.options.map { |option| OptionSerializer.new(option).attributes }
+      ActionCable.server.broadcast "question:#{question.secret}:vote", serialized_options
+
       respond_to do |format|
         format.html { redirect_to "/#{question.secret}" }
         format.json { render json: {}, status: :created }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dd2ce7f..31ced3f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,11 +1,5 @@
 <!DOCTYPE html>
-<html
-  ng-app="Poll"
-  data-pusher-key="<%= ENV['PUSHER_KEY'] %>"
-  data-pusher-host="<%= ENV['PUSHER_CLIENT_HOST'] %>"
-  data-pusher-port="<%= ENV['PUSHER_CLIENT_PORT'] %>"
-  data-pusher-port-ssl="<%= ENV['PUSHER_CLIENT_PORT_SSL'] %>"
->
+<html ng-app="Poll">
 <head>
   <title>Poll - Voting done simply in real-times</title>
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
@@ -40,7 +34,7 @@
     <div class="push"></div>
   </div>
   <div class="footer">
-    <p>Poll is an <a href="https://github.com/adambutler/poll" target="_blank">open-sourced project</a> by <a href="http://github.com/adambutler" target="_blank">Adam Butler</a> - Powered by <a href="http://pusher.com" target="_blank">Pusher</a><br>
+    <p>Poll is an <a href="https://github.com/adambutler/poll" target="_blank">open-sourced project</a> by <a href="http://github.com/adambutler" target="_blank">Adam Butler</a><br>
   </div>
 
   <script>
diff --git a/app/views/questions/results.html.erb b/app/views/questions/results.html.erb
index 2c165f7..c7d6b3e 100644
--- a/app/views/questions/results.html.erb
+++ b/app/views/questions/results.html.erb
@@ -1,4 +1,4 @@
-<div ng-controller="ResultController" ng-init="setQuestion('<%= @question.secret %>')">
+<div ng-controller="ResultController" ng-init="setQuestion('<%= @question.secret %>')" data-question-secret="<%= @question.secret %>">
   <div class="row">
     <div class="col col-left">
       <div class="chart">
diff --git a/config/initializers/pusher.rb b/config/initializers/pusher.rb
deleted file mode 100644
index e8d9a04..0000000
--- a/config/initializers/pusher.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'pusher'
-
-Pusher.url = "http://#{ENV['PUSHER_KEY']}:#{ENV['PUSHER_SECRET']}@#{ENV['PUSHER_API_HOST']}/apps/#{ENV['PUSHER_APP_ID']}"
-Pusher.logger = Rails.logger
-
-Pusher.host = ENV['PUSHER_API_HOST']
-Pusher.port = Integer(ENV['PUSHER_API_PORT'])
diff --git a/vendor/assets/javascripts/pusher.js b/vendor/assets/javascripts/pusher.js
deleted file mode 100644
index 90aa76c..0000000
--- a/vendor/assets/javascripts/pusher.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Pusher JavaScript Library v1.12.5
- * http://pusherapp.com/
- *
- * Copyright 2011, Pusher
- * Released under the MIT licence.
- */
-
-(function(){if(Function.prototype.scopedTo===void 0)Function.prototype.scopedTo=function(a,b){var e=this;return function(){return e.apply(a,Array.prototype.slice.call(b||[]).concat(Array.prototype.slice.call(arguments)))}};var c=function(a,b){this.options=b||{};this.key=a;this.channels=new c.Channels;this.global_emitter=new c.EventsDispatcher;var e=this;this.checkAppKey();this.connection=new c.Connection(this.key,this.options);this.connection.bind("connected",function(){e.subscribeAll()}).bind("message",
-function(b){var a=b.event.indexOf("pusher_internal:")===0;if(b.channel){var c;(c=e.channel(b.channel))&&c.emit(b.event,b.data)}a||e.global_emitter.emit(b.event,b.data)}).bind("disconnected",function(){e.channels.disconnect()}).bind("error",function(b){c.warn("Error",b)});c.instances.push(this);c.isReady&&e.connect()};c.instances=[];c.prototype={channel:function(a){return this.channels.find(a)},connect:function(){this.connection.connect()},disconnect:function(){this.connection.disconnect()},bind:function(a,
-b){this.global_emitter.bind(a,b);return this},bind_all:function(a){this.global_emitter.bind_all(a);return this},subscribeAll:function(){for(channelName in this.channels.channels)this.channels.channels.hasOwnProperty(channelName)&&this.subscribe(channelName)},subscribe:function(a){var b=this,e=this.channels.add(a,this);this.connection.state==="connected"&&e.authorize(this.connection.socket_id,this.options,function(c,f){c?e.emit("pusher:subscription_error",f):b.send_event("pusher:subscribe",{channel:a,
-auth:f.auth,channel_data:f.channel_data})});return e},unsubscribe:function(a){this.channels.remove(a);this.connection.state==="connected"&&this.send_event("pusher:unsubscribe",{channel:a})},send_event:function(a,b,e){return this.connection.send_event(a,b,e)},checkAppKey:function(){(this.key===null||this.key===void 0)&&c.warn("Warning","You must pass your app key when you instantiate Pusher.")}};c.Util={extend:function b(e,c){for(var f in c)e[f]=c[f]&&c[f].constructor&&c[f].constructor===Object?b(e[f]||
-{},c[f]):c[f];return e},stringify:function(){for(var b=["Pusher"],e=0;e<arguments.length;e++)typeof arguments[e]==="string"?b.push(arguments[e]):window.JSON==void 0?b.push(arguments[e].toString()):b.push(JSON.stringify(arguments[e]));return b.join(" : ")},arrayIndexOf:function(b,e){var c=Array.prototype.indexOf;if(b==null)return-1;if(c&&b.indexOf===c)return b.indexOf(e);for(i=0,l=b.length;i<l;i++)if(b[i]===e)return i;return-1}};c.debug=function(){c.log&&c.log(c.Util.stringify.apply(this,arguments))};
-c.warn=function(){window.console&&window.console.warn?window.console.warn(c.Util.stringify.apply(this,arguments)):c.log&&c.log(c.Util.stringify.apply(this,arguments))};c.VERSION="1.12.5";c.host="ws.pusherapp.com";c.ws_port=80;c.wss_port=443;c.sockjs_host="sockjs.pusher.com";c.sockjs_http_port=80;c.sockjs_https_port=443;c.sockjs_path="/pusher";c.channel_auth_endpoint="/pusher/auth";c.cdn_http="http://js.pusher.com/";c.cdn_https="https://d3dy5gmtp8yhk7.cloudfront.net/";c.dependency_suffix=".min";c.channel_auth_transport=
-"ajax";c.activity_timeout=12E4;c.pong_timeout=3E4;c.isReady=!1;c.ready=function(){c.isReady=!0;for(var b=0,e=c.instances.length;b<e;b++)c.instances[b].connect()};this.Pusher=c}).call(this);
-(function(){function c(){this._callbacks={}}function a(b){this.callbacks=new c;this.global_callbacks=[];this.failThrough=b}c.prototype.get=function(b){return this._callbacks[this._prefix(b)]};c.prototype.add=function(b,a){var c=this._prefix(b);this._callbacks[c]=this._callbacks[c]||[];this._callbacks[c].push(a)};c.prototype.remove=function(b,c){if(this.get(b)){var a=Pusher.Util.arrayIndexOf(this.get(b),c);this._callbacks[this._prefix(b)].splice(a,1)}};c.prototype._prefix=function(b){return"_"+b};
-a.prototype.bind=function(b,c){this.callbacks.add(b,c);return this};a.prototype.unbind=function(b,c){this.callbacks.remove(b,c);return this};a.prototype.emit=function(b,c){for(var a=0;a<this.global_callbacks.length;a++)this.global_callbacks[a](b,c);var f=this.callbacks.get(b);if(f)for(a=0;a<f.length;a++)f[a](c);else this.failThrough&&this.failThrough(b,c);return this};a.prototype.bind_all=function(b){this.global_callbacks.push(b);return this};this.Pusher.EventsDispatcher=a}).call(this);
-(function(){function c(b,c,a){if(c[b]!==void 0)c[b](a)}function a(c,a,f){b.EventsDispatcher.call(this);this.state=void 0;this.errors=[];this.stateActions=f;this.transitions=a;this.transition(c)}var b=this.Pusher;a.prototype.transition=function(a,g){var f=this.state,j=this.stateActions;if(f&&b.Util.arrayIndexOf(this.transitions[f],a)==-1)throw this.emit("invalid_transition_attempt",{oldState:f,newState:a}),Error("Invalid transition ["+f+" to "+a+"]");c(f+"Exit",j,g);c(f+"To"+(a.substr(0,1).toUpperCase()+
-a.substr(1)),j,g);c(a+"Pre",j,g);this.state=a;this.emit("state_change",{oldState:f,newState:a});c(a+"Post",j,g)};a.prototype.is=function(b){return this.state===b};a.prototype.isNot=function(b){return this.state!==b};b.Util.extend(a.prototype,b.EventsDispatcher.prototype);this.Pusher.Machine=a}).call(this);
-(function(){var c=function(){var a=this;Pusher.EventsDispatcher.call(this);window.addEventListener!==void 0&&(window.addEventListener("online",function(){a.emit("online",null)},!1),window.addEventListener("offline",function(){a.emit("offline",null)},!1))};c.prototype.isOnLine=function(){return window.navigator.onLine===void 0?!0:window.navigator.onLine};Pusher.Util.extend(c.prototype,Pusher.EventsDispatcher.prototype);this.Pusher.NetInfo=c}).call(this);
-(function(){function c(a){a.connectionWait=0;a.openTimeout=b.TransportType==="native"?4E3:b.TransportType==="flash"?7E3:6E3;a.connectedTimeout=2E3;a.connectionSecure=a.compulsorySecure;a.failedAttempts=0}function a(a,s){function k(){d.openTimeout<j&&(d.openTimeout+=g);d.connectedTimeout<t&&(d.connectedTimeout+=f);if(d.compulsorySecure!==!0)d.connectionSecure=!d.connectionSecure;d.failedAttempts++}function u(a){a=a||document.location.protocol==="https:";return(a?"wss://":"ws://")+b.host+":"+(a?b.wss_port:
-b.ws_port)}function v(a){a=a||document.location.protocol==="https:";return(a?"https://":"http://")+b.sockjs_host+":"+(a?b.sockjs_https_port:b.sockjs_http_port)+b.sockjs_path}function m(){d._machine.transition("impermanentlyClosing")}function p(){d._activityTimer&&clearTimeout(d._activityTimer);if(d.ping)d._activityTimer=setTimeout(function(){d.send_event("pusher:ping",{});d._activityTimer=setTimeout(function(){d.socket.close()},d.options.pong_timeout||b.pong_timeout)},d.options.activity_timeout||
-b.activity_timeout)}function q(){var b=d.connectionWait;if(b===0&&d.connectedAt){var a=(new Date).getTime()-d.connectedAt;a<1E3&&(b=1E3-a)}return b}function w(b){b=r(b);if(b!==void 0)if(b.event==="pusher:connection_established")d._machine.transition("connected",b.data.socket_id);else if(b.event==="pusher:error"){var a=b.data.code;d.emit("error",{type:"PusherError",data:{code:a,message:b.data.message}});a===4E3?(d.compulsorySecure=!0,d.connectionSecure=!0,d.options.encrypted=!0,m()):a<4100?d._machine.transition("permanentlyClosing"):
-a<4200?(d.connectionWait=1E3,d._machine.transition("waiting")):a<4300?m():d._machine.transition("permanentlyClosing")}}function x(a){p();a=r(a);if(a!==void 0){b.debug("Event recd",a);switch(a.event){case "pusher:error":d.emit("error",{type:"PusherError",data:a.data});break;case "pusher:ping":d.send_event("pusher:pong",{})}d.emit("message",a)}}function r(b){try{var a=JSON.parse(b.data);if(typeof a.data==="string")try{a.data=JSON.parse(a.data)}catch(c){if(!(c instanceof SyntaxError))throw c;}return a}catch(e){d.emit("error",
-{type:"MessageParseError",error:e,data:b.data})}}function n(){d._machine.transition("waiting")}function o(b){d.emit("error",{type:"WebSocketError",error:b})}function h(a,c){var e=d.state;d.state=a;e!==a&&(b.debug("State changed",e+" -> "+a),d.emit("state_change",{previous:e,current:a}),d.emit(a,c))}var d=this;b.EventsDispatcher.call(this);this.ping=!0;this.options=b.Util.extend({encrypted:!1},s);this.netInfo=new b.NetInfo;this.netInfo.bind("online",function(){d._machine.is("waiting")&&(d._machine.transition("connecting"),
-h("connecting"))});this.netInfo.bind("offline",function(){if(d._machine.is("connected"))d.socket.onclose=void 0,d.socket.onmessage=void 0,d.socket.onerror=void 0,d.socket.onopen=void 0,d.socket.close(),d.socket=void 0,d._machine.transition("waiting")});this._machine=new b.Machine("initialized",e,{initializedPre:function(){d.compulsorySecure=d.options.encrypted;d.key=a;d.socket=null;d.socket_id=null;d.state="initialized"},waitingPre:function(){d.netInfo.isOnLine()?(d.failedAttempts<2?h("connecting"):
-(h("unavailable"),d.connectionWait=1E4),d.connectionWait>0&&d.emit("connecting_in",q()),d._waitingTimer=setTimeout(function(){d._machine.transition("connecting")},q())):h("unavailable")},waitingExit:function(){clearTimeout(d._waitingTimer)},connectingPre:function(){if(d.netInfo.isOnLine()===!1)d._machine.transition("waiting"),h("unavailable");else{var a="/app/"+d.key+"?protocol=5&client=js&version="+b.VERSION+"&flash="+(b.TransportType==="flash"?"true":"false");if(b.TransportType==="sockjs"){b.debug("Connecting to sockjs",
-b.sockjs);var c=v(d.connectionSecure);d.ping=!1;d.socket=new SockJS(c);d.socket.onopen=function(){d.socket.send(JSON.stringify({path:a}));d._machine.transition("open")}}else c=u(d.connectionSecure)+a,b.debug("Connecting",c),d.socket=new b.Transport(c),d.socket.onopen=function(){d._machine.transition("open")};d.socket.onclose=n;d.socket.onerror=o;d._connectingTimer=setTimeout(m,d.openTimeout)}},connectingExit:function(){clearTimeout(d._connectingTimer);d.socket.onopen=void 0},connectingToWaiting:function(){k()},
-connectingToImpermanentlyClosing:function(){k()},openPre:function(){d.socket.onmessage=w;d.socket.onerror=o;d.socket.onclose=n;d._openTimer=setTimeout(m,d.connectedTimeout)},openExit:function(){clearTimeout(d._openTimer);d.socket.onmessage=void 0},openToWaiting:function(){k()},openToImpermanentlyClosing:function(){k()},connectedPre:function(b){d.socket_id=b;d.socket.onmessage=x;d.socket.onerror=o;d.socket.onclose=n;c(d);d.connectedAt=(new Date).getTime();p()},connectedPost:function(){h("connected")},
-connectedExit:function(){d._activityTimer&&clearTimeout(d._activityTimer);h("disconnected")},impermanentlyClosingPost:function(){if(d.socket)d.socket.onclose=n,d.socket.close()},permanentlyClosingPost:function(){d.socket?(d.socket.onclose=function(){c(d);d._machine.transition("permanentlyClosed")},d.socket.close()):(c(d),d._machine.transition("permanentlyClosed"))},failedPre:function(){h("failed");b.debug("WebSockets are not available in this browser.")},permanentlyClosedPost:function(){h("disconnected")}})}
-var b=this.Pusher,e={initialized:["waiting","failed"],waiting:["connecting","permanentlyClosed"],connecting:["open","permanentlyClosing","impermanentlyClosing","waiting"],open:["connected","permanentlyClosing","impermanentlyClosing","waiting"],connected:["permanentlyClosing","waiting"],impermanentlyClosing:["waiting","permanentlyClosing"],permanentlyClosing:["permanentlyClosed"],permanentlyClosed:["waiting","failed"],failed:["permanentlyClosed"]},g=2E3,f=2E3,j=1E4,t=1E4;a.prototype.connect=function(){!this._machine.is("failed")&&
-!b.Transport?this._machine.transition("failed"):this._machine.is("initialized")?(c(this),this._machine.transition("waiting")):this._machine.is("waiting")&&this.netInfo.isOnLine()===!0?this._machine.transition("connecting"):this._machine.is("permanentlyClosed")&&(c(this),this._machine.transition("waiting"))};a.prototype.send=function(b){if(this._machine.is("connected")){var a=this;setTimeout(function(){a.socket.send(b)},0);return!0}else return!1};a.prototype.send_event=function(a,c,e){a={event:a,data:c};
-e&&(a.channel=e);b.debug("Event sent",a);return this.send(JSON.stringify(a))};a.prototype.disconnect=function(){this._machine.is("permanentlyClosed")||(this._machine.is("waiting")||this._machine.is("failed")?this._machine.transition("permanentlyClosed"):this._machine.transition("permanentlyClosing"))};b.Util.extend(a.prototype,b.EventsDispatcher.prototype);this.Pusher.Connection=a}).call(this);
-(function(){Pusher.Channels=function(){this.channels={}};Pusher.Channels.prototype={add:function(a,b){var c=this.find(a);c||(c=Pusher.Channel.factory(a,b),this.channels[a]=c);return c},find:function(a){return this.channels[a]},remove:function(a){delete this.channels[a]},disconnect:function(){for(var a in this.channels)this.channels[a].disconnect()}};Pusher.Channel=function(a,b){var c=this;Pusher.EventsDispatcher.call(this,function(b){Pusher.debug("No callbacks on "+a+" for "+b)});this.pusher=b;this.name=
-a;this.subscribed=!1;this.bind("pusher_internal:subscription_succeeded",function(a){c.onSubscriptionSucceeded(a)})};Pusher.Channel.prototype={init:function(){},disconnect:function(){this.subscribed=!1;this.emit("pusher_internal:disconnected")},onSubscriptionSucceeded:function(){this.subscribed=!0;this.emit("pusher:subscription_succeeded")},authorize:function(a,b,c){return c(!1,{})},trigger:function(a,b){return this.pusher.send_event(a,b,this.name)}};Pusher.Util.extend(Pusher.Channel.prototype,Pusher.EventsDispatcher.prototype);
-Pusher.Channel.PrivateChannel={authorize:function(a,b,c){var g=this;return(new Pusher.Channel.Authorizer(this,Pusher.channel_auth_transport,b)).authorize(a,function(a,b){a||g.emit("pusher_internal:authorized",b);c(a,b)})}};Pusher.Channel.PresenceChannel={init:function(){this.members=new c(this)},onSubscriptionSucceeded:function(){this.subscribed=!0}};var c=function(a){var b=this,c=function(){this._members_map={};this.count=0;this.me=null};c.call(this);a.bind("pusher_internal:authorized",function(c){var e=
-JSON.parse(c.channel_data);a.bind("pusher_internal:subscription_succeeded",function(c){b._members_map=c.presence.hash;b.count=c.presence.count;b.me=b.get(e.user_id);a.emit("pusher:subscription_succeeded",b)})});a.bind("pusher_internal:member_added",function(c){b.get(c.user_id)===null&&b.count++;b._members_map[c.user_id]=c.user_info;a.emit("pusher:member_added",b.get(c.user_id))});a.bind("pusher_internal:member_removed",function(c){var e=b.get(c.user_id);e&&(delete b._members_map[c.user_id],b.count--,
-a.emit("pusher:member_removed",e))});a.bind("pusher_internal:disconnected",function(){c.call(b)})};c.prototype={each:function(a){for(var b in this._members_map)a(this.get(b))},get:function(a){return this._members_map.hasOwnProperty(a)?{id:a,info:this._members_map[a]}:null}};Pusher.Channel.factory=function(a,b){var c=new Pusher.Channel(a,b);a.indexOf("private-")===0?Pusher.Util.extend(c,Pusher.Channel.PrivateChannel):a.indexOf("presence-")===0&&(Pusher.Util.extend(c,Pusher.Channel.PrivateChannel),
-Pusher.Util.extend(c,Pusher.Channel.PresenceChannel));c.init();return c}}).call(this);
-(function(){Pusher.Channel.Authorizer=function(c,a,b){this.channel=c;this.type=a;this.authOptions=(b||{}).auth||{}};Pusher.Channel.Authorizer.prototype={composeQuery:function(c){var c="&socket_id="+encodeURIComponent(c)+"&channel_name="+encodeURIComponent(this.channel.name),a;for(a in this.authOptions.params)c+="&"+encodeURIComponent(a)+"="+encodeURIComponent(this.authOptions.params[a]);return c},authorize:function(c,a){return Pusher.authorizers[this.type].call(this,c,a)}};Pusher.auth_callbacks={};
-Pusher.authorizers={ajax:function(c,a){var b;b=Pusher.XHR?new Pusher.XHR:window.XMLHttpRequest?new window.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");b.open("POST",Pusher.channel_auth_endpoint,!0);b.setRequestHeader("Content-Type","application/x-www-form-urlencoded");for(var e in this.authOptions.headers)b.setRequestHeader(e,this.authOptions.headers[e]);b.onreadystatechange=function(){if(b.readyState==4)if(b.status==200){var c,e=!1;try{c=JSON.parse(b.responseText),e=!0}catch(j){a(!0,"JSON returned from webapp was invalid, yet status code was 200. Data was: "+
-b.responseText)}e&&a(!1,c)}else Pusher.warn("Couldn't get auth info from your webapp",b.status),a(!0,b.status)};b.send(this.composeQuery(c));return b},jsonp:function(c,a){this.authOptions.headers!==void 0&&Pusher.warn("Warn","To send headers with the auth request, you must use AJAX, rather than JSONP.");var b=document.createElement("script");Pusher.auth_callbacks[this.channel.name]=function(b){a(!1,b)};b.src=Pusher.channel_auth_endpoint+"?callback="+encodeURIComponent("Pusher.auth_callbacks['"+this.channel.name+
-"']")+this.composeQuery(c);var e=document.getElementsByTagName("head")[0]||document.documentElement;e.insertBefore(b,e.firstChild)}}}).call(this);
-var _require=function(){function c(a,c){document.addEventListener?a.addEventListener("load",c,!1):a.attachEvent("onreadystatechange",function(){(a.readyState=="loaded"||a.readyState=="complete")&&c()})}function a(a,e){var g=document.getElementsByTagName("head")[0],f=document.createElement("script");f.setAttribute("src",a);f.setAttribute("type","text/javascript");f.setAttribute("async",!0);c(f,function(){e()});g.appendChild(f)}return function(b,c){for(var g=0,f=0;f<b.length;f++)a(b[f],function(){b.length==
-++g&&setTimeout(c,0)})}}();
-(function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+
-".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}:function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(sockjsPath=c+"/sockjs"+Pusher.dependency_suffix+".js",_require([sockjsPath],function(){Pusher.Transport=SockJS;Pusher.TransportType="sockjs";Pusher.ready()}))}}(),e=function(a){var b=function(){document.body?
-a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})();