rudash 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be883b432dd317e12aa88cf12390e067292d866cb30ce89f0fd43826f75de74
-  data.tar.gz: fca7e87890b36e9e1423f5f5d1661d23db04834d08cb5b247f72e26dd9747ee4
+  metadata.gz: bd83c39622ad30f4a0c1831c7ccb7cd7a92c5bad4f46e39b854d2e7bf9f6f176
+  data.tar.gz: 3dbd1c65c36b27dfa5b1b3a8bcefbc84b600d9c8f20c9f43a9861cafa96af37a
 SHA512:
-  metadata.gz: 80dd01987d0301f1f5311d1b3e2278d71d2662d0eacd2864abb196224621fd878c276e11edc10288f7269340658685f760f8c5a1bd0e123fc3b283a56c998402
-  data.tar.gz: 2c4e8f9a515c7877518d30376a9a4b5692c3a517cd2be2f45bf0c1dff483526a3ab8cab46aa9b57b8564cc129edb48352a0db925b05aeeacd793ba1e23481236
+  metadata.gz: a85e4581e865eab2ec4c3fdc43fe3c442e4d4b953e531942278d8b37e186c3af466bf3e35e14a83d2147176ca640bd425dd2ce5f1d2a17b9e1faf624bdccf7c4
+  data.tar.gz: aba56b13cbd1ca07343cd2eec0914dcc64f2a6e61e817afab123ac6f57766e737cdd2c3a0cc42ceb53047fdcd163c58a4ce6b2f31e51d581e0128bcc4352dfb7

data/lib/rudash/each_right.rb

@@ -1,16 +1,11 @@
 require_relative 'each.rb'
+require_relative '../utils/index.rb'
 
 module EachRight
     extend Each
 
     def each_right(collection, *rest_args)
-        reversed_collection =
-            case collection
-                when Array then collection.reverse
-                when Hash then collection.reverse_each.to_h
-                when String then collection.reverse
-                else []
-            end
+        reversed_collection = Utils.force_reverse(collection)
 
         self.each(reversed_collection, *rest_args)
         collection

data/lib/rudash/filter.rb

@@ -1,6 +1,7 @@
 require_relative 'is_nil.rb'
 require_relative 'identity.rb'
 require_relative 'head.rb'
+require_relative '../utils/subset_deep_match.rb'
 
 module Filter
     extend IsNil
@@ -10,24 +11,12 @@ module Filter
     def filter(collection, *rest_args)
         filter = self.head(rest_args) || self.method(:identity)
 
-        if collection.is_a?(Array) && filter.is_a?(Hash)
-            filtered_arr = []
-            collection.each do |v|
-                match = true
-                filter.each do |key, value|
-                    if (value != v[key])
-                        match = false
-                        break
-                    end
-                end
-
-                if (match == true)
-                    filtered_arr << v
-                end
-            end
+        if filter.is_a?(Hash)
+            slice_matcher = SubsetDeepMatch.subset_deep_match?.(filter)
+            return self.filter(collection, slice_matcher) 
+        end
 
-            return filtered_arr
-        elsif collection.is_a?(Array)
+        if collection.is_a?(Array)
             begin
                 return collection.select.with_index { |x, idx| filter[x, idx] }
             rescue ArgumentError => e

data/lib/rudash/reduce_right.rb

@@ -1,17 +1,11 @@
 require_relative 'reduce.rb'
+require_relative '../utils/index.rb'
 
 module ReduceRight
     extend Reduce
 
     def reduce_right(collection, *rest_args)
-        reversed_collection =
-            case collection
-                when Array then collection.reverse
-                when Hash then collection.reverse_each.to_h
-                when String then collection.reverse
-                else []
-            end
-
+        reversed_collection = Utils.force_reverse(collection)
         self.reduce(reversed_collection, *rest_args)
     end
 end

data/lib/rudash/union.rb

@@ -18,8 +18,7 @@ module Union
 
         arr_values = self.filter(values, is_array)
         head = self.head(arr_values)
-        return [] if !head.is_a?(Array)
 
-        self.reduce(arr_values, union_reducer, head)
+        self.reduce(arr_values, union_reducer, head) || []
     end
 end

data/lib/utils/index.rb

@@ -3,4 +3,13 @@ module Utils
         return false if !str.is_a?(String)
         str.match(/^(\d)+$/)
     end
+
+    def self.force_reverse(collection)
+        case collection
+            when Array then collection.reverse
+            when Hash then collection.reverse_each.to_h
+            when String then collection.reverse
+            else []
+        end
+    end
 end

data/lib/utils/subset_deep_match.rb

@@ -0,0 +1,50 @@
+require_relative '../rudash'
+
+# This module was written to supply complex subset deep hash and array matching
+# in order to give filter, some?, every? and find the ability to deep match with complex hash queries.
+# See test_filter_hashes_by_deep_hash (test/filter.rb)
+
+module SubsetDeepMatch
+    def self.subset_deep_match?
+        subset_matcher = -> (slice, collection) {
+            match = true
+
+            # If was called with two arrays then the logic will be to
+            # check if every "slice" items exist somehow in the collection
+            # without any order consideration.
+            if (slice.is_a?(Array) && collection.is_a?(Array))
+                return R_.every?(slice, -> (sliceVal) {
+                    R_.some?(collection, -> (collectionVal) {
+                        self.subset_deep_match?.(sliceVal, collectionVal)
+                    })
+                })
+            end
+
+            begin
+                R_.each(collection, -> (v) {
+                    R_.each(slice, -> (value, key) {
+                        if (value.is_a?(Hash) && collection[key].is_a?(Hash))
+                            match &= self.subset_deep_match?.(value, collection[key])
+                        elsif (value.is_a?(Array) && collection[key].is_a?(Array))
+                            match &= self.subset_deep_match?.(value, collection[key])
+                        elsif (value != collection[key])
+                            match = false
+                        end
+                    })
+
+                    # That was done for performance manners since
+                    # R_.each don't stop when returning false from the proc
+                    # so we force it to stop by throwing an exception that we catch later
+                    # It's the same hack for JavaScript forEach function.
+                    raise if match == false
+                })
+            rescue
+                return false
+            end
+
+            match
+        }
+
+        subset_matcher.curry
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rudash
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Islam Attrash
@@ -66,6 +66,7 @@ files:
 - lib/utils/index.rb
 - lib/utils/nested_path_creator.rb
 - lib/utils/path_resolver.rb
+- lib/utils/subset_deep_match.rb
 homepage: https://github.com/Attrash-Islam/rudash
 licenses:
 - MIT