jsonapi.rb 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1557a7b02828b0aee6f7fafc9c67019e0486f05
-  data.tar.gz: 23fd349bb61835beeab3d904d54c04715e4aa9ce
+  metadata.gz: 8b1ee1a4a7cd79049959e65fed77c429414082d3
+  data.tar.gz: '0026897226e3074b5944b9ceac0dc4185ccb64d2'
 SHA512:
-  metadata.gz: 3d59d76a63b2bbc48f71cafe32f80f9ce5f3ed3575221619071799f76d8ed0bc648ba75988372df29a3aa6130d47a2c9b27375948f6ea165d54cd9e0eb53aaf8
-  data.tar.gz: 9f735bea904696b5a3c043267827a0cadbfdcf8c3a65d42c817a241e139b4adb6a953b4506695a84d28d5c15cdd9cab726360cca1bf6f4e01419f1f10b57593f
+  metadata.gz: 74be35a6b3eb14db777853c44b4cb0430e344f9dfb643a9e875fd05b1482b05708e8767aa9b8491ae05956c3492694e5c2a85d243848681c9f8e95c11e172b6d
+  data.tar.gz: 6b97c6e0e0b7bcebacf25a6895d4b24c5e079e41178d17601440cf341d22e7cba256c67132cc9ea65727859c257e95d5d7c89a1b5c2ca2b7d10dec9575591d5a

data/.travis.yml

@@ -3,5 +3,12 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.1
-before_install: gem install bundler
+  - 2.6.1
+  - 2.3.7
+env:
+  - RAILS_VERSION='~> 5'
+  - RAILS_VERSION='~> 4'
+before_install:
+  - rm -f Gemfile.lock
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - bundler || gem install bundler -v '< 2'

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jsonapi-rspec', github: 'stas/jsonapi-rspec'
+gem 'rails', ENV['RAILS_VERSION']

data/Gemfile.lock

@@ -148,7 +148,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.63.1)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -156,7 +156,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
-    rubocop-rails_config (0.4.2)
+    rubocop-rails_config (0.4.3)
       railties (>= 3.0)
       rubocop (~> 0.58)
     ruby-progressbar (1.10.0)
@@ -193,12 +193,12 @@ DEPENDENCIES
   ffaker
   jsonapi-rspec!
   jsonapi.rb!
-  rails
+  rails (~> 5)
   rspec (~> 3.0)
   rspec-rails
   rubocop-rails_config
   simplecov
-  sqlite3
+  sqlite3 (~> 1.3.6)
   yardstick
 
 BUNDLED WITH

data/jsonapi.rb.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
   spec.add_development_dependency 'ffaker'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'

data/lib/jsonapi/active_model_error_serializer.rb

@@ -16,8 +16,10 @@ module JSONAPI
 
     attribute :code do |object|
       _, error_hash = object
-      error_hash[:error] || error_hash[:message]
-        .to_s.delete("''").parameterize('_')
+      code = error_hash[:error] unless error_hash[:error].is_a?(Hash)
+      code ||= error_hash[:message] || :invalid
+      # `parameterize` separator arguments are different on Rails 4 vs 5...
+      code.to_s.delete("''").parameterize.gsub('-', '_')
     end
 
     attribute :detail do |object, params|
@@ -25,7 +27,11 @@ module JSONAPI
       errors_object = params[:model].errors
 
       # Rails 4 provides just the message.
-      if error_hash[:error].present?
+      if error_hash[:error].present? && error_hash[:error].is_a?(Hash)
+        message = errors_object.generate_message(
+          error_key, nil, error_hash[:error]
+        )
+      elsif error_hash[:error].present?
         message = errors_object.generate_message(error_key, error_hash[:error])
       else
         message = error_hash[:message]

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi
@@ -84,16 +84,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement