Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove multi_json dependency, use 'json' gem for old rubies #245

Merged
merged 1 commit into from Jul 1, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bugsnag.gemspec
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |s|
]
s.require_paths = ["lib"]

s.add_runtime_dependency 'multi_json', ["~> 1.0"]
s.add_dependency 'json', '~> 1.7', '>= 1.7.7'

if RUBY_VERSION < "1.9"
s.add_development_dependency "rake", "~> 10.1.1"
Expand Down
2 changes: 1 addition & 1 deletion lib/bugsnag/deploy.rb
Expand Up @@ -27,7 +27,7 @@ def self.notify(opts = {})

raise RuntimeError.new("No API key found when notifying of deploy") if !parameters["apiKey"] || parameters["apiKey"].empty?

payload_string = Bugsnag::Helpers.dump_json(parameters)
payload_string = ::JSON.dump(parameters)
Bugsnag::Delivery::Synchronous.deliver(endpoint, payload_string, configuration)
end
end
Expand Down
17 changes: 0 additions & 17 deletions lib/bugsnag/helpers.rb
Expand Up @@ -123,22 +123,5 @@ def self.flatten_meta_data(overrides)
overrides
end
end

# Helper functions to work around MultiJson changes in 1.3+
def self.dump_json(object, options={})
if MultiJson.respond_to?(:adapter)
MultiJson.dump(object, options)
else
MultiJson.encode(object, options)
end
end

def self.load_json(json, options={})
if MultiJson.respond_to?(:adapter)
MultiJson.load(json, options)
else
MultiJson.decode(json, options)
end
end
end
end
6 changes: 3 additions & 3 deletions lib/bugsnag/notification.rb
@@ -1,4 +1,4 @@
require "multi_json"
require "json"

if RUBY_VERSION =~ /^1\.8/
begin
Expand Down Expand Up @@ -39,10 +39,10 @@ def deliver_exception_payload(url, payload, configuration=Bugsnag.configuration,

# If the payload is going to be too long, we trim the hashes to send
# a minimal payload instead
payload_string = Bugsnag::Helpers.dump_json(payload)
payload_string = ::JSON.dump(payload)
if payload_string.length > 128000
payload[:events].each {|e| e[:metaData] = Bugsnag::Helpers.reduce_hash_size(e[:metaData])}
payload_string = Bugsnag::Helpers.dump_json(payload)
payload_string = ::JSON.dump(payload)
end

Bugsnag::Delivery[delivery_method || configuration.delivery_method].deliver(url, payload_string, configuration)
Expand Down
2 changes: 1 addition & 1 deletion spec/notification_spec.rb
Expand Up @@ -268,7 +268,7 @@ def gloops
expect(Bugsnag).to have_sent_notification{ |payload|
# Truncated body should be no bigger than
# 2 truncated hashes (4096*2) + rest of payload (20000)
expect(Bugsnag::Helpers.dump_json(payload).length).to be < 4096*2 + 20000
expect(::JSON.dump(payload).length).to be < 4096*2 + 20000
}
end

Expand Down