spout 0.10.0.beta9 → 0.10.0.beta10

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

@@ -0,0 +1,47 @@
+require 'spout/models/tables/default'
+require 'spout/helpers/array_statistics'
+
+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"]
+          ]
+        end
+
+        def footers
+          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_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_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)
+            end
+
+            [option.display_name] + row_cells + [{ text: Spout::Helpers::TableFormatting::format_number(row_subjects.count, :count), style: 'font-weight:bold'}]
+          end
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+require 'spout/models/tables/default'
+require 'spout/helpers/array_statistics'
+
+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"] ]
+        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" }
+          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'}]
+          ]
+        end
+
+        def rows
+          [:quartile_one, :quartile_two, :quartile_three, :quartile_four].collect do |quartile|
+            bucket = @filtered_both_variables_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)
+            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'}]
+          end
+        end
+
+        private
+
+        def get_row_name(quartile, bucket, row_subjects)
+          if row_subjects.size == 0
+            quartile.to_s.capitalize.gsub('_one', ' One').gsub('_two', ' Two').gsub('_three', ' Three').gsub('_four', ' Four')
+          else
+            "#{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
+end

data/lib/spout/models/tables.rb

@@ -0,0 +1,41 @@
+require 'spout/models/tables/default'
+require 'spout/models/tables/numeric_vs_choices'
+require 'spout/models/tables/choices_vs_choices'
+require 'spout/models/tables/numeric_vs_numeric'
+require 'spout/models/tables/choices_vs_numeric'
+
+
+module Spout
+  module Models
+    module Tables
+
+      DEFAULT_CLASS = Spout::Models::Tables::Default
+      GRAPHABLE_CLASSES = {
+        'numeric_vs_choices' => Spout::Models::Tables::NumericVsChoices,
+        'choices_vs_choices' => Spout::Models::Tables::ChoicesVsChoices,
+        'numeric_vs_numeric' => Spout::Models::Tables::NumericVsNumeric,
+        'choices_vs_numeric' => Spout::Models::Tables::ChoicesVsNumeric
+      }
+
+      def self.for(variable, chart_variable, subjects, subtitle)
+        table_type = get_table_type(variable, chart_variable)
+        (GRAPHABLE_CLASSES[table_type] || DEFAULT_CLASS).new(variable, chart_variable, subjects, subtitle)
+      end
+
+      def self.get_table_type(variable, chart_variable)
+        "#{variable_to_table_type(variable)}_vs_#{variable_to_table_type(chart_variable)}"
+      end
+
+      # Identical to graphables, TODO: Refactor
+      def self.variable_to_table_type(variable)
+        variable_type = (variable ? variable.type : nil)
+        case variable_type when 'numeric', 'integer'
+          'numeric'
+        else
+          variable_type
+        end
+      end
+
+    end
+  end
+end

data/lib/spout/models/variable.rb

@@ -1,8 +1,13 @@
 require 'json'
 
+require 'spout/models/record'
+require 'spout/models/domain'
+require 'spout/models/form'
+
+
 module Spout
   module Models
-    class Variable
+    class Variable < Spout::Models::Record
       # VARIABLE_TYPES = ['choices', 'numeric', 'integer']
 
       attr_accessor :id, :folder, :display_name, :description, :type, :units, :labels, :commonly_used, :calculation
@@ -14,7 +19,7 @@ module Spout
         @errors = []
         @id     = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
         @folder = file_name.to_s.gsub(/^#{dictionary_root}\/variables\/|#{@id}\.json$/, '')
-
+        @form_names = []
 
         json = begin
           JSON.parse(File.read(file_name))
@@ -41,6 +46,9 @@ module Spout
         end
 
         @errors = (@errors + [error]).compact
+
+        @domain = Spout::Models::Domain.find_by_id(@domain_name)
+        @forms = @form_names.collect{|form_name| Spout::Models::Form.find_by_id(form_name)}.compact
       end
 
       def path

data/lib/spout/templates/ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.1.4

data/lib/spout/templates/travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.3
+  - 2.1.4

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 10
     TINY = 0
-    BUILD = "beta9" # nil, "pre", "rc", "rc2"
+    BUILD = "beta10" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta9
+  version: 0.10.0.beta10
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,13 +129,28 @@ files:
 - lib/spout/helpers/send_file.rb
 - lib/spout/helpers/subject_loader.rb
 - lib/spout/helpers/table_formatting.rb
+- lib/spout/models/bucket.rb
 - lib/spout/models/coverage_result.rb
 - lib/spout/models/dictionary.rb
 - lib/spout/models/domain.rb
 - lib/spout/models/form.rb
+- lib/spout/models/graphables.rb
+- lib/spout/models/graphables/choices_vs_choices.rb
+- lib/spout/models/graphables/choices_vs_numeric.rb
+- lib/spout/models/graphables/default.rb
+- lib/spout/models/graphables/histogram.rb
+- lib/spout/models/graphables/numeric_vs_choices.rb
+- lib/spout/models/graphables/numeric_vs_numeric.rb
 - lib/spout/models/option.rb
 - lib/spout/models/outlier_result.rb
+- lib/spout/models/record.rb
 - lib/spout/models/subject.rb
+- lib/spout/models/tables.rb
+- lib/spout/models/tables/choices_vs_choices.rb
+- lib/spout/models/tables/choices_vs_numeric.rb
+- lib/spout/models/tables/default.rb
+- lib/spout/models/tables/numeric_vs_choices.rb
+- lib/spout/models/tables/numeric_vs_numeric.rb
 - lib/spout/models/variable.rb
 - lib/spout/support/javascripts/data.js
 - lib/spout/support/javascripts/highcharts-convert.js
@@ -191,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Turn your CSV data dictionary into a JSON repository. Collaborate with others