simple_jsonapi_rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f215ae2299e394ec1979de2ee91292f5628834f7202bcb9331de60325ee7e5
-  data.tar.gz: a685301d7e02ae0824907b4f958ca160a33a4817874fb7b3b094560ee282a080
+  metadata.gz: d9758a0f3fd06b470a59b9ab25ca7817645864ac816733172b63671fee1c3a4f
+  data.tar.gz: 24ff4b62b70c2883605e6440ee88306869b5c45e4c69ff6220a64fb28f85e3c7
 SHA512:
-  metadata.gz: '08c57a2fcce220afef37833a229c291c24db7d62203f459134c94cddbc6756b7bf0f38f17aedd1f5792666f51b38fadd04cdd73ebbc9d5638f5ea24b09ad21e1'
-  data.tar.gz: a855937c2a603fbe944cc0893e73a6ac45f5b171e5c0133a19aaa30d7810c0dd6fe41bd4106547f99c33b0704017d753bb552cb2adb6da835f95ee92296c8aed
+  metadata.gz: 30ca70b05fc1f6fd927a360ea94c94ac80b7d18320a5d89c1e0b806831c3597296f4d4805e3148732bedd20dc3edcd0d135c22c932049c32e324d9d59004a2f4
+  data.tar.gz: 4e94601dfcd208569e1cbfeb8691e6198f08d7569445220e7d974e43223eb336a036c86322c9a4d55be382d78a19e69886c45cf68589a2f5b67c1b0b8b4b79ab

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 1.3.0 - February 28, 2020
+* Fixing deprecation warning about media_type
+
 ## Version 1.2.0 - September 9, 2019
 * Adding support for Rails 6
 

data/lib/simple_jsonapi/rails/action_controller/request_validator.rb

@@ -4,7 +4,7 @@ module SimpleJsonapi
       class RequestValidator
         attr_reader :request, :params
 
-        delegate :body, :content_type, :accept, :path, to: :request, prefix: true
+        delegate :body, :content_type, :media_type, :accept, :path, to: :request, prefix: true
 
         def initialize(request, params)
           @request = request
@@ -12,7 +12,11 @@ module SimpleJsonapi
         end
 
         def valid_content_type_header?
-          !request_has_body? || request_content_type == SimpleJsonapi::MIME_TYPE
+          if request.respond_to?(:media_type)
+            !request_has_body? || request_media_type == SimpleJsonapi::MIME_TYPE
+          else
+            !request_has_body? || request_content_type == SimpleJsonapi::MIME_TYPE
+          end
         end
 
         def valid_accept_header?

data/lib/simple_jsonapi/rails/railtie.rb

@@ -14,17 +14,32 @@ module SimpleJsonapi
           # In the renderers, `self` is the controller
 
           ::ActionController::Renderers.add(:jsonapi_resource) do |resource, options|
-            self.content_type ||= Mime[:jsonapi]
+            if respond_to?(:media_type)
+              self.content_type = Mime[:jsonapi] unless self.media_type
+            else
+              self.content_type ||= Mime[:jsonapi]
+            end
+
             SimpleJsonapi.render_resource(resource, options).to_json
           end
 
           ::ActionController::Renderers.add(:jsonapi_resources) do |resources, options|
-            self.content_type ||= Mime[:jsonapi]
+            if respond_to?(:media_type)
+              self.content_type = Mime[:jsonapi] unless self.media_type
+            else
+              self.content_type ||= Mime[:jsonapi]
+            end
+
             SimpleJsonapi.render_resources(resources, options).to_json
           end
 
           ::ActionController::Renderers.add(:jsonapi_errors) do |errors, options|
-            self.content_type ||= Mime[:jsonapi]
+            if respond_to?(:media_type)
+              self.content_type = Mime[:jsonapi] unless self.media_type
+            else
+              self.content_type ||= Mime[:jsonapi]
+            end
+
             SimpleJsonapi.render_errors(errors, options).to_json
           end
         end

data/lib/simple_jsonapi/rails/version.rb

@@ -1,5 +1,5 @@
 module SimpleJsonapi
   module Rails
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_jsonapi_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - PatientsLikeMe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_jsonapi
@@ -234,6 +234,7 @@ files:
 - test/action_controller_test.rb
 - test/dummy/.gitignore
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/api_controller.rb
 - test/dummy/app/controllers/orders/relationships/items_controller.rb
 - test/dummy/app/controllers/orders_controller.rb
@@ -280,8 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A library for integrating SimpleJsonapi into a Rails application.
@@ -289,6 +289,7 @@ test_files:
 - test/action_controller_test.rb
 - test/dummy/.gitignore
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/api_controller.rb
 - test/dummy/app/controllers/orders/relationships/items_controller.rb
 - test/dummy/app/controllers/orders_controller.rb