Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Remove Nack::JSON namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
josh committed Nov 18, 2013
1 parent db0ef26 commit 0ef322a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
12 changes: 0 additions & 12 deletions lib/nack/json.rb
@@ -1,13 +1 @@
require 'json'

module Nack
module JSON
def self.encode(obj)
::JSON.generate(obj)
end

def self.decode(json)
::JSON.parse(json)
end
end
end
14 changes: 7 additions & 7 deletions test/test_server.rb
Expand Up @@ -41,7 +41,7 @@ def start(fixture = :echo)
def request(env = {}, body = nil)
socket = UNIXSocket.open(sock)

NetString.write(socket, JSON.encode(env))
NetString.write(socket, JSON.generate(env))
NetString.write(socket, body) if body
NetString.write(socket, "")

Expand All @@ -53,7 +53,7 @@ def request(env = {}, body = nil)
if status.nil?
status = data.to_i
elsif headers.nil?
headers = JSON.decode(data)
headers = JSON.parse(data)
elsif data.length > 0
body << data
else
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_invalid_json_env
error = nil

NetString.read(socket) do |data|
error = JSON.decode(data)
error = JSON.parse(data)
end

assert error
Expand All @@ -115,7 +115,7 @@ def test_invalid_netstring
error = nil

NetString.read(socket) do |data|
error = JSON.decode(data)
error = JSON.parse(data)
end

assert error
Expand All @@ -138,7 +138,7 @@ def test_app_error
start :error do
socket = UNIXSocket.open(sock)

NetString.write(socket, JSON.encode({}))
NetString.write(socket, JSON.generate({}))
NetString.write(socket, "foo=bar")
NetString.write(socket, "")

Expand All @@ -147,7 +147,7 @@ def test_app_error
error = nil

NetString.read(socket) do |data|
error = JSON.decode(data)
error = JSON.parse(data)
end

assert error
Expand All @@ -158,7 +158,7 @@ def test_app_error

def test_spawn_error
spawn :crash
error = JSON.decode(heartbeat.read)
error = JSON.parse(heartbeat.read)

assert error
assert_equal "RuntimeError", error['name']
Expand Down

0 comments on commit 0ef322a

Please sign in to comment.