pusher-fake 0.1.5 → 0.2.0

data/lib/pusher-fake.rb

@@ -1,7 +1,7 @@
 require "em-websocket"
-require "hmac-sha2"
+require "multi_json"
+require "openssl"
 require "thin"
-require "yajl"
 
 require "pusher-fake/channel"
 require "pusher-fake/channel/public"
@@ -14,7 +14,7 @@ require "pusher-fake/server/application"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 
   # Call this method to modify the defaults.
   #

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

@@ -43,7 +43,7 @@ module PusherFake
       # @param [Connection] connection The connection a subscription succeeded for.
       # @param [Hash] options The options for the channel.
       def subscription_succeeded(connection, options = {})
-        members[connection] = Yajl::Parser.parse(options[:channel_data], symbolize_keys: true)
+        members[connection] = MultiJson.load(options[:channel_data], symbolize_keys: true)
 
         emit("pusher_internal:member_added", members[connection])
 

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

@@ -35,7 +35,8 @@ module PusherFake
       def authentication_for(id, data = nil)
         configuration = PusherFake.configuration
         string        = [id, name, data].compact.map(&:to_s).join(":")
-        signature     = HMAC::SHA256.hexdigest(configuration.secret, string)
+        digest        = OpenSSL::Digest::SHA256.new
+        signature     = OpenSSL::HMAC.hexdigest(digest, configuration.secret, string)
 
         "#{configuration.key}:#{signature}"
       end

data/lib/pusher-fake/connection.rb

@@ -18,7 +18,7 @@ module PusherFake
     def emit(event, data = {}, channel = nil)
       message = { event: event, data: data }
       message[:channel] = channel if channel
-      message = Yajl::Encoder.encode(message)
+      message = MultiJson.dump(message)
 
       socket.send(message)
     end
@@ -32,7 +32,7 @@ module PusherFake
     #
     # @param [String] data The event data as JSON.
     def process(data)
-      message      = Yajl::Parser.parse(data, symbolize_keys: true)
+      message      = MultiJson.load(data, symbolize_keys: true)
       data         = message[:data]
       event        = message[:event]
       channel_name = message[:channel] || data.delete(:channel)

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

@@ -8,7 +8,7 @@ module PusherFake
       # @return [Rack::Response] A successful response.
       def self.call(environment)
         request = Rack::Request.new(environment)
-        event   = Yajl::Parser.parse(request.body.read)
+        event   = MultiJson.load(request.body.read)
 
         event["channels"].each do |channel|
           Channel.factory(channel).emit(event["name"], event["data"])

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

@@ -26,7 +26,7 @@ describe PusherFake::Channel::Presence, "#add" do
   subject { PusherFake::Channel::Presence.new("name") }
 
   before do
-    Yajl::Parser.stubs(:parse).returns(channel_data)
+    MultiJson.stubs(:load).returns(channel_data)
     subject.stubs(connections: connections, emit: nil, subscription_data: subscription_data)
   end
 
@@ -39,7 +39,7 @@ describe PusherFake::Channel::Presence, "#add" do
   it "parses the channel_data when authorized" do
     subject.stubs(authorized?: true)
     subject.add(connection, data)
-    Yajl::Parser.should have_received(:parse).with(data[:channel_data], symbolize_keys: true)
+    MultiJson.should have_received(:load).with(data[:channel_data], symbolize_keys: true)
   end
 
   it "assigns the parsed channel_data to the members hash for the current connection" do

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

@@ -56,12 +56,12 @@ describe PusherFake::Channel::Private, "#authentication_for" do
 
   before do
     PusherFake.stubs(configuration: configuration)
-    HMAC::SHA256.stubs(hexdigest: signature)
+    OpenSSL::HMAC.stubs(hexdigest: signature)
   end
 
   it "generates a signature" do
     subject.authentication_for(id)
-    HMAC::SHA256.should have_received(:hexdigest).with(configuration.secret, string)
+    OpenSSL::HMAC.should have_received(:hexdigest).with(kind_of(OpenSSL::Digest::SHA256), configuration.secret, string)
   end
 
   it "returns the authentication string" do
@@ -81,12 +81,12 @@ describe PusherFake::Channel::Private, "#authentication_for, with channel data"
 
   before do
     PusherFake.stubs(configuration: configuration)
-    HMAC::SHA256.stubs(hexdigest: signature)
+    OpenSSL::HMAC.stubs(hexdigest: signature)
   end
 
   it "generates a signature" do
     subject.authentication_for(id, channel_data)
