api_me 0.10.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d8837b6449bebef89f8e63446cc50f92f224b4c8d21c81655751820efb2cd8e
-  data.tar.gz: e7f0d635cfe9b5ed3f7a0d6e8c8bf7352436387d9287560242c2f15d1027b7bc
+  metadata.gz: 6edbf66319db35e695cd3b4b686e3b5688a2c2fe56d108eb954976732bc11bb5
+  data.tar.gz: 6063c1ca77185b64178360c103f6c3511b6fe9652575ee00da2a99d97d626dfc
 SHA512:
-  metadata.gz: 329510b616675ef8b0cc0f982faf6dfab653ef1968eead9e15cf9f5d56fd3e29e18f8f757d73eed584d0c88dcc7db725b74576152e9524393f75a728ecb4108c
-  data.tar.gz: f16d66ec6d11b8eb9943fa99388a7e72300086516f583e6deb2b2587b105daa646280c5a40423e0a1384fab3207045fd83df57e29abc4373279708f20d2883a2
+  metadata.gz: d08b61cc42bcaa27102961bea0b54c651e1fa18adbc7034d69531147076e1acdcd5fd09204c83741880b8b527a6269d0ee2634e339159910dd043a7b8bb664c4
+  data.tar.gz: 7c610c2d85ca5009c265c1456e9c3e21d653a762e933ce8f00d6f245dd2efa57fa480c9feee608a9c52a4ff2299bb3f4ed6fd60b471989fb9071e04ffca37589

data/lib/api_me.rb

@@ -17,6 +17,8 @@ module ApiMe
   included do
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
     rescue_from ActiveRecord::RecordInvalid, with: :handle_active_record_errors
+    rescue_from ActiveRecord::RecordNotDestroyed, with: :handle_active_record_errors
+    rescue_from ActiveRecord::ReadOnlyRecord, with: :handle_active_record_errors
     rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
   end
 
@@ -93,10 +95,7 @@ module ApiMe
   end
 
   def new
-    @object = model_klass.new
-    authorize_resource @object
-
-    render_errors(['new endpoint not supported'], 404)
+    render_errors(['new endpoint not supported'], :not_found)
   end
 
   def create
@@ -104,22 +103,20 @@ module ApiMe
     authorize_resource @object
     create_resource!
 
-    render status: 201, json: @object, root: singular_root_key, serializer: serializer_klass
+    render status: :created, json: @object, root: singular_root_key, serializer: serializer_klass
   end
 
   def edit
-    @object = find_resource
-    authorize_resource @object
-
-    render_errors(['edit endpoint not supported'], 404)
+    render_errors(['edit endpoint not supported'], :not_found)
   end
 
   def update
     @object = find_resource
+    @object.assign_attributes(object_params)
     authorize_resource @object
     update_resource!
 
-    head 204
+    render status: :ok, json: @object, root: singular_root_key, serializer: serializer_klass
   end
 
   def destroy
@@ -127,7 +124,7 @@ module ApiMe
     authorize_resource @object
     destroy_resource!
 
-    head 204
+    head :no_content
   end
 
   protected
@@ -152,7 +149,7 @@ module ApiMe
     params[:sort]
   end
 
-  def render_errors(errors, status = 422)
+  def render_errors(errors, status = :unprocessable_entity)
     render(json: { errors: errors }, status: status)
   end
 
@@ -164,11 +161,11 @@ module ApiMe
 
   def user_not_authorized
     payload = { message: "User is not allowed to access #{params[:action]} on this resource" }
-    render json: payload, status: 403
+    render json: payload, status: :forbidden
   end
 
   def resource_not_found
-    head 404
+    head :not_found
   end
 
   def model_klass
@@ -230,7 +227,7 @@ module ApiMe
   end
 
   def find_resource
-    @find_resource ||= model_klass.find_by_id!(params[:id])
+    @find_resource ||= model_klass.find_by!(id: params[:id])
   end
 
   def build_resource
@@ -238,11 +235,11 @@ module ApiMe
   end
 
   def create_resource!
-    @object.save!(object_params)
+    @object.save!
   end
 
   def update_resource!
-    @object.update!(object_params)
+    @object.save!
   end
 
   def destroy_resource!

data/lib/api_me/sorting.rb

@@ -2,13 +2,16 @@
 
 module ApiMe
   class Sorting
-    attr_accessor :sort_criteria, :sort_reverse, :scope
+    attr_accessor :sort_criteria, :sort_reverse, :scope, :custom_sort_options
 
-    def initialize(scope:, sort_params:)
+    def initialize(scope:, sort_params:, custom_sort_options: {})
       self.scope = scope
+
       return unless sort_params
+
       self.sort_criteria = sort_params[:criteria] || default_sort_criteria
       self.sort_reverse = sort_params[:reverse] || false
+      self.custom_sort_options = custom_sort_options
     end
 
     def results
@@ -39,7 +42,14 @@ module ApiMe
     end
 
     def sorted_scope(criteria)
-      if sort_reverse === 'true'
+      criteria_key = criteria.to_sym
+      if custom_sort_options.key?(criteria_key)
+        if sort_reverse == 'true'
+          custom_sort_scope(criteria_key).order(Arel.sql("#{custom_sort_options[criteria_key][:column]} DESC"))
+        else
+          custom_sort_scope(criteria_key).order(Arel.sql("#{custom_sort_options[criteria_key][:column]} ASC"))
+        end
+      elsif sort_reverse == 'true'
         scope.order(criteria => :desc)
       else
         scope.order(criteria => :asc)
@@ -48,6 +58,10 @@ module ApiMe
 
     private
 
+    def custom_sort_scope(criteria)
+      custom_sort_options[criteria].key?(:joins) ? scope.joins(custom_sort_options[criteria][:joins]) : scope
+    end
+
     def default_sort_criteria
       'id'
     end

data/lib/api_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiMe
-  VERSION = '0.10.5'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_me
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Api Me