Skip to content

Commit b717ffe

Browse files
bf4shishirmk
authored andcommitted
Let people choose their JSON serializer; JSON:API is not circular
1 parent e7caa7a commit b717ffe

5 files changed

Lines changed: 2 additions & 6 deletions

File tree

Gemfile.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ PATH
33
specs:
44
fast_jsonapi (1.0.17)
55
activesupport (>= 4.2)
6-
multi_json (~> 1.12)
76

87
GEM
98
remote: https://rubygems.org/
@@ -61,7 +60,6 @@ GEM
6160
nokogiri (>= 1.5.9)
6261
mini_portile2 (2.3.0)
6362
minitest (5.10.3)
64-
multi_json (1.13.1)
6563
nokogiri (1.8.1)
6664
mini_portile2 (~> 2.3.0)
6765
oj (3.4.0)

fast_jsonapi.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
2121
gem.summary = "fast JSON API(jsonapi.org) serializer"
2222

2323
gem.add_runtime_dependency(%q<activesupport>, [">= 4.2"])
24-
gem.add_runtime_dependency(%q<multi_json>, ["~> 1.12"])
2524
gem.add_development_dependency(%q<activerecord>, [">= 4.2"])
2625
gem.add_development_dependency(%q<skylight>, ["~> 1.3"])
2726
gem.add_development_dependency(%q<rspec>, ["~> 3.5.0"])

lib/fast_jsonapi/object_serializer.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'active_support/core_ext/object'
22
require 'active_support/concern'
33
require 'active_support/inflector'
4-
require 'multi_json'
54
require 'fast_jsonapi/serialization_core'
65

76
begin

lib/fast_jsonapi/serialization_core.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ def record_hash(record)
6565
end
6666
end
6767

68+
# Override #to_json for alternative implementation
6869
def to_json(payload)
69-
MultiJson.dump(payload) if payload.present?
70+
JSON.fast_generate(payload) if payload.present?
7071
end
7172

7273
# includes handler

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'fast_jsonapi'
22
require 'rspec-benchmark'
3-
require 'multi_json'
43
require 'byebug'
54
require 'active_model_serializers'
65
require 'oj'

0 commit comments

Comments
 (0)