spout 0.12.1 → 0.13.0.beta1

data/lib/spout/tests.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'json'
+require "rubygems"
+require "json"
 
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'colorize'
+require "minitest/autorun"
+require "minitest/reporters"
+require "colorize"
 
 module Minitest
   module Reporters
@@ -14,22 +14,22 @@ module Minitest
 
       def start
         super
-        print 'Loaded Suite test'.colorize(:white)
+        print "Loaded Suite test".colorize(:white)
         puts
         puts
-        puts 'Started'
+        puts "Started"
         puts
       end
 
       def report
         super
-        puts format('Finished in %.5f seconds.', total_time)
+        puts format("Finished in %.5f seconds.", total_time)
         puts
-        print format('%d tests', count).colorize(:white)
-        print format(', %d assertions, ', assertions)
+        print format("%d tests", count).colorize(:white)
+        print format(", %d assertions, ", assertions)
         color = failures.zero? && errors.zero? ? :green : :red
-        print format('%d failures, %d errors, ', failures, errors).colorize(color)
-        print format('%d skips', skips).colorize(:yellow)
+        print format("%d failures, %d errors, ", failures, errors).colorize(color)
+        print format("%d skips", skips).colorize(:yellow)
         puts
         puts
       end
@@ -37,11 +37,11 @@ module Minitest
       def record(test)
         super
         if !test.skipped? && test.failure
-          print '    '
+          print "    "
           print_colored_status(test)
           print "    #{test.name}"
           puts
-          print '             '
+          print "             "
           print test.failure.to_s.gsub("\n", "\n             ")
           puts
           puts
@@ -74,23 +74,23 @@ end
 
 Minitest::Reporters.use! Minitest::Reporters::SpoutReporter.new
 
-require 'spout/tests/json_validation'
-require 'spout/tests/domain_existence_validation'
-require 'spout/tests/domain_format'
-require 'spout/tests/domain_name_format'
-require 'spout/tests/domain_name_uniqueness'
-require 'spout/tests/domain_specified'
-require 'spout/tests/form_existence_validation'
-require 'spout/tests/form_name_format'
-require 'spout/tests/form_name_match'
-require 'spout/tests/form_name_uniqueness'
-require 'spout/tests/variable_display_name_length'
-require 'spout/tests/variable_name_format'
-require 'spout/tests/variable_name_match'
-require 'spout/tests/variable_name_uniqueness'
-require 'spout/tests/variable_type_validation'
+require "spout/tests/json_validation"
+require "spout/tests/domain_existence_validation"
+require "spout/tests/domain_format"
+require "spout/tests/domain_name_format"
+require "spout/tests/domain_name_uniqueness"
+require "spout/tests/domain_specified"
+require "spout/tests/form_existence_validation"
+require "spout/tests/form_name_format"
+require "spout/tests/form_name_match"
+require "spout/tests/form_name_uniqueness"
+require "spout/tests/variable_display_name_length"
+require "spout/tests/variable_name_format"
+require "spout/tests/variable_name_match"
+require "spout/tests/variable_name_uniqueness"
+require "spout/tests/variable_type_validation"
 
-require 'spout/helpers/iterators'
+require "spout/helpers/iterators"
 
 module Spout
   module Tests

data/lib/spout/version.rb

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

data/lib/spout/views/index.html.erb

@@ -204,8 +204,8 @@ tfoot td {
                 </div>
               </td>
               <td style="text-align:center">
-                <% matched = @matching_results.count{|csv_files, column, scr| scr.json['type'] == 'choices' and scr.domain_test} %>
-                <% total_count = @matching_results.count{|csv_files, column, scr| scr.json['type'] == 'choices'} %>
+                <% matched = @matching_results.count{|csv_files, column, scr| scr.json["type"] == "choices" and scr.domain_test} %>
+                <% total_count = @matching_results.count{|csv_files, column, scr| scr.json["type"] == "choices"} %>
                 <% matched_percent = (total_count == 0 ? 0 : (matched * 100.0 / total_count).floor) %>
                 <% missing_percent = 100 - matched_percent %>
                 <%= number_with_delimiter(matched) %> of <%= number_with_delimiter(total_count) %>
@@ -236,7 +236,7 @@ tfoot td {
               <tr>
                 <td>
                   <% csv_files.each do |csv_file| %>
-                    <code class="<%= 'success' if scr.number_of_errors == 0 %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, '') %></code><br />
+                    <code class="<%= "success" if scr.number_of_errors == 0 %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, "") %></code><br />
                   <% end %>
                 </td>
                 <td><%= column %></td>
@@ -252,37 +252,37 @@ tfoot td {
                     <% if scr.json_id_test %>
                       <code class="success">"id": "<%= column %>"</code>
                     <% else %>
-                      <code>"id": <%= scr.json['id'].inspect %></code>
+                      <code>"id": <%= scr.json["id"].inspect %></code>
                     <% end %>
                   <% end %>
                 </td>
                 <td>
                   <% if scr.file_name_test %>
-                    <code class="<%= 'success' if scr.variable_type_test %>">"type": <%= scr.json['type'].inspect %></code>
+                    <code class="<%= "success" if scr.variable_type_test %>">"type": <%= scr.json["type"].inspect %></code>
                   <% end %>
                 </td>
                 <td>
-                  <% if (scr.json['type'] == 'choices' || scr.json['domain'].to_s.downcase.strip != '') && scr.file_name_test %>
-                    <% if scr.domain_test || scr.json['domain'].to_s.strip == '' %>
-                      <code class="<%= 'success' if scr.domain_test %>">"domain": <%= scr.json['domain'].inspect %></code>
+                  <% if (scr.json["type"] == "choices" || scr.json["domain"].to_s.downcase.strip != "") && scr.file_name_test %>
+                    <% if scr.domain_test || scr.json["domain"].to_s.strip == "" %>
+                      <code class="<%= "success" if scr.domain_test %>">"domain": <%= scr.json["domain"].inspect %></code>
                     <% else %>
-                      <span class="text-danger"><code><%= scr.json['domain'] %>.json</code> missing</span>
+                      <span class="text-danger"><code><%= scr.json["domain"] %>.json</code> missing</span>
                     <% end %>
                   <% end %>
                 </td>
                 <td style="white-space:nowrap">
-                  <% if scr.json['type'] == 'choices' || scr.json['domain'].to_s.downcase.strip != '' %>
+                  <% if scr.json["type"] == "choices" || scr.json["domain"].to_s.downcase.strip != "" %>
                     <% unused_domain_values = scr.valid_values - scr.csv_values %>
                     <% unused_values = (scr.valid_values | scr.csv_values) - (scr.valid_values & scr.csv_values) %>
                     <% if scr.values_test && unused_values.empty? %>
                       <div class="text-success" style="text-align:center"><span class="glyphicon glyphicon-ok"></span></div>
                     <% else %>
                       <% (scr.valid_values + scr.csv_values.compact.sort).uniq.each do |value| %>
-                        <% value_as_number = format('%g', value) rescue value_as_number = nil %>
-                        <% next if !scr.valid_values.include?(value) && %w(numeric integer).include?(scr.json['type']) && !value_as_number.nil? %>
-                        <% class_type = '' %>
-                        <% class_type = 'success' if scr.valid_values.include?(value) %>
-                        <% class_type = 'default' if unused_domain_values.include?(value)  %>
+                        <% value_as_number = format("%g", value) rescue value_as_number = nil %>
+                        <% next if !scr.valid_values.include?(value) && %w(numeric integer).include?(scr.json["type"]) && !value_as_number.nil? %>
+                        <% class_type = "" %>
+                        <% class_type = "success" if scr.valid_values.include?(value) %>
+                        <% class_type = "default" if unused_domain_values.include?(value)  %>
                         <code class="<%= class_type %>"><%= value %></code>
                       <% end %>
                     <% end %>

data/lib/spout/views/outliers.html.erb

@@ -112,12 +112,12 @@ tfoot td {
             <% @overall_results.each do |csv_file, major_outliers, minor_outliers, total_outliers| %>
               <tr>
                 <td><%= csv_file %></td>
-                <td><code class="<%= major_outliers > 0 ? 'danger' : 'default' %>"><%= number_with_delimiter(major_outliers) %></code></td>
-                <td><code class="<%= minor_outliers > 0 ? 'warning' : 'default' %>"><%= number_with_delimiter(minor_outliers) %></code></td>
+                <td><code class="<%= major_outliers > 0 ? "danger" : "default" %>"><%= number_with_delimiter(major_outliers) %></code></td>
+                <td><code class="<%= minor_outliers > 0 ? "warning" : "default" %>"><%= number_with_delimiter(minor_outliers) %></code></td>
                 <td>
-                  <% css_class = 'success' %>
-                  <% css_class = 'warning' if minor_outliers > 0 %>
-                  <% css_class = 'danger' if major_outliers > 0 %>
+                  <% css_class = "success" %>
+                  <% css_class = "warning" if minor_outliers > 0 %>
+                  <% css_class = "danger" if major_outliers > 0 %>
                   <code class="<%= css_class %>"><%= number_with_delimiter(total_outliers) %>
                 </td>
               </tr>
@@ -142,9 +142,9 @@ tfoot td {
               <tr>
                 <td>
                   <% outlier_result.csv_files.each do |csv_file| %>
-                    <% css_class = 'success' if outlier_result.outliers.size == 0 %>
-                    <% css_class = 'warning-pale' if outlier_result.major_outliers.size == 0 and outlier_result.minor_outliers.size > 0 %>
-                    <code class="<%= css_class %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, '') %></code><br />
+                    <% css_class = "success" if outlier_result.outliers.size == 0 %>
+                    <% css_class = "warning-pale" if outlier_result.major_outliers.size == 0 and outlier_result.minor_outliers.size > 0 %>
+                    <code class="<%= css_class %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, "") %></code><br />
                   <% end %></td>
                 <td><%= outlier_result.method %></td>
                 <td><%= outlier_result.display_name.to_s[0..20] %></td>

data/lib/spout.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'spout/version'
+require "spout/version"
 
-require 'spout/models/dictionary'
+require "spout/models/dictionary"
 
 Spout::COMMANDS = {
-  'c' => :coverage_report,
-  'd' => :deploy,
-  'e' => :exporter,
-  'g' => :generate_charts_and_tables,
-  'i' => :importer,
-  'n' => :new_project,
-  'o' => :outliers_report,
-  't' => :test,
-  'u' => :update,
-  'v' => :version
+  "c" => :coverage_report,
+  "d" => :deploy,
+  "e" => :exporter,
+  "g" => :generate_charts_and_tables,
+  "i" => :importer,
+  "n" => :new_project,
+  "o" => :outliers_report,
+  "t" => :test,
+  "u" => :update,
+  "v" => :version
 }
 
 # Launch spout commands from command line.
@@ -24,56 +24,56 @@ module Spout
   end
 
   def self.new_project(argv)
-    require 'spout/commands/project_generator'
+    require "spout/commands/project_generator"
     Spout::Commands::ProjectGenerator.new(argv)
   end
 
   def self.coverage_report(argv)
-    require 'spout/commands/coverage'
+    require "spout/commands/coverage"
     Spout::Commands::Coverage.new(standard_version, argv)
   rescue NoMemoryError
     puts "[NoMemoryError] You made Spout cry... Spout doesn't run on potatoes :'-("
   end
 
   def self.exporter(argv)
-    require 'spout/commands/exporter'
+    require "spout/commands/exporter"
     Spout::Commands::Exporter.new(standard_version, argv)
   end
 
   def self.generate_charts_and_tables(argv)
     argv = argv.last(argv.size - 1)
-    require 'spout/commands/graphs'
+    require "spout/commands/graphs"
     Spout::Commands::Graphs.new(argv, standard_version)
   end
 
   def self.help(argv)
-    require 'spout/commands/help'
+    require "spout/commands/help"
     Spout::Commands::Help.new(argv)
   end
 
   def self.deploy(argv)
-    require 'spout/commands/deploy'
+    require "spout/commands/deploy"
     Spout::Commands::Deploy.new(argv, standard_version)
   end
 
   def self.importer(argv)
-    require 'spout/commands/importer'
+    require "spout/commands/importer"
     Spout::Commands::Importer.new(argv)
   end
 
   def self.outliers_report(argv)
-    require 'spout/commands/outliers'
+    require "spout/commands/outliers"
     Spout::Commands::Outliers.new(standard_version, argv)
   end
 
   def self.test(_argv)
-    system 'bundle exec rake'
-    # require 'spout/commands/test_runner'
+    system "bundle exec rake"
+    # require "spout/commands/test_runner"
     # Spout::Commands::TestRunner.new(argv)
   end
 
   def self.update(argv)
-    require 'spout/commands/update'
+    require "spout/commands/update"
     Spout::Commands::Update.start(argv)
   end
 
@@ -82,9 +82,9 @@ module Spout
   end
 
   def self.standard_version
-    version = File.open('VERSION', &:readline).strip
-    version == '' ? '1.0.0' : version
+    version = File.open("VERSION", &:readline).strip
+    version == "" ? "1.0.0" : version
   rescue
-    '1.0.0'
+    "1.0.0"
   end
 end

data/spout.gemspec

@@ -8,34 +8,34 @@
 # gem list -r spout
 # gem install spout
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'spout/version'
+require "spout/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'spout'
+  spec.name          = "spout"
   spec.version       = Spout::VERSION::STRING
-  spec.authors       = ['Remo Mueller']
-  spec.email         = ['remosm@gmail.com']
-  spec.description   = 'Manage your data dictionary as a JSON repository, and easily export back to CSV.'
-  spec.summary       = '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/spout'
-  spec.license       = 'MIT'
+  spec.authors       = ["Remo Mueller"]
+  spec.email         = ["remosm@gmail.com"]
+  spec.description   = "Manage your data dictionary as a JSON repository, and easily export back to CSV."
+  spec.summary       = "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/spout"
+  spec.license       = "MIT"
 
-  spec.files = Dir['{bin,lib}/**/*'] + ['CHANGELOG.md', 'LICENSE', 'Rakefile', 'README.md', 'spout.gemspec']
+  spec.files = Dir["{bin,lib}/**/*"] + ["CHANGELOG.md", "LICENSE", "Rakefile", "README.md", "spout.gemspec"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'bundler', '~> 1.13'
-  spec.add_dependency 'rake'
-  spec.add_dependency 'minitest'
-  spec.add_dependency 'minitest-reporters'
-  spec.add_dependency 'json'
-  spec.add_dependency 'colorize', '~> 0.8.1'
+  spec.add_dependency "bundler", "~> 1.13"
+  spec.add_dependency "rake"
+  spec.add_dependency "minitest"
+  spec.add_dependency "minitest-reporters"
+  spec.add_dependency "json"
+  spec.add_dependency "colorize", "~> 0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,12 +205,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Turn your CSV data dictionary into a JSON repository. Collaborate with others