yaqb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04bf5ad9bfc9480751951e4ff8d5130c63720fada33e09012d9204ac5a3082e
-  data.tar.gz: 3cbe75005b7df8d27bb0569db90dfc05377c59266bd137959a97281a0c944a7b
+  metadata.gz: 35af8dca94c4f277264099454912310c6d060e7ee02c1e54984cbc2e343dd546
+  data.tar.gz: 68271a354d61302b574c0d91688378b8dd5458ab51c9c505506439b37c7348b8
 SHA512:
-  metadata.gz: 0b1095d0e8d279e3d6d3ff7526ad3b92621676edfc43642e141b9275ef9aae43ec65b4f350da5e0c5b5c06fc9f51b362091f80366e92375dbeb838e4066271d6
-  data.tar.gz: 7cc7b2b5c26915c326da053903d129c55daca8575df356c836ca3703224d57c3995a3f4b6f7a73948e214d3524e115e0b8e7fb6c4d6204e81bfd03ae8320a412
+  metadata.gz: f3190cd9a92f8e31d7df0b8bd46f215cb8c26638512169508b4f183fad195d50a340da95270c12de0c0b33c445cab062fab27f0d799c0a6d13af70b63b34f088
+  data.tar.gz: a442e9c2973b4040b38dea491df9743d17b6b85710a8bb75bad87c292d2fc539884a84d53673a23ec545176d7313adf0b5c567e08417131c4a1cf83bf5d4f833

data/lib/yaqb/query_builders/paginate.rb

@@ -16,10 +16,10 @@ module Yaqb
       end
 
       def links
-        @links ||= pages.each_with_object([]) do |(k, v), links|
-          query_params = @query_params.merge("page" => v, "per" => @per).to_param
-          links << "<#{@url}?#{query_params}>; rel=\"#{k}\""
-        end.join(', ')
+        @links ||= pages.each_with_object({}) do |(k, v), hash|
+          query_params = @query_params.merge('page' => v, 'per' => @per).to_param
+          hash[k] = "#{@url}?#{query_params}"
+        end
       end
 
       private

data/lib/yaqb/query_builders/query_orchestrator.rb

@@ -7,6 +7,8 @@ require 'yaqb/query_builders/filter'
 module Yaqb
   module QueryBuilders
     class QueryOrchestrator
+      attr_reader :scope, :links
+
       def initialize(scope, params, request, response, presenter)
         @scope = scope
         @params = params
@@ -16,11 +18,11 @@ module Yaqb
       end
 
       def call
+        @scope = filter
         @scope = sort
         @scope = paginate
-        @scope = filter
 
-        @scope
+        self
       end
 
       private
@@ -28,12 +30,12 @@ module Yaqb
       def paginate
         current_url = @request.base_url + @request.path
         paginator = Paginate.new(@scope, @request.query_parameters, current_url)
-        @response.headers['Link'] = paginator.links
+        @response.headers['Link'] = @links = paginator.links
         paginator.paginate
       end
 
       def sort
-        Sort.new(@scope, @params).sort
+        Sort.new(@scope, @params, @presenter).sort
       end
 
       def filter

data/lib/yaqb/query_builders/sort.rb

@@ -5,8 +5,9 @@ module Yaqb
     class Sort
       DIRECTIONS = %w[asc desc].freeze
 
-      def initialize(scope, params)
+      def initialize(scope, params, presenter)
         @scope = scope
+        @presenter = presenter
         @column = params[:sort]
         @direction = params[:dir]
       end
@@ -14,8 +15,19 @@ module Yaqb
       def sort
         return @scope unless @column && @direction
 
+        validate!('sort', @column) unless @presenter.sort_attributes.include?(@column)
+        validate!('dir', @direction) unless DIRECTIONS.include?(@direction)
+
         @scope.order(Arel.sql("#{@column} #{@direction}"))
       end
+
+      private
+
+      def validate!(name, value)
+        columns = @presenter.sort_attributes.join(', ')
+        raise QueryBuilderError.new("#{name}=#{value}"),
+              "Invalid sorting params. sort: (#{columns}), 'dir': asc, desc"
+      end
     end
   end
 end

data/lib/yaqb/version.rb

@@ -1,3 +1,3 @@
 module Yaqb
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaqb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ronald Chacon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler