spout 0.12.1 → 0.13.0.beta1

data/lib/spout/helpers/table_formatting.rb

@@ -7,8 +7,8 @@ module Spout
       #   @number = number
       # end
 
-      def self.number_with_delimiter(number, delimiter = ',')
-        number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse
+      def self.number_with_delimiter(number, delimiter = ",")
+        number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(",").reverse
       end
 
       # type:  :count    or   :decimal
@@ -23,24 +23,24 @@ module Spout
       end
 
       def self.format_nil(number)
-        '-'
+        "-"
       end
 
       #   count:
-      #        0          ->             '-'
-      #       10          ->            '10'
-      #     1000          ->         '1,000'
+      #        0          ->             "-"
+      #       10          ->            "10"
+      #     1000          ->         "1,000"
       # Input (Numeric)   -> Output (String)
       def self.format_count(number)
-        (number == 0 || number.nil?) ? '-' : number_with_delimiter(number)
+        (number == 0 || number.nil?) ? "-" : number_with_delimiter(number)
       end
 
       # decimal:
-      #        0          ->           '0.0'
-      #       10          ->          '10.0'
-      #      -50.2555     ->         '-50.3'
-      #     1000          ->       '1,000.0'
-      # 12412423.42252525 ->  '12,412,423.4'
+      #        0          ->           "0.0"
+      #       10          ->          "10.0"
+      #      -50.2555     ->         "-50.3"
+      #     1000          ->       "1,000.0"
+      # 12412423.42252525 ->  "12,412,423.4"
       # Input (Numeric)   -> Output (String)
       def self.format_decimal(number, format)
         precision = 1

data/lib/spout/models/coverage_result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spout/tests/variable_type_validation'
+require "spout/tests/variable_type_validation"
 
 module Spout
   module Models
@@ -24,15 +24,15 @@ module Spout
         file = Dir.glob("variables/**/#{column.to_s.downcase}.json", File::FNM_CASEFOLD).first
         @file_name_test = !file.nil?
         @json = JSON.parse(File.read(file)) rescue @json = {}
-        @json_id_test = (@json['id'].to_s.downcase == column)
+        @json_id_test = (@json["id"].to_s.downcase == column)
       end
 
       def load_valid_values
         valid_values = []
-        if @json['type'] == 'choices' || domain_name != ''
+        if @json["type"] == "choices" || domain_name != ""
           file = Dir.glob("domains/**/#{@json['domain'].to_s.downcase}.json", File::FNM_CASEFOLD).first
           if json = JSON.parse(File.read(file)) rescue false
-            valid_values = json.collect { |hash| hash['value'] }
+            valid_values = json.collect { |hash| hash["value"] }
           end
         end
         @valid_values = valid_values
@@ -43,15 +43,15 @@ module Spout
       end
 
       def check_values
-        @json['type'] != 'choices' || (@valid_values | @csv_values.compact).size == @valid_values.size
+        @json["type"] != "choices" || (@valid_values | @csv_values.compact).size == @valid_values.size
       end
 
       def check_variable_type
-        Spout::Tests::VariableTypeValidation::VALID_VARIABLE_TYPES.include?(@json['type'])
+        Spout::Tests::VariableTypeValidation::VALID_VARIABLE_TYPES.include?(@json["type"])
       end
 
       def check_domain_specified
-        if @json['type'] != 'choices' && domain_name == ''
+        if @json["type"] != "choices" && domain_name == ""
           true
         else
           domain_file = Dir.glob("domains/**/#{@json['domain'].to_s.downcase}.json", File::FNM_CASEFOLD).first
@@ -67,7 +67,7 @@ module Spout
       end
 
       def domain_name
-        @json['domain'].to_s.downcase.strip
+        @json["domain"].to_s.downcase.strip
       end
     end
   end

data/lib/spout/models/dictionary.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spout/models/variable'
-require 'spout/models/domain'
-require 'spout/models/form'
+require "spout/models/variable"
+require "spout/models/domain"
+require "spout/models/form"
 
 module Spout
   module Models
@@ -17,9 +17,9 @@ module Spout
       def initialize(app_path)
         @app_path = app_path
 
-        @variable_files = json_files('variables')
-        @domain_files = json_files('domains')
-        @form_files = json_files('forms')
+        @variable_files = json_files("variables")
+        @domain_files = json_files("domains")
+        @form_files = json_files("forms")
 
         @variables = []
         @domains = []
@@ -34,21 +34,21 @@ module Spout
       end
 
       def load_variables!
-        load_type!('Variable')
+        load_type!("Variable")
       end
 
       def load_domains!
-        load_type!('Domain')
+        load_type!("Domain")
       end
 
       def load_forms!
-        load_type!('Form')
+        load_type!("Form")
       end
 
       private
 
       def json_files(type)
-        Dir.glob(File.join(@app_path, type, '**', '*.json'))
+        Dir.glob(File.join(@app_path, type, "**", "*.json"))
       end
 
       def load_type!(method)

data/lib/spout/models/domain.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require 'spout/models/record'
-require 'spout/models/option'
+require "spout/models/record"
+require "spout/models/option"
 
 module Spout
   module Models
@@ -13,9 +13,9 @@ module Spout
 
       def initialize(file_name, dictionary_root)
         @errors = []
-        @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+        @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, "").downcase
 
-        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/domains\/|#{@id}\.json$/, '')
+        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/domains\/|#{@id}\.json$/, "")
         @options = []
 
         json = begin
@@ -31,7 +31,7 @@ module Spout
         end
 
         if json.is_a? Array
-          @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+          @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, "").downcase
           @options = (json || []).collect do |option|
             Spout::Models::Option.new(option)
           end
@@ -41,7 +41,7 @@ module Spout
       end
 
       def deploy_params
-        { name: id, folder: folder.to_s.gsub(%r{/$}, ''),
+        { name: id, folder: folder.to_s.gsub(%r{/$}, ""),
           options: options.collect(&:deploy_params),
           spout_version: Spout::VERSION::STRING }
       end

data/lib/spout/models/empty.rb

@@ -12,7 +12,7 @@ module Spout
       end
 
       def to_s
-        'Empty'
+        "Empty"
       end
     end
   end

data/lib/spout/models/form.rb

@@ -6,7 +6,7 @@
 #   "code_book": "Baseline-Visit-Intake-Questionnaire.pdf"
 # }
 
-require 'spout/models/record'
+require "spout/models/record"
 
 module Spout
   module Models
@@ -16,13 +16,13 @@ module Spout
 
       def initialize(file_name, dictionary_root)
         @errors = []
-        @id     = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
-        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/forms\/|#{@id}\.json$/, '')
+        @id     = file_name.to_s.gsub(/^(.*)\/|\.json$/, "").downcase
+        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/forms\/|#{@id}\.json$/, "")
 
         json = begin
           JSON.parse(File.read(file_name))
         rescue => e
-          form_name = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+          form_name = file_name.to_s.gsub(/^(.*)\/|\.json$/, "").downcase
           @errors << "Error Parsing #{form_name}.json: #{e.message}"
           nil
         end
@@ -32,14 +32,14 @@ module Spout
             instance_variable_set("@#{method}", json[method])
           end
 
-          @errors << "'id': #{json['id'].inspect} does not match filename #{@id.inspect}" if @id != json['id']
+          @errors << "'id': #{json['id'].inspect} does not match filename #{@id.inspect}" if @id != json["id"]
         elsif json
           @errors << "Form must be a valid hash in the following format: {\n\"id\": \"FORM_ID\",\n  \"display_name\": \"FORM DISPLAY NAME\",\n  \"code_book\": \"FORMPDF.pdf\"\n}"
         end
       end
 
       def deploy_params
-        { name: id, folder: folder.to_s.gsub(%r{/$}, ''),
+        { name: id, folder: folder.to_s.gsub(%r{/$}, ""),
           display_name: display_name, code_book: code_book,
           spout_version: Spout::VERSION::STRING }
       end

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

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
+require "spout/models/graphables/default"
 
 module Spout
   module Models
     module Graphables
       class ChoicesVsChoices < Spout::Models::Graphables::Default
-
         def categories
           filtered_domain_options(@chart_variable).collect(&:display_name)
         end
 
         def units
-          'percent'
+          "percent"
         end
 
         def series
@@ -26,9 +25,8 @@ module Spout
         end
 
         def stacking
-          'percent'
+          "percent"
         end
-
       end
     end
   end

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

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
-require 'spout/helpers/array_statistics'
+require "spout/models/graphables/default"
+require "spout/helpers/array_statistics"
 
 module Spout
   module Models
     module Graphables
       class ChoicesVsNumeric < Spout::Models::Graphables::Default
-
         def categories
           filtered_subjects = filter_and_sort_subjects
 
@@ -20,7 +19,7 @@ module Spout
         end
 
         def units
-          'percent'
+          "percent"
         end
 
         def series
@@ -37,7 +36,7 @@ module Spout
         end
 
         def stacking
-          'percent'
+          "percent"
         end
 
         private
@@ -51,7 +50,6 @@ module Spout
             []
           end
         end
-
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spout/models/variable'
-require 'spout/models/bucket'
+require "spout/models/variable"
+require "spout/models/bucket"
 
 module Spout
   module Models
@@ -29,9 +29,9 @@ module Spout
         def valid?
           if @variable.nil? || @chart_variable.nil? || @values_unique == []
             false
-          elsif @variable.type == 'choices' && @variable.domain.options == []
+          elsif @variable.type == "choices" && @variable.domain.options == []
             false
-          elsif @chart_variable.type == 'choices' && @chart_variable.domain.options == []
+          elsif @chart_variable.type == "choices" && @chart_variable.domain.options == []
             false
           else
             true
@@ -43,7 +43,7 @@ module Spout
         end
 
         def subtitle
-          'By Visit'
+          "By Visit"
         end
 
         def categories
@@ -110,7 +110,7 @@ module Spout
         end
 
         def all_integer?(values_numeric)
-          count = values_numeric.count { |v| Integer(format('%.0f', v)) == v }
+          count = values_numeric.count { |v| Integer(format("%.0f", v)) == v }
           count == values_numeric.size
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
+require "spout/models/graphables/default"
 
 module Spout
   module Models
@@ -12,7 +12,7 @@ module Spout
         end
 
         def categories
-          if @variable.type == 'choices'
+          if @variable.type == "choices"
             filtered_domain_options(@variable).collect(&:display_name)
           else
             @buckets.collect(&:display_name)
@@ -20,7 +20,7 @@ module Spout
         end
 
         def units
-          'Subjects'
+          "Subjects"
         end
 
         def series
@@ -31,7 +31,7 @@ module Spout
 
             data = []
 
-            if @variable.type == 'choices'
+            if @variable.type == "choices"
               data = filtered_domain_options(@variable).collect do |o|
                 visit_subject_values.select { |v| v == o.value }.count
               end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
+require "spout/models/graphables/default"
 
 module Spout
   module Models

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
-require 'spout/helpers/array_statistics'
+require "spout/models/graphables/default"
+require "spout/helpers/array_statistics"
 
 module Spout
   module Models
@@ -44,10 +44,10 @@ module Spout
 
         def array_statistics(array)
           {      y: (array.mean.round(1) rescue 0.0),
-            stddev: ("%0.1f" % array.standard_deviation rescue ''),
-            median: ("%0.1f" % array.median rescue ''),
-               min: ("%0.1f" % array.min rescue ''),
-               max: ("%0.1f" % array.max rescue ''),
+            stddev: ("%0.1f" % array.standard_deviation rescue ""),
+            median: ("%0.1f" % array.median rescue ""),
+               min: ("%0.1f" % array.min rescue ""),
+               max: ("%0.1f" % array.max rescue ""),
                  n: array.n }
         end
 

data/lib/spout/models/graphables.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require 'spout/models/graphables/default'
-require 'spout/models/graphables/histogram'
-require 'spout/models/graphables/numeric_vs_choices'
-require 'spout/models/graphables/choices_vs_choices'
-require 'spout/models/graphables/numeric_vs_numeric'
-require 'spout/models/graphables/choices_vs_numeric'
+require "spout/models/graphables/default"
+require "spout/models/graphables/histogram"
+require "spout/models/graphables/numeric_vs_choices"
+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,
-        'numeric_vs_choices' => Spout::Models::Graphables::NumericVsChoices,
-        'choices_vs_choices' => Spout::Models::Graphables::ChoicesVsChoices,
-        'numeric_vs_numeric' => Spout::Models::Graphables::NumericVsNumeric,
-        'choices_vs_numeric' => Spout::Models::Graphables::ChoicesVsNumeric
+        "histogram" =>          Spout::Models::Graphables::Histogram,
+        "numeric_vs_choices" => Spout::Models::Graphables::NumericVsChoices,
+        "choices_vs_choices" => Spout::Models::Graphables::ChoicesVsChoices,
+        "numeric_vs_numeric" => Spout::Models::Graphables::NumericVsNumeric,
+        "choices_vs_numeric" => Spout::Models::Graphables::ChoicesVsNumeric
       }
 
       def self.for(variable, chart_variable, stratification_variable, subjects)
@@ -26,7 +26,7 @@ module Spout
 
       def self.get_graph_type(variable, chart_variable, stratification_variable)
         if stratification_variable.nil?
-          'histogram'
+          "histogram"
         else
           "#{variable_to_graph_type(variable)}_vs_#{variable_to_graph_type(chart_variable)}"
         end
@@ -35,8 +35,8 @@ module Spout
       def self.variable_to_graph_type(variable)
         variable_type = (variable ? variable.type : nil)
         case variable_type
-        when 'numeric', 'integer'
-          'numeric'
+        when "numeric", "integer"
+          "numeric"
         else
           variable_type
         end

data/lib/spout/models/outlier_result.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require 'spout/helpers/array_statistics'
-require 'spout/helpers/json_loader'
+require "spout/helpers/array_statistics"
+require "spout/helpers/json_loader"
 
 module Spout
   module Models
     class OutlierResult
-      attr_reader :csv_files, :method, :major_outliers, :minor_outliers, :outliers, :weight, :units, :display_name, :median, :variable_type
+      attr_reader :csv_files, :method, :major_outliers, :minor_outliers,
+                  :outliers, :weight, :units, :display_name, :median,
+                  :variable_type
 
       def initialize(subjects, method, csv_files)
         @values = subjects.collect(&method.to_sym)
         @csv_files = csv_files
         @method = method
-
-
         calculate_outliers!
-
-        @weight = if @major_outliers.count > 0
-          0
-        elsif @minor_outliers.count > 0
-          1
-        else
-          2
-        end
+        @weight = \
+          if @major_outliers.count > 0
+            0
+          elsif @minor_outliers.count > 0
+            1
+          else
+            2
+          end
         variable = Spout::Helpers::JsonLoader::get_variable(method)
-        @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)
+        @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
 
@@ -35,8 +35,6 @@ module Spout
         @minor_outliers = @values.minor_outliers.uniq
         @outliers = @values.outliers.uniq
       end
-
     end
-
   end
 end

data/lib/spout/models/record.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'fileutils'
+require "json"
+require "fileutils"
 
 module Spout
   module Models
@@ -27,7 +27,7 @@ module Spout
         end
 
         def expected_path(id)
-          File.join(dictionary_root, record_folder, '**', expected_filename(id))
+          File.join(dictionary_root, record_folder, "**", expected_filename(id))
         end
 
         def dictionary_root

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spout/models/tables/default'
+require "spout/models/tables/default"
 
 module Spout
   module Models
@@ -12,9 +12,9 @@ module Spout
         end
 
         def headers
-          header_row = [''] + filtered_domain_options(@chart_variable).collect(&:display_name)
+          header_row = [""] + filtered_domain_options(@chart_variable).collect(&:display_name)
           if @totals
-            header_row += ['Total']
+            header_row += ["Total"]
           end
           [header_row]
         end
@@ -22,11 +22,11 @@ module Spout
         def footers
           total_values = filtered_domain_options(@chart_variable).collect do |option|
             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' }
+            { text: (Spout::Helpers::TableFormatting.format_number(total_count, :count)), style: "font-weight:bold" }
           end
-          footer_row = [{ text: 'Total', style: 'font-weight:bold' }] + total_values
+          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' }]
+            footer_row += [{ text: Spout::Helpers::TableFormatting.format_number(@filtered_subjects.count, :count), style: "font-weight:bold" }]
           end
           [footer_row]
         end
@@ -36,25 +36,25 @@ module Spout
             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.count { |s| s.send(@chart_variable.id) == chart_option.value }
-              count > 0 ? Spout::Helpers::TableFormatting.format_number(count, :count) : { text: '-', class: 'text-muted' }
+              count > 0 ? Spout::Helpers::TableFormatting.format_number(count, :count) : { text: "-", class: "text-muted" }
             end
 
             row = [option.display_name] + row_cells
 
             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' }]
+              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.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.count { |s| s.send(@chart_variable.id) == chart_option.value && s.send(@variable.id).is_a?(Spout::Models::Empty) }, :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
+            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' }]
+              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 << unknown_row
           end