pusher-fake 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa94db2edd0797091dc88becfdb8ae831846e76
-  data.tar.gz: 5ab407e3e83ea0755b36a3548d226e40f957979e
+  metadata.gz: 9b6a74e962ef17c0feee10d1603d9d45b8ea2151
+  data.tar.gz: e20d2d3cb6eca5a7027f9fe6012760fd9e6148ce
 SHA512:
-  metadata.gz: 8fd3d7eae0e62bd30d631da88088720dbaff65c689b24bdd9016d2029841922e78706f83f68860b9488818a15e51965fff72bd4af0b3c85bd44c2efa29f878cd
-  data.tar.gz: 05ce0a03d04b78d02a0da9ae9a9ceee8766b3b67ae1833f58c6d0e8499f3780868cd89698237d4a9288c1fa582e0927f2a5db7e7c22939464af48a90499dccc1
+  metadata.gz: 0178d64c7290eb358a1433415960edcfccf78233f6cf4f5e41408d5bebaf57cd620bddafebc8603ed040186e499c87bfd424f8727b293bca18d31479b7566518
+  data.tar.gz: b0069fabf801b3dce31ad8e83611838ea98c5348e861f3da3f6df6281a435d13e07dedcac48e0c45bb627c51f75b0b4e58d5f052f5169700d447cb2ad6290c62

data/features/support/application.rb

@@ -1,8 +1,5 @@
-require "pusher"
 require "sinatra"
 
-Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@localhost:8081/apps/PUSHER_APP_ID"
-
 class Sinatra::Application
   set :root,          Proc.new { File.join(File.dirname(__FILE__), "application") }
   set :views,         Proc.new { File.join(root, "views") }
@@ -15,13 +12,19 @@ class Sinatra::Application
   end
 
   post "/pusher/auth" do
-    data    = nil
-    channel = Pusher[params[:channel_name]]
+    channel  = Pusher[params[:channel_name]]
+    response = channel.authenticate(params[:socket_id], channel_data)
+
+    MultiJson.dump(response)
+  end
+
+  protected
 
-    if params[:channel_name] =~ /^presence-/
-      data = { user_id: params[:socket_id], user_info: { name: "Alan Turing" } }
-    end
+  def channel_data
+    return unless params[:channel_name] =~ /^presence-/
 
-    MultiJson.dump(channel.authenticate(params[:socket_id], data))
+    { user_id:   params[:socket_id],
+      user_info: { name: "Alan Turing" }
+    }
   end
 end

data/features/support/application/public/javascripts/vendor/{pusher-2.1.5.js → pusher-2.1.6.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.1.5
+ * Pusher JavaScript Library v2.1.6
  * http://pusherapp.com/
  *
  * Copyright 2013, Pusher
@@ -599,7 +599,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.1.5';
+  Pusher.VERSION = '2.1.6';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -2452,7 +2452,8 @@
     cached: returnWithOriginalContext(function(context, ttl, strategy){
       return new Pusher.CachedStrategy(strategy, context.transports, {
         ttl: ttl,
-        timeline: context.timeline
+        timeline: context.timeline,
+        encrypted: context.encrypted
       });
     }),
 
@@ -2607,6 +2608,9 @@
     message = this.decodeMessage(message);
 
     if (message.event === "pusher:connection_established") {
+      if (!message.data.activity_timeout) {
+        throw "No activity timeout specified in handshake";
+      }
       return {
         action: "connected",
         id: message.data.socket_id,
@@ -2956,6 +2960,9 @@
     });
     Pusher.Network.bind("offline", function() {
       self.timeline.info({ netinfo: "offline" });
+      if (self.state === "connected") {
+        self.sendActivityCheck();
+      }
     });
 
     this.updateStrategy();
@@ -3027,6 +3034,7 @@
         self.runner = self.strategy.connect(0, callback);
       } else {
         if (handshake.action === "error") {
+          self.emit("error", { type: "HandshakeError", error: handshake.error });
           self.timeline.error({ handshakeError: handshake.error });
         } else {
           self.abortConnecting(); // we don't support switching connections yet
@@ -3105,26 +3113,30 @@
     }
   };
 
+  /** @private */
+  prototype.sendActivityCheck = function() {
+    var self = this;
+    self.stopActivityCheck();
+    self.send_event('pusher:ping', {});
+    // wait for pong response
+    self.activityTimer = new Pusher.Timer(
+      self.options.pongTimeout,
+      function() {
+        self.timeline.error({ pong_timed_out: self.options.pongTimeout });
+        self.retryIn(0);
+      }
+    );
+  };
+
   /** @private */
   prototype.resetActivityCheck = function() {
-    this.stopActivityCheck();
+    var self = this;
+    self.stopActivityCheck();
     // send ping after inactivity
-    if (!this.connection.supportsPing()) {
-      var self = this;
-      self.activityTimer = new Pusher.Timer(
-        self.activityTimeout,
-        function() {
-          self.send_event('pusher:ping', {});
-          // wait for pong response
-          self.activityTimer = new Pusher.Timer(
-            self.options.pongTimeout,
-            function() {
-              self.timeline.error({ pong_timed_out: self.options.pongTimeout });
-              self.retryIn(0);
-            }
-          );
-        }
-      );
+    if (!self.connection.supportsPing()) {
+      self.activityTimer = new Pusher.Timer(self.activityTimeout, function() {
+        self.sendActivityCheck();
+      });
     }
   };
 

data/features/support/application/views/index.erb

@@ -13,7 +13,7 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.1.5.js"></script>
+<script src="/javascripts/vendor/pusher-2.1.6.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Create the client instance using the PusherFake server.

data/features/support/coveralls.rb

@@ -1,5 +1 @@
-if ENV["CI"]
-  require "coveralls"
-
-  Coveralls.wear_merged!
-end
+require "./spec/support/coveralls"

data/features/support/pusher-fake.rb

@@ -1,3 +1,5 @@
+Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@localhost:8081/apps/PUSHER_APP_ID"
+
 Thread.new { PusherFake::Server.start }.tap do |thread|
   at_exit { thread.exit }
 end

data/lib/pusher-fake.rb

@@ -4,19 +4,15 @@ require "multi_json"
 require "openssl"
 require "thin"
 
-require "pusher-fake/channel"
-require "pusher-fake/channel/public"
-require "pusher-fake/channel/private"
-require "pusher-fake/channel/presence"
-require "pusher-fake/configuration"
-require "pusher-fake/connection"
-require "pusher-fake/server"
-require "pusher-fake/server/application"
-require "pusher-fake/webhook"
-
 module PusherFake
   # The current version string.
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
+
+  autoload :Channel,       "pusher-fake/channel"
+  autoload :Configuration, "pusher-fake/configuration"
+  autoload :Connection,    "pusher-fake/connection"
+  autoload :Server,        "pusher-fake/server"
+  autoload :Webhook,       "pusher-fake/webhook"
 
   # Call this method to modify the defaults.
   #
@@ -40,8 +36,11 @@ module PusherFake
   # @param [Hash] options Custom options for Pusher client.
   # @return [String] JavaScript overriding the Pusher client host and port.
   def self.javascript(options = {})
-    <<-EOS
-      new Pusher(#{configuration.key.to_json}, #{configuration.to_options(options).to_json})
-    EOS
+    arguments = [
+      configuration.key,
+      configuration.to_options(options)
+    ].map(&:to_json).join(",")
+
+    "new Pusher(#{arguments})"
   end
 end

data/lib/pusher-fake/channel.rb

@@ -1,5 +1,9 @@
 module PusherFake
   module Channel
+    autoload :Public,   "pusher-fake/channel/public"
+    autoload :Private,  "pusher-fake/channel/private"
+    autoload :Presence, "pusher-fake/channel/presence"
+
     class << self
       # Name matcher for private channels.
       PRIVATE_CHANNEL_MATCHER  = /\Aprivate-/.freeze

data/lib/pusher-fake/configuration.rb

@@ -33,46 +33,6 @@ module PusherFake
       self.web_options    = { host: "127.0.0.1", port: 8081 }
     end
 
-    # Set the host on which the socket server listens.
-    #
-    # @deprecated Please use {#socket_options} +Hash+ instead.
-    # @param host String
-    def socket_host=(host)
-      warn "[DEPRECATION] `socket_host=` is deprecated.  Please use `socket_options=` instead."
-
-      socket_options[:host] = host
-    end
-
-    # Set the port on which the socket server listens.
-    #
-    # @deprecated Please use {#socket_options} +Hash+ instead.
-    # @param port Integer
-    def socket_port=(port)
-      warn "[DEPRECATION] `socket_port=` is deprecated.  Please use `socket_options=` instead."
-
-      socket_options[:port] = port
-    end
-
-    # Set the host on which the web server listens.
-    #
-    # @deprecated Please use {#web_options} +Hash+ instead.
-    # @param host String
-    def web_host=(host)
-      warn "[DEPRECATION] `web_host=` is deprecated.  Please use `web_options=` instead."
-
-      web_options[:host] = host
-    end
-
-    # Set the port on which the web server listens.
-    #
-    # @deprecated Please use {#web_options} +Hash+ instead.
-    # @param port Integer
-    def web_port=(port)
-      warn "[DEPRECATION] `web_port=` is deprecated.  Please use `web_options=` instead."
-
-      web_options[:port] = port
-    end
-
     # Convert the configuration to a hash sutiable for Pusher JS options.
     #
     # @param [Hash] options Custom options for Pusher client.

data/lib/pusher-fake/connection.rb

@@ -27,7 +27,7 @@ module PusherFake
 
     # Notify the Pusher client that a connection has been established.
     def establish
-      emit("pusher:connection_established", socket_id: socket.object_id)
+      emit("pusher:connection_established", socket_id: socket.object_id, activity_timeout: 120)
     end
 
     # Process an event.

data/lib/pusher-fake/cucumber.rb

@@ -11,7 +11,7 @@ PusherFake.configuration.web_options.tap do |options|
   Pusher.port = options[:port]
 end
 
-# Start the fake web server.
+# Start the fake socket and web servers.
 fork { PusherFake::Server.start }.tap do |id|
   at_exit { Process.kill("KILL", id) }
 end

data/lib/pusher-fake/server.rb

@@ -1,5 +1,7 @@
 module PusherFake
   module Server
+    autoload :Application, "pusher-fake/server/application"
+
     # Start the servers.
     #
     # @see start_socket_server

data/lib/pusher-fake/server/application.rb

@@ -25,7 +25,7 @@ module PusherFake
                    when %r{\A/apps/#{id}/channels/([^/]+)/users\Z}
                      users($1)
                    else
-                     unknown_path(request.path)
+                     raise "Unknown path: #{request.path}"
                    end
 
         Rack::Response.new(MultiJson.dump(response)).finish
@@ -113,15 +113,6 @@ module PusherFake
 
         { users: users || [] }
       end
-
-      def self.unknown_path(path)
-        message = "Unknown path: #{path}"
-
-        logger = Logger.new(STDOUT)
-        logger.error(message)
-
-        raise message
-      end
     end
   end
 end

data/spec/lib/pusher-fake/configuration_spec.rb

@@ -9,46 +9,6 @@ describe PusherFake::Configuration do
   it { should have_configuration_option(:webhooks).with_default([]) }
 end
 
-describe PusherFake::Configuration, "#socket_host=" do
-  it "sets socket options host value" do
-    silence_warnings do
-      subject.socket_host = "192.168.0.1"
-    end
-
-    subject.socket_options[:host].should == "192.168.0.1"
-  end
-end
-
-describe PusherFake::Configuration, "#socket_post=" do
-  it "sets socket options host value" do
-    silence_warnings do
-      subject.socket_port = 443
-    end
-
-    subject.socket_options[:port].should == 443
-  end
-end
-
-describe PusherFake::Configuration, "#web_host=" do
-  it "sets web options host value" do
-    silence_warnings do
-      subject.web_host = "192.168.0.1"
-    end
-
-    subject.web_options[:host].should == "192.168.0.1"
-  end
-end
-
-describe PusherFake::Configuration, "#web_post=" do
-  it "sets web options host value" do
-    silence_warnings do
-      subject.web_port = 443
-    end
-
-    subject.web_options[:port].should == 443
-  end
-end
-
 describe PusherFake::Configuration, "#to_options" do
   it "includes the socket host as wsHost" do
     subject.to_options.should include(wsHost: subject.socket_options[:host])

data/spec/lib/pusher-fake/connection_spec.rb

@@ -44,7 +44,8 @@ describe PusherFake::Connection, "#establish" do
 
   it "emits the connection established event with the socket ID" do
     subject.establish
-    subject.should have_received(:emit).with("pusher:connection_established", socket_id: socket.object_id)
+    subject.should have_received(:emit)
+      .with("pusher:connection_established", socket_id: socket.object_id, activity_timeout: 120)
   end
 end
 

data/spec/lib/pusher-fake/server/application_spec.rb

@@ -82,8 +82,6 @@ describe PusherFake::Server::Application, ".call, with unknown path" do
   let(:environment) { mock }
 
   before do
-    subject.stubs(:unknown_path).raises(message)
-
     response.stubs(finish: response)
 
     Rack::Request.stubs(new: request)
@@ -97,11 +95,6 @@ describe PusherFake::Server::Application, ".call, with unknown path" do
     Rack::Request.should have_received(:new).with(environment)
   end
 
-  it "calls unknown_path with the path" do
-    subject.call(environment)
-    subject.should have_received(:unknown_path).with(request.path)
-  end
-
   it "creates a Rack response with the error message" do
     subject.call(environment)
     Rack::Response.should have_received(:new).with(message, 400)
@@ -408,31 +401,3 @@ describe PusherFake::Server::Application, ".users, for an unknown channel" do
     subject.users("fake").should == { users: [] }
   end
 end
-
-describe PusherFake::Server::Application, ".unknown_path" do
-  let(:path)    { "/apps/fake/events" }
-  let(:logger)  { stub(error: true) }
-  let(:message) { "Unknown path: #{path}" }
-
-  before do
-    Logger.stubs(new: logger)
-  end
-
-  subject { PusherFake::Server::Application }
-
-  it "creates a logger" do
-    expect { subject.unknown_path(path) }.to raise_error
-    Logger.should have_received(:new).with(STDOUT)
-  end
-
-  it "logs the error message" do
-    expect { subject.unknown_path(path) }.to raise_error
-    logger.should have_received(:error).with(message)
-  end
-
-  it "raises an error" do
-    expect {
-      subject.unknown_path(path)
-    }.to raise_error(message)
-  end
-end

data/spec/lib/pusher_fake_spec.rb

@@ -1,16 +1,12 @@
 require "spec_helper"
 
 describe PusherFake, ".configure" do
-  let(:configuration) { mock }
-
   subject { PusherFake }
 
-  before do
-    subject.stubs(configuration: configuration)
-  end
-
   it "yields the configuration" do
-    expect { |block| subject.configure(&block) }.to yield_with_args(configuration)
+    expect { |block|
+      subject.configure(&block)
+    }.to yield_with_args(subject.configuration)
   end
 end
 
@@ -51,14 +47,14 @@ describe PusherFake, ".javascript" do
   subject { PusherFake }
 
   it "returns JavaScript setting the host and port to the configured options" do
-    subject.javascript.should == <<-EOS
-      new Pusher(#{configuration.key.to_json}, #{configuration.to_options.to_json})
-    EOS
+    arguments = [configuration.key, configuration.to_options].map(&:to_json).join(",")
+
+    subject.javascript.should == "new Pusher(#{arguments})"
   end
 
   it "supports passing custom options" do
-    subject.javascript(options).should == <<-EOS
-      new Pusher(#{configuration.key.to_json}, #{configuration.to_options(options).to_json})
-    EOS
+    arguments = [configuration.key, configuration.to_options(options)].map(&:to_json).join(",")
+
+    subject.javascript(options).should == "new Pusher(#{arguments})"
   end
 end

data/spec/support/coveralls.rb

@@ -1,5 +1,8 @@
 if ENV["CI"]
   require "coveralls"
 
-  Coveralls.wear_merged!
+  Coveralls.wear_merged! do
+    add_filter "features/"
+    add_filter "spec/"
+  end
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -218,17 +218,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/pusher-fake/channel/presence.rb
-- lib/pusher-fake/channel/private.rb
-- lib/pusher-fake/channel/public.rb
-- lib/pusher-fake/channel.rb
-- lib/pusher-fake/configuration.rb
-- lib/pusher-fake/connection.rb
-- lib/pusher-fake/cucumber.rb
-- lib/pusher-fake/server/application.rb
-- lib/pusher-fake/server.rb
-- lib/pusher-fake/webhook.rb
-- lib/pusher-fake.rb
 - features/channel.feature
 - features/channel_presence.feature
 - features/channel_subscribe.feature
@@ -242,15 +231,26 @@ files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-2.1.5.js
-- features/support/application/views/index.erb
 - features/support/application.rb
+- features/support/application/public/javascripts/vendor/pusher-2.1.6.js
+- features/support/application/views/index.erb
 - features/support/coveralls.rb
 - features/support/environment.rb
 - features/support/pusher-fake.rb
 - features/support/timing.rb
 - features/support/webhooks.rb
 - features/user.feature
+- lib/pusher-fake.rb
+- lib/pusher-fake/channel.rb
+- lib/pusher-fake/channel/presence.rb
+- lib/pusher-fake/channel/private.rb
+- lib/pusher-fake/channel/public.rb
+- lib/pusher-fake/configuration.rb
+- lib/pusher-fake/connection.rb
+- lib/pusher-fake/cucumber.rb
+- lib/pusher-fake/server.rb
+- lib/pusher-fake/server/application.rb
+- lib/pusher-fake/webhook.rb
 - spec/lib/pusher-fake/channel/presence_spec.rb
 - spec/lib/pusher-fake/channel/private_spec.rb
 - spec/lib/pusher-fake/channel/public_spec.rb
@@ -264,7 +264,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/coveralls.rb
 - spec/support/have_configuration_option_matcher.rb
-- spec/support/warnings.rb
 homepage: https://github.com/tristandunn/pusher-fake
 licenses:
 - MIT
@@ -275,17 +274,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
@@ -303,7 +302,7 @@ test_files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-2.1.5.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.6.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb
@@ -325,5 +324,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/coveralls.rb
 - spec/support/have_configuration_option_matcher.rb
-- spec/support/warnings.rb
 has_rdoc: 

data/spec/support/warnings.rb

@@ -1,8 +0,0 @@
-module Kernel
-  def silence_warnings
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end
-end