From ea336358834eb519377a890b8b425509e0df9533 Mon Sep 17 00:00:00 2001 From: Chance Feick Date: Thu, 29 Sep 2016 09:53:01 -0700 Subject: [PATCH] remove delegation --- lib/librato/metrics/smart_json.rb | 45 +++++++++---------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/lib/librato/metrics/smart_json.rb b/lib/librato/metrics/smart_json.rb index 2fac194..d146890 100644 --- a/lib/librato/metrics/smart_json.rb +++ b/lib/librato/metrics/smart_json.rb @@ -4,37 +4,21 @@ class SmartJSON extend SingleForwardable if defined?(::MultiJson) - if RUBY_VERSION <= "2.3.0" + def self.read(json) # MultiJSON >= 1.3.0 if MultiJson.respond_to?(:load) - def_delegator MultiJson, :load, :read + MultiJson.load(json) else - def_delegator MultiJson, :decode, :read + MultiJson.decode(json) end + end + def self.write(json) # MultiJSON <= 1.2.0 if MultiJson.respond_to?(:dump) - def_delegator MultiJson, :dump, :write + MultiJson.dump(json) else - def_delegator MultiJson, :encode, :write - end - else - def self.read(json) - # MultiJSON >= 1.3.0 - if MultiJson.respond_to?(:load) - MultiJson.load(json) - else - MultiJson.decode(json) - end - end - - def self.write(json) - # MultiJSON <= 1.2.0 - if MultiJson.respond_to?(:dump) - MultiJson.dump(json) - else - MultiJson.encode(json) - end + MultiJson.encode(json) end end @@ -44,17 +28,12 @@ def self.handler else require "json" - if RUBY_VERSION <= "2.3.0" - def_delegator JSON, :parse, :read - def_delegator JSON, :generate, :write - else - def self.read(json) - JSON.parse(json) - end + def self.read(json) + JSON.parse(json) + end - def self.write(json) - JSON.generate(json) - end + def self.write(json) + JSON.generate(json) end def self.handler