pubnub 3.5.14 → 3.6.7

data/spec/lib/channel_presence_concat_pam_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe "#grant" do
+  before(:each) do
+
+    EM.stop if EM.reactor_running?
+    while EM.reactor_running? do end
+    sleep(0.1)
+
+    @response_output = StringIO.new
+    @message_output = StringIO.new
+
+    @callback = lambda { |envelope|
+      $logger.debug 'FIRING CALLBACK FROM TEST'
+      @response_output.write envelope.response
+      @message_output.write envelope.msg
+      @after_callback = true
+    }
+
+    @error_callback = lambda { |envelope|
+      $logger.debug 'FIRING ERROR CALLBACK FROM TEST'
+      @response_output.write envelope.response
+      @message_output.write envelope.msg
+      @after_error_callback = true
+    }
+
+    @pn = Pubnub.new(:max_retries => 0, :subscribe_key => 'sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe', :publish_key => 'pub-c-15d6fd3c-05de-4abc-8eba-6595a441959d', :secret_key => 'sec-c-ZWYwMGJiZTYtMTQwMC00NDQ5LWI0NmEtMzZiM2M5NThlOTJh', :error_callback => @error_callback)
+    @pn.uuid = 'f0ac67ef-912f-4797-be67-a59745107306'
+
+    Pubnub::Grant.any_instance.stub(:current_time).and_return 1234567890
+    Pubnub::Grant.any_instance.stub(:signature).and_return 'kdDh/sFC3rSR%2Bt5AEymIc57d1velIr562V7usa5M4k0='
+
+  end
+
+  it 'Works with given channel as string and presence as string' do
+    VCR.use_cassette("grant-multiple-channels-presence", :record => :none) do
+      @pn.grant(:ssl => true, :http_sync => true, :channel => "demo", :presence => "demo", :write => true, :read => true, &@callback)
+
+      @after_callback.should eq true
+      @response_output.seek 0
+      @response_output.read.should eq "{\"status\":200,\"service\":\"Access Manager\",\"message\":\"Success\",\"payload\":{\"channels\":{\"demo\":{\"r\":1,\"w\":1},\"demo-pnpres\":{\"r\":1,\"w\":1}},\"subscribe_key\":\"sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe\",\"ttl\":1440,\"level\":\"channel\"}}"
+      @message_output.seek 0
+      @message_output.read.should eq 'Success'
+    end
+  end
+
+  it 'Works with given multiple channels as string and multiple presences as string' do
+    VCR.use_cassette("grant-multiple-channels-presence-multi-1", :record => :none) do
+      @pn.grant(:ssl => true, :http_sync => true, :channel => "demo,demo1,demo2", :presence => "demo,demo1,demo2", :write => true, :read => true, &@callback)
+
+      @after_callback.should eq true
+      @response_output.seek 0
+      @response_output.read.should eq "{\"status\":200,\"service\":\"Access Manager\",\"message\":\"Success\",\"payload\":{\"channels\":{\"demo2-pnpres\":{\"r\":1,\"w\":1},\"demo\":{\"r\":1,\"w\":1},\"demo2\":{\"r\":1,\"w\":1},\"demo1\":{\"r\":1,\"w\":1},\"demo1-pnpres\":{\"r\":1,\"w\":1},\"demo-pnpres\":{\"r\":1,\"w\":1}},\"subscribe_key\":\"sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe\",\"ttl\":1440,\"level\":\"channel\"}}"
+      @message_output.seek 0
+      @message_output.read.should eq 'Success'
+    end
+  end
+
+  it 'Works with given multiple channels as string and multiple presences as array' do
+    VCR.use_cassette("grant-multiple-channels-presence-multi-2", :record => :none) do
+      @pn.grant(:ssl => true, :http_sync => true, :channel => "demo,demo1,demo2", :presence => ["demo","demo1","demo2"], :write => true, :read => true, &@callback)
+
+      @after_callback.should eq true
+      @response_output.seek 0
+      @response_output.read.should eq "{\"status\":200,\"service\":\"Access Manager\",\"message\":\"Success\",\"payload\":{\"channels\":{\"demo2-pnpres\":{\"r\":1,\"w\":1},\"demo\":{\"r\":1,\"w\":1},\"demo2\":{\"r\":1,\"w\":1},\"demo1\":{\"r\":1,\"w\":1},\"demo1-pnpres\":{\"r\":1,\"w\":1},\"demo-pnpres\":{\"r\":1,\"w\":1}},\"subscribe_key\":\"sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe\",\"ttl\":1440,\"level\":\"channel\"}}"
+      @message_output.seek 0
+      @message_output.read.should eq 'Success'
+    end
+  end
+
+  it 'Works with given multiple channels as array and multiple presences as string' do
+    VCR.use_cassette("grant-multiple-channels-presence-multi-3", :record => :none) do
+      @pn.grant(:ssl => true, :http_sync => true, :channel => ["demo","demo1","demo2"], :presence => "demo,demo1,demo2", :write => true, :read => true, &@callback)
+
+      @after_callback.should eq true
+      @response_output.seek 0
+      @response_output.read.should eq "{\"status\":200,\"service\":\"Access Manager\",\"message\":\"Success\",\"payload\":{\"channels\":{\"demo2-pnpres\":{\"r\":1,\"w\":1},\"demo\":{\"r\":1,\"w\":1},\"demo2\":{\"r\":1,\"w\":1},\"demo1\":{\"r\":1,\"w\":1},\"demo1-pnpres\":{\"r\":1,\"w\":1},\"demo-pnpres\":{\"r\":1,\"w\":1}},\"subscribe_key\":\"sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe\",\"ttl\":1440,\"level\":\"channel\"}}"
+      @message_output.seek 0
+      @message_output.read.should eq 'Success'
+    end
+  end
+
+  it 'Works with given multiple channels as array and multiple presences as array' do
+    VCR.use_cassette("grant-multiple-channels-presence-multi-4", :record => :none) do
+      @pn.grant(:ssl => true, :http_sync => true, :channel => ["demo","demo1","demo2"], :presence => ["demo","demo1","demo2"], :write => true, :read => true, &@callback)
+
+      @after_callback.should eq true
+      @response_output.seek 0
+      @response_output.read.should eq "{\"status\":200,\"service\":\"Access Manager\",\"message\":\"Success\",\"payload\":{\"channels\":{\"demo2-pnpres\":{\"r\":1,\"w\":1},\"demo\":{\"r\":1,\"w\":1},\"demo2\":{\"r\":1,\"w\":1},\"demo1\":{\"r\":1,\"w\":1},\"demo1-pnpres\":{\"r\":1,\"w\":1},\"demo-pnpres\":{\"r\":1,\"w\":1}},\"subscribe_key\":\"sub-c-53c3d30a-4135-11e3-9970-02ee2ddab7fe\",\"ttl\":1440,\"level\":\"channel\"}}"
+      @message_output.seek 0
+      @message_output.read.should eq 'Success'
+    end
+  end
+end

data/spec/lib/client_spec.rb

@@ -36,13 +36,12 @@ describe Pubnub::Client do
       end
     end
 
-    it 'starts EventMachine reactor in a separate thread' do
+    it 'doesnt start EventMachine reactor' do
       pubnub = Pubnub.new(:subscribe_key => 'key')
       sleep(0.1)
-      expect(EM.reactor_running?).to be true
-      expect(EM.reactor_thread).not_to be eq Thread.current
+      expect(EM.reactor_running?).to eq(false)
     end
 
   end
 
-end
+end

data/spec/lib/heartbeat_spec.rb

@@ -30,7 +30,7 @@ describe 'hearbeat' do
   it 'is called every heartbeat/2 - 1 seconds' do
     @pn = Pubnub.new(:subscribe_key => 'demo-36', :heartbeat => '12')
 
-    VCR.use_cassette("heartbeat-test", :record => :all) do
+    VCR.use_cassette("heartbeat-test", :record => :none) do
       @pn.subscribe(:channel => 'rubyheartbeatdemo'){|e| }
       eventually do
         @pn.env[:heartbeat].to_i.should      eq 12
@@ -39,21 +39,21 @@ describe 'hearbeat' do
     end
   end
 
-  it 'calls error_callback if get\'s non-200 response' do
-    @error = false
-    error_callback = lambda do |error|
-      @error = true
-      EM.stop
-    end
-
-    @pn = Pubnub.new(:subscribe_key => 'demo-36', :heartbeat => '4', :error_callback => error_callback)
-    VCR.use_cassette("heartbeat-non200", :record => :new_episodes) do
-      @pn.subscribe(:channel => 'rubyheartbeatdemo'){|e| }
-      eventually do
-        @error.should eq true
-      end
-    end
-  end
+  # it 'calls error_callback if get\'s non-200 response' do
+  #   @error = false
+  #   error_callback = lambda do |error|
+  #     @error = true
+  #     EM.stop
+  #   end
+  #
+  #   @pn = Pubnub.new(:subscribe_key => 'demo-36', :heartbeat => '4', :error_callback => error_callback)
+  #   VCR.use_cassette("heartbeat-non200", :record => :new_episodes) do
+  #     @pn.subscribe(:channel => 'rubyheartbeatdemo'){|e| }
+  #     eventually do
+  #       @error.should eq true
+  #     end
+  #   end
+  # end
 
   context 'is settable' do
     before(:each) do

data/spec/lib/integration/global_here_now_dpc_spec.rb

@@ -42,7 +42,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -56,7 +56,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -168,7 +168,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -182,7 +182,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -230,7 +230,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0'
                 @message_output.seek 0
-                @message_output.read.should eq '[0,"Invalid JSON in response."]'
+                @message_output.read.should eq "[0,\"Invalid JSON in response.\"]"
               end
             end
           end
@@ -244,7 +244,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0'
                   @message_output.seek 0
-                  @message_output.read.should eq '[0,"Invalid JSON in response."]'
+                  @message_output.read.should eq "[0,\"Invalid JSON in response.\"]"
                 end
               end
             end
@@ -297,7 +297,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -311,7 +311,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -423,7 +423,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -437,7 +437,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end

data/spec/lib/integration/global_here_now_spec.rb

@@ -42,7 +42,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -56,7 +56,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -168,7 +168,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -182,7 +182,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -297,7 +297,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -311,7 +311,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -423,7 +423,7 @@ describe "#here_now" do
                 @response_output.seek 0
                 @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                 @message_output.seek 0
-                @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -437,7 +437,7 @@ describe "#here_now" do
                   @response_output.seek 0
                   @response_output.read.should eq '{"status": 200, "message": "OK", "service": "Presence", "uuids": [], "occupancy": 0}'
                   @message_output.seek 0
-                  @message_output.read.should eq '{"status"=>200, "message"=>"OK", "service"=>"Presence", "uuids"=>[], "occupancy"=>0}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end

data/spec/lib/integration/here_now_dpc_spec.rb

@@ -40,9 +40,9 @@ describe "#here_now" do
                 
                 @after_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
-                @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -54,9 +54,9 @@ describe "#here_now" do
                 eventually do
                   @after_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
-                  @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -70,7 +70,7 @@ describe "#here_now" do
                 
                 @after_error_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
                 @message_output.read.should eq '[0,"Non 2xx server response."]'
               end
@@ -84,7 +84,7 @@ describe "#here_now" do
                 eventually do
                   @after_error_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
                   @message_output.read.should eq '[0,"Non 2xx server response."]'
                 end
@@ -166,9 +166,9 @@ describe "#here_now" do
 
                 @after_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
-                @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -180,9 +180,9 @@ describe "#here_now" do
                 eventually do
                   @after_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
-                  @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -196,7 +196,7 @@ describe "#here_now" do
                 
                 @after_error_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
                 @message_output.read.should eq '[0,"Non 2xx server response."]'
               end
@@ -210,7 +210,7 @@ describe "#here_now" do
                 eventually do
                   @after_error_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
                   @message_output.read.should eq '[0,"Non 2xx server response."]'
                 end
@@ -295,9 +295,9 @@ describe "#here_now" do
                 
                 @after_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
-                @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -309,9 +309,9 @@ describe "#here_now" do
                 eventually do
                   @after_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
-                  @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -325,7 +325,7 @@ describe "#here_now" do
 
                 @after_error_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
                 @message_output.read.should eq '[0,"Non 2xx server response."]'
               end
@@ -339,7 +339,7 @@ describe "#here_now" do
                 eventually do
                   @after_error_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
                   @message_output.read.should eq '[0,"Non 2xx server response."]'
                 end
@@ -423,9 +423,9 @@ describe "#here_now" do
                 
                 @after_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
-                @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                @message_output.read.should eq 'OK'
               end
             end
           end
@@ -437,9 +437,9 @@ describe "#here_now" do
                 eventually do
                   @after_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
-                  @message_output.read.should eq '{"uuids"=>["rubytests"], "occupancy"=>1}'
+                  @message_output.read.should eq 'OK'
                 end
               end
             end
@@ -453,7 +453,7 @@ describe "#here_now" do
                 
                 @after_error_callback.should eq true
                 @response_output.seek 0
-                @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                 @message_output.seek 0
                 @message_output.read.should eq '[0,"Non 2xx server response."]'
               end
@@ -467,7 +467,7 @@ describe "#here_now" do
                 eventually do
                   @after_error_callback.should eq true
                   @response_output.seek 0
-                  @response_output.read.should eq '{"uuids":["rubytests"],"occupancy":1}'
+                  @response_output.read.should eq "{\"status\": 200, \"message\": \"OK\", \"service\": \"Presence\", \"uuids\": [\"rubytest\"], \"occupancy\": 1}"
                   @message_output.seek 0
                   @message_output.read.should eq '[0,"Non 2xx server response."]'
                 end