readymade 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23f98bdcf35999cfdad659cf75fb3e5f103da34508ec1b05cd18eb45465751e
-  data.tar.gz: 15d45fadf8ad68e6603959d6c6ae51b43407733c7458aa4ca20c94ad76bf6fd3
+  metadata.gz: 37150c92279da3c7ecb29441fccbf188572039fe69712cf99824121c8ebeb889
+  data.tar.gz: f94ab00a9af6b37097958c1a386932f8667e7e37ea55ec30530a2e92a423738d
 SHA512:
-  metadata.gz: f5ec8fa06c4198d1281decc771ea8a9ed721a4ca75f17f983b82fc4dd000ad67a3c3b7116e57ae0324edc266055da18a394f36431c7ca2ed68a4a3fb29f31538
-  data.tar.gz: 5b14c12db646986bb0746e783ca04f075739f84b23f3ef2db12595c993108586350a11aff2ce3bc3257b3861c8625ac487d91a84a8a6baf0608f2175b55595c8
+  metadata.gz: b7b562dd8614ca64c8821d71c89ecff73c9556d8c8b5ea4ed95046ba8841354e193ae5e6d61ce05e673cdf8c8ef3946322165761862ca1aee7d8cdc44ecc6b99
+  data.tar.gz: 2608dd0e7def9ea166ec4c0edb391a748d02602e4c8a2e6fd3f0a536397fae5c0e286330fdd07901196f4316bdcf578630f14c5ff985e32896fee35a8f284cb1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.3.9] - 2024-01-04
+
+* Update `Readymade::Model::Filterable` to support and/or joins
+
 ## [0.3.8] - 2023-10-06
 
 * Add `conisder_success` argument to Response

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    readymade (0.3.8)
+    readymade (0.3.9)
       activejob
       activemodel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -25,7 +25,7 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.19.0)
+    minitest (5.20.0)
     rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/README.md

@@ -284,6 +284,7 @@ end
 
 ```ruby
 User.all.filter_collection({ by_status: 'active', by_role: 'manager' })
+User.all.filter_collection({ by_status: 'active', by_role: 'manager' }, chain_with: :or) # active OR manager
 ```
 
 ## Development

data/lib/readymade/model/filterable.rb

@@ -2,6 +2,8 @@ require 'active_support/concern'
 
 module Readymade
   module Model
+    # frozen_string_literal: true
+
     module Filterable
       extend ActiveSupport::Concern
 
@@ -20,13 +22,36 @@ module Readymade
           end
         end
 
-        def filter_collection(filtering_params)
+        def send_chain_with_or(methods, scope = self)
+          return scope if methods.blank?
+
+          conditions = []
+          if methods.respond_to?(:keys)
+            methods.each do |scope_name, argument|
+              conditions << send(scope_name, argument)
+            end
+          else
+            methods.each do |scope_name|
+              conditions << send(scope_name)
+            end
+          end
+
+          where(id: conditions.inject(:or).select(:id))
+        end
+
+        def filter_collection(filtering_params, chain_with: :and)
           filtering_params.permit! if filtering_params.respond_to?(:permit)
 
           regular_params = filtering_params.select { |_key, value| value.present? }.to_h
           custom_params = filtering_params.to_h.select { |_key, value| value.is_a?(String) && value.start_with?('without_') }.values
 
-          send_chain(regular_params, send_chain(custom_params)).distinct
+          if chain_with == :and
+            send_chain(regular_params, send_chain(custom_params)).all
+          elsif chain_with.to_sym == :or
+            send_chain_with_or(regular_params, send_chain_with_or(custom_params)).all
+          else
+            none
+          end
         end
       end
     end

data/lib/readymade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Readymade
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readymade
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug