pusher-fake 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d56e9bb6902ed10adbe4bca8166649d40749fc
-  data.tar.gz: 5a8e70714a86266a036d0a56c31564fbf8972dd2
+  metadata.gz: d4567bf9d8226e1d07e7f93382ae2f414a62888e
+  data.tar.gz: 8524195e9f243534d9a85b3d7c0a09c61c4fc252
 SHA512:
-  metadata.gz: 31ab418c7631fb803180cef6bca7eddac1ba06b5dc64be52cd35033412404b6e328cf631c962e11a1a8fe8f5a613dc7fa80d834004b2a0df6f3d4ea0eb62149e
-  data.tar.gz: bac0c88bd45616f6dc8ef8a829d2fe4682be67879778c95786aca8cc77e4175679c578bbf958b13cf64e064fc059a4a7ac56d4c55963f10ee014997b7141f22d
+  metadata.gz: 90f3394b3891466ed3dd2b5c4dab7a6fba6d437608a7d8b4bf96702584b829a14fdb2d84ab614cf23dd74fb3fb118789f616326e259bae52ba07bff3302dfb6e
+  data.tar.gz: e67ed85fd2a1bec93104ab4102ca148b8d295f51056babd2a8b5c13e4396b80ab53663ad66567b21f2a83d2136e8709d44142a3b7e5df86f5d6d773f110fdb11

