ree_lib 1.0.109 → 1.0.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c475acec8b61f3686477e9ae4643427b3f956c8abb2ae8fe6c4d8e8ebb2c82
-  data.tar.gz: 0a2138c853bd35f2340a9469b960e0c2cad3f89e4fdc4662692661048c9a3638
+  metadata.gz: 59f41ff2397eb9507b0e565246430ccde3467b8137bb747991181cecbb99a8d0
+  data.tar.gz: c267d40f7cd30a41ab86f428c0f30eec225a96fc6ed3ca33e9ab58cf130c0529
 SHA512:
-  metadata.gz: bb6bab53e49f860719f7b342df2500a16f5ce97e431cc2e96d04df39bdc749521a5f639f4d0d6f6b3068ed840e35adaa5144847805b8a5254d12e3969f36c566
-  data.tar.gz: 1bb7d488e89e1c5824012f6e1cde805bcc1d5bd095515c0e90608fca7995884115b2053fd6527306c0d6476884601c2d446b445260cabc46229e9e73cc8d11e4
+  metadata.gz: 04367c6369bd195fa8f2094159f999a1897485632b3e9c86d7e4ed7909513aeef7ea3beba05d544f7660b5bc9a22522f93cd7e3035da6650fbe60ea580d92045
+  data.tar.gz: 305010534eb1ed83b5e7a900b2cd88a9429ce6d1c629527af13dd1ecfcc8951b65a3ca68eb3c74c1a65f1d41e6ebce4cff788b4d5525cc787ab3bf13b0ffdebf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.109)
+    ree_lib (1.0.111)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/group_by.rb

@@ -6,7 +6,7 @@ class ReeArray::GroupBy
   fn :group_by
 
   contract(
-    ArrayOf[Any], Block => HashOf[Any, ArrayOf[Any]]
+    Or[ArrayOf[Any], Enumerable], Block => HashOf[Any, ArrayOf[Any]]
   )
   def call(list, &proc)
     result = {}

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/in_groups.rb

@@ -8,24 +8,24 @@ class ReeArray::InGroups
   doc(<<~DOC)
     Splits or iterates over the array in +number+ of groups, padding any
     remaining slots with +fill_with+ unless it is +false+.
-    
+
       in_groups(%w(1 2 3 4 5 6 7 8 9 10), 3, fill_with: nil) {|group| p group}
       ["1", "2", "3", "4"]
       ["5", "6", "7", nil]
       ["8", "9", "10", nil]
-    
+
       in_groups(%w(1 2 3 4 5 6 7 8 9 10, 3, fill_with: '&nbsp;') {|group| p group}
       ["1", "2", "3", "4"]
       ["5", "6", "7", "&nbsp;"]
       ["8", "9", "10", "&nbsp;"]
-    
+
       in_groups(%w(1 2 3 4 5 6 7), 3) {|group| p group}
       ["1", "2", "3"]
       ["4", "5"]
       ["6", "7"]
   DOC
   contract(
-    ArrayOf[Any],
+    Or[ArrayOf[Any], Enumerable],
     Integer,
     Ksplat[fill_with?: Any],
     Optblock => Or[ArrayOf[Any], Any]

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/in_groups_of.rb

@@ -8,25 +8,25 @@ class ReeArray::InGroupsOf
   doc(<<~DOC)
     Splits or iterates over the array in groups of size +number+,
     padding any remaining slots with +fill_with+ unless it is +false+.
-    
+
       in_groups_of(%w(1 2 3 4 5 6 7 8 9 10), 3, fill_with: nil) {|group| p group}
       ["1", "2", "3"]
       ["4", "5", "6"]
       ["7", "8", "9"]
       ["10", nil, nil]
-    
+
       in_groups_of(%w(1 2 3 4 5), 2, fill_with: '&nbsp;') {|group| p group}
       ["1", "2"]
       ["3", "4"]
       ["5", "&nbsp;"]
-    
+
       in_groups_of(%w(1 2 3 4 5), 2) {|group| p group}
       ["1", "2"]
       ["3", "4"]
       ["5"]
   DOC
   contract(
-    ArrayOf[Any],
+    Or[ArrayOf[Any], Enumerable],
     Integer,
     Ksplat[fill_with?: Any],
     Optblock => Or[ArrayOf[Any], ArrayOf[ArrayOf[Any]]]

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/index_by.rb

@@ -5,7 +5,7 @@ class ReeArray::IndexBy
 
   fn :index_by
 
-  contract(ArrayOf[Any], Block => Hash)
+  contract(Or[ArrayOf[Any], Enumerable], Block => Hash)
   def call(list, &proc)
     result = {}
     list.each { result[yield(_1)] = _1 }

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/split_by.rb

@@ -8,11 +8,11 @@ class ReeArray::SplitBy
   doc(<<~DOC)
     Divides the array into one or more subarrays based on a delimiting +value+
     or the result of an optional block.
-    
+
     split([1, 2, 3, 4, 5], 3)              # => [[1, 2], [4, 5]]
     split((1..10).to_a) { |i| i % 3 == 0 } # => [[1, 2], [4, 5], [7, 8], [10]]
   DOC
-  contract(ArrayOf[Any], Any, Optblock => ArrayOf[Any])
+  contract(Or[ArrayOf[Any], Enumerable], Any, Optblock => ArrayOf[Any])
   def call(array, value = nil, &block)
     arr = array.dup
     result = []

data/lib/ree_lib/packages/ree_array/package/ree_array/functions/wrap.rb

@@ -7,13 +7,13 @@ class ReeArray::Wrap
 
   doc(<<~DOC)
     Wraps its argument in an array unless it is already an array (or array-like).
-    
+
     Specifically:
-    
+
     * If the argument is +nil+ an empty array is returned.
     * Otherwise, if the argument responds to +to_ary+ it is invoked, and its result returned.
     * Otherwise, returns an array with the argument as its single element.
-    
+
         wrap(nil)       # => []
         wrap([1, 2, 3]) # => [1, 2, 3]
         wrap(0)         # => [0]
@@ -22,7 +22,7 @@ class ReeArray::Wrap
   def call(object)
     if object.nil?
       []
-    elsif object.is_a?(Array)
+    elsif object.is_a?(Array) || object.is_a?(Enumerable)
       object
     else
       [object]

data/lib/ree_lib/packages/ree_array/spec/ree_array/functions/index_by_spec.rb

@@ -14,4 +14,35 @@ RSpec.describe :index_by do
       }
     )
   }
+
+  it {
+    class EnumerableArray
+      include Enumerable
+
+      def initialize
+        @list = []
+      end
+
+      def each(&proc)
+        @list.each &proc
+      end
+
+      def add(v)
+        @list << v
+      end
+    end
+
+    list = EnumerableArray.new
+    list.add({id: 1})
+    list.add({id: 2})
+
+    result = index_by(list) { _1[:id] }
+
+    expect(result).to eq(
+      {
+        1 => {id: 1},
+        2 => {id: 2}
+      }
+    )
+  }
 end

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/wrappers/array.rb

@@ -9,7 +9,7 @@ class ReeMapper::Array < ReeMapper::AbstractWrapper
     ] => Array
   ).throws(ReeMapper::TypeError)
   def serialize(value, role: nil, fields_filters: nil)
-    if !value.is_a?(Array)
+    if !check_value(value)
       raise ReeMapper::TypeError.new("should be an array, got `#{truncate(value.inspect)}`")
     end
 
@@ -40,7 +40,7 @@ class ReeMapper::Array < ReeMapper::AbstractWrapper
     ] => Array
   ).throws(ReeMapper::TypeError)
   def cast(value, role: nil, fields_filters: nil)
-    if !value.is_a?(Array)
+    if !check_value(value)
       raise ReeMapper::TypeError.new("should be an array, got `#{truncate(value.inspect)}`")
     end
 
@@ -71,7 +71,7 @@ class ReeMapper::Array < ReeMapper::AbstractWrapper
     ] => Array
   ).throws(ReeMapper::TypeError)
   def db_dump(value, role: nil, fields_filters: nil)
-    if !value.is_a?(Array)
+    if !check_value(value)
       raise ReeMapper::TypeError.new("should be an array, got `#{truncate(value.inspect)}`")
     end
 
@@ -102,7 +102,7 @@ class ReeMapper::Array < ReeMapper::AbstractWrapper
     ] => Array
   ).throws(ReeMapper::TypeError)
   def db_load(value, role: nil, fields_filters: nil)
-    if !value.is_a?(Array)
+    if !check_value(value)
       raise ReeMapper::TypeError.new("should be an array, got `#{truncate(value.inspect)}`")
     end
 
@@ -124,4 +124,10 @@ class ReeMapper::Array < ReeMapper::AbstractWrapper
       raise e
     end
   end
+
+  private
+
+  def check_value(value)
+    value.is_a?(Array) || value.class.include?(Enumerable)
+  end
 end

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/wrappers/array_spec.rb

@@ -22,7 +22,31 @@ RSpec.describe 'ReeMapper::Array' do
     }
   }
 
+  class EnumerableArray
+    include Enumerable
+
+    def initialize
+      @list = []
+    end
+
+    def each(&proc)
+      @list.each &proc
+    end
+
+    def add(v)
+      @list << v
+    end
+  end
+
   describe '#serialize' do
+    it {
+      ar = EnumerableArray.new
+      ar.add(1)
+      ar.add(2)
+
+      expect(mapper.serialize({ tags: ar, ary_of_ary: [[1]] })).to eq({ tags: [1, 2], ary_of_ary: [[1]] })
+    }
+
     it {
       expect(mapper.serialize({ tags: [1, 2], ary_of_ary: [[1]] })).to eq({ tags: [1, 2], ary_of_ary: [[1]] })
     }
@@ -41,6 +65,14 @@ RSpec.describe 'ReeMapper::Array' do
   end
 
   describe '#cast' do
+    it {
+      ar = EnumerableArray.new
+      ar.add(1)
+      ar.add(2)
+
+      expect(mapper.cast({ 'tags' => ar })).to eq({ tags: [1, 2] })
+    }
+
     it {
       expect(mapper.cast({ 'tags' => [1, 2] })).to eq({ tags: [1, 2] })
     }
@@ -51,6 +83,14 @@ RSpec.describe 'ReeMapper::Array' do
   end
 
   describe '#db_dump' do
+    it {
+      ar = EnumerableArray.new
+      ar.add(1)
+      ar.add(2)
+
+      expect(mapper.db_dump(OpenStruct.new({ tags: ar }))).to eq({ tags: [1, 2] })
+    }
+
     it {
       expect(mapper.db_dump(OpenStruct.new({ tags: [1, 2] }))).to eq({ tags: [1, 2] })
     }
@@ -61,6 +101,14 @@ RSpec.describe 'ReeMapper::Array' do
   end
 
   describe '#db_load' do
+    it {
+      ar = EnumerableArray.new
+      ar.add(1)
+      ar.add(2)
+
+      expect(mapper.db_load({ 'tags' => ar })).to eq({ tags: [1, 2] })
+    }
+
     it {
       expect(mapper.db_load({ 'tags' => [1, 2] })).to eq({ tags: [1, 2] })
     }

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.109"
+  VERSION = "1.0.111"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.109
+  version: 1.0.111
 platform: ruby
 authors:
 - Ruslan Gatiyatov