Update to 0.5.x

Author: Lee Richmond

Gemfile

@@ -3,15 +3,13 @@ source 'https://rubygems.org'
 gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
 gem 'sqlite3'
 gem 'puma', '~> 3.0'
-gem 'jsonapi_suite', '~> 0.1'
+gem 'jsonapi_suite', '~> 0.5'
+gem 'jsonapi-rails', '~> 0.1'
 gem 'kaminari', '~> 0.17'
 
-gem 'jsonapi-rb', path: '../jsonapi-rb'
-gem 'jsonapi-rails', path: '../jsonapi-rails', require: 'jsonapi/rails'
-gem 'jsonapi_compliable', path: '../jsonapi_compliable'
-gem 'jsonapi-serializable', path: '../serializable'
-gem 'jsonapi-deserializable', path: '../jsonapi-deserializable'
-gem 'jsonapi-parser', path: '../jsonapi-parser'
+gem 'jsonapi-serializable',
+  git: 'https://github.com/jsonapi-rb/jsonapi-serializable.git',
+  branch: 'optim-1'
 
 group :development, :test do
   gem 'pry'

Gemfile.lock

@@ -1,36 +1,7 @@
-PATH
-  remote: ../jsonapi-deserializable
-  specs:
-    jsonapi-deserializable (0.1.1)
-      jsonapi-parser (= 0.1.1)
-
-PATH
-  remote: ../jsonapi-parser
-  specs:
-    jsonapi-parser (0.1.1)
-
-PATH
-  remote: ../jsonapi-rails
-  specs:
-    jsonapi-rails (0.1.1.beta4)
-      jsonapi-rb (= 0.1.1)
-
-PATH
-  remote: ../jsonapi-rb
-  specs:
-    jsonapi-rb (0.1.1)
-      jsonapi-deserializable (= 0.1.1)
-      jsonapi-serializable (= 0.1.1)
-
-PATH
-  remote: ../jsonapi_compliable
-  specs:
-    jsonapi_compliable (0.3.10)
-      jsonapi-rails
-      rails (>= 4.1, < 6)
-
-PATH
-  remote: ../serializable
+GIT
+  remote: https://github.com/jsonapi-rb/jsonapi-serializable.git
+  revision: c852bed5232c8853d62c188d4c796f2fc22b5b6c
+  branch: optim-1
   specs:
     jsonapi-serializable (0.1.1)
       jsonapi-renderer (= 0.1.1)
@@ -91,27 +62,34 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
+    json (1.8.6)
     jsonapi (0.1.1.beta2)
       json (~> 1.8)
+    jsonapi-deserializable (0.1.1)
+      jsonapi-parser (= 0.1.1)
+    jsonapi-parser (0.1.1)
+    jsonapi-rails (0.1.1)
+      jsonapi-rb (= 0.1.1)
+    jsonapi-rb (0.1.1)
+      jsonapi-deserializable (= 0.1.1)
+      jsonapi-serializable (= 0.1.1)
     jsonapi-renderer (0.1.1)
-    jsonapi_ams_extensions (0.1.1)
-      active_model_serializers (~> 0.10.x)
+    jsonapi_compliable (0.5.2)
+      jsonapi-serializable (~> 0.1)
     jsonapi_errorable (0.1.1)
       active_model_serializers (~> 0.10)
       rails (>= 4.1, < 6)
     jsonapi_spec_helpers (0.2.3)
-    jsonapi_suite (0.1.2)
-      active_model_serializers (~> 0.10.x)
-      jsonapi_ams_extensions (~> 0.1)
-      jsonapi_compliable (~> 0.3)
+    jsonapi_suite (0.5.1)
+      jsonapi (= 0.1.1.beta2)
+      jsonapi_compliable (~> 0.5)
       jsonapi_errorable (~> 0.1)
       jsonapi_spec_helpers (~> 0.2)
       jsonapi_swagger_helpers (~> 0.1)
       nested_attribute_reassignable (~> 0.6)
       rails (>= 4.1, < 6)
       strong_resources (~> 0.1)
