spout 0.8.0.beta15 → 0.8.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ad7fac5482c072ad581a633a31afe12086a659
-  data.tar.gz: 20de4cb06ae7b431d5e96aa3d82308088986ee43
+  metadata.gz: a512974613e6c33b378ed6d6db777f5df1dfd0bf
+  data.tar.gz: 28a675288a9ff58e53be07faf13979d0d0db10ef
 SHA512:
-  metadata.gz: 5b12a3c4217018bf0cd8f55344a3d0aace8693a538555ed1d234487872631841a4c4526cabd73f44b438368729cda39ed176086ca3bfebbd1c8769d38c7c9cb1
-  data.tar.gz: 48936868e7b7732ebd84eb2d7c71ff4724889a4395afa9e8adbbaca3ce270a3d95ec982342dde2b3a1a5258d79b9628b44f9b82c4ac0bd0fc04d1e7644458c44
+  metadata.gz: 844d78de2f57e79481bc7478cba6a638791ad9df92229467966c5826a00a051823c9e47e0ef597444fe78583e695e342d51ae2fbf1d28bf685cca3af392655f2
+  data.tar.gz: ae4016de5fd6cffc99f2c46df23d97fe42c69a1f542cff54084a179dc62896c3bbf05f46bc3b429f5e551d7c0e4693b681069ecdd3baac6b775a3e435a7a3c55

data/lib/spout/helpers/chart_types.rb

@@ -5,24 +5,27 @@ module Spout
   module Helpers
     class ChartTypes
       def self.get_bucket(buckets, value)
+        return nil if buckets.size == 0
         buckets.each do |b|
-          return "#{b[0].round(1)} to #{b[1].round(1)}" if value >= b[0] and value <= b[1]
+          return "#{b[0]} to #{b[1]}" if value >= b[0] and value <= b[1]
         end
-        nil
+        "#{buckets.last[0]} to #{buckets.last[1]}"
       end
 
       def self.continuous_buckets(values)
+        values.select!{|v| v.kind_of? Numeric}
         return [] if values.count == 0
         minimum_bucket = values.min
         maximum_bucket = values.max
+        max_buckets = 12
+        bucket_size = ((maximum_bucket - minimum_bucket) / max_buckets.to_f)
+        precision = [-Math.log10(bucket_size).floor, 0].max
 
-        max_buckets = [(maximum_bucket - minimum_bucket), 12].min
-        bucket_size = (maximum_bucket - minimum_bucket) / max_buckets
         buckets = []
         (0..(max_buckets-1)).to_a.each do |index|
-          start = minimum_bucket + index * bucket_size
-          stop = start + bucket_size
-          buckets << [start,stop]
+          start = (minimum_bucket + index * bucket_size)
+          stop = (start + bucket_size)
+          buckets << [start.round(precision),stop.round(precision)]
         end
         buckets
       end
@@ -337,30 +340,28 @@ module Spout
         { title: "#{json['display_name']} vs #{chart_variable_json['display_name']}", subtitle: subtitle, headers: headers, footers: footers, rows: rows }
       end
 
-
-      def self.chart_histogram_choices(chart_type, subjects, json, method)
-        return unless domain_json = get_domain(json)
+      def self.chart_histogram(chart_type, subjects, json, method)
+        domain_json = get_domain(json)
+        return if json['type'] == 'choices' and not domain_json
         return unless chart_variable_json = get_variable(chart_type)
         return unless chart_variable_domain = domain_array(chart_type)
 
-
         title = "#{json['display_name']}"
         subtitle = "By Visit"
-
-        categories = domain_json.collect{|option_hash| option_hash['display_name']}
-
         units = "Subjects"
         series = []
 
+        all_subject_values = subjects.collect(&method.to_sym).compact.sort
+        return nil if all_subject_values.count == 0
+        categories = pull_categories(json, method, all_subject_values, domain_json)
+
+        buckets = continuous_buckets(all_subject_values)
+
         chart_variable_domain.each do |display_name, value|
-          visit_subjects = subjects.select{ |s| s.send(chart_type) == value and s.send(method) != nil }.collect(&method.to_sym)
+          visit_subjects = subjects.select{ |s| s.send(chart_type) == value and s.send(method) != nil }.collect(&method.to_sym).sort
           next unless visit_subjects.size > 0
 
-          data = []
-
-          domain_json.each do |option_hash|
-            data << visit_subjects.select{ |v| v == option_hash['value'] }.count
-          end
+          data = pull_data(json, visit_subjects, buckets, categories, domain_json)
 
           series << { name: display_name, data: data }
         end
@@ -368,39 +369,30 @@ module Spout
         { title: title, subtitle: subtitle, categories: categories, units: units, series: series }
       end
 
-      def self.chart_histogram(chart_type, subjects, json, method)
-        return chart_histogram_choices(chart_type, subjects, json, method) if json['type'] == 'choices'
-        return unless chart_variable_json = get_variable(chart_type)
-        return unless chart_variable_domain = domain_array(chart_type)
-
-        title = "#{json['display_name']}"
-        subtitle = "By Visit"
+      def self.pull_categories(json, method, all_subject_values, domain_json)
         categories = []
-        units = "Subjects"
-        series = []
-
-        all_subject_values = subjects.collect(&method.to_sym).compact.sort
-        return nil if all_subject_values.count == 0
-        buckets = continuous_buckets(all_subject_values)
-
-        categories = buckets.collect{|b| "#{b[0].round(1)} to #{b[1].round(1)}"}
-
-        chart_variable_domain.each do |display_name, value|
-          visit_subjects = subjects.select{ |s| s.send(chart_type) == value and s.send(method) != nil }.collect(&method.to_sym).sort
-          next unless visit_subjects.size > 0
-
-          data = []
+        if json['type'] == 'choices'
+          categories = domain_json.collect{|option_hash| option_hash['display_name']}
+        else
+          buckets = continuous_buckets(all_subject_values)
+          categories = buckets.collect{|b| "#{b[0]} to #{b[1]}"}
+        end
+        categories
+      end
 
+      def self.pull_data(json, visit_subjects, buckets, categories, domain_json)
+        data = []
+        if json['type'] == 'choices'
+          domain_json.each do |option_hash|
+            data << visit_subjects.select{ |v| v == option_hash['value'] }.count
+          end
+        else
           visit_subjects.group_by{|v| get_bucket(buckets, v) }.each do |key, values|
             data[categories.index(key)] = values.count if categories.index(key)
           end
-
-          series << { name: display_name, data: data }
         end
-
-        { title: title, subtitle: subtitle, categories: categories, units: units, series: series }
+        data
       end
-
     end
   end
 end

data/lib/spout/version.rb

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

data/spout.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["remosm@gmail.com"]
   spec.description   = %q{Manage your data dictionary as a JSON repository, and easily export back to CSV.}
   spec.summary       = %q{Turn your CSV data dictionary into a JSON repository. Collaborate with others to update the data dictionary in JSON format. Generate new Data Dictionary from the JSON repository. Test and validate your data dictionary using built-in tests, or add your own for further validations.}
-  spec.homepage      = "https://github.com/sleepepi"
+  spec.homepage      = "https://github.com/sleepepi/spout"
   spec.license       = "CC BY-NC-SA 3.0"
 
   spec.files = Dir['{bin,lib}/**/*'] + ['CHANGELOG.md', 'LICENSE', 'Rakefile', 'README.md', 'spout.gemspec']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta15
+  version: 0.8.0.rc
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,7 +164,7 @@ files:
 - lib/spout/views/index.html.erb
 - lib/spout/views/outliers.html.erb
 - spout.gemspec
-homepage: https://github.com/sleepepi
+homepage: https://github.com/sleepepi/spout
 licenses:
 - CC BY-NC-SA 3.0
 metadata: {}