fetcheable_on_api 0.1.9.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a553bcde4c9048e8293d114936e2e9b4192e1499adcbc22bfdf78997a6e856
-  data.tar.gz: 532213cc5c36c522a8f2bcb0f46f7cbbf56ffeb94c8e1d83072bf18db6f6a768
+  metadata.gz: c9c8bca94ebf7b39b0dfee1fc94b7322afbbe19959712f67c0b1785c07944ff9
+  data.tar.gz: b0b9b05f0f4071c051c469e7092d1d17f7d216373c81ad13d29d73026cdd261c
 SHA512:
-  metadata.gz: 02b31b34d84a9ff79b034881a3fe8d1cdbf62620572625ba977183daf498cbdd9a82134f3bafc9ddd413c348b9e08f9151c78f7abde4fb14542cbe3b586ef781
-  data.tar.gz: 61dda83e7a0a5fe2d07b6e251347c42282be5ac904ca64632c00f46314441feb012628f1a462e5a3ae6f7c6d499dfdc900852473ab7b924b0ae5ba0c96e15bd3
+  metadata.gz: 5d9ecd3bad835fca0821ed277b808c400b3f3c8b6b93661d43c031e4d11063a3d67f34c9194ec0c4a88121cf1f8f502f5c104770b703d409147b50e7f2ece24b
+  data.tar.gz: d61db97cdf938aefcbfe31d6ca491a15bdd68ed50b5bcfcdb995abc198239f0d5b0ca0a437d64bf534269a767977b315a30693b6f612da8b6099e8f2b7401a31

data/README.md

@@ -259,6 +259,55 @@ $ curl -X GET \
 ]
 ```
 
+You can also sort through an association like this:
+
+```ruby
+class QuestionsController < ActionController::Base
+  #
+  # FetcheableOnApi
+  #
+  sort_by :position, :id
+  sort_by :answer,
+          class_name: Answer,
+          as: 'content'
+
+  # GET /questions
+  def index
+    questions = apply_fetcheable(Question.joins(:answer).includes(:answer).all)
+    render json: questions
+  end
+end
+```
+
+```bash
+$ curl -X GET \
+  'http://localhost:3000/questions?sort=answer'
+
+[
+    {
+        "id": 3,
+        "position": 1,
+        "category_id": 1,
+        "content": "How to simply sort a collection with this gem ?",
+        "answer": "Just add sort_by in your controller and call the apply_fetcheable method"
+    },
+    {
+        "id": 4,
+        "position": 2,
+        "category_id": 2,
+        "content": "Is it so simple?",
+        "answer": "Yes"
+    },
+    {
+        "id": 5,
+        "position": 3,
+        "category_id": 2,
+        "content": "Is this real life?",
+        "answer": "Yes this is real life"
+    }
+]
+```
+
 ### Pagination
 
 Pagination is automatically set on the controller and allows the use of a new parameter `page`.

data/lib/fetcheable_on_api/filtreable.rb

@@ -82,9 +82,10 @@ module FetcheableOnApi
     def valid_keys
       keys = filters_configuration.keys
       keys.each_with_index do |key, index|
-        predicate = filters_configuration[key.to_sym].fetch(:with, :ilike).to_sym
+        predicate = filters_configuration[key.to_sym].fetch(:with, :ilike)
+        next if predicate.respond_to?(:call) || PREDICATES_WITH_ARRAY.exclude?(predicate.to_sym)
 
-        keys[index] = { key => [] } if PREDICATES_WITH_ARRAY.include?(predicate)
+        keys[index] = { key => [] }
       end
 
       keys

data/lib/fetcheable_on_api/sortable.rb

@@ -51,23 +51,28 @@ module FetcheableOnApi
       return collection if params[:sort].blank?
       foa_valid_parameters!(:sort, foa_permitted_types: [String])
 
-      ordering      = {}
-      sorted_params = params[:sort].split(',')
+      ordering = []
 
-      sorted_params.each do |attr|
-        sort_sign = (attr =~ /\A[+-]/) ? attr.slice!(0) : '+'
-        klass     = collection.klass
-
-        if klass.attribute_names.include?(attr)
-          ordering[attr] = SORT_ORDER[sort_sign]
-        end
-      end
+      clean_params(params[:sort]).each do |attr|
+        klass = sorts_configuration[attr.to_sym].fetch(:class_name, collection.klass)
+        field = sorts_configuration[attr.to_sym].fetch(:as, attr.to_sym)
+        next unless klass.attribute_names.include?(field)
 
-      ordering.select! do |attr|
-        sorts_configuration.key?(attr.to_sym)
+        sort_sign = (attr =~ /\A[+-]/) ? attr.slice!(0) : '+'
+        ordering << klass
+                      .arel_table[field.to_sym]
+                      .send(SORT_ORDER[sort_sign])
       end
 
       collection.order(ordering)
     end
+
+    private
+
+    def clean_params(params)
+      params
+        .split(',')
+        .select { |e| sorts_configuration.keys.map(&:to_s).include?(e) }
+    end
   end
 end

data/lib/fetcheable_on_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FetcheableOnApi
-  VERSION = '0.1.9.0'.freeze
+  VERSION = '0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcheable_on_api
 version: !ruby/object:Gem::Version
-  version: 0.1.9.0
+  version: '0.2'
 platform: ruby
 authors:
 - Fabien
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport