trick_bag 0.49.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c735881db9b16262fde9e1753bbf19a2d3f09a2
-  data.tar.gz: bae4754d55eb643fdd1d0ecfb66533b0bd984c13
+  metadata.gz: 18fca0df6bf55045308d1addceafea1793c14b87
+  data.tar.gz: 37c89c74b67277d29d959d10a0d17636c6347269
 SHA512:
-  metadata.gz: 2ca095d4e271a8e963a6d1bba1541699e0bfc33ee7dc1db9adee2dc6dc1669a582144dd55b24ebd3f15d62a1e7960ad382df7ddf9b1b48ae9ab3e90afa359a62
-  data.tar.gz: a1100d716519313fe9158210264217cebc99283924cf7fcd612714d1ae1563f7e0f2b4296d3505701d8f8c4d756d0c340b5589d3fa337e588f7219bee741779e
+  metadata.gz: fa4fa5ddde0bca6c34ef27af74122b1ae1b669597b135f674b0f8e3dfac812a0d69576cea742ca2fe27ef5473cc1895ff5f046f1da0c36ec7d1104cfb2e5365c
+  data.tar.gz: 377ec62488029e12b522af9e8cc0ec7ee49bdd54028cc85c916b9d4da5c3f7b10ad99ef7e67714c3e17217401a8f6476d7213b056f6e9886f8ab74bd542ac88f

data/RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+## v0.50.0
+
+* On MultiCounter, fixed percent_of_total_hash, added fraction_of_total_hash.
+
+
 ## v0.49.0
 
 * Corrected name from from_array to from_enumerable.

data/lib/trick_bag/numeric/multi_counter.rb

@@ -15,6 +15,7 @@ class MultiCounter
     @counts = Hash.new(0)
   end
 
+  # Creates an instance and iterates over the enumberable, processing all its items.
   def self.from_enumerable(values, name = '')
     m_counter = MultiCounter.new(name)
     values.each { |value| m_counter.increment(value) }
@@ -51,13 +52,28 @@ class MultiCounter
     @counts.values.inject(0, &:+)
   end
 
-  # Returns a hash whose keys are the multicounter's keys and whose values
-  # are the percent of total of the values corresponding to those keys.
-  def percent_of_total_hash
+  # Private internal method for use by percent_of_total_hash
+  # and fraction_of_total_hash.
+  # @param mode :percent or :fraction
+  def of_total_hash(mode = :percent)
+    raise "bad mode: #{mode}" unless [:percent, :fraction].include?(mode)
     total = total_count
     keys.each_with_object({}) do |key, ptotal_hash|
-      ptotal_hash[key] = Float(self[key]) / total
+      value = Float(self[key]) / total
+      value *= 100 if mode == :percent
+      ptotal_hash[key] = value
     end
+  end; private :of_total_hash
+
+  # Returns a hash whose keys are the multicounter's keys and whose values
+  # are the percent of total of the values corresponding to those keys.
+  def percent_of_total_hash
+    of_total_hash(:percent)
+  end
+  # Returns a hash whose keys are the multicounter's keys and whose values
+  # are the fraction of total of the values corresponding to those keys.
+  def fraction_of_total_hash
+    of_total_hash(:fraction)
   end
 
   # Creates a hash whose keys are this counter's keys, and whose values are

data/lib/trick_bag/version.rb

@@ -1,3 +1,3 @@
 module TrickBag
-  VERSION = "0.49.0"
+  VERSION = "0.50.0"
 end

data/spec/trick_bag/numeric/multi_counter_spec.rb

@@ -38,6 +38,13 @@ module Numeric
 
     specify 'percent_of_total_hash is correctly calculated' do
       ptotal_hash = MultiCounter.from_enumerable(sample_data).percent_of_total_hash
+      expect(ptotal_hash['Open']).to eq(60.0)
+      expect(ptotal_hash['Closed']).to eq(20.0)
+      expect(ptotal_hash['New']).to eq(20.0)
+    end
+
+    specify 'fraction_of_total_hash is correctly calculated' do
+      ptotal_hash = MultiCounter.from_enumerable(sample_data).fraction_of_total_hash
       expect(ptotal_hash['Open']).to eq(0.6)
       expect(ptotal_hash['Closed']).to eq(0.2)
       expect(ptotal_hash['New']).to eq(0.2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trick_bag
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Keith Bennett