pusher-fake 1.2.0 → 1.3.0

data/spec/support/capybara.rb

@@ -0,0 +1,10 @@
+require "capybara/rspec"
+
+Capybara.app = Sinatra::Application
+Capybara.default_driver = :webkit
+
+Capybara.register_driver(:webkit) do |application|
+  Capybara::Webkit::Driver.new(application).tap do |driver|
+    driver.block_unknown_urls
+  end
+end

data/spec/support/coveralls.rb

@@ -2,7 +2,6 @@ if ENV["CI"]
   require "coveralls"
 
   Coveralls.wear_merged! do
-    add_filter "features/"
     add_filter "spec/"
   end
 end

data/spec/support/helpers/connect.rb

@@ -0,0 +1,21 @@
+module ConnectHelpers
+  def connect(options = {})
+    visit "/"
+
+    expect(page).to have_content("Client connected.")
+
+    if options[:channel]
+      subscribe_to(options[:channel])
+    end
+  end
+
+  def connect_as(name, options = {})
+    using_session(name) do
+      connect(options)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include(ConnectHelpers)
+end

data/spec/support/helpers/event.rb

@@ -0,0 +1,9 @@
+module EventHelpers
+  def have_event(event, options = {})
+    have_css("li", text: "Channel #{options[:on]} received #{event} event.")
+  end
+end
+
+RSpec.configure do |config|
+  config.include(EventHelpers)
+end

data/spec/support/helpers/subscription.rb

@@ -0,0 +1,29 @@
+module SubscriptionHelpers
+  def subscribe_to(channel)
+    page.execute_script("Helpers.subscribe(#{MultiJson.dump(channel)})")
+
+    expect(page).to have_content("Subscribed to #{channel}.")
+  end
+
+  def subscribe_to_as(channel, name)
+    using_session(name) do
+      subscribe_to(channel)
+    end
+  end
+
+  def unsubscribe_from(channel)
+    page.execute_script("Helpers.unsubscribe(#{MultiJson.dump(channel)})")
+
+    expect(page).to have_content("Unsubscribed from #{channel}.")
+  end
+
+  def unsubscribe_from_as(channel, name)
+    using_session(name) do
+      unsubscribe_from(channel)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include(SubscriptionHelpers)
+end

data/spec/support/helpers/user.rb

@@ -0,0 +1,11 @@
+module UserHelpers
+  def user_id(name = nil)
+    using_session(name) do
+      return page.evaluate_script("Pusher.instance.connection.socket_id")
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include(UserHelpers)
+end

data/spec/support/pusher-fake.rb

@@ -0,0 +1,15 @@
+RSpec.configure do |config|
+  config.before(:each, type: :feature) do
+    PusherFake.configuration.web_options.tap do |options|
+      Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@#{options[:host]}:#{options[:port]}/apps/PUSHER_APP_ID"
+    end
+
+    @thread = Thread.new { PusherFake::Server.start }
+  end
+
+  config.after(:each, type: :feature) do
+    @thread.exit
+
+    PusherFake::Channel.reset
+  end
+end

data/{features → spec}/support/webhooks.rb

@@ -1,4 +1,8 @@
-$events = []
+RSpec.configure do |config|
+  config.before(:each) do
+    $events = []
+  end
+end
 
 Thread.new do
   # Not explicitly requiring Thin::Server occasionally results in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -66,104 +66,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.16
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.3.2
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -184,42 +142,20 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.4
+        version: 0.8.7.6
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- features/channel.feature
-- features/channel_presence.feature
-- features/channel_subscribe.feature
-- features/channel_trigger.feature
-- features/channel_webhooks.feature
-- features/client_connect.feature
-- features/step_definitions/api_steps.rb
-- features/step_definitions/channel_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/event_steps.rb
-- features/step_definitions/navigation_steps.rb
-- features/step_definitions/presence_steps.rb
-- features/step_definitions/webhook_steps.rb
-- features/support/application.rb
-- features/support/application/public/javascripts/vendor/pusher-2.2.2.js
-- features/support/application/views/index.erb
-- features/support/coveralls.rb
-- features/support/environment.rb
-- features/support/pusher-fake.rb
-- features/support/timing.rb
-- features/support/webhooks.rb
-- features/user.feature
 - lib/pusher-fake.rb
 - lib/pusher-fake/channel.rb
 - lib/pusher-fake/channel/presence.rb
@@ -234,6 +170,14 @@ files:
 - lib/pusher-fake/support/cucumber.rb
 - lib/pusher-fake/support/rspec.rb
 - lib/pusher-fake/webhook.rb
+- spec/features/api/channels_spec.rb
+- spec/features/api/users_spec.rb
+- spec/features/client/connect_spec.rb
+- spec/features/client/event_spec.rb
+- spec/features/client/presence_spec.rb
+- spec/features/client/subscribe_spec.rb
+- spec/features/server/event_spec.rb
+- spec/features/server/webhooks_spec.rb
 - spec/lib/pusher-fake/channel/presence_spec.rb
 - spec/lib/pusher-fake/channel/private_spec.rb
 - spec/lib/pusher-fake/channel/public_spec.rb
@@ -245,8 +189,18 @@ files:
 - spec/lib/pusher-fake/webhook_spec.rb
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
+- spec/support/application.rb
+- spec/support/application/public/javascripts/vendor/pusher-2.2.4.js
+- spec/support/application/views/index.erb
+- spec/support/capybara.rb
 - spec/support/coveralls.rb
-- spec/support/have_configuration_option_matcher.rb
+- spec/support/helpers/connect.rb
+- spec/support/helpers/event.rb
+- spec/support/helpers/subscription.rb
+- spec/support/helpers/user.rb
+- spec/support/matchers/have_configuration_option.rb
+- spec/support/pusher-fake.rb
+- spec/support/webhooks.rb
 homepage: https://github.com/tristandunn/pusher-fake
 licenses:
 - MIT
@@ -267,33 +221,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
 test_files:
-- features/channel.feature
-- features/channel_presence.feature
-- features/channel_subscribe.feature
-- features/channel_trigger.feature
-- features/channel_webhooks.feature
-- features/client_connect.feature
-- features/step_definitions/api_steps.rb
-- features/step_definitions/channel_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/event_steps.rb
-- 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.2.2.js
-- features/support/application/views/index.erb
-- features/support/application.rb
-- features/support/coveralls.rb
-- features/support/environment.rb
-- features/support/pusher-fake.rb
-- features/support/timing.rb
-- features/support/webhooks.rb
-- features/user.feature
+- spec/features/api/channels_spec.rb
+- spec/features/api/users_spec.rb
+- spec/features/client/connect_spec.rb
+- spec/features/client/event_spec.rb
+- spec/features/client/presence_spec.rb
+- spec/features/client/subscribe_spec.rb
+- spec/features/server/event_spec.rb
+- spec/features/server/webhooks_spec.rb
 - spec/lib/pusher-fake/channel/presence_spec.rb
 - spec/lib/pusher-fake/channel/private_spec.rb
 - spec/lib/pusher-fake/channel/public_spec.rb
@@ -305,6 +245,16 @@ test_files:
 - spec/lib/pusher-fake/webhook_spec.rb
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
+- spec/support/application/public/javascripts/vendor/pusher-2.2.4.js
+- spec/support/application/views/index.erb
+- spec/support/application.rb
+- spec/support/capybara.rb
 - spec/support/coveralls.rb
-- spec/support/have_configuration_option_matcher.rb
+- spec/support/helpers/connect.rb
+- spec/support/helpers/event.rb
+- spec/support/helpers/subscription.rb
+- spec/support/helpers/user.rb
+- spec/support/matchers/have_configuration_option.rb
+- spec/support/pusher-fake.rb
+- spec/support/webhooks.rb
 has_rdoc: 

data/features/channel.feature

@@ -1,109 +0,0 @@
-@javascript
-Feature: Requesting channel information
-
-  Background:
-    Given I am connected
-
-  Scenario: Requesting all channels
-    When I request "/channels"
-    Then I should receive the following JSON:
-      """
-        { "channels" : {} }
-      """
-    When I subscribe to the "chat-message" channel
-    And I request "/channels"
-    Then I should receive the following JSON:
-      """
-        { "channels" : {
-            "chat-message" : {}
-          }
-        }
-      """
-    When I subscribe to the "presence-game-1" channel with presence events
-    And I request "/channels"
-    Then I should receive the following JSON:
-      """
-        { "channels" : {
-            "chat-message"    : {},
-            "presence-game-1" : {}
-          }
-        }
-      """
-
-  Scenario: Requesting all channels, with a filter
-    Given I subscribe to the "chat-message" channel
-    And I subscribe to the "presence-game-1" channel with presence events
-    When I request "/channels" with the following options:
-      | filter_by_prefix |
-      | chat             |
-    Then I should receive the following JSON:
-      """
-        { "channels" : {
-            "chat-message" : {}
-          }
-        }
-      """
-
-  Scenario: Requesting all channels, with a valid filter and info attributes
-    Given I subscribe to the "chat-message" channel
-    And I subscribe to the "presence-game-1" channel with presence events
-    When I request "/channels" with the following options:
-      | filter_by_prefix | info       |
-      | presence-        | user_count |
-    Then I should receive the following JSON:
-      """
-        { "channels" : {
-            "presence-game-1" : {
-              "user_count" : 1
-            }
-          }
-        }
-      """
-
-  Scenario: Requesting all channels, with an invalid filter and info attributes
-    Given I subscribe to the "chat-message" channel
-    And I subscribe to the "presence-game-1" channel with presence events
-    When I request "/channels" with the following options:
-      | filter_by_prefix | info       |
-      | chat-            | user_count |
-    Then I should receive the following error:
-      """
-        user_count may only be requested for presence channels - please supply filter_by_prefix begining with presence-
-      """
-
-  Scenario: Requesting a channel, with no occupants
-    When I request "/channels/empty"
-    Then I should receive the following JSON:
-    """
-      { "occupied" : false }
-    """
-
-  Scenario: Requesting a channel, with an occupant
-    Given I subscribe to the "non-empty" channel
-    When I request "/channels/non-empty"
-    Then I should receive the following JSON:
-    """
-      { "occupied" : true }
-    """
-
-  Scenario: Requesting a channel, with valid info attributes
-    Given I subscribe to the "presence-1" channel
-    And Bob is connected
-    And Bob is subscribed to the "presence-1" channel
-    When I request "/channels/presence-1" with the following options:
-      | info       |
-      | user_count |
-    Then I should receive the following JSON:
-    """
-      { "occupied"   : true,
-        "user_count" : 2 }
-    """
-
-  Scenario: Requesting a channel, with invalid info attributes
-    When I request "/channels/public-1" with the following options:
-      | info       |
-      | user_count |
-    Then I should receive the following error:
-      """
-        Cannot retrieve the user count unless the channel is a presence channel
-      """