jsonapi-utils 0.4.9 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e79dcc432ea412e938f711f040d12c70cb5196f
-  data.tar.gz: e34a24d48a769016f737c156311523935b4714a7
+  metadata.gz: e739a959755e7910791783ee16583499f32c06a6
+  data.tar.gz: 817a8fb3526e0fc8f15e4081a277a9e81d557340
 SHA512:
-  metadata.gz: 9b4222af57feada6a8c45b7385e8c889535e8000e229093e4053ce2812ef041aaf799216267e5105195282b027d516cf5b01db12204697f33d92c169a3b2ecd1
-  data.tar.gz: 4accdb7433731907f5cd9121c8e8227d916dae0480e1decf56b727208b7ef1537ef765236c4058130c21f74e77e09aceefcc4f1ed18c3d9d152c200b0f773030
+  metadata.gz: 3307a7571da692f2606d056cb0d7c8b28acc3abcd9cd53b39e521d5a979ef4b95c4499f5eb41b4b816417cb47e59b31548cf19fd262c214844c3d81941deee2a
+  data.tar.gz: a210faeb4ea1aa675d236ef1e8993c81bcc2f273392f0fa80dd983d322ebdba6846019556cc2ccddcb1ae6afbc11bafe483ce75b95da12c19e46e4ffb5a1f30b

data/README.md

@@ -4,16 +4,47 @@
 [![Gem Version](https://badge.fury.io/rb/jsonapi-utils.svg)](https://badge.fury.io/rb/jsonapi-utils)
 [![Build Status](https://travis-ci.org/b2beauty/jsonapi-utils.svg?branch=master)](https://travis-ci.org/b2beauty/jsonapi-utils)
 
-Simple yet powerful way to have your Rails API compliant with [JSON API](http://jsonapi.org).
-
-JSONAPI::Utils (JU) was built on top of [JSONAPI::Resources](https://github.com/cerebris/jsonapi-resources) taking advantage of its resource-driven style and bringing a Rails way to build modern APIs with no or less learning curve.
+Simple yet powerful way to get your Rails API compliant with [JSON API](http://jsonapi.org).
+
+JSONAPI::Utils (JU) is built on top of [JSONAPI::Resources](https://github.com/cerebris/jsonapi-resources) taking advantage of its resource-driven style and bringing a Rails way to build modern APIs with no or less learning curve.
+
+## Contents
+
+* [Installation](#installation)
+* [How does it work?](#how-does-it-work)
+* [Usage](#usage)
+  * [Response](#response)
+    * [Rendes](#renders)
+    * [Formatters](#formatters)
+  * [Request](#request)
+    * [Params helpers](#params-helpers)
+* [Full example](#full-example)
+  * [Models](#models)
+  * [Resources](#resources)
+  * [Routes & Controllers](routes--controllers)
+  * [Initializer](#initializer)
+  * [Requests & Responses](requests--responses)
+    * [Index](#index)
+    * [Index (options)](#index-options)
+    * [Show](#show)
+    * [Show (options)](#show-options)
+    * [Relationships (identifier objects)](#relationships-identifier-objects)
+    * [Nested resources](#nested-resources)
+* [Development](#development)
+* [Contributing](#contributing)
+* [License](#license)
 
 ## Installation
 
+For:
+
+* Ruby ~> 2.0 with Rails ~> 4.0, use JU's `0.4.6` version (stable);
+* Ruby ~> 2.1 with Rails 5, use JU's `0.5.0.beta1` version.
+
 Add these lines to your application's Gemfile:
 
 ```ruby
-gem 'jsonapi-utils', '~> 0.4.8'
+gem 'jsonapi-utils', '~> 0.4.6'
 ```
 
 And then execute:
@@ -171,6 +202,19 @@ Content-Type: application/vnd.api+json
 }
 ```
 
+#### Params helpers
+
+JU brings helper methods as a shortcut to get values from permitted params based on the resource configuration.
+
+- `resource_params`:
+  - Returns the permitted params present in the `attributes` JSON member;
+    - Example: `{ name: 'Bilbo', gender: 'male', city: 'Shire' }`
+  - Same of calling: `params.require(:data).require(:attributes).permit(:name, :gender, :city)`
+- `relationship_params`:
+  - Returns the relationship `id`s, distinguished by key, present in `relationships` JSON member;
+    - Example: `{ author: 1, posts: [1, 2, 3] }`
+  - Same as calling: `params.require(:relationships).require(:author).require(:data).permit(:id)`
+
 ## Full example
 
 In order to start working with JU after installing the gem you simply need to do the following:
@@ -224,7 +268,7 @@ end
 
 ### Routes & Controllers
 
-Let's define our routes using the `jsonapi_resources` and `jsonapi_links` macros provied by the `jsonapi-resources` gem:
+Let's define our routes using the `jsonapi_resources` and `jsonapi_links` methods provied by the `jsonapi-resources` gem:
 
 ```ruby
 Rails.application.routes.draw do
@@ -235,11 +279,13 @@ Rails.application.routes.draw do
 end
 ```
 
-In our base controller we need to include the `JSONAPI::Utils` module and define some default rendering:
+In our Rails controller we just need to include the `JSONAPI::Utils` module.
+
+> Note: with JU default rendering can be defined, like in the below example with `jsonapi_render_not_found` for when ActiveRecord doesn't find a record.
 
 ```ruby
 # app/controllers/base_controller.rb
-class BaseController < JSONAPI::ResourceController
+class BaseController < ActionController::Base
   include JSONAPI::Utils
   protect_from_forgery with: :null_session
   rescue_from ActiveRecord::RecordNotFound, with: :jsonapi_render_not_found
@@ -250,49 +296,43 @@ Finally, having inhirited `JSONAPI::Utils` methods from the `BaseController` we
 
 ```ruby
 # app/controllers/users_controller.rb
-  # GET /users
-  def index
-    users = User.all
-    jsonapi_render json: users
-  end
+# GET /users
+def index
+  users = User.all
+  jsonapi_render json: users
+end
 
-  # GET /users/:id
-  def show
-    user = User.find(params[:id])
-    jsonapi_render json: user
-  end
+# GET /users/:id
+def show
+  user = User.find(params[:id])
+  jsonapi_render json: user
+end
 
-  # POST /users
-  def create
-    user = User.new(user_params)
-    if user.save
-      jsonapi_render json: user, status: :created
-    else
-      jsonapi_render_errors json: user, status: :unprocessable_entity
-    end
+# POST /users
+def create
+  user = User.new(resource_params)
+  if user.save
+    jsonapi_render json: user, status: :created
+  else
+    jsonapi_render_errors json: user, status: :unprocessable_entity
   end
+end
 
-  # PATCH /users/:id
-  def update
-    user = User.find(params[:id])
-    if user.update(user_params)
-      jsonapi_render json: user
-    else
-      jsonapi_render_errors json: user, status: :unprocessable_entity
-    end
-  end
-  
-  # DELETE /users/:id
-  def destroy
-    User.find(params[:id]).destroy
-    head :no_content
+# PATCH /users/:id
+def update
+  user = User.find(params[:id])
+  if user.update(resource_params)
+    jsonapi_render json: user
+  else
+    jsonapi_render_errors json: user, status: :unprocessable_entity
   end
+end
 
-  private
-
-  def user_params
-    params.require(:data).require(:attributes).permit(:first_name, :last_name, :admin)
-  end
+# DELETE /users/:id
+def destroy
+  User.find(params[:id]).destroy
+  head :no_content
+end
 ```
 
 And:
@@ -324,12 +364,7 @@ class PostsController < BaseController
   private
 
   def post_params
-    params.require(:data).require(:attributes).permit(:title, :body)
-          .merge(user_id: author_params[:id])
-  end
-
-  def author_params
-    params.require(:relationships).require(:author).require(:data).permit(:id)
+    resource_params.merge(user_id: relationship_params[:author])
   end
 
   def load_user
@@ -348,8 +383,6 @@ JSONAPI.configure do |config|
   config.json_key_format = :underscored_key
   config.route_format = :dasherized_route
 
-  config.operations_processor = :active_record
-
   config.allow_include = true
   config.allow_sort = true
   config.allow_filter = true
@@ -387,7 +420,7 @@ Here's some examples of requests – based on those sample [controllers](#routes
 * [Relationships (identifier objects)](#relationships-identifier-objects)
 * [Nested resources](#nested-resources)
 
-#### Collection
+#### Index
 
 Request:
 
@@ -457,7 +490,7 @@ Content-Type: application/vnd.api+json
 }
 ```
 
-#### Collection (options)
+#### Index (options)
 
 Request:
 
@@ -542,7 +575,7 @@ Content-Type: application/vnd.api+json
 }
 ```
 
-#### Single record
+#### Show
 
 Request:
 
@@ -582,7 +615,7 @@ Content-Type: application/vnd.api+json
 }
 ```
 
-#### Single record (options)
+#### Show (options)
 
 Request:
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "jsonapi/utils"
+require 'bundler/setup'
+require 'jsonapi/utils'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "jsonapi/utils"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/jsonapi/utils.rb

@@ -1,12 +1,8 @@
-
 require 'jsonapi-resources'
 require 'jsonapi/utils/version'
 require 'jsonapi/utils/exceptions'
 require 'jsonapi/utils/request'
 require 'jsonapi/utils/response'
-require 'jsonapi/utils/support/filter/custom'
-
-JSONAPI::Resource.extend JSONAPI::Utils::Support::Filter::Custom
 
 module JSONAPI
   module Utils

data/lib/jsonapi/utils/request.rb

@@ -1,87 +1,47 @@
-module JSONAPI::Utils
-  module Request
-    # Setup and check request before action gets actually evaluated.
-    #
-    # @api public
-    def jsonapi_request_handling
-      setup_request
-      check_request
-    end
-
-    # Instantiate the request object.
-    #
-    # @return [JSONAPI::RequestParser]
-    #
-    # @api public
-    def setup_request
-      @request ||= JSONAPI::RequestParser.new(
-        params,
-        context: context,
-        key_formatter: key_formatter,
-        server_error_callbacks: (self.class.server_error_callbacks || [])
-      )
-    end
-
-    # Render an error response if the parsed request got any error.
-    #
-    # @api public
-    def check_request
-      @request.errors.blank? || jsonapi_render_errors(json: @request)
-    end
+module JSONAPI
+  module Utils
+    module Request
+      def jsonapi_request_handling
+        setup_request
+        check_request
+      end
 
-    # Override the JSONAPI::ActsAsResourceController#process_request method.
-    #
-    # It might be removed when the following line on JR is fixed:
-    # https://github.com/cerebris/jsonapi-resources/blob/release-0-8/lib/jsonapi/acts_as_resource_controller.rb#L62
-    #
-    # @return [String]
-    #
-    # @api public
-    def process_request
-      process_operations
-      render_results(@operation_results)
-    rescue => e
-      handle_exceptions(e)
-    end
+      def setup_request
+        @request ||=
+          JSONAPI::RequestParser.new(
+            params.dup,
+            context: context,
+            key_formatter: key_formatter,
+            server_error_callbacks: (self.class.server_error_callbacks || [])
+          )
+      end
 
-    # Helper to get params for the main resource.
-    #
-    # @return [Hash]
-    #
-    # @api public
-    def resource_params
-      build_params_for(:resource)
-    end
+      def check_request
+        @request.errors.blank? || jsonapi_render_errors(json: @request)
+      end
 
-    # Helper to get params for relationship params.
-    #
-    # @return [Hash]
-    #
-    # @api public
-    def relationship_params
-      build_params_for(:relationship)
-    end
+      def resource_params
+        build_params_for(:resource)
+      end
 
-    private
+      def relationship_params
+        build_params_for(:relationship)
+      end
 
-    # Extract params from request and build a Hash with params
-    # for either the main resource or relationships.
-    #
-    # @return [Hash]
-    #
-    # @api private
-    def build_params_for(param_type)
-      return {} if @request.operations.empty?
+      private
 
-      keys = %i(attributes to_one to_many)
-      operation = @request.operations.find { |e| e.options[:data].keys & keys == keys }
+      def build_params_for(param_type)
+        return {} if @request.operations.empty?
 
-      if operation.nil?
-        {}
-      elsif param_type == :relationship
-        operation.options[:data].values_at(:to_one, :to_many).compact.reduce(&:merge)
-      else
-        operation.options[:data][:attributes]
+        keys      = %i(attributes to_one to_many)
+        operation = @request.operations.find { |e| e.options[:data].keys & keys == keys }
+        if operation.nil?
+          {}
+        elsif param_type == :relationship
+          operation.options[:data].values_at(:to_one, :to_many).compact.reduce(&:merge)
+        else
+          operation.options[:data][:attributes]
+        end
       end
     end
   end

data/lib/jsonapi/utils/response/support.rb

@@ -1,14 +1,14 @@
-require 'jsonapi/utils/support/error'
-require 'jsonapi/utils/support/filter/default'
+require 'jsonapi/utils/support/filter'
 require 'jsonapi/utils/support/pagination'
 require 'jsonapi/utils/support/sort'
+require 'jsonapi/utils/support/error'
 
 module JSONAPI
   module Utils
     module Response
       module Support
         include ::JSONAPI::Utils::Support::Error
-        include ::JSONAPI::Utils::Support::Filter::Default
+        include ::JSONAPI::Utils::Support::Filter
         include ::JSONAPI::Utils::Support::Pagination
         include ::JSONAPI::Utils::Support::Sort
 

data/lib/jsonapi/utils/support/filter.rb

@@ -19,9 +19,8 @@ module JSONAPI
           @_filter_params ||=
             case params[:filter]
             when Hash, ActionController::Parameters
-              default_filters.each_with_object({}) do |field, hash|
-                unformatted_field = @request.unformat_key(field)
-                hash[unformatted_field] = params[:filter][field]
+              params[:filter].keys.each_with_object({}) do |resource, hash|
+                hash[resource] = params[:filter][resource]
               end
             end
         end

data/lib/jsonapi/utils/support/pagination.rb

@@ -2,133 +2,64 @@ module JSONAPI
   module Utils
     module Support
       module Pagination
-        # Apply proper pagination to the records.
-        #
-        # @param records [ActiveRecord::Relation, Array] collection of records
-        #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-        #
-        # @param options [Hash] JU's options
-        #   e.g.: { resource: V2::UserResource, count: 100 }
-        #
-        # @return [ActiveRecord::Relation, Array]
-        #
-        # @api public
         def apply_pagination(records, options = {})
           return records unless apply_pagination?(options)
-          records.is_a?(Array) ? records[paginate_with(:range)] : paginate_with(:paginator).apply(records, nil)
-        end
-
-        # Mount pagination params for JSONAPI::ResourcesOperationResult.
-        # It can also be used anywhere else as a helper method.
-        #
-        # @param records [ActiveRecord::Relation, Array] collection of records
-        #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-        #
-        # @param options [Hash] JU's options
-        #   e.g.: { resource: V2::UserResource, count: 100 }
-        #
-        # @return [Hash]
-        #   e.g.: {"first"=>{"number"=>1, "size"=>2}, "next"=>{"number"=>2, "size"=>2}, "last"=>{"number"=>2, "size"=>2}}
-        #
-        # @api public
-        def pagination_params(records, options)
-          return {} unless JSONAPI.configuration.top_level_links_include_pagination
-          paginator.links_page_params(record_count: count_records(records, options))
-        end
-
-        private
 
-        # Define the paginator object to be used in the response's pagination.
-        #
-        # @return [PagedPaginator, OffsetPaginator]
-        #
-        # @api private
-        def paginator
-          @paginator ||= paginator_klass.new(page_params)
-        end
+          pagination = set_pagination
 
-        # Returns the paginator class to be used in the response's pagination.
-        #
-        # @return [Paginator]
-        #
-        # @api private
-        def paginator_klass
-          "#{JSONAPI.configuration.default_paginator}_paginator".classify.constantize
+          records =
+            if records.is_a?(Array)
+              records[pagination[:range]]
+            else
+              pagination[:paginator].apply(records, nil)
+            end
         end
 
-        # Check whether pagination should be applied to the response.
-        #
-        # @return [Boolean]
-        #
-        # @api private
         def apply_pagination?(options)
           JSONAPI.configuration.default_paginator != :none &&
             (options[:paginate].nil? || options[:paginate])
         end
 
-        # Creates an instance of ActionController::Parameters for page params.
-        #
-        # @return [ActionController::Parameters]
-        #
-        # @api private
-        def page_params
-          @page_params ||= begin
-            page = @request.params.to_unsafe_hash['page'] || {}
-            ActionController::Parameters.new(page)
+        def pagination_params(records, options)
+          @paginator ||= paginator(params)
+          if @paginator && JSONAPI.configuration.top_level_links_include_pagination
+            options = {}
+            @paginator.class.requires_record_count &&
+              options[:record_count] = count_records(records, options)
+            @paginator.links_page_params(options)
+          else
+            {}
           end
         end
 
-        # Define the paginator or range according to the pagination strategy.
-        #
-        # @param kind [Symbol] pagination object's kind
-        #   e.g.: :paginator or :range
-        #
-        # @return [PagedPaginator, OffsetPaginator, Range]
-        #   e.g.: #<PagedPaginator:0x00561ed06dc5a0 @number=1, @size=2>
-        #         0..9
-        #
-        # @api private
-        def paginate_with(kind)
-          @pagination ||=
-            case kind
-            when :paginator then paginator
-            when :range     then pagination_range
+        def paginator(params)
+          page_params = ActionController::Parameters.new(params[:page] || {})
+
+          @paginator ||=
+            if JSONAPI.configuration.default_paginator == :paged
+              PagedPaginator.new(page_params)
+            elsif JSONAPI.configuration.default_paginator == :offset
+              OffsetPaginator.new(page_params)
             end
         end
 
-        # Define a pagination range for objects which quack like Arrays.
-        #
-        # @return [Range]
-        #   e.g.: 0..9
-        #
-        # @api private
-        def pagination_range
-          case JSONAPI.configuration.default_paginator
-          when :paged
+        def set_pagination
+          page_params = ActionController::Parameters.new(@request.params[:page] || {})
+          if JSONAPI.configuration.default_paginator == :paged
+            @_paginator ||= PagedPaginator.new(page_params)
             number = page_params['number'].to_i.nonzero? || 1
             size   = page_params['size'].to_i.nonzero?   || JSONAPI.configuration.default_page_size
-            (number - 1) * size..number * size - 1
-          when :offset
+            { paginator: @_paginator, range: (number - 1) * size..number * size - 1 }
+          elsif JSONAPI.configuration.default_paginator == :offset
+            @_paginator ||= OffsetPaginator.new(page_params)
             offset = page_params['offset'].to_i.nonzero? || 0
             limit  = page_params['limit'].to_i.nonzero?  || JSONAPI.configuration.default_page_size
-            offset..offset + limit - 1
+            { paginator: @_paginator, range: offset..offset + limit - 1 }
           else
-            paginator.pagination_range(page_params)
+            {}
           end
         end
 
-        # Count records in order to build a proper pagination and to fill up the "record_count" response's member.
-        #
-        # @param records [ActiveRecord::Relation, Array] collection of records
-        #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-        #
-        # @param options [Hash] JU's options
-        #   e.g.: { resource: V2::UserResource, count: 100 }
-        #
-        # @return [Integer]
-        #   e.g.: 42
-        #
-        # @api private
         def count_records(records, options)
           if options[:count].present?
             options[:count]

data/lib/jsonapi/utils/support/sort.rb

@@ -1,53 +1,36 @@
-module JSONAPI::Utils::Support
-  module Sort
-    # Apply sort on result set (ascending by default).
-    #   e.g.: User.order(:first_name)
-    #
-    # @param records [ActiveRecord::Relation, Array] collection of records
-    #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-    #
-    # @return [ActiveRecord::Relation, Array]
-    #
-    # @api public
-    def apply_sort(records)
-      return records unless params[:sort].present?
+module JSONAPI
+  module Utils
+    module Support
+      module Sort
+        def apply_sort(records)
+          return records unless params[:sort].present?
 
-      if records.is_a?(Array)
-        records.sort { |a, b| comp = 0; eval(sort_criteria) }
-      elsif records.respond_to?(:order)
-        records.order(sort_params)
-      end
-    end
+          if records.is_a?(Array)
+            records.sort { |a, b| comp = 0; eval(sort_criteria) }
+          elsif records.respond_to?(:order)
+            records.order(sort_params)
+          end
+        end
 
-    # Build the criteria to be evaluated wthen applying sort
-    # on Array of Hashes (ascending by default).
-    #
-    # @return [String]
-    #
-    # @api public
-    def sort_criteria
-      @sort_criteria ||=
-        sort_params.reduce('') do |sum, (key, value)|
-          comparables = ["a[:#{key}]", "b[:#{key}]"]
-          comparables.reverse! if value == :desc
-          sum + "comp = comp == 0 ? #{comparables.join(' <=> ')} : comp; "
+        def sort_criteria
+          @sort_criteria ||=
+            sort_params.reduce('') do |sum, (key, value)|
+              comparables = ["a[:#{key}]", "b[:#{key}]"]
+              comparables.reverse! if value == :desc
+              sum + "comp = comp == 0 ? #{comparables.join(' <=> ')} : comp; "
+            end
         end
-    end
 
-    # Build a Hash with the sort criteria.
-    #
-    # @return [Hash, NilClass]
-    #
-    # @api public
-    def sort_params
-      @_sort_params ||=
-        if params[:sort].present?
-          params[:sort].split(',').each_with_object({}) do |field, hash|
-            unformatted_field = @request.unformat_key(field)
-            desc, field       = unformatted_field.to_s.match(/^([-_])?(\w+)$/i)[1..2]
-            hash[field]       = desc.present? ? :desc : :asc
-          end
+        def sort_params
+          @_sort_params ||=
+            if params[:sort].present?
+              params[:sort].split(',').each_with_object({}) do |criteria, hash|
+                order, field = criteria.match(/(\-?)(\w+)/i)[1..2]
+                hash[field]  = order == '-' ? :desc : :asc
+              end
+            end
         end
+      end
     end
   end
 end

data/lib/jsonapi/utils/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Utils
-    VERSION = '0.4.9'
+    VERSION = '0.5.0.beta1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Tiago Guedes
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,6 @@ files:
 - lib/jsonapi/utils/response/support.rb
 - lib/jsonapi/utils/support/error.rb
 - lib/jsonapi/utils/support/filter.rb
-- lib/jsonapi/utils/support/filter/custom.rb
-- lib/jsonapi/utils/support/filter/default.rb
 - lib/jsonapi/utils/support/pagination.rb
 - lib/jsonapi/utils/support/sort.rb
 - lib/jsonapi/utils/version.rb
@@ -194,14 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: JSON::Utils is a simple way to get a full-featured JSON API serialization
   for your controller's responses.
 test_files: []
+has_rdoc: 

data/lib/jsonapi/utils/support/filter/custom.rb

@@ -1,18 +0,0 @@
-module JSONAPI::Utils::Support::Filter
-  module Custom
-    def _custom_filters
-      @_allowed_custom_filters || []
-    end
-
-    def custom_filters(*attrs)
-      attrs.each { |attr| custom_filter(attr) }
-    end
-
-    def custom_filter(attr)
-      attr = attr.to_sym
-      @_allowed_filters[attr] = {}
-      @_allowed_custom_filters ||= []
-      @_allowed_custom_filters |= [attr]
-    end
-  end
-end

data/lib/jsonapi/utils/support/filter/default.rb

@@ -1,66 +0,0 @@
-module JSONAPI::Utils::Support::Filter
-  module Default
-    # Apply default equality filters.
-    #   e.g.: User.where(name: 'Foobar')
-    #
-    # @param records [ActiveRecord::Relation, Array] collection of records
-    #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-    #
-    # @param options [Hash] JU's options
-    #   e.g.: { filter: false, paginate: false }
-    #
-    # @return [ActiveRecord::Relation, Array]
-    #
-    # @api public
-    def apply_filter(records, options = {})
-      if apply_filter?(records, options)
-        records.where(filter_params)
-      else
-        records
-      end
-    end
-
-    # Check whether default filters should be applied.
-    #
-    # @param records [ActiveRecord::Relation, Array] collection of records
-    #   e.g.: User.all or [{ id: 1, name: 'Tiago' }, { id: 2, name: 'Doug' }]
-    #
-    # @param options [Hash] JU's options
-    #   e.g.: { filter: false, paginate: false }
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def apply_filter?(records, options = {})
-      params[:filter].present? && records.respond_to?(:where) &&
-        (options[:filter].nil? || options[:filter])
-    end
-
-    # Build a Hash with the default filters.
-    #
-    # @return [Hash, NilClass]
-    #
-    # @api public
-    def filter_params
-      @_filter_params ||=
-        case params[:filter]
-        when Hash, ActionController::Parameters
-          default_filters.each_with_object({}) do |field, hash|
-            unformatted_field = @request.unformat_key(field)
-            hash[unformatted_field] = params[:filter][field]
-          end
-        end
-    end
-
-    private
-
-    # Take all allowed filters and remove the custom ones.
-    #
-    # @return [Array]
-    #
-    # @api private
-    def default_filters
-      params[:filter].keys.map(&:to_sym) - @request.resource_klass._custom_filters
-    end
-  end
-end