query_filter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c7c2dd2053a60050b2d42501e1b45d3733e4d0
-  data.tar.gz: d4083887f336028f260e9d93223052dd23e2fcbd
+  metadata.gz: 9ff61e6a1116f9f3945907c8369903c79828ed79
+  data.tar.gz: 907e50842ca587c954365f506905a78bd255bd69
 SHA512:
-  metadata.gz: 742cf53b1f36fddbbbc5e020b63b194f08613b7b53c560c3497bb61a601324e6217110c7ee2d13d8ec7f1c0688126955657d2e02fc5b800bf474f83b1fc58a8c
-  data.tar.gz: b99ce1d22816aac5a81e7ba72a0ddbb61b691a14475f56a89599101555b1cb350989c31c26cdda14541ab0fd55e9d015deb9448998360254ad2d7af316986692
+  metadata.gz: 37d2d592b08101e2fdc405ed6a4f1181796af6959d69d73e999c6b4b459011e9dd2c52d01bffe443b7b224a9213e5ae688edf326dfe9e3c64e390f92e53aa068
+  data.tar.gz: f25f30ed5d2e8226e5185c46b37e7652dfe3928bcb3dc45e7bf237168f85af76c0a46bc0ef0fc65f0bdd008c8798e81e4a283c46f1b2684beefbfbc51198f654

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_filter (0.1.3)
+    query_filter (0.1.4)
       activesupport (>= 4.0)
 
 GEM

data/README.md

@@ -119,6 +119,7 @@ class OrderFilter < QueryFilter::Base
   # can be restricted using array of values
   scope :state, only: [:pending, :completed]
   scope :deleted, only: TRUE_ARRAY
+  scope :archived, if: :allow_archived?
 
   range :price
 
@@ -138,6 +139,10 @@ class OrderFilter < QueryFilter::Base
     query.where(deleted: true)
   end
 
+  def scope_archived(_)
+    query.where(archived: true)
+  end
+
   # Filter will be applied when following params present
   # { price_from: 100, price_to: 200 }
   def range_price(range)
@@ -159,6 +164,12 @@ class OrderFilter < QueryFilter::Base
   def order_by_sort_column(column, direction)
     query.reorder("orders.#{column} #{direction} NULLS LAST")
   end
