spout 0.8.0.beta11 → 0.8.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24bb02bdd280c06d7525c64dcf7ba2e8d41cbdd
-  data.tar.gz: 4320a06b3bf72ef336bfd211e4b54c2cfbcc379d
+  metadata.gz: 1b54a8c6d6961f85f94ebc386b6d19f2c005c065
+  data.tar.gz: 28080e314a53b7de358956658e2a0c3cf81a8d30
 SHA512:
-  metadata.gz: b6d305cc70fb6bcbd16e97c7450f0bed6f35bf456f93becc7ce23c97b766d5eda07a06c152941d3c127a61cd8042737013b99c01ba13563226a6bd3186453351
-  data.tar.gz: 2493538c40d38fb5708795f4c4b7dc75b0eb3ecf7ec119e0365244a38dae4f86753e60c5f6422bc1361e1e4b8319e8e61dcfcdbe65710745473043d885a8fb9e
+  metadata.gz: 5d6e7f3af3e290a83147ffac8c3cb215193bede45866c028a06ace4b6cfd1fdaa9e321b6f5138a6a0d094cae5c3ad4e13b279846a54cb57b5680390b8e2a47e3
+  data.tar.gz: ff772b5b0633a23137dd8a34623fcdaa2c0cafdc1e09ebc47858ac1eb4a2fc835a6c2d5ba37793e1c3f8f62a59c295b04d29ff2e1e21fc8d6e0ef347bf53ca43

data/CHANGELOG.md

@@ -14,6 +14,9 @@
   - Updated to colorize 0.7.2
 - Use of Ruby 2.1.2 is now recommended
 
+### Bug Fix
+- Spout commands are now more consistently case insensitive for file and column names across platforms
+
 ### Testing
 - Refactored Spout code and updated test coverage for all major spout commands
 

data/lib/spout/commands/coverage.rb

@@ -29,6 +29,8 @@ module Spout
       end
 
       def run_coverage_report!
+        puts "Generating: index.html\n\n"
+
         @matching_results = []
 
         @subject_loader.all_methods.each do |method, csv_files|
@@ -58,8 +60,6 @@ module Spout
         FileUtils.mkpath coverage_folder
         coverage_file = File.join(coverage_folder, 'index.html')
 
-        print "\nGenerating: index.html\n\n"
-
         File.open(coverage_file, 'w+') do |file|
           erb_location = File.join( File.dirname(__FILE__), '../views/index.html.erb' )
           file.puts ERB.new(File.read(erb_location)).result(binding)

data/lib/spout/commands/exporter.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'json'
 
 module Spout
   module Commands

data/lib/spout/commands/importer.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'json'
 
 module Spout
   module Commands

data/lib/spout/commands/outliers.rb

@@ -28,6 +28,8 @@ module Spout
       end
 
       def run_outliers_report!
+        puts "Generating: outliers.html\n\n"
+
         @outlier_results = @subject_loader.all_methods.collect do |method, csv_files|
           Spout::Models::OutlierResult.new(@subjects, method, csv_files)
         end
@@ -46,8 +48,6 @@ module Spout
         FileUtils.mkpath coverage_folder
         html_file = File.join(coverage_folder, 'outliers.html')
 
-        print "\nGenerating: outliers.html\n\n"
-
         File.open(html_file, 'w+') do |file|
           erb_location = File.join( File.dirname(__FILE__), '../views/outliers.html.erb' )
           file.puts ERB.new(File.read(erb_location)).result(binding)

data/lib/spout/helpers/chart_types.rb

@@ -28,7 +28,7 @@ module Spout
       end
 
       def self.get_json(file_name, file_type)
-        file = Dir.glob("#{file_type}s/**/#{file_name}.json").first
+        file = Dir.glob("#{file_type.to_s.downcase}s/**/#{file_name.to_s.downcase}.json", File::FNM_CASEFOLD).first
         json = JSON.parse(File.read(file)) rescue json = nil
         json
       end
@@ -42,7 +42,7 @@ module Spout
       end
 
       def self.domain_array(variable_name)
-        variable_file = Dir.glob("variables/**/#{variable_name}.json").first
+        variable_file = Dir.glob("variables/**/#{variable_name.to_s.downcase}.json", File::FNM_CASEFOLD).first
         json = JSON.parse(File.read(variable_file)) rescue json = nil
         if json
           domain_json = get_domain(json)

data/lib/spout/helpers/json_loader.rb

@@ -3,7 +3,7 @@ module Spout
     class JsonLoader
 
       def self.get_json(file_name, file_type)
-        file = Dir.glob("#{file_type}s/**/#{file_name}.json").first
+        file = Dir.glob("#{file_type.to_s.downcase}s/**/#{file_name.to_s.downcase}.json", File::FNM_CASEFOLD).first
         json = JSON.parse(File.read(file)) rescue json = nil
         json
       end

data/lib/spout/helpers/subject_loader.rb

@@ -35,27 +35,30 @@ module Spout
           CSV.parse( File.open(csv_file, 'r:iso-8859-1:utf-8'){|f| f.read}, headers: true, header_converters: lambda { |h| h.to_s.downcase } ) do |line|
             row = line.to_hash
             count += 1
-            puts "Line: #{count}" if (count % 1000 == 0)
+            print '.' if (count % 10 == 0)
             @subjects << Spout::Models::Subject.create do |t|
               t._visit = row[@visit]
 
               row.each do |key,value|
-                unless t.respond_to?(key)
-                  t.class.send(:define_method, "#{key}") { instance_variable_get("@#{key}") }
-                  t.class.send(:define_method, "#{key}=") { |value| instance_variable_set("@#{key}", value) }
+                method = key.to_s.downcase
+
+                unless t.respond_to?(method)
+                  t.class.send(:define_method, "#{method}") { instance_variable_get("@#{method}") }
+                  t.class.send(:define_method, "#{method}=") { |value| instance_variable_set("@#{method}", value) }
                 end
 
-                @all_methods[key] ||= []
-                @all_methods[key] = @all_methods[key] | [csv_file]
+                @all_methods[method] ||= []
+                @all_methods[method] = @all_methods[method] | [csv_file]
 
                 unless value == nil
-                  t.send("#{key}=", value)
+                  t.send("#{method}=", value)
                 end
               end
             end
             # puts "Memory Used: " + (`ps -o rss -p #{$$}`.strip.split.last.to_i / 1024).to_s + " MB" if count % 1000 == 0
             break if @number_of_rows != nil and count >= @number_of_rows
           end
+          puts "\n\n"
         end
       end
 

data/lib/spout/models/coverage_result.rb

@@ -16,7 +16,7 @@ module Spout
       end
 
       def load_json(column)
-        file = Dir.glob("variables/**/#{column}.json").first
+        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)
@@ -25,7 +25,7 @@ module Spout
       def load_valid_values
         valid_values = []
         if @json['type'] == 'choices'
-          file = Dir.glob("domains/**/#{@json['domain']}.json").first
+          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']}
           end
@@ -49,7 +49,7 @@ module Spout
         if @json['type'] != 'choices'
           true
         else
-          domain_file = Dir.glob("domains/**/#{@json['domain']}.json").first
+          domain_file = Dir.glob("domains/**/#{@json['domain'].to_s.downcase}.json", File::FNM_CASEFOLD).first
           if domain_json = JSON.parse(File.read(domain_file)) rescue false
             return domain_json.kind_of?(Array)
           end

data/lib/spout/version.rb

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