data/features/support/application/public/javascripts/vendor/{pusher-2.1.2.js → pusher-2.1.3.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.1.2
+ * Pusher JavaScript Library v2.1.3
  * http://pusherapp.com/
  *
  * Copyright 2013, Pusher
@@ -509,7 +509,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.1.2';
+  Pusher.VERSION = '2.1.3';
   Pusher.PROTOCOL = 6;
 
   // DEPRECATED: WS connection parameters
@@ -622,6 +622,7 @@
 
   /** Error classes used throughout pusher-js library. */
   Pusher.Errors = {
+    BadEventName: buildExceptionClass("BadEventName"),
     UnsupportedTransport: buildExceptionClass("UnsupportedTransport"),
     UnsupportedStrategy: buildExceptionClass("UnsupportedStrategy"),
     TransportPriorityTooLow: buildExceptionClass("TransportPriorityTooLow"),
@@ -1169,21 +1170,25 @@
   prototype.send = function(sendJSONP, callback) {
     var self = this;
 
+    if (Pusher.Network.isOnline() === false) {
+      return false;
+    }
+
     var data = {};
-    if (this.sent === 0) {
+    if (self.sent === 0) {
       data = Pusher.Util.extend({
-        key: this.key,
-        features: this.options.features,
-        version: this.options.version
-      }, this.options.params || {});
+        key: self.key,
+        features: self.options.features,
+        version: self.options.version
+      }, self.options.params || {});
     }
-    data.session = this.session;
-    data.timeline = this.events;
+    data.session = self.session;
+    data.timeline = self.events;
     data = Pusher.Util.filterObject(data, function(v) {
       return v !== undefined;
     });
 
-    this.events = [];
+    self.events = [];
     sendJSONP(data, function(error, result) {
       if (!error) {
         self.sent++;
@@ -1226,7 +1231,7 @@
         receiver: Pusher.JSONP
       };
       return Pusher.JSONPRequest.send(params, function(error, result) {
-        if (result.host) {
+        if (result && result.host) {
           self.host = result.host;
         }
         if (callback) {
@@ -1385,9 +1390,13 @@
   function fetchTransportInfo() {
     var storage = Pusher.Util.getLocalStorage();
     if (storage) {
-      var info = storage.pusherTransport;
-      if (info) {
-        return JSON.parse(storage.pusherTransport);
+      try {
+        var info = storage.pusherTransport;
+        if (info) {
+          return JSON.parse(info);
+        }
+      } catch (e) {
+        flushTransportInfo();
       }
     }
     return null;
@@ -1402,7 +1411,7 @@
           transport: transport,
           latency: latency
         });
-      } catch(e) {
+      } catch (e) {
         // catch over quota exceptions raised by localStorage
       }
     }
@@ -1413,7 +1422,7 @@
     if (storage && storage.pusherTransport) {
       try {
         delete storage.pusherTransport;
-      } catch(e) {
+      } catch (e) {
         storage.pusherTransport = undefined;
       }
     }
@@ -3361,6 +3370,11 @@
 
   /** Triggers an event */
   prototype.trigger = function(event, data) {
+    if (event.indexOf("client-") !== 0) {
+      throw new Pusher.Errors.BadEventName(
+        "Event '" + event + "' does not start with 'client-'"
+      );
+    }
     return this.pusher.send_event(event, data, this.name);
   };
 

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

@@ -13,16 +13,13 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.1.2.js"></script>
+<script src="/javascripts/vendor/pusher-2.1.3.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Create the client instance using the PusherFake server.
   Pusher.instance = <%= PusherFake.javascript %>;
   Pusher.instance.events = {};
 
-  // Force the connection to go unavailable after a single attempt.
-  Pusher.instance.connection.connectionAttempts = 4;
-
   // Record all events.
   Pusher.instance.connection.bind("message", function(message) {
     var events    = Pusher.instance.events,

data/lib/pusher-fake.rb

@@ -16,7 +16,7 @@ require "pusher-fake/webhook"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 
   # Call this method to modify the defaults.
   #

data/lib/pusher-fake/configuration.rb

@@ -9,31 +9,68 @@ module PusherFake
     # @return [String] The Pusher API token. (Defaults to +PUSHER_API_SECRET+.)
     attr_accessor :secret
 
-    # @return [String] The host on which the socket server listens. (Defaults to +127.0.0.1+.)
-    attr_accessor :socket_host
-
-    # @return [Fixnum] The port on which the socket server listens. (Defaults to +8080+.)
-    attr_accessor :socket_port
-
-    # @return [String] The host on which the web server listens. (Defaults to +127.0.0.1+.)
-    attr_accessor :web_host
+    # Options for the socket server. See +EventMachine::WebSocket.start+ for options.
+    #
+    # @return [Hash] Options for the socket server.
+    attr_accessor :socket_options
 
-    # @return [Fixnum] The port on which the web server listens. (Defaults to +8081+.)
-    attr_accessor :web_port
+    # Options for the web server. See +Thin::Server+ for options.
+    #
+    # @return [Hash] Options for the web server.
+    attr_accessor :web_options
 
     # @return [Array] An array of webhook URLs. (Defaults to +[]+.)
     attr_accessor :webhooks
 
     # Instantiated from {PusherFake.configuration}. Sets the defaults.
     def initialize
-      self.app_id      = "PUSHER_APP_ID"
-      self.key         = "PUSHER_API_KEY"
-      self.secret      = "PUSHER_API_SECRET"
-      self.socket_host = "127.0.0.1"
-      self.socket_port = 8080
-      self.web_host    = "127.0.0.1"
-      self.web_port    = 8081
-      self.webhooks    = []
+      self.app_id   = "PUSHER_APP_ID"
+      self.key      = "PUSHER_API_KEY"
+      self.secret   = "PUSHER_API_SECRET"
+      self.webhooks = []
+
+      self.socket_options = { host: "127.0.0.1", port: 8080 }
+      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.
@@ -41,8 +78,8 @@ module PusherFake
     # @param [Hash] options Custom options for Pusher client.
     def to_options(options = {})
       options.merge({
-        wsHost: socket_host,
-        wsPort: socket_port
+        wsHost: socket_options[:host],
+        wsPort: socket_options[:port]
       })
     end
   end

data/lib/pusher-fake/cucumber.rb

@@ -6,8 +6,10 @@ PusherFake.configure do |configuration|
 end
 
 # Set the host and port to the fake web server.
-Pusher.host = PusherFake.configuration.web_host
-Pusher.port = PusherFake.configuration.web_port
+PusherFake.configuration.web_options.tap do |options|
+  Pusher.host = options[:host]
+  Pusher.port = options[:port]
+end
 
 # Start the fake web server.
 fork { PusherFake::Server.start }.tap do |id|

data/lib/pusher-fake/server.rb

@@ -13,7 +13,7 @@ module PusherFake
 
     # Start the WebSocket server.
     def self.start_socket_server
-      EventMachine::WebSocket.start(socket_server_options) do |socket|
+      EventMachine::WebSocket.start(configuration.socket_options) do |socket|
         socket.onopen do
           connection = Connection.new(socket)
           connection.establish
@@ -30,8 +30,16 @@ module PusherFake
 
     # Start the web server.
     def self.start_web_server
+      options = configuration.web_options.dup
+
       Thin::Logging.silent = true
-      Thin::Server.start(configuration.web_host, configuration.web_port, Application)
+      Thin::Server.new(options.delete(:host), options.delete(:port), Application).tap do |server|
+        options.each do |key, value|
+          server.__send__("#{key}=", value)
+        end
+
+        server.start!
+      end
     end
 
     private

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

@@ -4,20 +4,58 @@ describe PusherFake::Configuration do
   it { should have_configuration_option(:app_id).with_default("PUSHER_APP_ID") }
   it { should have_configuration_option(:key).with_default("PUSHER_API_KEY") }
   it { should have_configuration_option(:secret).with_default("PUSHER_API_SECRET") }
-  it { should have_configuration_option(:socket_host).with_default("127.0.0.1") }
-  it { should have_configuration_option(:socket_port).with_default(8080) }
-  it { should have_configuration_option(:web_host).with_default("127.0.0.1") }
-  it { should have_configuration_option(:web_port).with_default(8081) }
+  it { should have_configuration_option(:socket_options).with_default({ host: "127.0.0.1", port: 8080 }) }
+  it { should have_configuration_option(:web_options).with_default({ host: "127.0.0.1", port: 8081 }) }
   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_host)
+    subject.to_options.should include(wsHost: subject.socket_options[:host])
   end
 
   it "includes the socket port as wsPort" do
-    subject.to_options.should include(wsPort: subject.socket_port)
+    subject.to_options.should include(wsPort: subject.socket_options[:port])
   end
 
   it "supports passing custom options" do

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

@@ -37,9 +37,9 @@ end
 describe PusherFake::Server, ".start_socket_server" do
   let(:data)          { stub }
   let(:socket)        { stub(onopen: nil, onmessage: nil, onclose: nil) }
-  let(:options)       { { host: configuration.socket_host, port: configuration.socket_port } }
+  let(:options)       { configuration.socket_options }
   let(:connection)    { stub(establish: nil, process: nil) }
-  let(:configuration) { stub(socket_host: "192.168.0.1", socket_port: 8080) }
+  let(:configuration) { stub(socket_options: { host: "192.168.0.1", port: 8080 }) }
 
   subject { PusherFake::Server }
 
@@ -128,12 +128,13 @@ end
 describe PusherFake::Server, ".start_web_server" do
   let(:host)          { "192.168.0.1" }
   let(:port)          { 8081 }
-  let(:configuration) { stub(web_host: host, web_port: port) }
+  let(:server)        { stub(:start! => true, :ssl= => true) }
+  let(:configuration) { stub(web_options: { host: host, port: port, ssl: true }) }
 
   subject { PusherFake::Server }
 
   before do
-    Thin::Server.stubs(:start)
+    Thin::Server.stubs(new: server)
     Thin::Logging.stubs(:silent=)
     PusherFake.stubs(configuration: configuration)
   end
@@ -143,8 +144,18 @@ describe PusherFake::Server, ".start_web_server" do
     Thin::Logging.should have_received(:silent=).with(true)
   end
 
+  it "creates the web server" do
+    subject.start_web_server
+    Thin::Server.should have_received(:new).with(host, port, PusherFake::Server::Application)
+  end
+
+  it "assigns custom options to the server" do
+    subject.start_web_server
+    server.should have_received(:ssl=).with(true)
+  end
+
   it "starts the web server" do
     subject.start_web_server
-    Thin::Server.should have_received(:start).with(host, port, PusherFake::Server::Application)
+    server.should have_received(:start!).with()
   end
 end

data/spec/support/have_configuration_option_matcher.rb

@@ -7,7 +7,19 @@ module BartenderHelper
     def matches?(configuration)
       @configuration = configuration
       @configuration.respond_to?(@option).should == true
-      @configuration.__send__(@option).should == @default if instance_variables.include?("@default")
+
+      if instance_variables.include?(:@default)
+        actual = @configuration.__send__(@option)
+
+        if @default.is_a?(Hash)
+          @default.each do |key, value|
+            actual[key].should == value
+          end
+        else
+          actual.should == @default
+        end
+      end
+
       @configuration.__send__(:"#{@option}=", "value")
       @configuration.__send__(@option).should == "value"
     end

data/spec/support/warnings.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +184,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.7.2
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -236,7 +236,7 @@ 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.2.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.3.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb
@@ -258,6 +258,7 @@ 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
@@ -296,7 +297,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.2.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.3.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb
@@ -318,4 +319,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/coveralls.rb
 - spec/support/have_configuration_option_matcher.rb
+- spec/support/warnings.rb
 has_rdoc: