plain_query 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fff1e9e16625d80a9f3f62e6c3cffcda79974c4bfcd41a8a2717165cb3f35f9
-  data.tar.gz: 282cf0017c3d7b4ab771f17c67f3340a5a6d7cab1315ce821d7ffbb5e5040694
+  metadata.gz: 70c15cb5669c0f7794a193a259ba966f97f6017fafa8db1d6b97ce63d4e2ef17
+  data.tar.gz: 37d7a7c0e1109f138a0e9860dd956002b6b68de6eb6b54cac501b62783b01bff
 SHA512:
-  metadata.gz: 30e9043ea80059f42b536998decf73e7b672a54da0724a139dab572f41460118b1635f0ad00f30ef22d8c4825b1abf8d29cd49edc4cd6761fae4bd4787371f57
-  data.tar.gz: f66cdc23a9feb4143ef6bb7cba086872bc9c47be6ab2073795c3f40921affb56c432100ad4c82d6624e712d3704b3df93a8561a3ef971bddaaa19635638a989f
+  metadata.gz: d24c959954d7cf9a25fb512ab3c603c46a168891e84a120c980fda12675e398a81af9362cd1cc203b3f97342f611b7446663277ad793fb8f03fe6d01045d808c
+  data.tar.gz: 9cfb9811e1c2bd1ff8c8832481f4b1d084da6526c6562ef8547f4b48759ae669d58cabe00e1a4d97fdf9f6248e0f53d2c4c1a23c58990068bf30289e6bda1658

data/README.md

@@ -41,17 +41,13 @@ class UsersQuery
   include PlainQuery::Base(model: User)
 
   query_step :filter_by_activity, if: -> { options[:only_active] }
-  query_step :filter_by_phone_presence
+  query_step :filter_by_phone_presence, query: UsersWithPhoneQuery
   query_step :order_by_name
 
   def filter_by_activity
     relation.where(active: true)
   end
 
-  def filter_by_phone_presence
-    relation.where.not(phone: nil)
-  end
-
   def order_by_name
     relation.order(name: :asc)
   end
@@ -81,13 +77,15 @@ It declares which query change method will be executed, condition of execution a
 It has several arguments:
 
 ```rb
-query_step STEP_NAME, CONDITION_OF_EXECUTION
+query_step STEP_NAME, EXECUTION_OPTIONS
 ```
 
 `STEP_NAME` is a name of method which will be executed.
 
-`CONDITION_OF_EXECUTION` is a method which allows or denieds execution of query step.
-Type of condition can be `if:` or `unless:`. Condition definition can be proc (lambda) or some query object method name. Result of query object method used in condition will be used as a boolean value.
+`EXECUTION_OPTIONS` is a collection of options related with step execution.
+Available two types of options:
+`Condition` - allows or denieds execution of query step. Type of condition can be `if:` or `unless:`. Condition definition can be proc (lambda) or some query object method name. Result of query object method used in condition will be used as a boolean value.
+`Nested query` - realises DI for current query object by `query` key. It can execute any class which has call method and returns relation.
 
 ### Using in Active Record model scope.
 First of all you need to set correct model name inside query object.

data/lib/plain_query/instance_methods.rb

@@ -28,7 +28,7 @@ module PlainQuery
         end
 
         # Executes query mutation and checks that step returns ActiveRecord::Relation
-        mutated_query = send(step_name)
+        mutated_query = params[:query] ? params[:query].call(@relation, @options) : send(step_name)
         unless mutated_query.is_a?(ActiveRecord::Relation)
           raise(StandardError, 'Scope must be ActiveRecord::Relation')
         end

data/lib/plain_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainQuery
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - gl-pv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord