Support for Ruby 2.4+

.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7

Rakefile

@@ -1,11 +1,13 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
 
-task :default => :test
+task default: :test

json-merge_patch.gemspec

@@ -1,24 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'json/merge_patch/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "json-merge_patch"
+  spec.name          = 'json-merge_patch'
   spec.version       = JSON::MergePatch::VERSION
-  spec.authors       = ["Steve Klabnik"]
-  spec.email         = ["steve@steveklabnik.com"]
-  spec.description   = %q{An implementation of the json-merge-patch draft.}
-  spec.summary       = %q{An implementation of the json-merge-patch draft.}
-  spec.homepage      = "http://json-merge-patch.herokuapp.com/"
-  spec.license       = "MIT"
+  spec.authors       = ['Steve Klabnik']
+  spec.email         = ['steve@steveklabnik.com']
+  spec.description   = 'An implementation of the json-merge-patch draft.'
+  spec.summary       = 'An implementation of the json-merge-patch draft.'
+  spec.homepage      = 'http://json-merge-patch.herokuapp.com/'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.required_ruby_version = '>= 2.4'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rake'
 end

lib/json/merge_patch.rb

@@ -58,7 +58,7 @@ def is_array_or_primitive?(obj)
     end
 
     def is_primitive?(val)
-      [ String, Fixnum,
+      [ String, Integer, Float,
         TrueClass, FalseClass,
         NilClass
       ].include?(val.class)

lib/json/merge_patch/version.rb

@@ -3,6 +3,6 @@
 module JSON
   class MergePatch
     # The current version of json-merge_patch
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end