pusher-fake 0.1.1 → 0.1.2

data/features/channel_presence.feature

@@ -19,3 +19,9 @@ Feature: Client on a presence channel
     Then I should see 2 clients
     When Bob unsubscribes from the "presence-game-1" channel
     Then I should see 1 client
+
+  Scenario: Subscribing client should receive User info
+    Given Bob is connected
+    And Bob is subscribed to the "presence-game-1" channel
+    When I subscribe to the "presence-game-1" channel with presence events
+    Then I should see 2 clients with the name "Alan Turing"

data/features/step_definitions/channel_steps.rb

@@ -26,6 +26,10 @@ When %{I subscribe to the "$channel" channel with presence events} do |channel|
         var
         element = list.appendChild(document.createElement("li"));
         element.setAttribute("id", "client-" + client.id);
+
+        if (client.info) {
+          element.innerHTML = client.info.name;
+        }
       });
     });
     channel.bind("pusher:member_added", function(client) {
@@ -34,6 +38,10 @@ When %{I subscribe to the "$channel" channel with presence events} do |channel|
       var
       element = list.appendChild(document.createElement("li"));
       element.setAttribute("id", "client-" + client.id);
+
+      if (client.info) {
+        element.innerHTML = client.info.name;
+      }
     });
     channel.bind("pusher:member_removed", function(client) {
       var item = list.querySelector("li#client-" + client.id);

data/features/step_definitions/presence_steps.rb

@@ -1,6 +1,6 @@
-Then /^I should see (\d+) clients?$/ do |count|
+Then /^I should see (\d+) clients?(?: with the name "([^"]+)")?$/ do |count, name|
   within("#presence") do
     should have_css("header h1 span", text: count)
-    should have_css("ul li", count: count.to_i)
+    should have_css("ul li", count: count.to_i, text: name)
   end
 end

data/features/support/application.rb

@@ -19,7 +19,7 @@ class Sinatra::Application
     channel = Pusher[params[:channel_name]]
 
     if params[:channel_name] =~ /^presence-/
-      data = { user_id: params[:socket_id], user_info: {} }
+      data = { user_id: params[:socket_id], user_info: { name: "Alan Turing" } }
     end
 
     channel.authenticate(params[:socket_id], data).to_json

data/lib/pusher-fake.rb

@@ -14,7 +14,7 @@ require "pusher-fake/server/application"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 
   # Call this method to modify the defaults.
   #

data/lib/pusher-fake/channel/presence.rb

@@ -8,7 +8,7 @@ module PusherFake
       #
       # @param [String] name The channel name.
       def initialize(name)
-        super(name)
+        super
 
         @members = {}
       end
@@ -22,14 +22,13 @@ module PusherFake
         emit("pusher_internal:member_removed", members.delete(connection))
       end
 
-      # Returns a subscription hash containing presence information for
-      # the channel.
+      # Returns a hash containing presence information for the channel.
       #
-      # @return [Hash] Subscription hash contained presence information.
+      # @return [Hash] Hash containing presence information.
       def subscription_data
         hash = Hash[
           members.map { |_, member|
-            [member[:user_id], member]
+            [member[:user_id], member[:user_info]]
           }
         ]
 
@@ -43,7 +42,7 @@ module PusherFake
 
         emit("pusher_internal:member_added", members[connection])
 
-        super(connection, options)
+        super
       end
     end
   end

data/lib/pusher-fake/channel/public.rb

@@ -48,12 +48,12 @@ module PusherFake
         connections.delete(connection)
       end
 
-      private
-
       def subscription_data
         {}
       end
 
+      private
+
       def subscription_succeeded(connection, options = {})
         connection.emit("pusher_internal:subscription_succeeded", subscription_data, name)
         connections.push(connection)

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

@@ -18,7 +18,9 @@ module PusherFake
       #
       # @return [String] The channel name.
       def self.channel
-        path.match(%r{/apps/#{PusherFake.configuration.app_id}/channels/(.+)/events}i)[1]
+        matcher = %r{/apps/#{PusherFake.configuration.app_id}/channels/(.+)/events}i
+        matches = path.match(matcher)
+        matches[1]
       end
 
       # Parse and return the event data from the request JSON.

data/spec/lib/pusher-fake/channel/presence_spec.rb

@@ -111,10 +111,10 @@ describe PusherFake::Channel::Presence, "#subscription_data" do
     subject.stubs(members: members)
   end
 
-  it "returns presence hash and count" do
+  it "returns hash with presence information" do
     subject.subscription_data.should == {
       presence: {
-        hash:  { member[:user_id] => member },
+        hash:  { member[:user_id] => member[:user_info] },
         count: 1
       }
     }
@@ -125,7 +125,7 @@ describe PusherFake::Channel::Presence, "#subscription_data" do
 
     subject.subscription_data.should == {
       presence: {
-        hash:  { member[:user_id] => member, other[:user_id] => other },
+        hash:  { member[:user_id] => member[:user_info], other[:user_id] => other[:user_info] },
         count: 2
       }
     }

data/spec/lib/pusher-fake/channel/public_spec.rb

@@ -88,3 +88,11 @@ describe PusherFake::Channel, "#remove" do
     subject.connections.should be_empty
   end
 end
+
+describe PusherFake::Channel::Public, "#subscription_data" do
+  subject { PusherFake::Channel::Public.new("name") }
+
+  it "returns an empty hash" do
+    subject.subscription_data.should == {}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70195226755160 !ruby/object:Gem::Requirement
+  requirement: &70109727331120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70195226755160
+  version_requirements: *70109727331120
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70195226768900 !ruby/object:Gem::Requirement
+  requirement: &70109727329680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70195226768900
+  version_requirements: *70109727329680
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70195226779500 !ruby/object:Gem::Requirement
+  requirement: &70109727327300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70195226779500
+  version_requirements: *70109727327300
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70195226774260 !ruby/object:Gem::Requirement
+  requirement: &70109727325360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70195226774260
+  version_requirements: *70109727325360
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70195226798680 !ruby/object:Gem::Requirement
+  requirement: &70109727339500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70195226798680
+  version_requirements: *70109727339500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70195226812420 !ruby/object:Gem::Requirement
+  requirement: &70109727337120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70195226812420
+  version_requirements: *70109727337120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70195226808740 !ruby/object:Gem::Requirement
+  requirement: &70109727335040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70195226808740
+  version_requirements: *70109727335040
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70195226819740 !ruby/object:Gem::Requirement
+  requirement: &70109727333180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *70195226819740
+  version_requirements: *70109727333180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70195226816180 !ruby/object:Gem::Requirement
+  requirement: &70109727332620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.9
   type: :development
   prerelease: false
-  version_requirements: *70195226816180
+  version_requirements: *70109727332620
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &70195226828020 !ruby/object:Gem::Requirement
+  requirement: &70109727347660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70195226828020
+  version_requirements: *70109727347660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70195226824580 !ruby/object:Gem::Requirement
+  requirement: &70109727346760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70195226824580
+  version_requirements: *70109727346760
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70195226822700 !ruby/object:Gem::Requirement
+  requirement: &70109727345700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *70195226822700
+  version_requirements: *70109727345700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70195230220940 !ruby/object:Gem::Requirement
+  requirement: &70109727344740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +153,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70195230220940
+  version_requirements: *70109727344740
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70195230219480 !ruby/object:Gem::Requirement
+  requirement: &70109727343960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +164,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70195230219480
+  version_requirements: *70109727343960
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70195230217620 !ruby/object:Gem::Requirement
+  requirement: &70109727343260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,7 +175,7 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70195230217620
+  version_requirements: *70109727343260
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -231,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1138384851111270143
+      hash: 2074501190721020282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1138384851111270143
+      hash: 2074501190721020282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11