pusher-fake 0.14.0 → 1.0.0

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

@@ -168,21 +168,23 @@ describe PusherFake::Server::Application, ".call, raising an error" do
 end
 
 describe PusherFake::Server::Application, ".events" do
-  let(:body)      { stub(read: json) }
-  let(:data)      { mock }
-  let(:json)      { mock }
-  let(:name)      { "event-name" }
-  let(:event)     { { "channels" => channels, "name" => name, "data" => data, "socket_id" => socket_id } }
-  let(:request)   { stub(body: body) }
-  let(:channels)  { ["channel-1", "channel-2"] }
-  let(:channel_1) { stub(emit: true) }
-  let(:channel_2) { stub(emit: true) }
-  let(:socket_id) { stub }
+  let(:body)       { stub(read: event_json) }
+  let(:data)       { { "example" => "data" } }
+  let(:name)       { "event-name" }
+  let(:event)      { { "channels" => channels, "name" => name, "data" => data_json, "socket_id" => socket_id } }
+  let(:request)    { stub(body: body) }
+  let(:channels)   { ["channel-1", "channel-2"] }
+  let(:channel_1)  { stub(emit: true) }
+  let(:channel_2)  { stub(emit: true) }
+  let(:data_json)  { data.to_json }
+  let(:socket_id)  { stub }
+  let(:event_json) { mock }
 
   subject { PusherFake::Server::Application }
 
   before do
-    MultiJson.stubs(load: event)
+    MultiJson.stubs(:load).with(event_json).returns(event)
+    MultiJson.stubs(:load).with(data_json).returns(data)
     PusherFake::Channel.stubs(:factory).with(channels[0]).returns(channel_1)
     PusherFake::Channel.stubs(:factory).with(channels[1]).returns(channel_2)
   end
@@ -190,7 +192,26 @@ describe PusherFake::Server::Application, ".events" do
   it "parses the request body as JSON" do
     subject.events(request)
 
-    expect(MultiJson).to have_received(:load).with(json)
+    expect(MultiJson).to have_received(:load).with(event_json)
+  end
+
+  it "parses the event data as JSON" do
+    subject.events(request)
+
+    expect(MultiJson).to have_received(:load).with(data_json)
+  end
+
+  it "handles invalid JSON for event data" do
+    event["data"] = data = "fake"
+
+    MultiJson.stubs(:load).with(data).raises(MultiJson::LoadError)
+
+    expect {
+      subject.events(request)
+    }.to_not raise_error
+
+    expect(channel_1).to have_received(:emit).with(name, data, socket_id: socket_id)
+    expect(channel_2).to have_received(:emit).with(name, data, socket_id: socket_id)
   end
 
   it "creates channels by name" do
@@ -383,8 +404,8 @@ end
 
 describe PusherFake::Server::Application, ".users, for an occupied channel" do
   let(:name)     { "public-1" }
-  let(:user_1)   { mock }
-  let(:user_2)   { mock }
+  let(:user_1)   { stub(id: "1") }
+  let(:user_2)   { stub(id: "2") }
   let(:channel)  { stub(connections: [user_1, user_2]) }
   let(:channels) { { name => channel } }
 
@@ -398,8 +419,8 @@ describe PusherFake::Server::Application, ".users, for an occupied channel" do
     hash = subject.users(name)
 
     expect(hash).to eq({ users: [
-      { id: user_1.object_id },
-      { id: user_2.object_id }
+      { id: user_1.id },
+      { id: user_2.id }
     ] })
   end
 end

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

@@ -14,6 +14,7 @@ describe PusherFake::Webhook, ".trigger" do
   before do
     OpenSSL::HMAC.stubs(hexdigest: signature)
     EventMachine::HttpRequest.stubs(new: http)
+    PusherFake.stubs(:log)
     PusherFake.stubs(configuration: configuration)
   end
 
@@ -42,4 +43,10 @@ describe PusherFake::Webhook, ".trigger" do
       }
     )
   end
+
+  it "logs sending the hook" do
+    subject.trigger(name, data)
+
+    expect(PusherFake).to have_received(:log).with("HOOK: #{payload}")
+  end
 end

data/spec/lib/pusher_fake_spec.rb

@@ -78,7 +78,7 @@ describe PusherFake, ".log" do
 
     subject.log(message)
 
-    expect(logger).to have_received(:<<).with(message + "\n").once
+    expect(logger).to have_received(:<<).with("#{message}\n").once
   end
 
   it "does not forward message when not verbose" do

data/spec/support/have_configuration_option_matcher.rb

@@ -9,7 +9,7 @@ RSpec::Matchers.define :have_configuration_option do |option|
     @default = default
   end
 
-  failure_message_for_should do |configuration|
+  failure_message do |configuration|
     description  = "expected configuration to have #{option.inspect} option"
     description << " with a default of #{@default.inspect}" unless @default.nil?
     description

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-06-07 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
+        version: '1.1'
   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
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.15
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
@@ -134,70 +128,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.4
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -218,7 +212,7 @@ files:
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
 - features/support/application.rb
-- features/support/application/public/javascripts/vendor/pusher-2.1.6.js
+- features/support/application/public/javascripts/vendor/pusher-2.2.1.js
 - features/support/application/views/index.erb
 - features/support/coveralls.rb
 - features/support/environment.rb
@@ -270,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
@@ -288,7 +282,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.6.js
+- features/support/application/public/javascripts/vendor/pusher-2.2.1.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb