From 5861f27ebb1c5f9f53e12c29e969f5deead77c08 Mon Sep 17 00:00:00 2001 From: "Min.Kim" Date: Fri, 2 Feb 2018 15:33:25 +0000 Subject: [PATCH] Add jsonapi-rb / require for jsonapi-rb benchmark test --- Gemfile.lock | 23 +++++++++++++++- fast_jsonapi.gemspec | 64 ++++++++++++++++++++++++++++++++++++-------- spec/spec_helper.rb | 1 + 3 files changed, 76 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47bcbea..5cc42de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,25 @@ GEM i18n (0.9.1) concurrent-ruby (~> 1.0) jsonapi-renderer (0.2.0) + json (1.8.6) + jsonapi-deserializable (0.2.0) + jsonapi-rb (0.5.0) + jsonapi-deserializable (~> 0.2.0) + jsonapi-serializable (~> 0.3.0) + jsonapi-renderer (0.2.0) + jsonapi-serializable (0.3.0) + jsonapi-renderer (~> 0.2.0) + juwelier (2.1.3) + builder + bundler (>= 1.13) + git (>= 1.2.5) + github_api + highline (>= 1.6.15) + nokogiri (>= 1.5.10) + rake + rdoc + semver + jwt (1.5.6) loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -99,7 +118,9 @@ DEPENDENCIES bundler (~> 1.0) byebug fast_jsonapi! - oj (~> 3.3) + jsonapi-rb (~> 0.5.0) + juwelier (~> 2.1.0) + rdoc (~> 3.12) rspec (~> 3.5.0) rspec-benchmark (~> 0.3.0) skylight (~> 1.3) diff --git a/fast_jsonapi.gemspec b/fast_jsonapi.gemspec index 5b7a93c..00cff64 100644 --- a/fast_jsonapi.gemspec +++ b/fast_jsonapi.gemspec @@ -20,15 +20,57 @@ Gem::Specification.new do |gem| gem.rubygems_version = "2.5.1" gem.summary = "fast JSON API(jsonapi.org) serializer" - gem.add_runtime_dependency(%q, ["~> 5.0"]) - gem.add_runtime_dependency(%q, ["~> 1.12"]) - gem.add_development_dependency(%q, ["~> 5.0"]) - gem.add_development_dependency(%q, ["~> 1.3"]) - gem.add_development_dependency(%q, ["~> 3.5.0"]) - gem.add_development_dependency(%q, ["~> 3.3"]) - gem.add_development_dependency(%q, ["~> 0.3.0"]) - gem.add_development_dependency(%q, ["~> 1.0"]) - gem.add_development_dependency(%q, [">= 0"]) - gem.add_development_dependency(%q, ["~> 0.10.4"]) - gem.add_development_dependency(%q, ["~> 1.3"]) + if s.respond_to? :specification_version then + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, ["~> 5.0"]) + s.add_runtime_dependency(%q, ["~> 1.12"]) + s.add_runtime_dependency(%q, ["~> 3.3"]) + s.add_runtime_dependency(%q, ["~> 5.0"]) + s.add_development_dependency(%q, ["~> 1.3"]) + s.add_development_dependency(%q, ["~> 3.5.0"]) + s.add_development_dependency(%q, ["~> 0.3.0"]) + s.add_development_dependency(%q, ["~> 3.12"]) + s.add_development_dependency(%q, ["~> 1.0"]) + s.add_development_dependency(%q, ["~> 2.1.0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, ["~> 0.10.4"]) + s.add_development_dependency(%q, ["~> 1.3"]) + s.add_development_dependency(%q, ["~> 0.5.0"]) + else + s.add_dependency(%q, ["~> 5.0"]) + s.add_dependency(%q, ["~> 1.12"]) + s.add_dependency(%q, ["~> 3.3"]) + s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 5.0"]) + s.add_dependency(%q, ["~> 3.5.0"]) + s.add_dependency(%q, ["~> 0.3.0"]) + s.add_dependency(%q, ["~> 3.12"]) + s.add_dependency(%q, ["~> 1.0"]) + s.add_dependency(%q, ["~> 2.1.0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, ["~> 0.10.4"]) + s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 0.5.0"]) + end + else + s.add_dependency(%q, ["~> 5.0"]) + s.add_dependency(%q, ["~> 1.12"]) + s.add_dependency(%q, ["~> 3.3"]) + s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 5.0"]) + s.add_dependency(%q, ["~> 3.5.0"]) + s.add_dependency(%q, ["~> 0.3.0"]) + s.add_dependency(%q, ["~> 3.12"]) + s.add_dependency(%q, ["~> 1.0"]) + s.add_dependency(%q, ["~> 2.1.0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, ["~> 0.10.4"]) + s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 0.5.0"]) + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c278cdc..a82b893 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,6 +4,7 @@ require 'multi_json' require 'byebug' require 'active_model_serializers' require 'oj' +require 'jsonapi/serializable' Dir[File.dirname(__FILE__) + '/shared/contexts/*.rb'].each {|file| require file }