pusher-fake 0.9.0 → 0.10.0

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

@@ -13,15 +13,11 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.0.5.js"></script>
+<script src="/javascripts/vendor/pusher-2.1.2.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
-  // Use the PusherFake server.
-  Pusher.host     = <%= MultiJson.dump(PusherFake.configuration.socket_host) %>;
-  Pusher.ws_port  = <%= MultiJson.dump(PusherFake.configuration.socket_port) %>;
-
-  // Create the client instance.
-  Pusher.instance = new Pusher(<%= MultiJson.dump(PusherFake.configuration.key) %>);
+  // 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.

data/features/support/coveralls.rb

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

data/lib/pusher-fake.rb

@@ -16,7 +16,7 @@ require "pusher-fake/webhook"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 
   # Call this method to modify the defaults.
   #
@@ -37,11 +37,11 @@ module PusherFake
 
   # Convenience method for the JS to override the Pusher client host and port.
   #
+  # @param [Hash] options Custom options for Pusher client.
   # @return [String] JavaScript overriding the Pusher client host and port.
-  def self.javascript
+  def self.javascript(options = {})
     <<-EOS
-      Pusher.host    = #{configuration.socket_host.to_json};
-      Pusher.ws_port = #{configuration.socket_port.to_json};
+      new Pusher(#{configuration.key.to_json}, #{configuration.to_options(options).to_json})
     EOS
   end
 end

data/lib/pusher-fake/configuration.rb

@@ -35,5 +35,15 @@ module PusherFake
       self.web_port    = 8081
       self.webhooks    = []
     end
+
+    # Convert the configuration to a hash sutiable for Pusher JS options.
+    #
+    # @param [Hash] options Custom options for Pusher client.
+    def to_options(options = {})
+      options.merge({
+        wsHost: socket_host,
+        wsPort: socket_port
+      })
+    end
   end
 end

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

@@ -10,3 +10,17 @@ describe PusherFake::Configuration do
   it { should have_configuration_option(:web_port).with_default(8081) }
   it { should have_configuration_option(:webhooks).with_default([]) }
 end
+
+describe PusherFake::Configuration, "#to_options" do
+  it "includes the socket host as wsHost" do
+    subject.to_options.should include(wsHost: subject.socket_host)
+  end
+
+  it "includes the socket port as wsPort" do
+    subject.to_options.should include(wsPort: subject.socket_port)
+  end
+
+  it "supports passing custom options" do
+    subject.to_options(custom: "option").should include(custom: "option")
+  end
+end

data/spec/lib/pusher_fake_spec.rb

@@ -45,20 +45,20 @@ describe PusherFake, ".configuration" do
 end
 
 describe PusherFake, ".javascript" do
-  let(:socket_host)   { "127.0.0.1" }
-  let(:socket_port)   { 1234 }
-  let(:configuration) { stub(socket_host: socket_host, socket_port: socket_port) }
+  let(:options)       { { custom: "option" } }
+  let(:configuration) { subject.configuration }
 
   subject { PusherFake }
 
-  before do
-    PusherFake.stubs(configuration: configuration)
-  end
-
   it "returns JavaScript setting the host and port to the configured options" do
     subject.javascript.should == <<-EOS
-      Pusher.host    = #{socket_host.to_json};
-      Pusher.ws_port = #{socket_port.to_json};
+      new Pusher(#{configuration.key.to_json}, #{configuration.to_options.to_json})
+    EOS
+  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
   end
 end

data/spec/support/coveralls.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -114,70 +114,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.6.1
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.6.1
+        version: 0.8.7
 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.0.5.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.2.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb
@@ -296,7 +296,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.0.5.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.2.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb