spout 0.8.0.rc4 → 0.8.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e60605f5f08718770e8a7256d056a3866960d84
-  data.tar.gz: 77b047a1e7c90245c7796d50610220342f20581f
+  metadata.gz: 1038cad773aceeeaac1094a6adfd45b2ad083272
+  data.tar.gz: e6f1973edde2c5ebd32ced6f84873de3bcb7b29b
 SHA512:
-  metadata.gz: bae8e98ede97b0c7556ebb615e23116e729e6052ce35452e47ffa98ec08bf9be13ad4c883d011b4969808a2b76569fdea7011ad7164789d27be936cf57bc69a7
-  data.tar.gz: 408fe628b0bfece7d265ebc042eb3f61e43e8358626e8d3dd72b2c0a1b46e0dad7dbf03910ebb16a1c433c8f47695a8a44067b9725ce4c16f52b5bad45f1c88c
+  metadata.gz: d88dbc04759648e28509bd63d171a307f029776c73e2b4297212d9035412ee16bf01f6b06180df9a4f22bb282c622547bd5c100f7db7481811e2c82b2010be67
+  data.tar.gz: 2262b47b04d4dca34e15b655a8d65f53b31b79cc006a81949d9a8b0d515c90852bbdb96225e6065aacb843eaef4e7ad88e57082d9b03d573e462e9061e785ee0

data/CHANGELOG.md

@@ -24,6 +24,9 @@
   - `dictionary.variables.count`
   - `dictionary.domains.count`
   - `dictionary.forms.count`
+- The `spout export` command now includes a `forms.csv` file that exports form information referenced by variables
+- Graphs for histograms now specify units on the x-axis
+- The `spout graphs` command does not generate graphs when no underlying values exists for the variable
 - **Gem Changes**
   - Updated to colorize 0.7.2
   - Updated to minitest
@@ -31,6 +34,7 @@
 
 ### Bug Fix
 - Spout commands are now more consistently case insensitive for file and column names across platforms
+- The `spout import` command now correctly makes variable ids and domain ids consistently lowercase
 
 ### Testing
 - Refactored Spout code and updated test coverage for all major spout commands

data/lib/spout/commands/exporter.rb

@@ -19,45 +19,42 @@ module Spout
         puts "      create".colorize( :green ) + "  #{folder}"
         FileUtils.mkpath folder
 
-        variables_export_file = "variables.csv"
-        puts "      export".colorize( :blue ) + "  #{folder}/#{variables_export_file}"
-        CSV.open("#{folder}/#{variables_export_file}", "wb") do |csv|
-          keys = %w(id display_name description type units domain labels calculation)
-          csv << ['folder'] + keys
-          Dir.glob("variables/**/*.json").sort.each do |file|
-            if json = JSON.parse(File.read(file)) rescue false
-              variable_folder = variable_folder_path(file)
-              csv << [variable_folder] + keys.collect{|key| json[key].kind_of?(Array) ? json[key].join(';') : json[key].to_s}
-            end
+        generic_export(folder, 'variables', %w(id display_name description type units domain labels calculation))
+        generic_export(folder, 'domains', %w(value display_name description), true)
+        generic_export(folder, 'forms', %w(id display_name code_book))
+      end
+
+      def generic_export(folder, type, keys, include_domain_name = false)
+        export_file = "#{type}.csv"
+        puts "      export".colorize( :blue ) + "  #{folder}/#{export_file}"
+        CSV.open("#{folder}/#{export_file}", "wb") do |csv|
+          if include_domain_name
+            csv << ['folder', 'domain_id'] + keys
+          else
+            csv << ['folder'] + keys
           end
-        end
-        domains_export_file = "domains.csv"
-        puts "      export".colorize( :blue ) + "  #{folder}/#{domains_export_file}"
-        CSV.open("#{folder}/#{domains_export_file}", "wb") do |csv|
-          keys = %w(value display_name description)
-          csv << ['folder', 'domain_id'] + keys
-          Dir.glob("domains/**/*.json").sort.each do |file|
+          Dir.glob("#{type}/**/*.json").sort.each do |file|
             if json = JSON.parse(File.read(file)) rescue false
-              domain_folder = domain_folder_path(file)
-              domain_name = extract_domain_name(file)
-              json.each do |hash|
-                csv << [domain_folder, domain_name] + keys.collect{|key| hash[key]}
+              relative_folder = generic_folder_path(file, type)
+              if include_domain_name
+                domain_name = extract_domain_name(file)
+                json.each do |hash|
+                  csv << [relative_folder, domain_name] + keys.collect{|key| hash[key]}
+                end
+              else
+                csv << [relative_folder] + keys.collect{|key| json[key].kind_of?(Array) ? json[key].join(';') : json[key].to_s}
               end
             end
           end
         end
       end
 
