Merge pull request #293 from ekohl/drop-multi_json

Drop multi_json support

Author: bastelfreak

lib/puppet/util/json.rb

@@ -16,17 +16,7 @@ def self.build(original_exception, data)
       end
     end
 
-    begin
-      require 'multi_json'
-      # Force backend detection before attempting to use the library
-      # or load any other JSON libraries
-      MultiJson.default_adapter
-
-      # Preserve core type monkey-patching done by the built-in JSON gem
-      require 'json'
-    rescue LoadError
-      require 'json'
-    end
+    require 'json'
 
     # Load the content from a file as JSON if
     # contents are in valid format. This method does not
@@ -49,46 +39,20 @@ def self.load_file(filename, options = {})
     # when using the built-in JSON backend, to ensure consistent behavior
     # whether or not MultiJson can be loaded.
     def self.load(string, options = {})
-      if defined? MultiJson
-        begin
-          # This ensures that JrJackson and Oj will parse very large or very small
-          # numbers as floats rather than BigDecimals, which are serialized as
-          # strings by the built-in JSON gem and therefore can cause schema errors,
-          # for example, when we are rendering reports to JSON using `to_pson` in
-          # PuppetDB.
-          case MultiJson.adapter.name
-          when "MultiJson::Adapters::JrJackson"
-            options[:use_bigdecimal] = false
-          when "MultiJson::Adapters::Oj"
-            options[:bigdecimal_load] = :float
-          end
+      string = string.read if string.respond_to?(:read)
 
-          MultiJson.load(string, options)
-        rescue MultiJson::ParseError => e
-          raise Puppet::Util::Json::ParseError.build(e, string)
-        end
-      else
-        begin
-          string = string.read if string.respond_to?(:read)
-
-          options[:symbolize_names] = true if options.delete(:symbolize_keys)
-          ::JSON.parse(string, options)
-        rescue JSON::ParserError => e
-          raise Puppet::Util::Json::ParseError.build(e, string)
-        end
-      end
+      options[:symbolize_names] = true if options.delete(:symbolize_keys)
+      ::JSON.parse(string, options)
+    rescue JSON::ParserError => e
+      raise Puppet::Util::Json::ParseError.build(e, string)
     end
 
     def self.dump(object, options = {})
-      if defined? MultiJson
-        MultiJson.dump(object, options)
-      elsif options.is_a?(JSON::State)
-        # we're being called recursively
-        object.to_json(options)
-      else
-        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
-        object.to_json(options)
+      # Options is a state when we're being called recursively
+      if !options.is_a?(JSON::State) && options.delete(:pretty)
+        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h)
       end
+      object.to_json(options)
     end
   end
 end

openvox.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('fast_gettext', '>= 2.1', '< 5')
   spec.add_runtime_dependency('getoptlong', '~> 0.2.0')
   spec.add_runtime_dependency('locale', '~> 2.1')
-  spec.add_runtime_dependency('multi_json', '~> 1.13')
   spec.add_runtime_dependency('openfact', '~> 5.0')
   spec.add_runtime_dependency('ostruct', '>= 0.5.5', '< 0.7')
   spec.add_runtime_dependency('puppet-resource_api', '~> 2.0')

rakelib/benchmark.rake

@@ -1,6 +1,5 @@
 require 'benchmark'
 require 'tmpdir'
-require 'csv'
 require 'objspace'
 
 namespace :benchmark do
@@ -37,6 +36,8 @@ namespace :benchmark do
 
       desc "Run the #{name} scenario."
       task :run, [*run_args] =>  :generate do |_, args|
+        require 'csv'
+
         report = []
         details = []
         Benchmark.benchmark(Benchmark::CAPTION, 10, Benchmark::FORMAT, "> total:", "> avg:") do |b|

spec/unit/network/formats_spec.rb

@@ -368,12 +368,6 @@ def self.from_binary(data)
       expect(json.render_multiple(instances)).to eq([{"string" => "foo"}].to_json)
     end
 
-    it "should render multiple instances as a JSON array of hashes when multi_json is not present" do
-      hide_const("MultiJson") if defined?(MultiJson)
-      instances = [FormatsTest.new("foo")]
-      expect(json.render_multiple(instances)).to eq([{"string" => "foo"}].to_json)
-    end
-
     it "should intern an instance from a JSON hash" do
       text = Puppet::Util::Json.dump({"string" => "parsed_json"})
       instance = json.intern(FormatsTest, text)