jsonapi_compliable 0.10.7 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f3fde1d93829c0cae1e4a182d93fb179480ebe
-  data.tar.gz: 617a21bae42b814b68d59205da139504436549fb
+  metadata.gz: c57344ec75f9fa96fd13ebcf83abe1ca58d1d20e
+  data.tar.gz: cf942fd528a49bbad613692b4d6db297742c8224
 SHA512:
-  metadata.gz: aa0f523a1ab819795655ae3fa18961b883f790432de523582ad9113737bc79f48d76082fc76895fbcccff0c0b5a7ecdd6051c3bb0c87aab5550ae46ad55ff707
-  data.tar.gz: 410d64165adb71abf7925194247e7931e27d5f216b2dbd47491ff2f02827c936294cd7c22c8226e81316b85d8eddef503bbac6fd8866992ebc0c9b3437b8539c
+  metadata.gz: 07dbfa3e4559cc419343479ed870d9264e66b6a6c9c34eac5384b49e2259ac1ecd8d12cbd098fa03dbcb34b5269617fd20fa598e1fb797be62d7a1ab0a89ce2e
+  data.tar.gz: 3ade1417f03913ad2df35d6447a19c15fe4eb302e3effe1c00b9822fc376accb8d482e20dcbaaaa366204f5c44bdc82968f469d4bd8db79029a6165ed78e6f85

data/.travis.yml

@@ -5,11 +5,6 @@ rvm:
 
 script: "bundle exec rake"
 
-before_install:
-  - gem update --system
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.14.6
-
 install: bundle install --retry=3 --jobs=3
 
 gemfile:

data/lib/generators/jsonapi/templates/destroy_request_spec.rb.erb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe "<%= type %>#destroy", type: :request do
   context 'basic destroy' do
-    let!(:<%= file_name %>) { FactoryGirl.create(:<%= file_name %>) }
+    let!(:<%= file_name %>) { create(:<%= file_name %>) }
 
     it 'updates the resource' do
       expect {

data/lib/generators/jsonapi/templates/index_request_spec.rb.erb

@@ -6,7 +6,7 @@ RSpec.describe "<%= file_name.pluralize %>#index", type: :request do
     let!(:<%= file_name %>2) { create(:<%= file_name %>) }
 
     it 'serializes the list correctly' do
-      get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>"
+      jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>"
 
       expect(json_ids(true)).to match_array([<%= file_name %>1.id, <%= file_name %>2.id])
       assert_payload(:<%= file_name %>, <%= file_name %>1, json_items[0])

data/lib/generators/jsonapi/templates/show_request_spec.rb.erb

@@ -5,7 +5,7 @@ RSpec.describe "<%= file_name.pluralize %>#show", type: :request do
     let!(:<%= file_name %>) { create(:<%= file_name %>) }
 
     it 'serializes the resource correctly' do
-      get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>/#{<%= file_name %>.id}"
+      jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>/#{<%= file_name %>.id}"
 
       assert_payload(:<%= file_name %>, <%= file_name %>, json_item)
     end

data/lib/jsonapi_compliable/adapters/active_record.rb

@@ -80,6 +80,8 @@ module JsonapiCompliable
           else
             parent.send(association_name) << child
           end
+        elsif association_type == :has_one
+          parent.send("#{association_name}=", child)
         elsif
           child.send("#{association_name}=", parent)
         end

data/lib/jsonapi_compliable/errors.rb

@@ -13,6 +13,17 @@ module JsonapiCompliable
       end
     end
 
+    class InvalidInclude < StandardError
+      def initialize(relationship, parent_resource)
+        @relationship = relationship
+        @parent_resource = parent_resource
+      end
+
+      def message
+        "The requested included relationship \"#{@relationship}\" is not supported on resource \"#{@parent_resource}\""
+      end
+    end
+
     class StatNotFound < StandardError
       def initialize(attribute, calculation)
         @attribute = attribute

data/lib/jsonapi_compliable/scope.rb

@@ -81,6 +81,11 @@ module JsonapiCompliable
 
       includes.each_pair do |name, nested|
         sideload = @resource.sideload(name)
+
+        unless sideload
+          raise JsonapiCompliable::Errors::InvalidInclude.new(name, @resource.type)
+        end
+
         namespace = Util::Sideload.namespace(@namespace, sideload.name)
         sideload.resolve(results, @query, namespace)
       end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.10.7"
+  VERSION = "0.10.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.9
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable