spout 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e001b51a9983790658860bbb51632a1813b894d1
-  data.tar.gz: 0f211bacf09bb60aa4ddba44b83402ce7301140c
+  metadata.gz: be0327cbf6a23831a9d083cb661fad0dde046ca7
+  data.tar.gz: d67d665c3054ae148b984cabfe06a1bb11f981bf
 SHA512:
-  metadata.gz: 02a7909c448bc1b41857e5f42d9f4c5be878c17943731016477a87cee969c2143b341b58d1573e1155989fbbad9682cf4598d37d265fc5a710257daf7b517290
-  data.tar.gz: 7080763bcf995bf88767a59948b2cff64e97cb61c1c1bf73cc6bfa227f86eb28c6e6acdf2ce73fd4fd65901f42913353a97e990ba6454b8e5c9ad9cfa06bc7f8
+  metadata.gz: 9ec0a4511d1b4b1a13dd1cc17c2941dc7d10dac65b9879a4fe808e0463ab6541bfd13104abdc93e88a591fccbdf04f196b4397a75f8fafc98800f0657825d1ec
+  data.tar.gz: 8296234875bf25d5cb5c5e0ee8c126e99a5677bb9557a797dfdcf69dc9b29df0f376a66de60957812063ec553ee5647f5fdab95dc25d134bd001e9c98c837a90

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.11.1 (February 4, 2016)
+
+### Bug Fix
+- Fixed a bug that prevented variables without graphs from being pushed to server
+
 ## 0.11.0 (January 19, 2016)
 
 ### Deprecations

data/lib/spout/commands/coverage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'erb'
 require 'fileutils'

data/lib/spout/commands/deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 require 'net/http'
 require 'io/console'

data/lib/spout/commands/exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 require 'json'
 require 'fileutils'

data/lib/spout/commands/graphs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 require 'fileutils'
 require 'rubygems'
@@ -104,7 +106,6 @@ module Spout
 
           next unless variable.errors.size == 0
           next unless @valid_ids.include?(variable.id) || @valid_ids.size == 0
-          next unless %w(numeric integer choices).include?(variable.type)
           next unless Spout::Models::Subject.method_defined?(variable.id)
 
           if @deploy_mode
@@ -117,37 +118,7 @@ module Spout
           @progress[variable.id]['uploaded'] ||= []
           next if (!@deploy_mode && @progress[variable.id]['generated'] == true) || (@deploy_mode && @progress[variable.id]['uploaded'].include?(@webserver_name))
 
-          stats = {
-            charts: {},
-            tables: {}
-          }
-
-          @chart_variables.each do |chart_type_hash|
-            chart_type = chart_type_hash['chart']
-            chart_title = chart_type_hash['title'].downcase.gsub(' ', '-')
-            chart_variable = Spout::Models::Variable.find_by_id(chart_type)
-
-            filtered_subjects = @subjects.reject { |s| s.send(chart_type).nil? || s.send(variable.id).nil? }
-
-            next if filtered_subjects.collect(&variable.id.to_sym).compact_empty.count == 0
-            if chart_type == @config.visit
-              graph = Spout::Models::Graphables.for(variable, chart_variable, nil, filtered_subjects)
-              stats[:charts][chart_title] = graph.to_hash
-              table = Spout::Models::Tables.for(variable, chart_variable, filtered_subjects, nil, totals: false)
-              stats[:tables][chart_title] = table.to_hash
-            else
-              graph = Spout::Models::Graphables.for(variable, chart_variable, @stratification_variable, filtered_subjects)
-              stats[:charts][chart_title] = graph.to_hash
-              stats[:tables][chart_title] = @stratification_variable.domain.options.collect do |option|
-                visit_subjects = filtered_subjects.select { |s| s._visit == option.value }
-                Spout::Models::Tables.for(variable, chart_variable, visit_subjects, option.display_name).to_hash
-              end.compact
-            end
-          end
-
-          chart_json_file = File.join(@graphs_folder, "#{variable.id}.json")
-          File.open(chart_json_file, 'w') { |file| file.write(JSON.pretty_generate(stats) + "\n") }
-          @progress[variable.id]['generated'] = true
+          stats = compute_stats(variable)
 
           if @deploy_mode && !@progress[variable.id]['uploaded'].include?(@webserver_name)
             values = @subjects.collect(&variable.id.to_sym).compact_empty
@@ -166,6 +137,39 @@ module Spout
         end
       end
 
+      def compute_stats(variable)
+        stats = { charts: {}, tables: {} }
+        return stats unless %w(numeric integer choices).include?(variable.type)
+
+        @chart_variables.each do |chart_type_hash|
+          chart_type = chart_type_hash['chart']
+          chart_title = chart_type_hash['title'].downcase.tr(' ', '-')
+          chart_variable = Spout::Models::Variable.find_by_id(chart_type)
+
+          filtered_subjects = @subjects.reject { |s| s.send(chart_type).nil? || s.send(variable.id).nil? }
+
+          next if filtered_subjects.collect(&variable.id.to_sym).compact_empty.count == 0
+          if chart_type == @config.visit
+            graph = Spout::Models::Graphables.for(variable, chart_variable, nil, filtered_subjects)
+            stats[:charts][chart_title] = graph.to_hash
+            table = Spout::Models::Tables.for(variable, chart_variable, filtered_subjects, nil, totals: false)
+            stats[:tables][chart_title] = table.to_hash
+          else
+            graph = Spout::Models::Graphables.for(variable, chart_variable, @stratification_variable, filtered_subjects)
+            stats[:charts][chart_title] = graph.to_hash
+            stats[:tables][chart_title] = @stratification_variable.domain.options.collect do |option|
+              visit_subjects = filtered_subjects.select { |s| s._visit == option.value }
+              Spout::Models::Tables.for(variable, chart_variable, visit_subjects, option.display_name).to_hash
+            end.compact
+          end
+        end
+
+        chart_json_file = File.join(@graphs_folder, "#{variable.id}.json")
+        File.open(chart_json_file, 'w') { |file| file.write(JSON.pretty_generate(stats) + "\n") }
+        @progress[variable.id]['generated'] = true
+        stats
+      end
+
       def send_variable_params_to_server(variable, stats)
         params = { auth_token: @token, version: @standard_version,
                    dataset: @slug, variable: variable.deploy_params,
@@ -174,7 +178,6 @@ module Spout
         params[:variable][:spout_stats] = stats.to_json
         (response, status) = Spout::Helpers::JsonRequestGeneric.post("#{@url}/api/v1/variables/create_or_update.json", params)
         if response.is_a?(Hash) && status.is_a?(Net::HTTPSuccess)
-          # puts "response: #{response}".colorize(:blue)
           @progress[variable.id]['uploaded'] << @webserver_name
         else
           puts "\nUPLOAD FAILED: ".colorize(:red) + variable.id

data/lib/spout/commands/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 
 module Spout

data/lib/spout/commands/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 require 'json'
 require 'fileutils'

data/lib/spout/commands/outliers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'erb'
 require 'fileutils'

data/lib/spout/commands/project_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 require 'fileutils'
 

data/lib/spout/helpers/array_statistics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Extensions to the Array class to calculate quartiles, outliers, and statistics
 class Array
   def compact_empty

data/lib/spout/helpers/chart_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/helpers/array_statistics'
 require 'spout/helpers/table_formatting'
 

data/lib/spout/helpers/config_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Spout

data/lib/spout/helpers/iterators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/dictionary'
 
 module Spout

data/lib/spout/helpers/json_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Spout

data/lib/spout/helpers/json_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'net/http'
 require 'json'

data/lib/spout/helpers/json_request_generic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'net/http'
 require 'json'

data/lib/spout/helpers/number_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Helpers
     module NumberHelper

data/lib/spout/helpers/quietly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Helpers
     # Silences output for tests

data/lib/spout/helpers/semantic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Helpers
     # Helps to sort semantically versioned numbers to match versions that are

data/lib/spout/helpers/send_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'net/http'
 require 'json'

data/lib/spout/helpers/subject_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 require 'csv'
 require 'json'
@@ -129,8 +131,9 @@ module Spout
 
       def get_json(file_name, file_type)
         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
+        JSON.parse(File.read(file))
+      rescue
+        nil
       end
 
       def get_variable(variable_name)

data/lib/spout/helpers/table_formatting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Helpers
     class TableFormatting

data/lib/spout/models/bucket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Models
     # Defines a continuous or discrete bucket for tables and graphs

data/lib/spout/models/coverage_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/tests/variable_type_validation'
 
 module Spout

data/lib/spout/models/dictionary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/variable'
 require 'spout/models/domain'
 require 'spout/models/form'

data/lib/spout/models/domain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 require 'spout/models/record'

data/lib/spout/models/empty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Models
     # Used for empty values, these values exist in that the column is defined

data/lib/spout/models/form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # {
 #   "id": "intake_questionnaire",
 #   "display_name": "Intake Questionnaire at Baseline Visit",

data/lib/spout/models/graphables/choices_vs_choices.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 
 module Spout

data/lib/spout/models/graphables/choices_vs_numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 require 'spout/helpers/array_statistics'
 

data/lib/spout/models/graphables/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/variable'
 require 'spout/models/bucket'
 

data/lib/spout/models/graphables/histogram.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 
 module Spout

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 
 module Spout

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 require 'spout/helpers/array_statistics'
 

data/lib/spout/models/graphables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/graphables/default'
 require 'spout/models/graphables/histogram'
 require 'spout/models/graphables/numeric_vs_choices'

data/lib/spout/models/option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Models
     class Option

data/lib/spout/models/outlier_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/helpers/array_statistics'
 require 'spout/helpers/json_loader'
 

data/lib/spout/models/record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'fileutils'
 

data/lib/spout/models/subject.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Models
     # Subject encapsulates records for individuals specified by an identifier

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/tables/default'
 
 module Spout

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/tables/default'
 require 'spout/helpers/array_statistics'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/variable'
 require 'spout/helpers/table_formatting'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/tables/default'
 require 'spout/helpers/array_statistics'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/tables/default'
 require 'spout/helpers/array_statistics'
 

data/lib/spout/models/tables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/models/tables/default'
 require 'spout/models/tables/numeric_vs_choices'
 require 'spout/models/tables/choices_vs_choices'

data/lib/spout/models/variable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 require 'spout/models/record'

data/lib/spout/tasks/engine.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'colorize'
 

data/lib/spout/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load Spout rakefile extensions
 %w(
   engine

data/lib/spout/templates/test/dictionary_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 # Launches default Spout tests and custom tests for specific to this dictionary

data/lib/spout/templates/test/test_helper.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spout/tests'

data/lib/spout/tests/domain_existence_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module DomainExistenceValidation

data/lib/spout/tests/domain_format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module DomainFormat

data/lib/spout/tests/domain_name_format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     # Tests to assure that the domain name starts with a lowercase letter

data/lib/spout/tests/domain_name_uniqueness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module DomainNameUniqueness

data/lib/spout/tests/domain_specified.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/tests/json_helper'
 
 module Spout

data/lib/spout/tests/form_existence_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module FormExistenceValidation

data/lib/spout/tests/form_name_format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     # Tests to assure that the domain name starts with a lowercase letter

data/lib/spout/tests/form_name_match.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module FormNameMatch

data/lib/spout/tests/form_name_uniqueness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module FormNameUniqueness

data/lib/spout/tests/json_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 def json_value(file, key)

data/lib/spout/tests/json_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module JsonValidation

data/lib/spout/tests/variable_display_name_length.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module VariableDisplayNameLength
-
       Dir.glob("variables/**/*.json").each do |file|
         define_method("test_variable_display_name_length: "+file) do
           assert_operator 255, :>=, (begin JSON.parse(File.read(file))["display_name"].size rescue 0 end)
         end
       end
-
     end
   end
 end

data/lib/spout/tests/variable_name_format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     # Tests to assure that the variable name starts with a lowercase letter

data/lib/spout/tests/variable_name_match.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module VariableNameMatch

data/lib/spout/tests/variable_name_uniqueness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module VariableNameUniqueness

data/lib/spout/tests/variable_type_validation.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 module Spout
   module Tests
     module VariableTypeValidation
-      VALID_VARIABLE_TYPES = ['identifier', 'choices', 'integer', 'numeric', 'string', 'text', 'date', 'time', 'file', 'datetime'].sort
+      VALID_VARIABLE_TYPES = %w(identifier choices integer numeric string text date time file datetime).sort
 
       def assert_variable_type(item)
         message = "#{item} invalid variable type. Valid types: #{VALID_VARIABLE_TYPES.join(', ')}"
         assert VALID_VARIABLE_TYPES.include?(item), message
       end
 
-      Dir.glob("variables/**/*.json").each do |file|
-        define_method("test_variable_type: "+file) do
-          assert_variable_type begin JSON.parse(File.read(file))["type"] rescue nil end
+      Dir.glob('variables/**/*.json').each do |file|
+        define_method("test_variable_type: #{file}") do
+          assert_variable_type begin JSON.parse(File.read(file))['type'] rescue nil end
         end
       end
-
     end
   end
 end

data/lib/spout/tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'json'
 

data/lib/spout/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Spout
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 11
-    TINY = 0
+    TINY = 1
     BUILD = nil # 'pre', 'rc', 'rc2', nil
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.').freeze
   end
 end

data/lib/spout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spout/version'
 
 require 'spout/models/dictionary'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler