spout 0.10.2 → 0.11.0.beta1

data/lib/spout/models/graphables/default.rb

@@ -5,7 +5,6 @@ module Spout
   module Models
     module Graphables
       class Default
-
         attr_reader :variable, :chart_variable, :stratification_variable, :subjects
 
         def initialize(variable, chart_variable, stratification_variable, subjects)
@@ -13,27 +12,24 @@ module Spout
           @chart_variable = chart_variable
           @stratification_variable = stratification_variable
           @subjects = subjects
-
-          @values = subjects.collect(&@variable.id.to_sym) rescue @values = []
-          @values_unique = @values.uniq
-
+          begin
+            @values_unique = subjects.collect(&@variable.id.to_sym).reject { |a| a.is_a?(Spout::Models::Empty) }.uniq
+          rescue
+            @values_unique = []
+          end
           @buckets = continuous_buckets
         end
 
         def to_hash
-          if valid?
-            { title: title, subtitle: subtitle, categories: categories, units: units, series: series, stacking: stacking, x_axis_title: x_axis_title }
-          else
-            nil
-          end
+          { title: title, subtitle: subtitle, categories: categories, units: units, series: series, stacking: stacking, x_axis_title: x_axis_title } if valid?
         end
 
         def valid?
-          if @variable == nil or @chart_variable == nil or @values == []
+          if @variable.nil? || @chart_variable.nil? || @values_unique == []
             false
-          elsif @variable.type == 'choices' and @variable.domain.options == []
+          elsif @variable.type == 'choices' && @variable.domain.options == []
             false
-          elsif @chart_variable.type == 'choices' and @chart_variable.domain.options == []
+          elsif @chart_variable.type == 'choices' && @chart_variable.domain.options == []
             false
           else
             true
@@ -45,7 +41,7 @@ module Spout
         end
 
         def subtitle
-          "By Visit"
+          'By Visit'
         end
 
         def categories
@@ -71,11 +67,17 @@ module Spout
         private
 
         def continuous_buckets
-          values_numeric = @values.select{|v| v.kind_of? Numeric}
+          values_numeric = @values_unique.select { |v| v.is_a? Numeric }
+
           return [] if values_numeric.count == 0
           minimum_bucket = values_numeric.min
           maximum_bucket = values_numeric.max
           max_buckets = 12
+          if all_integer?(values_numeric) && (maximum_bucket - minimum_bucket < max_buckets)
+            max_buckets = maximum_bucket - minimum_bucket
+            return discrete_buckets
+          end
+
           bucket_size = ((maximum_bucket - minimum_bucket) / max_buckets.to_f)
           precision = (bucket_size == 0 ? 0 : [-Math.log10(bucket_size).floor, 0].max)
 
@@ -88,8 +90,30 @@ module Spout
           buckets
         end
 
+        def discrete_buckets
+          values_numeric = @values_unique.select { |v| v.is_a? Numeric }
+          minimum_bucket = values_numeric.min
+          maximum_bucket = values_numeric.max
+          max_buckets = maximum_bucket - minimum_bucket + 1
+          bucket_size = 1
+          precision = 0
+
+          buckets = []
+          (0..(max_buckets-1)).to_a.each do |index|
+            start = (minimum_bucket + index * bucket_size)
+            stop = start
+            buckets << Spout::Models::Bucket.new(start.round(precision), stop.round(precision), discrete: true)
+          end
+          buckets
+        end
+
+        def all_integer?(values_numeric)
+          count = values_numeric.count { |v| Integer(format('%.0f', v)) == v }
+          count == values_numeric.size
+        end
+
         def get_bucket(value)
-          return nil if @buckets.size == 0 or not value.kind_of?(Numeric)
+          return nil if @buckets.size == 0 || !value.is_a?(Numeric)
           @buckets.each do |b|
             return b.display_name if b.in_bucket?(value)
           end
@@ -105,10 +129,9 @@ module Spout
         # b) or are marked as missing codes but represented in the dataset
         def filtered_domain_options(variable)
           variable.domain.options.select do |o|
-            o.missing != true or (o.missing == true and @values_unique.include?(o.value))
+            o.missing != true || (o.missing == true && @values_unique.include?(o.value))
           end
         end
-
       end
     end
   end

data/lib/spout/models/graphables/histogram.rb

@@ -3,8 +3,8 @@ require 'spout/models/graphables/default'
 module Spout
   module Models
     module Graphables
+      # Generates data for variable histograms
       class Histogram < Spout::Models::Graphables::Default
-
         def title
           @variable.display_name
         end
@@ -23,18 +23,18 @@ module Spout
 
         def series
           @chart_variable.domain.options.collect do |option|
-            visit_subjects = @subjects.select{ |s| s.send(@chart_variable.id) == option.value and s.send(@variable.id) != nil } rescue visit_subjects = []
-            visit_subject_values = visit_subjects.collect(&@variable.id.to_sym).sort rescue visit_subject_values = []
+            visit_subjects = @subjects.select{ |s| s.send(@chart_variable.id) == option.value && !s.send(@variable.id).nil? && !s.send(@variable.id).is_a?(Spout::Models::Empty) } rescue visit_subjects = []
+            visit_subject_values = visit_subjects.collect(&@variable.id.to_sym).sort # rescue visit_subject_values = []
             next unless visit_subject_values.size > 0
 
             data = []
 
             if @variable.type == 'choices'
-              data = filtered_domain_options(@variable).collect do |option|
-                visit_subject_values.select{ |v| v == option.value }.count
+              data = filtered_domain_options(@variable).collect do |o|
+                visit_subject_values.select { |v| v == o.value }.count
               end
             else
-              visit_subject_values.group_by{|v| get_bucket(v) }.each do |key, values|
+              visit_subject_values.group_by { |v| get_bucket(v) }.each do |key, values|
                 data[categories.index(key)] = values.count if categories.index(key)
               end
             end
@@ -46,7 +46,6 @@ module Spout
         def x_axis_title
           @variable.units
         end
-
       end
     end
   end

data/lib/spout/models/graphables.rb

@@ -5,11 +5,9 @@ require 'spout/models/graphables/choices_vs_choices'
 require 'spout/models/graphables/numeric_vs_numeric'
 require 'spout/models/graphables/choices_vs_numeric'
 
-
 module Spout
   module Models
     module Graphables
-
       DEFAULT_CLASS = Spout::Models::Graphables::Default
       GRAPHABLE_CLASSES = {
         'histogram' =>          Spout::Models::Graphables::Histogram,
@@ -25,7 +23,7 @@ module Spout
       end
 
       def self.get_graph_type(variable, chart_variable, stratification_variable)
-        if stratification_variable == nil
+        if stratification_variable.nil?
           'histogram'
         else
           "#{variable_to_graph_type(variable)}_vs_#{variable_to_graph_type(chart_variable)}"
@@ -34,13 +32,13 @@ module Spout
 
       def self.variable_to_graph_type(variable)
         variable_type = (variable ? variable.type : nil)
-        case variable_type when 'numeric', 'integer'
+        case variable_type
+        when 'numeric', 'integer'
           'numeric'
         else
           variable_type
         end
       end
-
     end
   end
 end

data/lib/spout/models/option.rb

@@ -4,11 +4,15 @@ module Spout
       attr_accessor :display_name, :value, :description, :missing
 
       def initialize(option_hash)
-        %w( display_name value description missing ).each do |method|
-          instance_variable_set("@#{method}", (option_hash.kind_of?(Hash) ? option_hash : {})[method])
+        %w(display_name value description missing).each do |method|
+          instance_variable_set("@#{method}", (option_hash.is_a?(Hash) ? option_hash : {})[method])
         end
       end
 
+      def deploy_params
+        { display_name: display_name, value: value, description: description,
+          missing: missing }
+      end
     end
   end
 end

data/lib/spout/models/outlier_result.rb

@@ -22,9 +22,9 @@ module Spout
           2
         end
         variable = Spout::Helpers::JsonLoader::get_variable(method)
-        @units = (variable.kind_of?(Hash) ? variable['units'] : nil)
-        @display_name = (variable.kind_of?(Hash) ? variable['display_name'] : nil)
-        @variable_type = (variable.kind_of?(Hash) ? variable['type'] : nil)
+        @units = (variable.is_a?(Hash) ? variable['units'] : nil)
+        @display_name = (variable.is_a?(Hash) ? variable['display_name'] : nil)
+        @variable_type = (variable.is_a?(Hash) ? variable['type'] : nil)
         @median = @values.median
       end
 

data/lib/spout/models/record.rb

@@ -3,16 +3,34 @@ require 'fileutils'
 
 module Spout
   module Models
+    # Base class for spout variables, forms, and domains that are read from JSON
+    # files
     class Record
-
       class << self
         # Only returns records with zero json errors, nil otherwise
         def find_by_id(id)
-          dictionary_root = FileUtils.pwd # '.'
-          file_name = Dir.glob(File.join(dictionary_root, "#{self.name.split("::").last.to_s.downcase}s", "**", "#{id.to_s.downcase}.json"), File::FNM_CASEFOLD).first
+          file_name = Dir.glob(expected_path(id), File::FNM_CASEFOLD).first
           variable = new(file_name, dictionary_root)
           (variable.errors.size > 0 ? nil : variable)
         end
+
+        private
+
+        def record_folder
+          "#{name.split('::').last.to_s.downcase}s"
+        end
+
+        def expected_filename(id)
+          "#{id.to_s.downcase}.json"
+        end
+
+        def expected_path(id)
+          File.join(dictionary_root, record_folder, '**', expected_filename(id))
+        end
+
+        def dictionary_root
+          FileUtils.pwd
+        end
       end
     end
   end

data/lib/spout/models/subject.rb

@@ -1,17 +1,14 @@
-# subject.rb
-
 module Spout
   module Models
-
+    # Subject encapsulates records for individuals specified by an identifier
     class Subject
-      attr_accessor :_visit
+      attr_accessor :_visit, :_csv
 
-      def self.create(&block)
-        subject = self.new
+      def self.create
+        subject = new
         yield subject if block_given?
         subject
       end
-
     end
   end
 end

data/lib/spout/models/tables/choices_vs_choices.rb

@@ -3,49 +3,61 @@ require 'spout/models/tables/default'
 module Spout
   module Models
     module Tables
+      # Generates a table of
       class ChoicesVsChoices < Spout::Models::Tables::Default
-
         def title
           "#{@variable.display_name} vs #{@chart_variable.display_name}"
         end
 
         def headers
-          [ [""] + filtered_domain_options(@chart_variable).collect(&:display_name) + ["Total"] ]
+          header_row = [''] + filtered_domain_options(@chart_variable).collect(&:display_name)
+          if @totals
+            header_row += ['Total']
+          end
+          [header_row]
         end
 
         def footers
           total_values = filtered_domain_options(@chart_variable).collect do |option|
-            total_count = @filtered_subjects.select{|s| s.send(@chart_variable.id) == option.value }.count
-            { text: (total_count == 0 ? "-" : Spout::Helpers::TableFormatting::format_number(total_count, :count)), style: "font-weight:bold" }
+            total_count = @filtered_subjects.count { |s| s.send(@chart_variable.id) == option.value }
+            { text: (Spout::Helpers::TableFormatting.format_number(total_count, :count)), style: 'font-weight:bold' }
+          end
+          footer_row = [{ text: 'Total', style: 'font-weight:bold' }] + total_values
+          if @totals
+            footer_row += [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count, :count), style: 'font-weight:bold' }]
           end
-          [
-            [{ text: "Total", style: "font-weight:bold" }] + total_values + [{ text: Spout::Helpers::TableFormatting::format_number(@filtered_subjects.count, :count), style: 'font-weight:bold'}]
-          ]
+          [footer_row]
         end
 
         def rows
-          rows_result = []
           rows_result = filtered_domain_options(@variable).collect do |option|
-            row_subjects = @filtered_subjects.select{ |s| s.send(@variable.id) == option.value }
+            row_subjects = @filtered_subjects.select { |s| s.send(@variable.id) == option.value }
             row_cells = filtered_domain_options(@chart_variable).collect do |chart_option|
-              count = row_subjects.select{ |s| s.send(@chart_variable.id) == chart_option.value }.count
-              count > 0 ? Spout::Helpers::TableFormatting::format_number(count, :count) : { text: '-', class: 'text-muted' }
+              count = row_subjects.count { |s| s.send(@chart_variable.id) == chart_option.value }
+              count > 0 ? Spout::Helpers::TableFormatting.format_number(count, :count) : { text: '-', class: 'text-muted' }
             end
 
-            total = row_subjects.count
+            row = [option.display_name] + row_cells
 
-            [option.display_name] + row_cells + [total == 0 ? { text: '-', class: 'text-muted' } : { text: Spout::Helpers::TableFormatting::format_number(total, :count), style: 'font-weight:bold'}]
+            if @totals
+              total = row_subjects.count
+              row += [total == 0 ? { text: '-', class: 'text-muted' } : { text: Spout::Helpers::TableFormatting.format_number(total, :count), style: 'font-weight:bold' }]
+            end
+            row
           end
 
-          if @filtered_subjects.select{|s| s.send(@variable.id) == nil }.count > 0
+          if @filtered_subjects.count { |s| s.send(@variable.id).is_a?(Spout::Models::Empty) } > 0
             unknown_values = filtered_domain_options(@chart_variable).collect do |chart_option|
-              { text: Spout::Helpers::TableFormatting::format_number(@filtered_subjects.select{ |s| s.send(@chart_variable.id) == chart_option.value and s.send(@variable.id) == nil }.count, :count), class: 'text-muted' }
+              { text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count { |s| s.send(@chart_variable.id) == chart_option.value && s.send(@variable.id).is_a?(Spout::Models::Empty) }, :count), class: 'text-muted' }
+            end
+            unknown_row = [{ text: 'Unknown', class: 'text-muted' }] + unknown_values
+            if @totals
+              unknown_row += [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count { |s| s.send(@variable.id).is_a?(Spout::Models::Empty) }, :count), style: 'font-weight:bold', class: 'text-muted' }]
             end
-            rows_result << [{ text: 'Unknown', class: 'text-muted'}] + unknown_values + [ { text: Spout::Helpers::TableFormatting::format_number(@filtered_subjects.select{|s| s.send(@variable.id) == nil}.count, :count), style: 'font-weight:bold', class: 'text-muted' } ]
+            rows_result << unknown_row
           end
           rows_result
         end
-
       end
     end
   end

data/lib/spout/models/tables/choices_vs_numeric.rb

@@ -4,45 +4,52 @@ require 'spout/helpers/array_statistics'
 module Spout
   module Models
     module Tables
+      # Generates a table that displays choices versus numeric values
       class ChoicesVsNumeric < Spout::Models::Tables::Default
-
         def title
           "#{@variable.display_name} vs #{@chart_variable.display_name}"
         end
 
         def headers
           categories = [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
-            bucket = @filtered_both_variables_subjects.send(quartile).collect(&@chart_variable.id.to_sym)
+            bucket = @filtered_subjects.send(quartile).collect(&@chart_variable.id.to_sym)
             "#{bucket.min} to #{bucket.max} #{@chart_variable.units}"
           end
 
-          [ [""] + categories + ["Total"] ]
+          [[''] + categories + ['Total']]
         end
 
         def footers
           total_values = [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
-            { text: Spout::Helpers::TableFormatting::format_number(@filtered_both_variables_subjects.send(quartile).count, :count), style: "font-weight:bold" }
+            { text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.send(quartile).count, :count), style: 'font-weight:bold' }
           end
 
           [
-            [{ text: "Total", style: "font-weight:bold" }] + total_values + [{ text: Spout::Helpers::TableFormatting::format_number(@filtered_both_variables_subjects.count, :count), style: 'font-weight:bold'}]
+            [{ text: 'Total', style: 'font-weight:bold' }] + total_values + [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count, :count), style: 'font-weight:bold' }]
           ]
         end
 
         def rows
-          filtered_both_variables_domain_options(@variable).collect do |option|
-            row_subjects = @filtered_both_variables_subjects.select{ |s| s.send(@variable.id) == option.value }
+          rows_result = filtered_domain_options(@variable).collect do |option|
+            row_subjects = @filtered_subjects.select { |s| s.send(@variable.id) == option.value }
 
             data = [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
-              bucket = @filtered_both_variables_subjects.send(quartile).select{ |s| s.send(@variable.id) == option.value }
-              Spout::Helpers::TableFormatting::format_number(bucket.count, :count)
+              count = @filtered_subjects.send(quartile).count { |s| s.send(@variable.id) == option.value }
+              Spout::Helpers::TableFormatting.format_number(count, :count)
             end
 
-            [option.display_name] + data + [{ text: Spout::Helpers::TableFormatting::format_number(row_subjects.count, :count), style: 'font-weight:bold'}]
+            [option.display_name] + data + [{ text: Spout::Helpers::TableFormatting.format_number(row_subjects.count, :count), style: 'font-weight:bold' }]
           end
-        end
-
 
+          if @filtered_subjects.count { |s| s.send(@variable.id).is_a?(Spout::Models::Empty) } > 0
+            unknown_values = [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
+              count = @filtered_subjects.send(quartile).count { |s| s.send(@variable.id).is_a?(Spout::Models::Empty) }
+              { text: Spout::Helpers::TableFormatting.format_number(count, :count), class: 'text-muted' }
+            end
+            rows_result << [{ text: 'Unknown', class: 'text-muted'}] + unknown_values + [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count { |s| s.send(@variable.id).is_a?(Spout::Models::Empty) }, :count), style: 'font-weight:bold', class: 'text-muted' }]
+          end
+          rows_result
+        end
       end
     end
   end

data/lib/spout/models/tables/default.rb

@@ -5,41 +5,36 @@ module Spout
   module Models
     module Tables
       class Default
+        attr_reader :variable, :chart_variable, :subjects, :subtitle, :totals
 
-        attr_reader :variable, :chart_variable, :subjects, :subtitle
-
-        def initialize(variable, chart_variable, subjects, subtitle)
+        def initialize(variable, chart_variable, subjects, subtitle, totals)
           @variable = variable
           @chart_variable = chart_variable
-          @subjects = subjects
           @subtitle = subtitle
-
-          @filtered_subjects = @subjects.select{ |s| s.send(@chart_variable.id) != nil } rescue @filtered_subjects = []
-          @filtered_both_variables_subjects = subjects.select{ |s| s.send(@variable.id) != nil and s.send(@chart_variable.id) != nil }.sort_by(&@chart_variable.id.to_sym) rescue @filtered_both_variables_subjects = []
-
-          @values = @filtered_subjects.collect(&@variable.id.to_sym).uniq rescue @values = []
-
-          @values_unique = @values.uniq
-
-          @values_both_variables = @filtered_both_variables_subjects.collect(&@variable.id.to_sym).uniq rescue @values_both_variables = []
-          @values_both_variables_unique = @values_both_variables.uniq
+          @totals = totals
+          begin
+            @filtered_subjects = subjects.reject { |s| s.send(@chart_variable.id).is_a?(Spout::Models::Empty) }.sort_by(&@chart_variable.id.to_sym)
+          rescue
+            @filtered_subjects = []
+          end
+          begin
+            @values_unique = @filtered_subjects.collect(&@variable.id.to_sym).uniq
+          rescue
+            @values_unique = []
+          end
         end
 
         def to_hash
-          if valid?
-            { title: title, subtitle: @subtitle, headers: headers, footers: footers, rows: rows }
-          else
-            nil
-          end
+          { title: title, subtitle: @subtitle, headers: headers, footers: footers, rows: rows } if valid?
         end
 
         # TODO: Same as graphables/default.rb REFACTOR
         def valid?
-          if @variable == nil or @chart_variable == nil or @values == []
+          if @variable.nil? || @chart_variable.nil? || @values_unique == []
             false
-          elsif @variable.type == 'choices' and @variable.domain.options == []
+          elsif @variable.type == 'choices' && @variable.domain.options == []
             false
-          elsif @chart_variable.type == 'choices' and @chart_variable.domain.options == []
+          elsif @chart_variable.type == 'choices' && @chart_variable.domain.options == []
             false
           else
             true
@@ -47,7 +42,7 @@ module Spout
         end
 
         def title
-          ""
+          ''
         end
 
         def headers
@@ -62,7 +57,6 @@ module Spout
           []
         end
 
-
         private
 
         # Returns variable options that are either:
@@ -70,16 +64,9 @@ module Spout
         # b) or are marked as missing codes but represented in the dataset
         def filtered_domain_options(variable)
           variable.domain.options.select do |o|
-            o.missing != true or (o.missing == true and @values_unique.include?(o.value))
+            o.missing != true || (o.missing == true && @values_unique.include?(o.value))
           end
         end
-
-        def filtered_both_variables_domain_options(variable)
-          variable.domain.options.select do |o|
-            o.missing != true or (o.missing == true and @values_both_variables_unique.include?(o.value))
-          end
-        end
-
       end
     end
   end

data/lib/spout/models/tables/numeric_vs_choices.rb

@@ -5,42 +5,38 @@ module Spout
   module Models
     module Tables
       class NumericVsChoices < Spout::Models::Tables::Default
-
         def title
           "#{@chart_variable.display_name} vs #{@variable.display_name}"
         end
 
         def headers
-          [
-            [""] + Spout::Helpers::ArrayStatistics::calculations.collect{|calculation_label, calculation_method| calculation_label} + ["Total"]
-          ]
+          [[''] + Spout::Helpers::ArrayStatistics.calculations.collect(&:first) + ['Total']]
         end
 
         def footers
-          total_values = Spout::Helpers::ArrayStatistics::calculations.collect do |calculation_label, calculation_method, calculation_type, calculation_format|
+          return [] unless @totals
+          total_values = Spout::Helpers::ArrayStatistics.calculations.collect do |_calculation_label, calculation_method, calculation_type, calculation_format|
             total_count = @filtered_subjects.collect(&@variable.id.to_sym).send(calculation_method)
-            { text: Spout::Helpers::TableFormatting::format_number(total_count, calculation_type, calculation_format), style: "font-weight:bold" }
+            { text: Spout::Helpers::TableFormatting.format_number(total_count, calculation_type, calculation_format), style: 'font-weight:bold' }
           end
 
           [
-            [{ text: "Total", style: "font-weight:bold" }] + total_values + [{ text: Spout::Helpers::TableFormatting::format_number(@filtered_subjects.count, :count), style: 'font-weight:bold'}]
+            [{ text: 'Total', style: 'font-weight:bold' }] + total_values + [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count, :count), style: 'font-weight:bold' }]
           ]
         end
 
         def rows
           filtered_domain_options(@chart_variable).collect do |option|
-            row_subjects = @filtered_subjects.select{ |s| s.send(@chart_variable.id) == option.value }
+            row_subjects = @filtered_subjects.select { |s| s.send(@chart_variable.id) == option.value }
 
-            row_cells = Spout::Helpers::ArrayStatistics::calculations.collect do |calculation_label, calculation_method, calculation_type, calculation_format|
+            row_cells = Spout::Helpers::ArrayStatistics.calculations.collect do |_calculation_label, calculation_method, calculation_type, calculation_format|
               count = row_subjects.collect(&@variable.id.to_sym).send(calculation_method)
-              (count == 0 && calculation_method == :count) ? { text: '-', class: 'text-muted' } : Spout::Helpers::TableFormatting::format_number(count, calculation_type, calculation_format)
+              (count == 0 && calculation_method == :count) ? { text: '-', class: 'text-muted' } : Spout::Helpers::TableFormatting.format_number(count, calculation_type, calculation_format)
             end
 
-            [option.display_name] + row_cells + [{ text: Spout::Helpers::TableFormatting::format_number(row_subjects.count, :count), style: 'font-weight:bold'}]
+            [option.display_name] + row_cells + [{ text: Spout::Helpers::TableFormatting.format_number(row_subjects.count, :count), style: 'font-weight:bold' }]
           end
         end
-
-
       end
     end
   end

data/lib/spout/models/tables/numeric_vs_numeric.rb

@@ -5,37 +5,36 @@ module Spout
   module Models
     module Tables
       class NumericVsNumeric < Spout::Models::Tables::Default
-
         def title
           "#{@chart_variable.display_name} vs #{@variable.display_name}"
         end
 
         def headers
-          [ [""] + Spout::Helpers::ArrayStatistics::calculations.collect{|calculation_label, calculation_method| calculation_label} + ["Total"] ]
+          [[''] + Spout::Helpers::ArrayStatistics.calculations.collect(&:first) + ['Total']]
         end
 
         def footers
-          total_values = Spout::Helpers::ArrayStatistics::calculations.collect do |calculation_label, calculation_method, calculation_type, calculation_format|
-            total_count = @filtered_both_variables_subjects.collect(&@variable.id.to_sym).send(calculation_method)
-            { text: Spout::Helpers::TableFormatting::format_number(total_count, calculation_type, calculation_format), style: "font-weight:bold" }
+          total_values = Spout::Helpers::ArrayStatistics.calculations.collect do |_calculation_label, calculation_method, calculation_type, calculation_format|
+            total_count = @filtered_subjects.collect(&@variable.id.to_sym).send(calculation_method)
+            { text: Spout::Helpers::TableFormatting.format_number(total_count, calculation_type, calculation_format), style: 'font-weight:bold' }
           end
 
           [
-            [{ text: "Total", style: "font-weight:bold" }] + total_values + [{ text: Spout::Helpers::TableFormatting::format_number(@filtered_both_variables_subjects.count, :count), style: 'font-weight:bold'}]
+            [{ text: 'Total', style: 'font-weight:bold' }] + total_values + [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count, :count), style: 'font-weight:bold' }]
           ]
         end
 
         def rows
           [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
-            bucket = @filtered_both_variables_subjects.send(quartile)
+            bucket = @filtered_subjects.send(quartile)
             row_subjects = bucket.collect(&@variable.id.to_sym)
-            data = Spout::Helpers::ArrayStatistics::calculations.collect do |calculation_label, calculation_method, calculation_type, calculation_format|
-              Spout::Helpers::TableFormatting::format_number(row_subjects.send(calculation_method), calculation_type, calculation_format)
+            data = Spout::Helpers::ArrayStatistics.calculations.collect do |_calculation_label, calculation_method, calculation_type, calculation_format|
+              Spout::Helpers::TableFormatting.format_number(row_subjects.send(calculation_method), calculation_type, calculation_format)
             end
 
             row_name = get_row_name(quartile, bucket, row_subjects)
 
-            [row_name] + data + [{ text: Spout::Helpers::TableFormatting::format_number(row_subjects.count, :count), style: 'font-weight:bold'}]
+            [row_name] + data + [{ text: Spout::Helpers::TableFormatting.format_number(row_subjects.count, :count), style: 'font-weight:bold' }]
           end
         end
 
@@ -48,7 +47,6 @@ module Spout
             "#{bucket.collect(&@chart_variable.id.to_sym).min} to #{bucket.collect(&@chart_variable.id.to_sym).max} #{@chart_variable.units}"
           end
         end
-
       end
     end
   end