jsonapi-resources 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb51f8c096de8ece9f78168a967750a958fe620
-  data.tar.gz: 1e7e845621c801642776c99bd559185af85a645c
+  metadata.gz: f0f3c0056192f7ce0100152a1365750eeec04e3b
+  data.tar.gz: 5d2b1057fc7f624e91eee60ea8a5cbaff019516d
 SHA512:
-  metadata.gz: 57b8f79c39ddfe67ab9fc939292b8f9c9ed014cf0b673eab9c7e9957a927dd743b51c719c40c55973c81856898c349715c1ae3560a8e72c5efc37fe7c71e7407
-  data.tar.gz: d3ac8f45d9d357fc9adc44a88cb46596c5dcb81bac8b6f1bb3bbb20079eb797490689f4014e118a52a3885f418d9955ebc52e21f8de0f1fe66ccfb4fe18852f6
+  metadata.gz: 25ff4a750913e3a987e2e0c3b1e366b8195db07d4487d849608637cb0c3cdfc62bbae9ea0553284bba60a12b41de19b6d451f448dd68c32c9b92d8319cde5d9b
+  data.tar.gz: 41a3b01c6367dd22b4ce0f285a2a4cbba91cb84868ab5dbb345498387cc2921c5565edc0c6f095de37a8a56b8b8c093460f6f83f2be3d9c55821869671dd8468

data/lib/jsonapi/resource.rb

@@ -261,6 +261,18 @@ module JSONAPI
         self.new(model, context)
       end
 
+      def find_by_keys(keys, options = {})
+        context = options[:context]
+        _models = _model_class.where({_primary_key => keys})
+
+        unless _models.length == keys.length
+          key = (keys - _models.pluck(:id).map(&:to_s)).first
+          raise JSONAPI::Exceptions::RecordNotFound.new(key)
+        end
+
+        _models.map { |model| self.new(model, context) }
+      end
+
       def verify_filters(filters, context = nil)
         verified_filters = {}
         filters.each do |filter, raw_value|
@@ -398,7 +410,7 @@ module JSONAPI
               resource_class = self.class.resource_for(type_name)
               if resource_class
                 associated_model = @model.send attr
-                return resource_class.new(associated_model, @context)
+                return associated_model ? resource_class.new(associated_model, @context) : nil
               end
             end unless method_defined?(attr)
           elsif @_associations[attr].is_a?(JSONAPI::Association::HasMany)

data/lib/jsonapi/resource_controller.rb

@@ -30,14 +30,11 @@ module JSONAPI
     def show
       keys = parse_key_array(params[resource_klass._primary_key])
 
-      if keys.length > 1
-        resources = []
-        keys.each do |key|
-          resources.push(resource_klass.find_by_key(key, context: context))
-        end
-      else
-        resources = resource_klass.find_by_key(keys[0], context: context)
-      end
+      resources = if keys.length > 1
+                    resource_klass.find_by_keys(keys, context: context)
+                  else
+                    resource_klass.find_by_key(keys[0], context: context)
+                  end
 
       render json: JSONAPI::ResourceSerializer.new.serialize_to_hash(
           resources,

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/test/controllers/controller_test.rb

@@ -971,6 +971,12 @@ class TagsControllerTest < ActionController::TestCase
     assert_equal 4, json_response['tags'].size
     assert_equal 2, json_response['linked']['posts'].size
   end
+
+  def test_tags_show_multiple_with_nonexistent_ids
+    get :show, {id: '6,99,9,100'}
+    assert_response :not_found
+    assert_match /The record identified by 99 could not be found./, json_response['errors'][0]['detail']
+  end
 end
 
 class ExpenseEntriesControllerTest < ActionController::TestCase

data/test/fixtures/active_record.rb

@@ -135,7 +135,7 @@ end
 
 class Planet < ActiveRecord::Base
   has_many :moons
-  has_one :planet_type
+  belongs_to :planet_type
 
   has_and_belongs_to_many :tags, join_table: :planets_tags
 end
@@ -432,6 +432,10 @@ class BreedResource < JSONAPI::Resource
   def self.find_by_key(id, options = {})
     BreedResource.new($breed_data.breeds[id.to_i], options[:context])
   end
+
+  def self.find_by_keys(keys, options = {})
+    keys.map { |key| self.find_by_key(key, options) }
+  end
 end
 
 class PlanetResource < JSONAPI::Resource
@@ -452,7 +456,7 @@ class PropertyResource < JSONAPI::Resource
 end
 
 class PlanetTypeResource < JSONAPI::Resource
-  attribute :name
+  attributes :id, :name
   has_many :planets
 end
 

data/test/unit/serializer/serializer_test.rb

@@ -549,4 +549,50 @@ class SerializerTest < MiniTest::Unit::TestCase
     assert_match /\"planetType\":null/, json
     assert_match /\"moons\":\[\]/, json
   end
+
+  def test_serializer_include_with_empty_links_null_and_array
+    planets = []
+    Planet.find(7, 8).each do |planet|
+      planets.push PlanetResource.new(planet)
+    end
+
+    planet_hash = JSONAPI::ResourceSerializer.new.serialize_to_hash(
+      planets,
+      include: ['planet_type'],
+      fields: { planet_types: [:id, :name] }
+    )
+
+    assert_hash_equals(
+      {
+        planets: [{
+                    id: 7,
+                    name: 'Beta X',
+                    description: 'Newly discovered Planet Z',
+                    links: {
+                      planetType: 1,
+                      tags: [],
+                      moons: []
+                    }
+                  },
+                  {
+                    id: 8,
+                    name: 'Beta W',
+                    description: 'Newly discovered Planet W',
+                    links: {
+                      planetType: nil,
+                      tags: [],
+                      moons: []
+                    }
+                  }],
+        linked: {
+          planetTypes: [
+            { id: 1, name: "Gas Giant" }
+          ]
+        }
+      }, planet_hash)
+
+    json = planet_hash.to_json
+    assert_match /\"planetType\":null/, json
+    assert_match /\"moons\":\[\]/, json
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler