merginator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d45708d09006490c77f0d2819b0fecc13e35a2a81e69a6f4c7fcf5c8a8bf7f
-  data.tar.gz: c508d5dec15b52a26e3388130d9845a20b4821a1fb5f3f8c7acf735e48afc770
+  metadata.gz: cec09691fc1e5abd0eb16409a89002e835b565c1f030235d58e01143a090419a
+  data.tar.gz: 84dc992b1e3567c82ef5d53d280d8708105a81186d71b4adc592d1284d75fec4
 SHA512:
-  metadata.gz: c85058dd8a0282a43ce46050c4ddba76c9d7f7bb6a2997f2bdf06bf10646f1797e4f1f13a98bd1ec740449dd6501c8b5990255e19d8e5b08eba7e6bc68e0aa81
-  data.tar.gz: a4365f144da7520eecc9e18080aabe6cf16a3322778a5c08a7ff06832d6b85aa0e204629b667cd673d879f0244849da005b706e437897ddf266054c3bc92e13b
+  metadata.gz: 4238899209c3d5fbf18a3f4d72ff0167ac0d4218f338f9ae09ef78cc798e9798456729d41ebcadd3fa01df75b0758fcf5096af3e3b4ba3eb1db024f2a0b06eb0
+  data.tar.gz: e1b1b285d7dee050ab08a2100794f82a0a993ac40f26dc12af30c98f04ab5cd2c1d4e1e6edf56ff595844490d44fda3d648edb7db2bab19dad761247729086b6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.2.2] - 2023-06-30
+
+- Updating ignore total behavior to actually ignore total when validating
+
 ## [0.2.1] - 2023-06-27
 
 - Configuration change version bump

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merginator (0.2.1)
+    merginator (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/merginator/pattern_merge.rb

@@ -25,11 +25,10 @@ module Merginator
     end
 
     def merge(*collections, wrapper: @wrapper, ignore_total: false)
-      validate_merge_collections(collections)
+      validate_merge_collections(collections, ignore_total: ignore_total)
       validate_wrapper wrapper
 
-      total_to_use = @total
-      total_to_use = collections.sum(&:size) if !total || ignore_total
+      total_to_use = total_to_use(collections, ignore_total: ignore_total)
 
       slices_for_collections = slice_collections(collections)
       merge_collections_into_wrapper(slices_for_collections, wrapper: wrapper, total: total_to_use)
@@ -75,6 +74,10 @@ module Merginator
       wrapper.replace wrapper.take(total)
     end
 
+    def total_to_use(collections, ignore_total: false)
+      !@total || ignore_total ? collections.sum(&:size) : @total.to_i
+    end
+
     def validate_pattern
       raise ArgumentError, 'there must be more than one collection in the pattern' if @pattern.count <= 1
       raise ArgumentError, 'pattern must be all integers' unless @pattern.all? { |n| n.is_a? Integer }
@@ -86,15 +89,15 @@ module Merginator
       raise ArgumentError, 'total must be at least 1'
     end
 
-    def validate_merge_collections(collections)
+    def validate_merge_collections(collections, ignore_total: false)
       unless @pattern.count == collections.count
         message = 'number of collections must match pattern; '
         message += "expected #{@pattern.count} collections, actual: #{collections.count}"
         raise ArgumentError, message
       end
 
-      total_to_use = @total || collections.flatten.count
-      return if collections.flatten.count >= total_to_use
+      total_to_use = total_to_use(collections, ignore_total: ignore_total)
+      return if collections.sum(&:size) >= total_to_use
 
       message = 'total number of elements in collections must be >= provided total; '
       message += "expected #{@total} elements, actual: #{collections.flatten.count}"

data/lib/merginator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Merginator
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/sig/{mergifier/pattern_merge.rbs → pattern_merge.rbs}

@@ -17,8 +17,9 @@ class Merginator::PatternMerge
   def generate_pattern_counts: (total) -> Array[Integer]?
   def slice_collections: (Array[collection]) -> Array[Array[untyped]]
   def merge_collections_into_wrapper: (Array[Array[untyped]], wrapper: wrapper, total: Integer) -> wrapper
+  def total_to_use: (Array[collection], ?ignore_total: bool) -> Integer
   def validate_pattern: () -> void
   def validate_total: () -> void
-  def validate_merge_collections: (Array[collection]) -> void
+  def validate_merge_collections: (Array[collection], ?ignore_total: bool) -> void
   def validate_wrapper: (?wrapper) -> void
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merginator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryan Verhey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies: []
 description: Merge 2 or more collections based on a repeating pattern.
 email:
@@ -33,8 +33,8 @@ files:
 - merginator.gemspec
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
-- sig/mergifier/pattern_merge.rbs
 - sig/merginator.rbs
+- sig/pattern_merge.rbs
 homepage: https://github.com/RyanVerhey/merginator
 licenses:
 - MIT