restpack_serializer 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3daa5bd16f4c61dc8e0e46a1aa91234ea6eee250
-  data.tar.gz: 0ccaa8526f5811905ca6aee4c6c762fedd2576e9
+  metadata.gz: aa7cfdbe2a9599b02355d695b51fb1ba6bd50bed
+  data.tar.gz: aa3d9b0c277baf98f13fb7ab9c798a445c903a7a
 SHA512:
-  metadata.gz: ac15ac3b387840b892689ccb93047f7356bf0e65a493228efde51916a1c67f4c196d59852b26519fa01975b8ab75ea6ee80e20f3e38ba532a4563c92afbd106c
-  data.tar.gz: 6cb929625f66ff9ae579b6d28d46a9c75d771a59f9b1f16681aa7b7b097a3d400d3c93931be4d4f54ea99d6918a3cc429b1643956fa5eec0977aed137f8beb65
+  metadata.gz: e9adc45be506cf71e5d2edb1d71dd09e5d92132b6f2252d0894ac47537096840bf8b9b7cc77551ef75445eeaefdfb99314ebc075e5dc706c4322ae2136e62e6a
+  data.tar.gz: ba50400c0c244ea96efcd89988026c58f4f9c11cdae1a53b0c0ea691243218b4d78181710f1fc3ee43a1a03e3db2caf2bbc713a12ff01673ce036d73ec8f9752

data/lib/restpack_serializer/serializable/paging.rb

@@ -28,7 +28,8 @@ module RestPack::Serializer::Paging
 
       side_load_data = side_loads(page, options)
       result[:meta].merge!(side_load_data[:meta] || {})
-      result.merge side_load_data.except(:meta)
+      result = result.merge side_load_data.except(:meta)
+      inject_to_many_links result
     end
 
     private
@@ -68,5 +69,32 @@ module RestPack::Serializer::Paging
       url += '?' + params.join('&') if params.any?
       url
     end
+
+    def inject_to_many_links(result) #TODO: GJ: extract this into a result class and refactor
+      keys = result.keys - [:meta, :links]
+
+      keys.each do |key|
+        result[key].each do |item|
+          if item[:links]
+            item[:links].each do |link_key, link_value|
+              unless link_value.is_a? Array
+                plural_linked_key = "#{link_key}s".to_sym
+
+                if result[plural_linked_key]
+                  linked_resource = result[plural_linked_key].find { |i| i[:id] == link_value }
+                  if linked_resource
+                    linked_resource[:links] ||= {}
+                    linked_resource[:links][key] ||= []
+                    linked_resource[:links][key] << item[:id]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      result
+    end
   end
 end

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.4.7'
+    VERSION = '0.4.8'
   end
 end

data/spec/serializable/paging_spec.rb

@@ -112,6 +112,19 @@ describe RestPack::Serializer::Paging do
         page[:meta][:songs][:next_href].should == '/songs.json?page=2&include=albums'
       end
 
+      it "includes links between documents" do
+        song = page[:songs].first
+        song_model = MyApp::Song.find(song[:id])
+        song[:links][:album].should == song_model.album_id.to_s
+        song[:links][:artist].should == song_model.artist_id.to_s
+
+        album = page[:albums].first
+        album_model = MyApp::Album.find(album[:id])
+
+        album[:links][:artist].should == album_model.artist_id.to_s
+        album[:links][:songs].should == page[:songs].map { |song| song[:id] }
+      end
+
       context "with includes as comma delimited string" do
         let(:params) { { include: "albums,artists" } }
         it "includes side-loaded models" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord