rails-data-explorer 0.1.0 → 0.2.0

data/lib/rails-data-explorer/data_type/quantitative/temporal.rb

@@ -6,10 +6,10 @@ class RailsDataExplorer
         def all_available_chart_types
           [
             {
-              :chart_class => Chart::HistogramTemporal,
-              :chart_roles => [:x],
-              :dimensions_count_min => 1,
-              :dimensions_count_max => 1
+              chart_class: Chart::HistogramTemporal,
+              chart_roles: [:x],
+              dimensions_count_min: 1,
+              dimensions_count_max: 1
             },
             {
               chart_class: Chart::DescriptiveStatisticsTable,
@@ -22,6 +22,12 @@ class RailsDataExplorer
               chart_roles: [:dimension],
               dimensions_count_min: 3,
             },
+            # {
+            #   chart_class: Chart::StackedHistogramTemporal,
+            #   chart_roles: [:x],
+            #   dimensions_count_min: 2,
+            #   dimensions_count_max: 2,
+            # },
           ].freeze
         end
 
@@ -29,24 +35,24 @@ class RailsDataExplorer
           non_nil_values = values.find_all { |e| !e.nil? }
           ruby_formatter = Proc.new { |v| v.nil? ? '' : v.strftime('%a, %b %e, %Y, %l:%M:%S %p %Z') }
           [
-            { :label => 'Min', :value => non_nil_values.min, :ruby_formatter => ruby_formatter },
-            { :label => 'Max', :value => non_nil_values.max, :ruby_formatter => ruby_formatter },
-            { :label => 'Count', :value => values.length, :ruby_formatter => Proc.new { |e| number_with_delimiter(e) } },
+            { label: 'Min', value: non_nil_values.min, ruby_formatter: ruby_formatter },
+            { label: 'Max', value: non_nil_values.max, ruby_formatter: ruby_formatter },
+            { label: 'Count', value: values.length, ruby_formatter: Proc.new { |e| number_with_delimiter(e) } },
           ]
         end
 
-        # Returns an OpenStruct that describes a statistics table.
+        # Returns an object that describes a statistics table.
         def descriptive_statistics_table(values)
           desc_stats = descriptive_statistics(values)
-          table = OpenStruct.new(
-            :rows => desc_stats.map { |stat|
-              OpenStruct.new(
-                :css_class => 'rde-row-values',
-                :tag => :tr,
-                :cells => [
-                  OpenStruct.new(:value => stat[:label], :tag => :th, :css_class => 'rde-row_header'),
-                  OpenStruct.new(:value => stat[:value], :ruby_formatter => stat[:ruby_formatter], :tag => :td, :css_class => 'rde-cell-value'),
-                ]
+          table = Utils::RdeTable.new(
+            desc_stats.map { |stat|
+              Utils::RdeTableRow.new(
+                :tr,
+                [
+                  Utils::RdeTableCell.new(:th, stat[:label], css_class: 'rde-row_header'),
+                  Utils::RdeTableCell.new(:td, stat[:value], ruby_formatter: stat[:ruby_formatter], css_class: 'rde-cell-value'),
+                ],
+                css_class: 'rde-row-values',
               )
             }
           )

data/lib/rails-data-explorer/exploration.rb

@@ -6,6 +6,8 @@ class RailsDataExplorer
 
     attr_accessor :charts, :data_set, :title
 
+    delegate :number_of_values, to: :data_set, prefix: false
+
     # Initializes a new visualization.
     # @param[String] _title will be printed at top of visualization
     # @param[Array] data_set_or_array can be a number of things:
@@ -24,11 +26,12 @@ class RailsDataExplorer
     end
 
     def render
-      content_tag(:div, :class => 'rde-exploration panel panel-default', :id => dom_id) do
-        content_tag(:div, :class => 'panel-heading') do
-          content_tag(:h2, @title, :class => 'rde-exploration-title panel-title')
+      content_tag(:div, class: 'rde-exploration panel panel-default', id: dom_id) do
+        content_tag(:div, class: 'panel-heading') do
+          %(<span style="float: right;"><a href="#rails_data_explorer-toc">Top</a></span>).html_safe +
+          content_tag(:h2, @title, class: 'rde-exploration-title panel-title')
         end +
-        content_tag(:div, :class => 'panel-body') do
+        content_tag(:div, class: 'panel-body') do
           if @charts.any?
             @charts.map { |e| e.render }.join.html_safe
           else
@@ -54,6 +57,19 @@ class RailsDataExplorer
       r << %(#{ '  ' * (indent-1) }>\n)
     end
 
+    def type_of_analysis
+      case @data_set.dimensions_count
+      when 0
+        '[No data given]'
+      when 1
+        'Univariate'
+      when 2
+        'Bivariate'
+      else
+        'Multivariate'
+      end
+    end
+
   private
 
     def initialize_charts(chart_specs)

data/lib/rails-data-explorer/statistics/rng_category.rb

@@ -27,7 +27,7 @@ class RailsDataExplorer
         running_sum = 0
         @categories.each_with_index { |e, idx|
           running_sum += @category_probabilities[idx]
-          category_order << { :category => e, :threshold => running_sum }
+          category_order << { category: e, threshold: running_sum }
         }
         category_order
       end

data/lib/rails-data-explorer/utils/data_binner.rb

@@ -10,18 +10,28 @@ class RailsDataExplorer
   module Utils
     class DataBinner
 
-      def initialize(*args)
+      # @param[Hash] threshold_specs a hash with a key value pair for each threshold
+      #   The key is the label to use, and the value is a Numeric threshold.
+      #   Adds one more bin for values greater than the highest threshold.
+      #   Example: { '0' => 0, '1' => 1, '2' => 2, '3..10' => 10, '11..100' => 100 }
+      #   Will generate the following output:
+      #     -1   => '0'
+      #      0   => '0'
+      #      0.1 => '1'
+      #      4   => '3..10'
+      #     10   => '3..10'
+      #     10.1 => '3..10'
+      #   1000   => '> 100'
+      def initialize(threshold_specs)
         @max = -Float::INFINITY
-        @bin_specs = [*args].compact.uniq.sort.map { |e|
-          case e
-          when Numeric
-            @max = [@max, e].max
-            { :label => "#{ e.to_s } or less", :lte => e }
-          else
-            raise "Handle this bin_spec: #{ e.inspect }"
-          end
+        @bin_specs = threshold_specs.to_a.sort { |(k_a, v_a), (k_b, v_b)|
+          v_a <=> v_b
+        }.map { |(label, threshold)|
+          raise "Invalid threshold: #{ threshold.inspect }"  unless threshold.is_a?(Numeric)
+          @max = [@max, threshold].max
+          { label: label, lte: threshold }
         }
-        @bin_specs << { :label => "> #{ @max }", :gt => @max }
+        @bin_specs << { label: "> #{ @max }", gt: @max }
       end
 
       def bin(value)

data/lib/rails-data-explorer/utils/data_quantizer.rb

@@ -8,10 +8,10 @@ class RailsDataExplorer
 
       def initialize(data_series, options = {})
         @options = {
-          :nice => true,
-          :type => 'midtread', # 'midtread' or 'midrise'
-          :number_of_bins => 100, # assuming 800px wide chart, 8px per bin
-          :delta => nil,
+          nice: true,
+          type: 'midtread', # 'midtread' or 'midrise'
+          number_of_bins: 100, # assuming 800px wide chart, 8px per bin
+          delta: nil,
         }.merge(options)
         @data_series = data_series
         @number_of_bins = @options[:number_of_bins]
@@ -22,7 +22,7 @@ class RailsDataExplorer
         # Compute boundaries
         if @options[:nice]
           range = @data_series.max_val - @data_series.min_val
-          rounding_factor = 10.0 ** Math.log10(range).floor
+          rounding_factor = 10.0 ** Math.log10([range, GREATER_ZERO].max).floor
           @min_val = (@data_series.min_val / rounding_factor).floor * rounding_factor
           @max_val = (@data_series.max_val / rounding_factor).ceil * rounding_factor
         else
@@ -51,7 +51,7 @@ class RailsDataExplorer
             }
           when 'midtread'
             @data_series.values.map { |e|
-              index_of_quantized_value = ((e - @min_val) / @delta).round
+              index_of_quantized_value = ((e - @min_val) / [@delta, GREATER_ZERO].max).round
               (
                 (index_of_quantized_value * @delta) +
                 @min_val

data/lib/rails-data-explorer/utils/rde_table.rb

@@ -0,0 +1,62 @@
+# Defines classes to describe tables:
+#     rde_table.rows
+#       rde_row.css_class
+#       rde_row.tag
+#       rde_row.cells
+#         rde_cell.css_class
+#         rde_cell.ruby_formatter
+#         rde_cell.style
+#         rde_cell.tag
+#         rde_cell.title
+#         rde_cell.value
+
+class RailsDataExplorer
+  module Utils
+
+    class RdeTable
+
+      attr_accessor :rows
+
+      def initialize(rows)
+        @rows = rows
+      end
+
+    end
+
+
+    class RdeTableRow
+
+      attr_accessor :cells
+      attr_accessor :css_class
+      attr_accessor :tag
+
+      def initialize(tag, cells, opts = {})
+        @tag = tag
+        @cells =cells
+        @css_class = opts[:css_class]
+      end
+
+    end
+
+    class RdeTableCell
+
+      attr_accessor :tag
+      attr_accessor :value
+      attr_accessor :css_class
+      attr_accessor :ruby_formatter
+      attr_accessor :style
+      attr_accessor :title
+
+      def initialize(tag, value, opts = {})
+        @tag = tag
+        @value = value
+        @css_class = opts[:css_class]
+        @ruby_formatter = opts[:ruby_formatter]
+        @style = opts[:style]
+        @title = opts[:title]
+      end
+
+    end
+
+  end
+end

data/lib/rails_data_explorer.rb

@@ -13,8 +13,8 @@ class RailsDataExplorer
 
     data_series_specs.each do |data_series_spec|
       ds_spec = {
-        :univariate => true,
-        :bivariate => true,
+        univariate: true,
+        bivariate: true,
       }.merge(data_series_spec)
       univariate << ds_spec.dup  if ds_spec[:univariate]
 
@@ -70,6 +70,10 @@ class RailsDataExplorer
     r
   end
 
+  def number_of_values
+    explorations.first.number_of_values
+  end
+
 private
 
   def build_exploration_from_data_series_specs(data_collection, ds_specs)
@@ -77,26 +81,37 @@ private
       ds_specs.map { |e| e[:name] }.sort.join(' vs. '),
       ds_specs.map { |ds_spec|
         {
-          :name => ds_spec[:name],
-          :values => data_collection.map(&ds_spec[:data_method])
+          name: ds_spec[:name],
+          values: data_collection.map(&ds_spec[:data_method])
         }
       }
     )
   end
 
   def render_toc(expls)
-    content_tag(:div, :class => 'rde panel panel-primary') do
-      content_tag(:div, :class => 'panel-heading') do
-        content_tag(:h2, "Table of contents", :class => 'rde-exploration-title panel-title')
+    grouped_by_analysis = expls.group_by { |e| e.type_of_analysis }
+    content_tag(:div, class: 'rde panel panel-primary') do
+      content_tag(:div, class: 'panel-heading') do
+        %(<a name="rails_data_explorer-toc"></a>).html_safe +
+        content_tag(:h2, "List of data explorations", class: 'rde-exploration-title panel-title')
       end +
-      content_tag(:div, :class => 'panel-body') do
-        content_tag(:ul, :class => 'rde-table_of_contents') do
-          expls.map { |expl|
-            content_tag(
-              :li,
-              %(<a href="##{ expl.dom_id }">#{ expl.title }</a>).html_safe
-            )
-          }.join.html_safe
+      content_tag(:div, class: 'panel-body') do
+        content_tag(:table, class: 'table') do
+          content_tag(:tr) do
+            grouped_by_analysis.map { |(label, exps)|
+              content_tag(:td, style: "width: 30%;") do
+                content_tag(:h3, label) +
+                content_tag(:ol, class: 'rde-table_of_contents') do
+                  exps.map { |expl|
+                    content_tag(
+                      :li,
+                      %(<a href="##{ expl.dom_id }">#{ expl.title }</a>).html_safe
+                    )
+                  }.join.html_safe
+                end
+              end
+            }.join.html_safe
+          end
         end
       end
     end
@@ -108,11 +123,11 @@ private
 
   def render_explorations_without_charts(expls)
     return ''  if expls.empty?
-    content_tag(:div, :class => 'rde panel panel-default') do
-      content_tag(:div, :class => 'panel-heading') do
-        content_tag(:h2, "Explorations without charts", :class => 'rde-exploration-title panel-title')
+    content_tag(:div, class: 'rde panel panel-default') do
+      content_tag(:div, class: 'panel-heading') do
+        content_tag(:h2, "Explorations without charts", class: 'rde-exploration-title panel-title')
       end +
-      content_tag(:div, :class => 'panel-body') do
+      content_tag(:div, class: 'panel-body') do
         content_tag(:p, "There are no charts available for the following explorations:") +
         content_tag(:ul) do
           expls.map { |expl|
@@ -124,7 +139,7 @@ private
   end
 
   def separate_explorations_with_and_without_charts
-    explorations.inject({ :with => [], :without => [] }) { |m, e|
+    explorations.inject({ with: [], without: [] }) { |m, e|
       m[e.charts.any? ? :with : :without] << e
       m
     }

data/rails-data-explorer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = 'rails-data-explorer'
-  gem.version = '0.1.0'
+  gem.version = '0.2.0'
   gem.platform = Gem::Platform::RUBY
 
   gem.authors = ['Jo Hund']

data/spec/rails-data-explorer/exploration_spec.rb

@@ -23,19 +23,19 @@ class RailsDataExplorer
       [
         [
           ['Univariate Integer data', [nil, 1, 2, 3]],
-          { :has_charts => ['histogram-quantitative', 'descriptive-statistics-table'] }
+          { has_charts: ['histogram-quantitative', 'descriptive-statistics-table'] }
         ],
         [
           ['Univariate Decimal data', [nil, 1.0, 2.0, 3.0]],
-          { :has_charts => ['histogram-quantitative', 'descriptive-statistics-table'] }
+          { has_charts: ['histogram-quantitative', 'descriptive-statistics-table'] }
         ],
         [
           ['Univariate Temporal data', [nil, Time.now]],
-          { :has_charts => ['histogram-temporal', 'descriptive-statistics-table'] }
+          { has_charts: ['histogram-temporal', 'descriptive-statistics-table'] }
         ],
         [
           ['Univariate Categorical data', [nil, 'a', 'b', 'c']],
-          { :has_charts => ['histogram-categorical', 'pie-chart', 'descriptive-statistics-table'] }
+          { has_charts: ['histogram-categorical', 'pie-chart', 'descriptive-statistics-table'] }
         ],
       ].each { |(args, xpect_options)|
         title, data_set_or_array, chart_specs = args

data/spec/rails-data-explorer/utils/data_binner_spec.rb

@@ -9,14 +9,14 @@ class RailsDataExplorer
         [
           [
             '1',
-            [1,2,3],
+            { '1 or less' => 1, '2' => 2, '3' => 3 },
             [0,1,2,3,4],
-            ["1 or less", "1 or less", "2 or less", "3 or less", "> 3"]
+            ['1 or less', '1 or less', '2', '3', '> 3']
           ],
         ].each do |(name, bin_specs, vals, xpect)|
 
           it "bins #{ name }" do
-            db = DataBinner.new(*bin_specs)
+            db = DataBinner.new(bin_specs)
             vals.map{ |e| db.bin(e) }.must_equal xpect
           end
 

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: rails-data-explorer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jo Hund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: descriptive-statistics
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: distribution
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: interpolate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-spec-expect
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: rails-data-explorer is a Rails Engine plugin that makes it easy to explore
@@ -178,7 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -206,6 +185,7 @@ files:
 - lib/rails-data-explorer/chart/scatterplot.rb
 - lib/rails-data-explorer/chart/scatterplot_matrix.rb
 - lib/rails-data-explorer/chart/stacked_bar_chart_categorical_percent.rb
+- lib/rails-data-explorer/constants.rb
 - lib/rails-data-explorer/data_series.rb
 - lib/rails-data-explorer/data_set.rb
 - lib/rails-data-explorer/data_type.rb
@@ -225,6 +205,7 @@ files:
 - lib/rails-data-explorer/utils/data_binner.rb
 - lib/rails-data-explorer/utils/data_encoder.rb
 - lib/rails-data-explorer/utils/data_quantizer.rb
+- lib/rails-data-explorer/utils/rde_table.rb
 - lib/rails-data-explorer/utils/value_formatter.rb
 - lib/rails_data_explorer.rb
 - rails-data-explorer.gemspec
@@ -255,27 +236,26 @@ files:
 homepage: http://rails-data-explorer.clearcove.ca
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails engine plugin for exploring data in your app with charts and statistics.
 test_files:
 - spec/helper.rb