-      def extract_domain_name(file)
-        file.gsub(/domains\//, '').split('/').last.to_s.gsub(/.json/, '')
-      end
-
-      def domain_folder_path(file)
-        file.gsub(/domains\//, '').split('/')[0..-2].join('/')
+      def generic_folder_path(file, type)
+        file.gsub(/#{type}\//, '').split('/')[0..-2].join('/')
       end
 
-      def variable_folder_path(file)
-        file.gsub(/variables\//, '').split('/')[0..-2].join('/')
+      def extract_domain_name(file)
+        file.gsub(/domains\//, '').split('/').last.to_s.gsub(/.json/, '')
       end
 
     end

data/lib/spout/commands/graphs.rb

@@ -101,7 +101,7 @@ module Spout
               end
             else
               filtered_subjects = @subjects.select{ |s| s.send(chart_type) != nil } # and s.send(variable_name) != nil
-              if filtered_subjects.count > 0
+              if filtered_subjects.collect(&variable_name.to_sym).compact.count > 0
                 stats[:charts][chart_title] = Spout::Helpers::ChartTypes::chart_arbitrary(chart_type, filtered_subjects, json, variable_name, visits)
                 stats[:tables][chart_title] = visits.collect do |visit_display_name, visit_value|
                   visit_subjects = filtered_subjects.select{ |s| s._visit == visit_value }

data/lib/spout/commands/importer.rb

@@ -46,12 +46,12 @@ EOT
           folder = File.join('variables', row.delete('folder').to_s)
           FileUtils.mkpath folder
           hash = {}
-          id = row.delete('id')
+          id = row.delete('id').to_s.downcase
           hash['id'] = id
           hash['display_name'] = row.delete('display_name')
           hash['description'] = row.delete('description').to_s
           hash['type'] = row.delete('type')
-          domain = row.delete('domain').to_s
+          domain = row.delete('domain').to_s.downcase
           hash['domain'] = domain if domain != ''
           units = row.delete('units').to_s
           hash['units'] = units if units != ''
@@ -61,7 +61,7 @@ EOT
           hash['labels'] = labels if labels.size > 0
           hash['other'] = row unless row.empty?
 
-          file_name = File.join(folder, id.to_s.downcase + '.json')
+          file_name = File.join(folder, id + '.json')
           File.open(file_name, 'w') do |file|
             file.write(JSON.pretty_generate(hash) + "\n")
           end
@@ -89,7 +89,7 @@ EOT
 
           next if row['domain_id'].to_s == '' or row['value'].to_s == '' or row['display_name'].to_s == ''
           folder = File.join('domains', row['folder'].to_s).gsub(/[^a-zA-Z0-9_\/\.-]/, '_')
-          domain_name = row['domain_id'].to_s.gsub(/[^a-zA-Z0-9_\/\.-]/, '_')
+          domain_name = row['domain_id'].to_s.gsub(/[^a-zA-Z0-9_\/\.-]/, '_').downcase
           domains[domain_name] ||= {}
           domains[domain_name]["folder"] = folder
           domains[domain_name]["options"] ||= []
@@ -106,7 +106,7 @@ EOT
           folder = domain_hash["folder"]
           FileUtils.mkpath folder
 
-          file_name = File.join(folder, domain_name.to_s.downcase + '.json')
+          file_name = File.join(folder, domain_name + '.json')
 
           File.open(file_name, 'w') do |file|
             file.write(JSON.pretty_generate(domain_hash["options"]) + "\n")

data/lib/spout/helpers/chart_types.rb

@@ -353,6 +353,7 @@ module Spout
         title = "#{json['display_name']}"
         subtitle = "By Visit"
         units = "Subjects"
+        x_axis_units = json["units"]
         series = []
 
         all_subject_values = subjects.collect(&method.to_sym).compact.sort
@@ -370,7 +371,7 @@ module Spout
           series << { name: display_name, data: data }
         end
 
-        { title: title, subtitle: subtitle, categories: categories, units: units, series: series }
+        { title: title, subtitle: subtitle, categories: categories, units: units, series: series, x_axis_title: x_axis_units }
       end
 
       def self.pull_categories(json, method, all_subject_values, domain_json)

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 8
     TINY = 0
-    BUILD = "rc4" # nil, "pre", "rc", "rc2"
+    BUILD = "rc5" # 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.8.0.rc4
+  version: 0.8.0.rc5
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake