recollect-array 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c60eb4e7c1f4cdbb94be9a3dd9cf0118a990e6b0aea89e238b32490a8557354
-  data.tar.gz: 4f8a4c8f5311d192e62cc539fdc5bf4274fed94def9ee3e3ea524de7e02a7dc4
+  metadata.gz: 5fbfc110c1d152ac717818073bfd1992075a2f661e0476fb914dcf9082436745
+  data.tar.gz: 45faef709c5d1f123a3f1aae9f45efc877fb34d5638dacc73de766cb2c4e5333
 SHA512:
-  metadata.gz: fb8f5e5fa178a2981d77f79d3727889062ffbce756b3dc354c50e62fe42df51c8bed60b20cfbd196127b06ea5222e25ec9d42bee2e95577bf5b901a6a6474029
-  data.tar.gz: 60d86ca9e454898bc7cc981eafc80a7e2411a326141ee291dea52f4c39ca83e96719ffb11ec96e4195c6189f4a2f54298b0c888516827a574ff8356acfcff25b
+  metadata.gz: dbefed9321cf4c56854090598fff906ddd4dff5c7ba8ddaab71bc606e7d41a1b87c0cf0783d0ef8ec8bd80c40b15e7f7322e3c6163b776eef61ca91823cd31bd
+  data.tar.gz: a6cff58f1fa350d046ce25c24de264f49f79bf9422902e266349aadfe70df7852b684cfea028a407422fe6babf68113b55dc77053a1a06024b6a9c0428f95d6f

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

data/lib/recollect/array/filterable.rb

@@ -9,6 +9,28 @@ module Recollect
         instance
       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,23 +52,30 @@ 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.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 || 'eq')
+            klass = Predicate.call(predicate)
 
             next unless !!klass
 
@@ -61,14 +90,26 @@ 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
-      }[named.to_sym]
+        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
   end

data/lib/recollect/array/version.rb

@@ -2,6 +2,6 @@
 
 module Recollect
   module Array
-    VERSION = '0.1.1'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: recollect-array
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 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: []