filtering 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a507bc2561032ac497b5b4b5c7f83fbb8f545b1
-  data.tar.gz: 8ef5df369108a7fdbc82ee8b3e5916611bd55040
+  metadata.gz: 4b170e2aad62fcfa7b6dfff8cb8b0813f9302258
+  data.tar.gz: 18abc83af13f89396ab1e13736731697c20d2f14
 SHA512:
-  metadata.gz: f74fc8bcae8e7b94cee4428ad458d639641b487754d523fa714dbd08d3b2a445ea5673d22b103d96280c3542cee994f0198855ebea6b611c95f86c519b9e9cfd
-  data.tar.gz: 399a1d6b716513cdea90060564d3443f3e0b80c0dcf455397f8103b26535ead923ee47f0650db57f999cae9fdef1347373a8e618976f63a9bcb12fe6c722767a
+  metadata.gz: e6f6c2791d7231e58f421d4803d2320b532b9304ffdaa55d0fc4c21743d97635eb5132933f8ae210d0ba292c94e420cb1e1666f460e4b977d7567b32bf6ec712
+  data.tar.gz: 942b44852d0234d08eae35cc9579d3b573f1e864318d6bf3686ac151c1a5358dc071cb2e95fd389d3d4db5ee85359b715c7d728d04442aeca7615e81918787be

data/README.md

@@ -66,7 +66,7 @@ Controller usage example:
 
 ```
 def index
-  render json: Filters::UsersFilter.new(params, page: params[:page]).call
+  render json: Filters::UsersFilter.new(params, page: params[:page], order: :asc).call
 end
 ```
 If you don't use Kaminari just delete page from initializer

data/lib/filtering/base.rb

@@ -1,50 +1,62 @@
 class Filtering::Base
   def initialize(params, args = {})
-    @plain_params = params.permit(plain_acessible_params) unless plain_acessible_params.empty?
-    @complex_params = params.permit(complex_acessible_params) unless complex_acessible_params.empty?
+    @plain_params = permit(params, plain_acessible_params)
+    @complex_params = permit(params, complex_acessible_params)
     @page = args[:page]
-    @results = relation
+    @order = args[:order]
   end
 
   def call
-    raise "@relation not initialized at #{self.class.name}. Add @relation = Offer for example." if relation.nil?
+    @result = relation
 
     filter_by_plain_params unless plain_params.empty?
     filter_by_complex_params unless complex_params.empty?
 
-    return results.page(page) if results.respond_to?(:page)
-    results
+    paginate if result.respond_to?(:page)
+    ordering if order.present?
+
+    return result
   end
 
   protected
 
-  attr_reader :plain_params, :complex_params, :page, :results
+  attr_reader :plain_params, :complex_params, :page, :order, :result
 
   def relation
     raise 'relation method not implemented. Add this method to calling class and add AR relation, for example Model.all'
   end
 
-  def plain_acessible_params
-    []
-  end
+  def permit(params, acessible_params)
+    return {} if acessible_params.nil?
 
-  def complex_acessible_params
-    []
+    if params.respond_to?(:permit)
+      params.permit(acessible_params)
+    else
+      params.symbolize_keys.slice(*acessible_params.map(&:to_sym))
+    end
   end
 
+  def plain_acessible_params; end
+
+  def complex_acessible_params; end
+
   private
 
   def filter_by_plain_params
+    return if plain_params.empty?
+
     plain_params.each do |key, value|
-      @results = results.where("#{key}": value) if value.present?
+      @result = result.where("#{key}": value) if value.present?
     end
   end
 
   def filter_by_complex_params
+    return if complex_params.empty?
+
     raise_if_complex_method_not_implemented
 
     complex_params.each do |key, value|
-      @results = send("filter_by_#{key}", value)
+      @result = send("filter_by_#{key}", value)
     end
   end
 
@@ -54,4 +66,12 @@ class Filtering::Base
       raise "#{method_name} method not implemented. Add #{method_name} private method to #{self.class.name} or remove #{param} param from complex_acessible_params" unless self.private_methods.include?(method_name.to_sym)
     end
   end
+
+  def paginate
+    @result = result.page(page)
+  end
+
+  def ordering
+    @result = result.order(order)
+  end
 end

data/lib/filtering/version.rb

@@ -1,3 +1,3 @@
 module Filtering
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filtering
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vitaliy