grape-jsonapi-resources 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575cc7e2962074d9f9e4ffb125db8b851e991e28
-  data.tar.gz: b1af375ccf4b1bf922704ce91b703bf2f6d23cad
+  metadata.gz: 501995cf9777aea9358f30ffcf907dc906b5cf90
+  data.tar.gz: aa46b95ca1832521723d19881eb4da9321f8cc18
 SHA512:
-  metadata.gz: edac78ce14e4248f4222c506902402afc908bcd978f45ac38b36edf9cc3b0578f854df65a5fd86b3e7c40205cc7ab51045c2c9788c1582c036979ec51996bfda
-  data.tar.gz: 941743ea6628246b0b04afd9874f8a38f99e22789a0916725d4d55b000f72679201fa7ab25046a5ab6a2e839d7bc0894048b52f92504a132ab8c21a7b8fa1880
+  metadata.gz: a6abff14330738a8b9de22a49936f4a2270529637584acb40eb2226197aa4a2dd97657af8b4d6e0507bc03a128f0cbcda72d04f147ed0195f7b7bb9f114db130
+  data.tar.gz: 3047469ceb26c6525043499d94f2fd738085c3c589ebadf084ba839694681eb5ad0ac30c4c5a64e20759027dc33a2cbc2b38d67cddcca344ab923f24d5a11a21

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/Gemfile

@@ -8,3 +8,5 @@ when 'HEAD'
 else
   gem 'grape', version
 end
+
+gem 'jsonapi-resources', "0.8.0.beta2"

data/grape-jsonapi-resources.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'grape'
   gem.add_dependency 'jsonapi-resources', '>= 0.5.0'
 
-  gem.add_development_dependency 'rails-api', '>= 0.4.0'
+  gem.add_development_dependency 'rails', '>= 5.0.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'rake'

data/lib/grape-jsonapi-resources/formatter.rb

@@ -35,22 +35,34 @@ module Grape
           end
 
           resource_instances = nil
+          sorted_primary_ids = nil
           if resource.respond_to?(:to_ary)
             resource_instances = resource.to_ary.compact.collect do |each_resource|
               each_resource_class = resource_class_for(each_resource)
               each_resource_class.new(each_resource, context)
             end
+            sorted_primary_ids = resource_instances.collect { |resource_instance| resource_instance.try(:id) }
           else
             resource_instances = resource_class.new(resource, context)
           end
 
-          resource_serialzer = JSONAPI::ResourceSerializer.new(resource_class, jsonapi_options).serialize_to_hash(resource_instances)
-          if jsonapi_options[:meta]
+          resource_serialzed = JSONAPI::ResourceSerializer.new(resource_class, jsonapi_options).serialize_to_hash(resource_instances)
+          json_output = if jsonapi_options[:meta]
             # Add option to merge top level meta tag as jsonapi-resources does not appear to support this
-            resource_serialzer.as_json.merge(meta: jsonapi_options[:meta]).to_json if jsonapi_options[:meta]
+            resource_serialzed.as_json.merge(meta: jsonapi_options[:meta])
           else
-            resource_serialzer.to_json
+            resource_serialzed
           end
+
+          # Ensure sort order is maintained, serialize_to_hash can reorder objects if
+          # objects of the array are of different types (polymorphic cases)
+          json_output = json_output.stringify_keys
+          if sorted_primary_ids && (data = json_output["data"]).present?
+            sorted_primary_ids = sorted_primary_ids.map(&:to_s)
+            json_output["data"] = data.sort_by { |d| sorted_primary_ids.index(d["id"]) }
+          end
+
+          json_output.to_json
         end
 
         def build_options_from_endpoint(endpoint)

data/lib/grape-jsonapi-resources/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module JSONAPIResources
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/spec/grape-jsonapi-resources/formatter_spec.rb

@@ -25,6 +25,8 @@ describe Grape::Formatter::JSONAPIResources do
 
   describe '.serialize_resource' do
     let(:user) { User.new(first_name: 'John', id: 123) }
+    let(:user_2) { User.new(first_name: 'Jane', id: 456) }
+    let(:blog_post) { BlogPost.new(title: 'Blag', body: 'Super blag', id: 321) }
 
     if Grape::Util.const_defined?('InheritableSetting')
       let(:endpoint) { Grape::Endpoint.new(Grape::Util::InheritableSetting.new, path: '/', method: 'foo', root: false) }
@@ -53,7 +55,12 @@ describe Grape::Formatter::JSONAPIResources do
       expect(UserResource).to receive(:new).with(user, {current_user: endpoint.current_user}).twice.and_call_original
       described_class.serialize_resource([ user, user ], env)
     end
-    # array
+
+    it 'should maintain order of different resources' do
+      serialized_results = ActiveSupport::JSON.decode(described_class.serialize_resource([user, blog_post, user_2], env))
+      expect(serialized_results["data"].map {|r| r["id"]}).to eq([user.id, blog_post.id, user_2.id].map(&:to_s))
+      expect(serialized_results["data"].map {|r| r["type"]}).to eq(["users", "blog-posts", "users"])
+    end
 
     it 'should specify serializer options like "base_url" and "include"' do
       allow(described_class).to receive(:build_options_from_endpoint).with(endpoint).and_return({base_url: "/api/v1"})

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'rails'
 require 'action_controller'
 require 'active_model'
 require 'jsonapi-resources'
-require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext'
 require 'active_support/json'
 require 'rspec'
 require 'rack/test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: rails-api
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt