ecom_core 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f6e3983ebe8c52b90ff6e03d7be6b681c3b1370cb8fd1f05754fe1d30c4632
-  data.tar.gz: 919a8ddf42360fd8893e4c0c3f1e9dbb4605179fbcafe95da93eb6fefa92a489
+  metadata.gz: 2c0b15c898c1865b73c99b6c2c94eefd24830c2e5849cd04f173208bdd2e3da7
+  data.tar.gz: fb1f5f442e4e33d457c51656efca5d4f11c25968be4f260b0cc0f72b047040f7
 SHA512:
-  metadata.gz: ce44c79419ca0323fd373e0b1918291024537accdd4c7fcaaf5b6a6466f831c8ae575d1cadb86679a817562f129682bab164fae50c767cb72fc52463044db4ea
-  data.tar.gz: f03eaf3aecb8268df496ac1407056413369a8cd35df04d4f238683523ee4de170cc257916ef241d9468d74c2b87629e5a15456eb311f505b83ba607dbfbecf22
+  metadata.gz: 25e3d49560ae3e835c3673f284da580c03b12787ba84423d45f27d49dbb8f71acbc64d3dea90511aa1b363e1fd7767e50ce530d004cdfc7fb5ae317286614e1a
+  data.tar.gz: ca28ea1b20d10bfcb7938ee402fe60cc10a7d6a142d2b876aa722333c7d6da178fab22939768a65ec09856e971c7bfc5e9b358eb29c8ec73d84a2c4ce26e6937

data/app/controllers/concerns/ecom/core/resource_typeable.rb

@@ -8,13 +8,13 @@ module Ecom
       end
 
       def index
-        render json: ResourceTypeSerializer.new(@clazz.all).serializable_hash
+        render json: @clazz.all
       end
 
       def create
         resource_type = @clazz.new(resource_type_params)
         if resource_type.save
-          render json: ResourceTypeSerializer.new(resource_type).serializable_hash, status: :created
+          render json: resource_type, status: :created
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end
@@ -23,7 +23,7 @@ module Ecom
       def update
         resource_type = @clazz.find(params[:id])
         if resource_type.update(resource_type_params)
-          render json: ResourceTypeSerializer.new(resource_type).serializable_hash
+          render json: resource_type
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/application_modules_controller.rb

@@ -2,13 +2,13 @@ module Ecom
   module Core
     class ApplicationModulesController < ApplicationController
       def index
-        render json: ApplicationModuleSerializer.new(ApplicationModule.all).serializable_hash
+        render json: ApplicationModule.all
       end
 
       def create
         application_module = ApplicationModule.new(application_module_params)
         if application_module.save
-          render json: ApplicationModuleSerializer.new(application_module).serializable_hash, status: :created
+          render json: application_module, status: :created
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end
@@ -17,7 +17,7 @@ module Ecom
       def update
         application_module = ApplicationModule.find(params[:id])
         if application_module.update(application_module_params)
-          render json: ApplicationModuleSerializer.new(application_module).serializable_hash
+          render json: application_module
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/user_roles_controller.rb

@@ -4,14 +4,14 @@ module Ecom
       before_action :set_user_role, only: [:update]
 
       def index
-        render json: UserRoleSerializer.new(UserRole.all).serializable_hash
+        render json: UserRole.all
       end
 
       def create
         user_role = UserRole.new(user_role_params)
 
         if user_role.save
-          render json: UserRoleSerializer.new(user_role).serializable_hash, status: :created
+          render json: user_role, status: :created
         else
           render json: { success: false, errors: user_role.errors }, status: :unprocessable_entity
         end
@@ -19,7 +19,7 @@ module Ecom
 
       def update
         if @user_role.update(user_role_params)
-          render json: UserRoleSerializer.new(@user_role).serializable_hash
+          render json: @user_role
         else
           render json: { success: false, errors: @user_role.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/users_controller.rb

@@ -4,17 +4,17 @@ module Ecom
       before_action :set_user, only: [:update]
 
       def index
-        render json: UserSerializer.new(User.all).serializable_hash
+        render json: User.all
       end
 
       def active
-        render json: UserSerializer.new(User.active).serializable_hash
+        render json: User.active
       end
 
       def create
         user = User.new(user_params)
         if user.save
-          render json: UserSerializer.new(user).serializable_hash, status: :created
+          render json: user, status: :created
         else
           render json: { success: false, errors: user.errors }, status: :unprocessable_entity
         end
@@ -22,7 +22,7 @@ module Ecom
 
       def update
         if @user.update(user_params)
-          render json: UserSerializer.new(@user).serializable_hash
+          render json: @user
         else
           render json: { success: false, errors: @user.errors }, status: :unprocessable_entity
         end

data/app/serializers/ecom/core/application_module_serializer.rb

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class ApplicationModuleSerializer < ApplicationSerializer
+    class ApplicationModuleSerializer < ActiveModel::Serializer
       attributes :id, :code, :name
     end
   end

data/app/serializers/ecom/core/lookup_serializer.rb

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class LookupSerializer < ApplicationSerializer
+    class LookupSerializer < ActiveModel::Serializer
       attributes :id, :name, :type
     end
   end

data/app/serializers/ecom/core/resource_type_serializer.rb

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class ResourceTypeSerializer < ApplicationSerializer
+    class ResourceTypeSerializer < ActiveModel::Serializer
       attributes :id, :code, :name, :base_unit, :type
     end
   end

data/app/serializers/ecom/core/user_role_serializer.rb

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class UserRoleSerializer < ApplicationSerializer
+    class UserRoleSerializer < ActiveModel::Serializer
       attributes :id, :name
     end
   end

data/app/serializers/ecom/core/user_serializer.rb

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class UserSerializer < ApplicationSerializer
+    class UserSerializer < ActiveModel::Serializer
       attributes :id, :first_name, :last_name, :email, :active
     end
   end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.1.7'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -2,4 +2,4 @@ require 'ecom/core'
 require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
-require 'fast_jsonapi'
+require 'active_model_serializers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,6 @@ files:
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
 - app/serializers/ecom/core/application_module_serializer.rb
-- app/serializers/ecom/core/application_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb

data/app/serializers/ecom/core/application_serializer.rb

@@ -1,20 +0,0 @@
-module Ecom
-  module Core
-    class ApplicationSerializer
-      include FastJsonapi::ObjectSerializer
-
-      def serializable_hash
-        data = super[:data]
-        if data.is_a? Hash
-          data[:attributes]
-        elsif data.is_a? Array
-          data.map { |d| d[:attributes] }
-        elsif data.nil?
-          nil
-        else
-          data
-        end
-      end
-    end
-  end
-end