qfill 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7186df445b2f2b4c069058d078506b6182848dacd2c87b33d4ddf7acc358c78c
-  data.tar.gz: 8419501fe262e72e156e7def12a6fa0a08535ed080ee6c8c60c1fef8be955eb1
+  metadata.gz: ebf168a7298dded7f0c9f3eb4e4edd7fd6f6150465a857343c2433eae5861364
+  data.tar.gz: 8917c3a87fdb98aea36a483008d26e46099bae22ce904b6802df9e310c6053c5
 SHA512:
-  metadata.gz: f46b79785bf08438e44128f53184967a8bf5f866955b7fe79a3d970a7b8798b013300f14637e7d46dfe1f6da52abf0923cd22faf5bf3283378b34c50e46e2e50
-  data.tar.gz: 373477a0fa69992fa1f028631f392f314c8e46f4c17266879b70e597269832050af0a7d0a67eae70aa09146de0f2b691b96bc4d3051e8faca12140b2dba5bb6d
+  metadata.gz: aa7d5e8882e07947969161d2da89dab24d5e2549ea5138b95fef4bf90ffa82b2eb451133281c1de72c328a903850e6434a701d753b55e7c9aae690f5709e6b50
+  data.tar.gz: df6957d37df1670ad0362c333b60540ed8242b2f8b3db7a84fcf2219cdda5012a5698cbd2cad51054d8cb4a1241b208db46d406df4c8caae68016b78a2980a20

data/Gemfile

@@ -17,10 +17,8 @@ end
 
 group :development, :test do
   if ruby_version >= Gem::Version.new('2.4')
-    # No need to run byebug / pry on earlier versions
+    # No need to run byebug on earlier versions
     gem 'byebug', platform: :mri
-    gem 'pry', platform: :mri
-    gem 'pry-byebug', platform: :mri
   end
 
   if ruby_version >= Gem::Version.new('2.7')

data/lib/qfill/result.rb

@@ -28,6 +28,8 @@ module Qfill
                   :max_tracker
 
     def self.get_limit_from_max_and_ratio(all_list_max, ratio, remain = nil)
+      return 1 if remain == 1
+
       limit = (all_list_max * ratio).round(0)
       # If we rounded down to zero we have to keep at least one.
       # This is because with small origin sets all ratios might round down to 0.
@@ -144,6 +146,7 @@ module Qfill
       self.current_count = 0
     end
 
+    # Results can overfill, because fractions.
     def is_full?
       self.total_count >= max
     end

data/lib/qfill/strategy/time_slice.rb

@@ -80,20 +80,19 @@ module Qfill
       def fill_up_to_ratio!
         ratio = 1.0 / popper.primary.length # 1 divided by the number of queues
         max_from_list = Qfill::Result.get_limit_from_max_and_ratio(result.max, ratio, remaining)
-        while !is_full? && !result.is_full? && !popper.totally_empty? && (origin_list = popper.current_list)
-          array_to_push = popper.next_objects!(origin_list.name, [max_from_list, remaining].min)
+        while !is_full? && (take = [max_from_list, remaining].min) && (!result.is_full? || take == 1) && !popper.totally_empty? && (origin_list = popper.current_list)
+          array_to_push = popper.next_objects!(origin_list.name, take)
           self.added = result.push(array_to_push, origin_list.name)
           bump!
-          puts "[fill_up_to_ratio!]#{self}[Added:#{added}][Max List:#{max_from_list}][ratio:#{ratio}][added:#{added}]" if Qfill::VERBOSE
+          puts "[fill_up_to_ratio!]#{self}[Added:#{added}][Max List:#{max_from_list}][ratio:#{ratio}][take:#{take}]" if Qfill::VERBOSE
           popper.set_next_as_current!
         end
       end
 
       def fill_according_to_list_ratios!
-        # puts "#{!is_full?} && #{result.fill_count} >= #{result.max} && #{!self.popper.totally_empty?} && #{(list_ratio_tuple = result.current_list_ratio)}"
-        while !is_full? && !result.is_full? && !popper.totally_empty? && (list_ratio_tuple = result.current_list_ratio)
-          max_from_list = Qfill::Result.get_limit_from_max_and_ratio(result.max, list_ratio_tuple[1], remaining)
-          array_to_push = popper.next_objects!(list_ratio_tuple[0], max_from_list)
+        # puts "#{!is_full?} && #{result.fill_count} >= #{result.max} && #{!self.popper.totally_empty?} && #{result.current_list_ratio}"
+        while !is_full? && !popper.totally_empty? && (list_ratio_tuple = result.current_list_ratio) && (take = Qfill::Result.get_limit_from_max_and_ratio(result.max, list_ratio_tuple[1], remaining)) && (!result.is_full? || take == 1)
+          array_to_push = popper.next_objects!(list_ratio_tuple[0], take)
           self.added = result.push(array_to_push, list_ratio_tuple[0])
           bump!
           puts "[fill_according_to_list_ratios!]#{self}[#{list_ratio_tuple[0]}][added:#{added}]" if Qfill::VERBOSE

data/lib/qfill/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qfill
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/qfill/manager_spec.rb

@@ -731,12 +731,15 @@ describe Qfill::Manager do
   end
 
   context 'when strategy => :time_slice' do
+    let(:elements) { 2400 }
+    let(:window_size) { 20 }
+    let(:pane_size) { 2 }
     let(:popper) do
       Qfill::Popper.from_array_of_hashes(
         [
           {
             name: 'data',
-            elements: build_elements('ef', 2400)
+            elements: build_elements('ef', elements)
           }
         ]
       )
@@ -746,23 +749,45 @@ describe Qfill::Manager do
         popper: popper,
         strategy: :time_slice,
         strategy_options: {
-          window_size: 20,
+          window_size: window_size,
           window_units: 'minutes',
-          pane_size: 2,
+          pane_size: pane_size,
           pane_units: 'seconds'
         }
       }
     end
 
-    describe '#new' do
-      it 'does not raise any errors' do
-        expect { described_class.new(arguments) }.not_to raise_error
+    shared_examples_for "a good citizen" do
+      describe '#new' do
+        it 'does not raise any errors' do
+          expect { described_class.new(arguments) }.not_to raise_error
+        end
+      end
+
+      describe '#fill!' do
+        it 'instantiates with pusher' do
+          expect { described_class.new(arguments).fill! }.not_to raise_error
+        end
       end
     end
 
-    describe '#fill!' do
-      it 'instantiates with pusher' do
-        expect { described_class.new(arguments).fill! }.not_to raise_error
+    it_behaves_like "a good citizen"
+
+    context "other options" do
+      let(:elements) { 101 }
+
+      context "5 minutes by 3 seconds" do
+        let(:window_size) { 5 }
+        let(:pane_size) { 3 }
+
+        it_behaves_like "a good citizen"
+      end
+
+      context "7 minutes by 4 seconds" do
+        let(:window_size) { 7 }
+        let(:pane_size) { 4 }
+
+        it_behaves_like "a good citizen"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qfill
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Boling
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: 'You have a set of arrays that need to be turned into a different set of