jsonapi_compliable 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdce2b040460bc3c66f0aa2a869e5be239cef593
-  data.tar.gz: 37e97590487dbd9eca8edc3157174f4826e79bba
+  metadata.gz: ff9f3051203426cebee5e62694cf097f0aba942d
+  data.tar.gz: f427616b68314981ec7dd9d46a5941042e234637
 SHA512:
-  metadata.gz: 0462e8f0e8745dcefafce80dd8c605254b7b28731a14d6d0c5fdd4cb2cae0575c22dc83d199b00269bbb78d77a2a22d6744b515bf05d4ad24fa0e845529d33e4
-  data.tar.gz: 6cbacdb485370394b01d8dd80a031b254e0712e182c833671a04c39d62037e2b61e79f9fd084b57e0ebd90cc3b279eb282ae42c0fea5e99f3dc93b817d1c9e7e
+  metadata.gz: 2ec6bf442ea94a3213137860adf61e12aff5a29897a1eebee53850c1f69a927ba636c8ad98bf4523adcc976182777abdc314ff75af165e80d7e3d65110b2cca3
+  data.tar.gz: 0ade2b736330f5267b58d97c10ad669ec285d25fffc705436d3398b5869ea2e7d07eabcb81b0767109a8898fdc24a6e23ccf6d2ea7a4280963d02e8a246a2b09

data/gemfiles/rails_4.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1"
-gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", :require => "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", platform: [:mri]
+  gem "pry-byebug", :platform => [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec path: "../"
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0"
-gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", :require => "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", platform: [:mri]
+  gem "pry-byebug", :platform => [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec path: "../"
+gemspec :path => "../"

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

@@ -39,7 +39,9 @@ class <%= model_klass.name.pluralize %>Controller < ApplicationController
   <%- end -%>
   def show
     scope = jsonapi_scope(<%= model_klass %>.where(id: params[:id]))
-    render_jsonapi(scope.resolve.first, scope: false)
+    instance = scope.resolve.first
+    raise JsonapiCompliable::Errors::RecordNotFound unless instance
+    render_jsonapi(instance, scope: false)
   end
 
   <%- end -%>
@@ -79,13 +81,17 @@ class <%= model_klass.name.pluralize %>Controller < ApplicationController
   <%- end -%>
   <%- if actions?('destroy') -%>
   <%- unless omit_comments? -%>
-  # No need for any special logic here as no_content is jsonapi_compliant.
-  # Customize this if you have a more complex use case.
+  # Renders 200 OK with empty meta
+  # http://jsonapi.org/format/#crud-deleting-responses-200
   <%- end -%>
   def destroy
-    <%= file_name %> = <%= model_klass %>.find(params[:id])
-    <%= file_name %>.destroy
-    return head(:no_content)
+    <%= file_name %>, success = jsonapi_destroy.to_a
+
+    if success
+      render json: { meta: {} }
+    else
+      render_errors_for(<%= file_name %>)
+    end
   end
   <%- end -%>
 end

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

@@ -1,7 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe "<%= type %>#create", type: :request do
-  context 'basic create' do
+  subject(:make_request) do
+    jsonapi_post "/<%= api_namespace %>/v1/<%= type %>", payload
+  end
+
+  describe 'basic create' do
     let(:payload) do
       {
         data: {
@@ -15,7 +19,7 @@ RSpec.describe "<%= type %>#create", type: :request do
 
     it 'creates the resource' do
       expect {
-        jsonapi_post "/<%= api_namespace %>/v1/<%= type %>", payload
+        make_request
       }.to change { <%= model_klass %>.count }.by(1)
       <%= file_name %> = <%= model_klass %>.last
 

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

@@ -1,15 +1,20 @@
 require 'rails_helper'
 
 RSpec.describe "<%= type %>#destroy", type: :request do
-  context 'basic destroy' do
+  subject(:make_request) do
+    jsonapi_delete "/<%= api_namespace %>/v1/<%= type %>/#{<%= file_name %>.id}"
+  end
+
+  describe 'basic destroy' do
     let!(:<%= file_name %>) { create(:<%= file_name %>) }
 
     it 'updates the resource' do
       expect {
-        delete "/<%= api_namespace %>/v1/<%= type %>/#{<%= file_name %>.id}"
+        make_request
       }.to change { <%= model_klass %>.count }.by(-1)
 
-      expect(response.status).to eq(204)
+      expect(response.status).to eq(200)
+      expect(json).to eq('meta' => {})
     end
   end
 end

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

@@ -1,13 +1,19 @@
 require 'rails_helper'
 
 RSpec.describe "<%= file_name.pluralize %>#index", type: :request do
-  context 'basic fetch' do
+  let(:params) { {} }
+
+  subject(:make_request) do
+    jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>",
+      params: params
+  end
+
+  describe 'basic fetch' do
     let!(:<%= file_name %>1) { create(:<%= file_name %>) }
     let!(:<%= file_name %>2) { create(:<%= file_name %>) }
 
     it 'serializes the list correctly' do
-      jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>"
-
+      make_request
       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])
       assert_payload(:<%= file_name %>, <%= file_name %>2, json_items[1])

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

@@ -1,12 +1,18 @@
 require 'rails_helper'
 
 RSpec.describe "<%= file_name.pluralize %>#show", type: :request do
-  context 'basic fetch' do
+  let(:params) { {} }
+
+  subject(:make_request) do
+    jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>/#{<%= file_name %>.id}",
+      params: params
+  end
+
+  describe 'basic fetch' do
     let!(:<%= file_name %>) { create(:<%= file_name %>) }
 
     it 'serializes the resource correctly' do
-      jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>/#{<%= file_name %>.id}"
-
+      make_request
       assert_payload(:<%= file_name %>, <%= file_name %>, json_item)
     end
   end

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

@@ -1,7 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe "<%= type %>#update", type: :request do
-  context 'basic update' do
+  subject(:make_request) do
+    jsonapi_put "/<%= api_namespace %>/v1/<%= type %>/#{<%= file_name %>.id}", payload
+  end
+
+  describe 'basic update' do
     let!(:<%= file_name %>) { create(:<%= file_name %>) }
 
     let(:payload) do
@@ -19,7 +23,7 @@ RSpec.describe "<%= type %>#update", type: :request do
     # Replace 'xit' with 'it' after adding attributes
     xit 'updates the resource' do
       expect {
-        jsonapi_put "/<%= api_namespace %>/v1/<%= type %>/#{<%= file_name %>.id}", payload
+        make_request
       }.to change { <%= file_name %>.reload.attributes }
       assert_payload(:<%= file_name %>, <%= file_name %>, json_item)
 

data/lib/jsonapi_compliable/base.rb

@@ -226,6 +226,12 @@ module JsonapiCompliable
       end
     end
 
+    def jsonapi_destroy
+      _persist do
+        jsonapi_resource.destroy(params[:id])
+      end
+    end
+
     # Similar to +render :json+ or +render :jsonapi+
     #
     # By default, this will "build" the scope via +#jsonapi_scope+. To avoid

data/lib/jsonapi_compliable/deserializer.rb

@@ -207,10 +207,18 @@ class JsonapiCompliable::Deserializer
   end
 
   def raw_attributes
-    data[:attributes] || {}
+    if data
+      data[:attributes] || {}
+    else
+      {}
+    end
   end
 
   def raw_relationships
-    data[:relationships] || {}
+    if data
+      data[:relationships] || {}
+    else
+      {}
+    end
   end
 end

data/lib/jsonapi_compliable/errors.rb

@@ -44,5 +44,8 @@ module JsonapiCompliable
         end
       end
     end
+
+    class RecordNotFound < StandardError
+    end
   end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Lee Richmond