-    jsonapi_swagger_helpers (0.1.2)
+    jsonapi_swagger_helpers (0.1.5)
       swagger-blocks (~> 1.3)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -204,12 +182,12 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    strong_resources (0.1.1)
+    strong_resources (0.1.6)
       rails (>= 4.1, < 6.0)
       stronger_parameters (~> 2.6)
     stronger_parameters (2.6.0)
       actionpack (>= 3.2, < 5.1)
-    swagger-blocks (1.3.4)
+    swagger-blocks (1.4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -223,13 +201,9 @@ PLATFORMS
 
 DEPENDENCIES
   database_cleaner (~> 1.5)
-  jsonapi-deserializable!
-  jsonapi-parser!
-  jsonapi-rails!
-  jsonapi-rb!
+  jsonapi-rails (~> 0.1)
   jsonapi-serializable!
-  jsonapi_compliable!
-  jsonapi_suite (~> 0.1)
+  jsonapi_suite (~> 0.5)
   kaminari (~> 0.17)
   listen (~> 3.0.5)
   pry
@@ -243,4 +217,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

app/controllers/departments_controller.rb

@@ -1,5 +1,5 @@
 class DepartmentsController < ApplicationController
-  jsonapi { }
+  jsonapi resource: DepartmentResource
 
   def index
     departments = Department.all

app/controllers/employees_controller.rb

@@ -1,17 +1,5 @@
 class EmployeesController < ApplicationController
-  jsonapi do
-    allow_filter :name
-    allow_filter :age
-
-    allow_filter :name_prefix do |scope, value|
-      scope.where(["name LIKE ?", "#{value}%"])
-    end
-
-    includes whitelist: {
-      index: :department,
-      show: { department: :goals }
-    }
-  end
+  jsonapi resource: EmployeeResource
 
   before_action :deserialize_jsonapi!, only: [:create, :update]
 
@@ -25,15 +13,15 @@ def index
   end
 
   def show
-    employee = jsonapi_scope(Employee.all).find(params[:id])
-    render_jsonapi(employee)
+    employee = jsonapi_scope(Employee.where(id: params[:id]))
+    render_jsonapi(employee.resolve.first, scope: false)
   end
 
   def create
     employee = Employee.new(strong_resource)
 
     if employee.save
-      render_jsonapi(employee)
+      render_jsonapi(employee, scope: false)
     else
       render_errors_for(employee)
     end
@@ -52,6 +40,6 @@ def update
   def destroy
     employee = Employee.find(params[:id])
     employee.destroy
-    render_jsonapi(employee)
+    render_jsonapi(employee, scope: false)
   end
 end

app/resources/application_resource.rb

@@ -0,0 +1,3 @@
+class ApplicationResource < JsonapiCompliable::Resource
+  use_adapter JsonapiCompliable::Adapters::ActiveRecord
+end

app/resources/department_resource.rb

@@ -0,0 +1,8 @@
+class DepartmentResource < ApplicationResource
+  type :departments
+
+  belongs_to :employee,
+    foreign_key: :employee_id,
+    scope: -> { Employee.all },
+    resource: EmployeeResource
+end

app/resources/employee_resource.rb

@@ -0,0 +1,15 @@
+class EmployeeResource < ApplicationResource
+  type :employees
+
+  allow_filter :name
+  allow_filter :age
+
+  allow_filter :name_prefix do |scope, value|
+    scope.where(["name LIKE ?", "#{value}%"])
+  end
+
+  has_many :departments,
+    scope: -> { Department.all },
+    foreign_key: :employee_id,
+    resource: DepartmentResource
+end

app/resources/goal_resource.rb

@@ -0,0 +1,8 @@
+class GoalResource < ApplicationResource
+  type :goals
+
+  belongs_to :department,
+    scope: -> { Department.all },
+    foreign_key: :department_id,
+    resource: DepartmentResource
+end

app/resources/serializable_department.rb renamed to app/serializers/serializable_department.rb

@@ -0,0 +1 @@
+require 'jsonapi_compliable/adapters/active_record'