+
+  protected
+
+  def allow_archived?
+    @params[:old] == '1' || params[:state] == 'archived'
+  end
 end
 ```
 

data/lib/query_filter/base.rb

@@ -6,7 +6,7 @@ module QueryFilter
 
     class_attribute :filters
 
-    attr_reader :query
+    attr_reader :query, :params
 
     def initialize(scope, params)
       @query = scope
@@ -55,7 +55,7 @@ module QueryFilter
 
     def active_filters
       self.class.filters.each do |filter|
-        yield filter, filter.normalize_params(@params) if filter.valid?(@params)
+        yield filter, filter.normalize_params(@params) if filter.can_apply?(self)
       end
     end
   end

data/lib/query_filter/rules/scope.rb

@@ -1,46 +1,58 @@
 # Define filter rules
 #
-module QueryFilter::Rules
-  class Scope
-    VALIDATON_KEYS = [:in, :only, :format].freeze
-
-    attr_reader :keys
-
-    def initialize(keys, options = {})
-      @keys = Array(keys)
-      @options = options
-    end
-
-    def blank_validation?
-      (@options.keys & VALIDATON_KEYS).empty?
-    end
-
-    def valid?(params)
-      values = normalize_params(params)
-
-      checks = []
-      checks << @options[:in].include?(values.first) if @options[:in]
-      checks << @options[:only].include?(values.first) if @options[:only]
-      checks << !values.map(&:blank?).all? if blank_validation?
-      checks << @options[:intersect] & Array.wrap(values) if @options[:intersect]
-
-      !checks.empty? && checks.all?
-    end
-
-    def endpoint
-      @options[:to] || "#{name}_#{key}"
-    end
-
-    def name
-      'scope'.freeze
-    end
-
-    def key
-      @key ||= @keys.first
-    end
-
-    def normalize_params(params)
-      params.values_at(*keys)
+module QueryFilter
+  module Rules
+    class Scope
+      VALIDATON_KEYS = [:in, :only, :format, :if, :unless].freeze
+
+      attr_reader :keys
+
+      def initialize(keys, options = {})
+        @keys = Array(keys)
+        @options = options
+      end
+
+      def blank_validation?
+        (@options.keys & VALIDATON_KEYS).empty?
+      end
+
+      def valid?(params)
+        values = normalize_params(params)
+
+        checks = []
+        checks << @options[:in].include?(values.first) if @options[:in]
+        checks << @options[:only].include?(values.first) if @options[:only]
+        checks << !values.map(&:blank?).all? if blank_validation?
+        checks << @options[:intersect] & Array.wrap(values) if @options[:intersect]
+
+        !checks.empty? && checks.all?
+      end
+
+      def endpoint
+        @options[:to] || "#{name}_#{key}"
+      end
+
+      def name
+        'scope'.freeze
+      end
+
+      def key
+        @key ||= @keys.first
+      end
+
+      def normalize_params(params)
+        params.values_at(*keys)
+      end
+
+      def can_apply?(target)
+        conditions = QueryFilter::Utils::UserConditions.new(target, @options)
+
+        if conditions.present?
+          conditions.passed?
+        else
+          valid?(target.params)
+        end
+      end
     end
   end
 end

data/lib/query_filter/utils/user_conditions.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module QueryFilter
+  module Utils
+    class UserConditions
+      attr_reader :target
+
+      def initialize(target, options = {})
+        @target = target
+        @options = options
+
+        @if = Array(options[:if])
+        @unless = Array(options[:unless])
+      end
+
+      def passed?
+        return true if empty?
+        value = target.params
+
+        conditions_lambdas.all? { |c| c.call(target, value) }
+      end
+
+      def empty?
+        @if.empty? && @unless.empty?
+      end
+
+      def present?
+        !empty?
+      end
+
+      def conditions_lambdas
+        @if.map { |c| make_lambda c } +
+          @unless.map { |c| invert_lambda make_lambda c }
+      end
+
+      private
+
+      def invert_lambda(l)
+        ->(*args, &blk) { !l.call(*args, &blk) }
+      end
+
+      # Filters support:
+      #
+      #   Symbols:: A method to call.
+      #   Procs::   A proc to call with the object.
+      #
+      # All of these objects are converted into a lambda and handled
+      # the same after this point.
+      def make_lambda(filter)
+        case filter
+        when Symbol
+          ->(target, _, &blk) { target.send filter, &blk }
+        when ::Proc
+          make_proc(filter)
+        else
+          raise ArgumentError
+        end
+      end
+
+      def make_proc(filter)
+        if filter.arity > 1
+          lambda do |target, _, &block|
+            raise ArgumentError unless block
+            target.instance_exec(target, block, &filter)
+          end
+        elsif filter.arity <= 0
+          ->(target, _) { target.instance_exec(&filter) }
+        else
+          ->(target, _) { target.instance_exec(target, &filter) }
+        end
+      end
+    end
+  end
+end

data/lib/query_filter/version.rb

@@ -1,3 +1,3 @@
 module QueryFilter
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/query_filter.rb

@@ -19,5 +19,6 @@ module QueryFilter
   module Utils
     autoload :DatePeriod, 'query_filter/utils/date_period'
     autoload :ScopeRange, 'query_filter/utils/scope_range'
+    autoload :UserConditions, 'query_filter/utils/user_conditions'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,7 @@ files:
 - lib/query_filter/rules/splitter_range.rb
 - lib/query_filter/utils/date_period.rb
 - lib/query_filter/utils/scope_range.rb
+- lib/query_filter/utils/user_conditions.rb
 - lib/query_filter/version.rb
 - query_filter.gemspec
 homepage: https://github.com/psyipm/query_filter