-    HMAC::SHA256.should have_received(:hexdigest).with(configuration.secret, string)
+    OpenSSL::HMAC.should have_received(:hexdigest).with(kind_of(OpenSSL::Digest::SHA256), configuration.secret, string)
   end
 
   it "returns the authentication string" do

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

@@ -13,12 +13,12 @@ end
 
 describe PusherFake::Connection, "#emit" do
   let(:data)         { { some: "data", good: true } }
-  let(:json)         { Yajl::Encoder.encode(message) }
+  let(:json)         { MultiJson.dump(message) }
   let(:event)        { "name" }
   let(:socket)       { stub(:send) }
   let(:channel)      { "channel" }
   let(:message)      { { event: event, data: data } }
-  let(:channel_json) { Yajl::Encoder.encode(message.merge(channel: channel)) }
+  let(:channel_json) { MultiJson.dump(message.merge(channel: channel)) }
 
   subject { PusherFake::Connection.new(socket) }
 
@@ -58,13 +58,13 @@ describe PusherFake::Connection, "#process, with a subscribe event" do
   subject { PusherFake::Connection.new(stub) }
 
   before do
-    Yajl::Parser.stubs(parse: message)
+    MultiJson.stubs(load: message)
     PusherFake::Channel.stubs(factory: channel)
   end
 
   it "parses the JSON data" do
     subject.process(json)
-    Yajl::Parser.should have_received(:parse).with(json, symbolize_keys: true)
+    MultiJson.should have_received(:load).with(json, symbolize_keys: true)
   end
 
   it "creates a channel from the event data" do
@@ -87,13 +87,13 @@ describe PusherFake::Connection, "#process, with an unsubscribe event" do
   subject { PusherFake::Connection.new(stub) }
 
   before do
-    Yajl::Parser.stubs(parse: message)
+    MultiJson.stubs(load: message)
     PusherFake::Channel.stubs(factory: channel)
   end
 
   it "parses the JSON data" do
     subject.process(json)
-    Yajl::Parser.should have_received(:parse).with(json, symbolize_keys: true)
+    MultiJson.should have_received(:load).with(json, symbolize_keys: true)
   end
 
   it "creates a channel from the event data" do
@@ -118,13 +118,13 @@ describe PusherFake::Connection, "#process, with a client event" do
   subject { PusherFake::Connection.new(stub) }
 
   before do
-    Yajl::Parser.stubs(parse: message)
+    MultiJson.stubs(load: message)
     PusherFake::Channel.stubs(factory: channel)
   end
 
   it "parses the JSON data" do
     subject.process(json)
-    Yajl::Parser.should have_received(:parse).with(json, symbolize_keys: true)
+    MultiJson.should have_received(:load).with(json, symbolize_keys: true)
   end
 
   it "creates a channel from the event data" do
@@ -172,13 +172,13 @@ describe PusherFake::Connection, "#process, with an unknown event" do
   subject { PusherFake::Connection.new(stub) }
 
   before do
-    Yajl::Parser.stubs(parse: message)
+    MultiJson.stubs(load: message)
     PusherFake::Channel.stubs(factory: channel)
   end
 
   it "parses the JSON data" do
     subject.process(json)
-    Yajl::Parser.should have_received(:parse).with(json, symbolize_keys: true)
+    MultiJson.should have_received(:load).with(json, symbolize_keys: true)
   end
 
   it "creates a channel from the event data" do

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

@@ -18,7 +18,7 @@ describe PusherFake::Server::Application, ".call" do
   before do
     response.stubs(finish: response)
 
-    Yajl::Parser.stubs(parse: event)
+    MultiJson.stubs(load: event)
     Rack::Request.stubs(new: request)
     Rack::Response.stubs(new: response)
     PusherFake::Channel.stubs(:factory).with(channels[0]).returns(channel_1)
@@ -32,7 +32,7 @@ describe PusherFake::Server::Application, ".call" do
 
   it "parses the request body as JSON" do
     subject.call(environment)
-    Yajl::Parser.should have_received(:parse).with(json)
+    MultiJson.should have_received(:load).with(json)
   end
 
   it "creates channels by name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -27,22 +27,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +162,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +170,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.0.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +194,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +202,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2596033998219902442
+      hash: 680940724053515135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -315,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2596033998219902442
+      hash: 680940724053515135
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23