plain_query 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8f5297c612866609495705363e33a5b04d43acfc4169b6db99ac7fd831a58c
-  data.tar.gz: 7a8adf2c33adbd013d68e1989970385834861e6c3d474d88785f94bb473501c9
+  metadata.gz: dee05c4d00595dfab9fd6e7d5a2f154a5859a4be75ef3f73e38260b2e06ea300
+  data.tar.gz: d0e1115a8da4c3f78cb97fe3107743ca1f4aab9874260f9a26ea86e68da64594
 SHA512:
-  metadata.gz: 95163e316ad68b4c3dd0141030ccc5e58c6de3514aca0658bcb556d4494d42cdd6260a62f4e8e58206e3a804ed3f7ac26eb976c3272c8b5ad700cecf7ea16399
-  data.tar.gz: 31f79976ab181c103bd62823c0be4e4978da81925beb9a885515970cd0301a5a1f86dd280b079d7660af771c0d4c33032d8924edf1ec68b987b91787ed444c78
+  metadata.gz: 676f7357d5ece333078b7434451ee1d26f4512a2e7e9ede0ddba7530fad1a32da8568679f6835da4b1058d86ff5bf4914e9c1c04d6846da291f36466e49e7b3a
+  data.tar.gz: bbb09631bb05e2ed2cbbc52346ea18fc42813a50c1f790b786a9da5d9cf6b302b5ee1b70c2335739176640e0668957dce4334be6dabffac9c495ff8f871bba1f

data/README.md

@@ -40,7 +40,7 @@ Query steps perform in writing order.
 class UsersQuery < PlainQuery
   model User
 
-  query_step :filter_by_activity, if: { options[:only_active] }
+  query_step :filter_by_activity, if: -> { options[:only_active] }
   query_step :filter_by_phone_presence
   query_step :order_by_name
 
@@ -137,8 +137,6 @@ end
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/plain_query. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
 1. Fork it
 2. Create your feature branch (git checkout -b my-new-feature)
 3. Commit your changes (git commit -am 'Add some feature')

data/lib/plain_query/logic.rb

@@ -1,6 +1,7 @@
 # Realises methods for scope building by execution of sequence of steps
 # Query class defines query steps:
 # query_step :filter_by_status, if: -> { options[:status].present? }
+#
 # def filter_by_status
 #   relation.where(status: options[:status])
 # end
@@ -12,10 +13,8 @@ class PlainQuery
     @options = options
     @steps = self.class.steps
 
-    # Validates initial relation format. Allowed only ActiveRecord::Relation, model class.
-    if relation.nil?
-      raise(RelationRequired, 'Queries require a base relation defined')
-    elsif !relation.is_a?(ActiveRecord::Relation)
+    # Validates initial relation format. Allowed only ActiveRecord::Relation.
+    unless relation.is_a?(ActiveRecord::Relation)
       raise(RelationRequired, 'Queries accept only ActiveRecord::Relation as input')
     end
   end
@@ -34,7 +33,7 @@ class PlainQuery
 
       # Executes query mutation and checks that step returns ActiveRecord::Relation
       mutated_query = send(step_name)
-      if !mutated_query.is_a?(ActiveRecord::Relation)
+      unless mutated_query.is_a?(ActiveRecord::Relation)
         raise(RelationIsIncorrect, 'Scope must be ActiveRecord::Relation')
       end
 
@@ -46,7 +45,7 @@ class PlainQuery
 
   # Executes if and unless conditions, conditions must contain object method name or proc (lambda)
   def exec_condition(condition)
-    if condition.is_a?(String) || condition.is_a?(Symbol)
+    if [String, Symbol].member?(condition.class)
       !!send(condition)
     elsif condition.is_a?(Proc)
       !!instance_exec(&condition)

data/lib/plain_query/version.rb

@@ -1,3 +1,3 @@
 class PlainQuery
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

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