Skip to content

Commit 1e92693

Browse files
radixhoundchrisbutler
authored andcommitted
Update json requirements to work with a Rails 5 project
- Locking the json to an old version seems uneccessary - Forcing multi_json and json_pure monkeypatching broke our test suite - removed the json_pure and so far so good
1 parent de1c294 commit 1e92693

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# frozen_string_literal: true
21
# encoding: UTF-8
2+
# frozen_string_literal: true
33

44
require 'bundler/gem_tasks'
55
require 'rubocop/rake_task'

lib/mockserver-client.rb

-14
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,3 @@
44
require_relative './mockserver/version'
55
require_relative './mockserver/mock_server_client'
66
require_relative './mockserver/proxy_client'
7-
8-
# Setup serialization correctly with multi_json
9-
require 'json/pure'
10-
11-
# To fix serialization bugs. See: http://prettystatemachine.blogspot.com/2010/09/typeerrors-in-tojson-make-me-briefly.html
12-
# rubocop:disable Lint/UnifiedInteger
13-
class Fixnum
14-
def to_json(_)
15-
to_s
16-
end
17-
end
18-
19-
require 'multi_json'
20-
MultiJson.use(:json_pure)

mockserver-client.gemspec

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
3131
spec.add_dependency 'activesupport', '>= 4.1'
3232
spec.add_dependency 'colorize', '~> 0.7'
3333
spec.add_dependency 'hashie', '~> 3.0'
34-
spec.add_dependency 'json', '~> 1.8'
35-
spec.add_dependency 'json_pure', '~> 1.8'
36-
spec.add_dependency 'activesupport', '~> 4.1'
37-
spec.add_dependency 'rest-client'
34+
spec.add_dependency 'json', '>= 1.8'
3835
spec.add_dependency 'logging_factory', '~> 0.0.2'
3936
spec.add_dependency 'rest-client', '>= 1.7'
4037
spec.add_dependency 'thor', '~> 0.19'

0 commit comments

Comments
 (0)