recollect-array 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e4b341fd0128d11eebe856242f5a58e4fe2fde5d52a1b32e5ab7677cb87eb0
-  data.tar.gz: 9dd9dfb0d30ea7d4a5005f9abda3e2123a6716f52bc7e8b65b4ab4e1b7f2909d
+  metadata.gz: 86bf4480af01a28e888309fd260dc30b70d511315fdf5e1f99b76134d55df721
+  data.tar.gz: 3cf74cc206a43dfe434d2493ac68c4d4f6da3b78dcb2fbc4ac86472229136c58
 SHA512:
-  metadata.gz: f456880a49863da46af5ddf3776a6f3997141207b42b4f327235f9498ce78ad65d056eb20794f8bb690ee6f86a3e4084c947cf186319fc2e3b7d2a5f5eb87127
-  data.tar.gz: 790347aba973043fd253fb00eff346421c7eb263c0672d3e991b33eaf03ec5a04ea0ea1d0d24a87fb54caf11683bdc698fb395e96718a2130c2ef149fd581607
+  metadata.gz: c2b52884d19f896f1b9a82fbc09fbdc0f8a2e3d658d9099c1203dc0222daa29501dd2b0db1092e64ad1e6bccd09d00c37c9e9b09ae09fa5bb4d2c38692991448
+  data.tar.gz: ce7d90aab0236d2cd8069d69d0623ff0062b70a1d223dc17f7f122164e48f61ef2e5838f1424b5aabd36a5d00163b7302246f2d712d053f788720e53c85074bb

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.1.2

data/README.md

@@ -196,6 +196,16 @@ filters = {
 collection = Recollect::Array.filter(data, filters)
 ```
 
+Using default Equal predicate.
+
+```ruby
+Recollect::Array.filter(data, numbers: 3)
+
+Recollect::Array.filter(data, active: true)
+
+Recollect::Array.filter(data, id: 3)
+```
+
 If array, you can navigate into self, using `property.NUMBER.property`
 
 ```ruby
@@ -361,7 +371,7 @@ filters = { numbers_in: ['1'] }
 
 collection = Recollect::Array.filter(data, filters)
 
-expect(collection.result.size).to eq(1)
+expect(collection.size).to eq(1)
 ```
 
 **Combine conditions**

data/lib/recollect/array/filterable.rb

@@ -5,10 +5,33 @@ module Recollect
     class Filterable
       def self.call(data, filters)
         instance = new(data, filters)
+        
         instance.call!
-        instance
+        instance.result
       end
 
+      PREDICATES = %w[
+        eq
+        noteq
+        not_eq
+        cont
+        notcont
+        not_cont
+        lt
+        lteq
+        gt
+        gteq
+        start
+        notstart
+        not_start
+        end
+        notend
+        not_end
+        in
+        notin
+        not_in
+      ].freeze
+
       # Available filter
       attr_accessor :filters
 
@@ -30,21 +53,28 @@ module Recollect
 
           case value
           when ::Hash
-            value.each do |predicate, item_value|
+            value.each do |predicate, hash_value|
               klass = Predicate.call(predicate)
 
               @result.filter! do |item|
-                case item_value
+                case hash_value
                 when Proc, Module
-                  klass.check!(item, key, item_value.call)
+                  klass.check!(item, key, hash_value.call)
                 else
-                  klass.check!(item, key, item_value)
+                  klass.check!(item, key, hash_value)
                 end
               end
             end
           else
             parts = key.to_s.split('_')
-            predicate = parts.size == 1 ? :eq : parts.pop
+
+            predicate = Array(parts[-2..]).filter do |pkey| 
+              next unless PREDICATES.include? pkey
+
+              parts = parts - [pkey]
+              pkey
+            end&.last || :eq
+
             iteratee = parts.join('_')
             klass = Predicate.call(predicate)
 
@@ -61,13 +91,25 @@ module Recollect
 
     Predicate = lambda do |named|
       {
-        eq: Equal, noteq: NotEqual, not_eq: NotEqual,
-        cont: Contains, notcont: NotContains, not_cont: NotContains,
-        lt: LessThan, lteq: LessThanEqual,
-        gt: GreaterThan, gteq: GreaterThanEqual,
-        start: Startify, notstart: NotStartify, not_start: NotStartify,
-        end: Endify, notend: NotEndify, not_end: NotEndify,
-        in: Included, notin: NotIncluded, not_in: NotIncluded
+        eq: Equal,
+        noteq: NotEqual,
+        not_eq: NotEqual,
+        cont: Contains,
+        notcont: NotContains,
+        not_cont: NotContains,
+        lt: LessThan,
+        lteq: LessThanEqual,
+        gt: GreaterThan,
+        gteq: GreaterThanEqual,
+        start: Startify,
+        notstart: NotStartify,
+        not_start: NotStartify,
+        end: Endify,
+        notend: NotEndify,
+        not_end: NotEndify,
+        in: Included,
+        notin: NotIncluded,
+        not_in: NotIncluded
       }[named.to_sym || :eq]
     end
     private_constant :Predicate

data/lib/recollect/array/version.rb

@@ -2,6 +2,6 @@
 
 module Recollect
   module Array
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: recollect-array
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Thadeu Esteves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2023-02-28 00:00:00.000000000 Z
@@ -131,7 +131,7 @@ homepage: https://github.com/thadeu/recollect-array
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Simple wrapper to filter array using Ruby and simple predicate conditions
 test_files: []