jsonapi-utils 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4adff6c61b1c3f166099b6819c3de30bf3b3199d
-  data.tar.gz: c9f896c24d1b6d4efce89ec9807596e377f46790
+  metadata.gz: d6eff0a7e2d11caccf5abf5a536e44169a753848
+  data.tar.gz: 28548fd3c87c86c5812af6b98ab7211f85161cd0
 SHA512:
-  metadata.gz: 8904573999d64b34e6969529fbb9afeb50b3e7b6e5b04abeea63eaae7384527d80eddd3d039ab007f2c83bebb9e67e4322897d069bea38388d5b08f65833a9b1
-  data.tar.gz: 08fb3c7497a3fb367eafb2ae02c95ef946675d24af58a588da11cd525655559d062e2e17efb69e97b9dd21fd543713c68a4f91355c9bbdc7702f88c34643f07e
+  metadata.gz: b25decbe1f936d4f47699941abbc6967f52d390bd83f760a975cc2eca02004205c908d64de1be152bd692969a9f4233ff0f4269f7c3339fbd1aeb35c0df7bad3
+  data.tar.gz: 7ed12c4c431e2d4693e28e00b0cfe617dc17bb8088dd75946b04dc278d308227f0405e21be22b8218c7448a0e7d2f2d8b52b25da4ae8bede7431c5cb70ea993b

data/jsonapi-utils.gemspec

@@ -21,13 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'smart_rspec'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'factory_girl', '~> 4.5'
   spec.add_development_dependency 'jsonapi-resources', '~> 0.7.0'
-
-  spec.add_dependency 'rails', '>= 4.0'
+  spec.add_development_dependency 'rails', '>= 4.0'
 end

data/lib/jsonapi/utils.rb

@@ -41,9 +41,9 @@ module JSONAPI
       jsonapi_render_errors(::JSONAPI::Utils::Exceptions::BadRequest.new)
     end
 
-    def jsonapi_render_not_found
+    def jsonapi_render_not_found(exception)
       setup_request
-      id = extract_ids(@request.params)
+      id = exception.message.match(/=(\d+)/)[1]
       jsonapi_render_errors(JSONAPI::Exceptions::RecordNotFound.new(id))
     end
 
@@ -59,11 +59,11 @@ module JSONAPI
 
       if records.respond_to?(:to_ary)
         records = fix_when_hash(records, options) if needs_to_be_fixed?(records)
-        @resources = build_collection(records, options)
-        results.add_result(JSONAPI::ResourcesOperationResult.new(:ok, @resources, result_options(options)))
+        @_records = build_collection(records, options)
+        results.add_result(JSONAPI::ResourcesOperationResult.new(:ok, @_records, result_options(records, options)))
       else
-        @resource = turn_into_resource(records, options)
-        results.add_result(JSONAPI::ResourceOperationResult.new(:ok, @resource))
+        @_record = turn_into_resource(records, options)
+        results.add_result(JSONAPI::ResourceOperationResult.new(:ok, @_record))
       end
 
       create_response_document(results).contents
@@ -71,11 +71,6 @@ module JSONAPI
 
     private
 
-    def extract_ids(hash)
-      ids = hash.keys.select { |e| e =~ /id$/i }.map { |e| hash[e] }
-      ids.first rescue '(id not identified)'
-    end
-
     def fix_request_options(params, records)
       return if request.method !~ /get/i ||
                 params.nil? ||
@@ -88,26 +83,25 @@ module JSONAPI
       records.is_a?(Array) && records.all? { |e| e.is_a?(Hash) }
     end
 
-    def result_options(options)
-      hash = {}
-
-      if JSONAPI.configuration.top_level_links_include_pagination
-        hash[:pagination_params] = pagination_params(options)
-      end
+    def result_options(records, options)
+      {}.tap do |data|
+        if JSONAPI.configuration.default_paginator != :none &&
+          JSONAPI.configuration.top_level_links_include_pagination
+          data[:pagination_params] = pagination_params(records, options)
+        end
 
-      if JSONAPI.configuration.top_level_meta_include_record_count
-        hash[:record_count] = count_records(@resources, options)
+        if JSONAPI.configuration.top_level_meta_include_record_count
+          data[:record_count] = count_records(records, options)
+        end
       end
-
-      hash
     end
 
-    def pagination_params(options)
+    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(@resources, options)
+          options[:record_count] = count_records(records, options)
         @paginator.links_page_params(options)
       else
         {}
@@ -126,9 +120,9 @@ module JSONAPI
     end
 
     def build_collection(records, options = {})
-      unless JSONAPI.configuration.default_paginator == :none
-        records = paginator(@request.params).apply(records, nil)
-      end
+      records = apply_filter(records, options)
+      records = apply_pagination(records, options)
+      records = apply_sort(records)
       records.respond_to?(:to_ary) ? records.map { |record| turn_into_resource(record, options) } : []
     end
 
@@ -140,24 +134,103 @@ module JSONAPI
       end
     end
 
+    def apply_filter(records, options = {})
+      if apply_filter?(records, options)
+        records.where(filter_params)
+      else
+        records
+      end
+    end
+
+    def apply_filter?(records, options = {})
+      params[:filter].present? && records.respond_to?(:where) &&
+        (options[:filter].nil? || options[:filter])
+    end
+
+    def filter_params
+      @_filter_params ||=
+        params[:filter].keys.each_with_object({}) do |resource, hash|
+          hash[resource] = params[:filter][resource]
+        end
+    end
+
+    def apply_pagination(records, options = {})
+      return records unless apply_pagination?(options)
+      pagination = set_pagination(options)
+
+      records =
+        if records.is_a?(Array)
+          records[pagination[:range]]
+        else
+          pagination[:paginator].apply(records, nil)
+        end
+    end
+
+    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
+
+    def sort_criteria
+      sort_params.reduce('') do |sum, hash|
+        foo = ["a[:#{hash[0]}]", "b[:#{hash[0]}]"]
+        foo.reverse! if hash[1] == :desc
+        sum + "comp = comp == 0 ? #{foo.join(' <=> ')} : comp; "
+      end
+    end
+
+    def sort_params
+      @_sort_params ||=
+        params[:sort].split(',').each_with_object({}) do |criteria, hash|
+          order, field = criteria.match(/(\-?)(\w+)/i)[1..2]
+          hash[field]  = order == '-' ? :desc : :asc
+        end
+    end
+
+    def set_pagination(options)
+      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
+        { 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
+        { paginator: @_paginator, range: offset..offset + limit - 1 }
+      else
+        {}
+      end
+    end
+
+    def apply_pagination?(options)
+      JSONAPI.configuration.default_paginator != :none &&
+        (options[:paginate].nil? || options[:paginate])
+    end
+
     def fix_when_hash(records, options)
       return [] unless options[:model]
       records.map { |hash| options[:model].new(hash) }
-    rescue
+    rescue ActiveRecord::UnknownAttributeError
       ids = records.map { |e| e[:id] || e['id'] }
       scope = options[:scope] ? options[:model].send(options[:scope]) : options[:model]
       scope.where(id: ids)
     end
 
     def count_records(records, options)
-      if records.size.zero?                    then 0
-      elsif options[:count]                    then options[:count]
-      elsif options[:model] && options[:scope] then options[:model].send(options[:scope]).count
-      elsif options[:model]                    then options[:model].count
+      if options[:count].present?
+        options[:count]
+      elsif records.is_a?(Array)
+        records.length
       else
-        record = records.first
-        model  = record.try(:model) || record.try(:_model)
-        model.class.count
+        records = apply_filter(records, options) if params[:filter].present?
+        records.except(:group, :order).count("DISTINCT #{records.table.name}.id")
       end
     end
 

data/lib/jsonapi/utils/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Utils
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tiago Guedes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,34 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: smart_rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +102,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: