frequency_analyser 1.2.1 → 1.2.2

data/lib/frequency_analyser/aggregator.rb

@@ -9,7 +9,7 @@ class FrequencyAnalyser::Aggregator < Struct.new(:counter, :aggregation)
   end
 
   def aggregate(*files)
-    files = [files].flatten
+    files = coerce(files)
     files.each do |file|
       file.each_line do |line|
         aggregation << counter.count(line)
@@ -23,4 +23,8 @@ class FrequencyAnalyser::Aggregator < Struct.new(:counter, :aggregation)
     FrequencyAnalyser
   end
 
+  def coerce(files)
+    [files].flatten
+  end
+
 end

data/lib/frequency_analyser/modifier.rb

@@ -1,37 +1,35 @@
-class FrequencyAnalyser::Modifier
+class FrequencyAnalyser::Modifier < Struct.new(:aggregation)
 
   def self.modify(aggregation, mode)
-    new.modify(aggregation, mode)
+    new(aggregation).modify(mode)
   end
 
-  def modify(aggregation, mode)
+  def modify(mode)
     case mode
     when :probability
-      probability(aggregation)
+      probability
     when :percentage
-      percentage(aggregation)
+      percentage
     else
       aggregation
     end
   end
 
   private
-  def probability(aggregation)
-    sum = sum(aggregation)
+  def probability
     aggregation.inject(aggregation) do |hash, (k, v)|
       hash.merge!(k => v.to_f / sum)
     end
   end
 
-  def percentage(aggregation)
-    sum = sum(aggregation)
+  def percentage
     aggregation.inject(aggregation) do |hash, (k, v)|
       hash.merge!(k => v.to_f / sum * 100)
     end
   end
 
-  def sum(aggregation)
-    aggregation.values.inject(:+)
+  def sum
+    @sum ||= aggregation.values.inject(:+)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frequency_analyser
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Christopher Patuzzo