json_api_ruby 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2583d3425ef36b085c8a7d2c58569b138f695462
-  data.tar.gz: 4a23def762768101841b2719d5862fc721c0d1d5
+  metadata.gz: c5dceae1c4696a3b82d185b7d649c75a54b9970b
+  data.tar.gz: 0bc9d17129bfe3ef885ea78ad1313c56b151927d
 SHA512:
-  metadata.gz: 706bfc6a97b2d8fccc355e91162f5a0a34f4a54299cd5f5dd4864d48f7e8f7e4d0bb084e32d679eed0b848bfbd3e7f890e7d2fb1f7719ceeb2fce855d5d78394
-  data.tar.gz: 683c5fab664a31b4817fcaa2629a1a5003c8b8fd4de95cb9889bcd5a6e40314bd04a979a6e4b7768bc2958ba9bba1725ee2c6a782830e3a6443470f66ef0e28c
+  metadata.gz: e16b110f1359c748d9868ff1c7d487a1855648a1519ff46b79c01e6ab177725d5e9b43f9e01969cda08ad87a213419e02ad74232f6f54c1983563897db8849b6
+  data.tar.gz: 08ff527bfe60cc369fd1a68c04d251194721ba01123bb1e1dbc897e6fb229fab38d39eb7c155de2d757d7efd7ff14673ed75c665be2665bc54d16a9fdb31483c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.4.4
+Fixed an issue with complex includes
+
 0.4.3
 Removed the constraint on activesupport 3. Should be >= 3 not ~> 3
 

data/lib/json_api_ruby/includes.rb

@@ -11,19 +11,13 @@ module JsonApi
       first_include = self.new
 
       split_includes = Array(includes).map{|inc| inc.to_s.split('.')}
-      if split_includes.blank?
-        return first_include
-      end
-
-      first_array = Array(split_includes.first)
-      other_arrays = split_includes[1..-1]
-      zipped = first_array.zip(*other_arrays)
-      first_array = zipped.shift
-      first_include.includes = first_array.uniq.compact
+      split_includes = ArrayTransposer.new(split_includes).transpose_array
+      first_array = split_includes.shift
+      first_include.includes = Array(first_array).uniq.compact
 
-      zipped.inject(first_include) do |base_include, object_name|
+      split_includes.inject(first_include) do |base_include, sub_array|
         new_include = self.new
-        new_include.includes = object_name.uniq.compact
+        new_include.includes = sub_array.uniq.compact
         base_include.next = new_include
         new_include
       end
@@ -42,5 +36,41 @@ module JsonApi
     def next
       @next || self.class.new
     end
+
+  end
+
+  class ArrayTransposer
+    attr_reader :array
+
+    def initialize(array)
+      @array = Array(array)
+    end
+
+    def transpose_array
+      padded_sub_arrays.transpose
+    end
+
+    def padded_sub_arrays
+      max_length = largest_sub_array_length
+      array.map do |sub_array|
+        sub_array.extend(ArrayPadder)
+        sub_array.pad(max_length)
+      end
+    end
+
+    def largest_sub_array_length
+      largest_count = 0
+      array.each do |sub_array|
+        largest_count = sub_array.count if sub_array.length > largest_count
+      end
+      largest_count
+    end
+  end
+
+  # Meant to be extended within an Array instance
+  module ArrayPadder
+    def pad(length)
+      self + self.class.new(length - self.length) { nil }
+    end
   end
 end

data/lib/json_api_ruby/version.rb

@@ -1,3 +1,3 @@
 module JsonApi
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/json_api_ruby/includes_spec.rb

@@ -25,10 +25,10 @@ describe JsonApi::Includes do
 
     context 'complex includes' do
       subject(:parsed_includes) do
-        described_class.parse_includes(['thingone.thingtwo.thingthree', 'thingone.thingfour', 'thingone.thingtwo.thingfive', 'thingsix.thingseven'])
+        described_class.parse_includes(['thingeight', 'thingnine', 'thingone.thingtwo.thingthree', 'thingone.thingfour', 'thingone.thingtwo.thingfive', 'thingsix.thingseven'])
       end
 
-      specify { expect(parsed_includes.includes).to eq ['thingone', 'thingsix'] }
+      specify { expect(parsed_includes.includes).to eq ['thingeight', 'thingnine', 'thingone', 'thingsix'] }
       specify { expect(parsed_includes.next.includes).to eq ['thingtwo', 'thingfour', 'thingseven'] }
       specify { expect(parsed_includes.next.next.includes).to eq ['thingthree', 'thingfive'] }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Tracey Eubanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport