spout 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62adbf205bca2bcc8145f98ec3db81e0e4f727cefc8a6cd4feba20f89cad05c3
-  data.tar.gz: 27865c6bc004b782554f351f9f06e7ba1dfb30c2c3b770fcb30d81017924fa97
+  metadata.gz: d7ba6db3d6933e6ec1a5880869caaa3094e2ee66b0f7d23b11704f38783d417f
+  data.tar.gz: 1000f48c9c6d47f4d988c474a8a96bc7a19cea02bc52b1a99b7b97ee9985faf6
 SHA512:
-  metadata.gz: f21716870519e6fca63473053c7cbe7f09f447b7fe1515236523a1b9659fcb8fea8d19fac7492a376fde9afd1aef29a586d85ecfb6b086c171b2bd36fa59c095
-  data.tar.gz: 76b8ae9036b3a5e95853b11a7b6cc330b44f0c1815de212949417fa32c8f8edfb3aab00335d974a745a7fe292b473ec26bb7f52a21bf739478889038cb79db25
+  metadata.gz: 18fb6eab1720ffbf069a083dab7f5caf0082718bdff5f30aa028e532302bb58435222f888fa96e7f23de88a86d86351e2487b0b8ee60d8d3cf9c44d94e0f8ba1
+  data.tar.gz: e7d9b7669c65f625cd33018b9902519d7b58d93f4277de2295b303c903b6b1f16876eeba8358f68f9f02a555bd0c8ecf1fa68c8427690f157e258ec188209710

data/lib/spout/commands/exporter.rb

@@ -45,7 +45,7 @@ module Spout
                    %w(folder) + keys
                  end
           Dir.glob("#{type}/**/*.json").sort.each do |file|
-            json = JSON.parse(File.read(file)) rescue false
+            json = JSON.parse(File.read(file, encoding: "utf-8")) rescue false
             if json
               relative_folder = generic_folder_path(file, type)
               if include_domain_name

data/lib/spout/commands/graphs.rb

@@ -79,7 +79,7 @@ module Spout
 
       def load_current_progress
         @progress_file = File.join(@graphs_folder, ".progress.json")
-        @progress = JSON.parse(File.read(@progress_file)) rescue @progress = {}
+        @progress = JSON.parse(File.read(@progress_file, encoding: "utf-8")) rescue @progress = {}
         @progress = {} if !@progress.is_a?(Hash) || @clean || @progress["SPOUT_VERSION"] != Spout::VERSION::STRING
         @progress["SPOUT_VERSION"] = Spout::VERSION::STRING
       end

data/lib/spout/helpers/json_loader.rb

@@ -7,8 +7,11 @@ module Spout
     class JsonLoader
       def self.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, encoding: "utf-8"))
+      rescue => e
+        puts "JsonLoader Warning".red
+        puts e.to_s.white
+        nil
       end
 
       def self.get_variable(variable_name)

data/lib/spout/helpers/subject_loader.rb

@@ -100,7 +100,7 @@ module Spout
         print "Converting numeric values to floats"
         @variable_files.each_with_index do |variable_file, index|
           print "\rConverting numeric values to floats:#{'% 3d' % ((index + 1) * 100 / variable_count)}%"
-          json = JSON.parse(File.read(variable_file)) rescue json = nil
+          json = JSON.parse(File.read(variable_file, encoding: "utf-8")) rescue json = nil
           next unless json
           next unless @valid_ids.include?(json["id"].to_s.downcase) || @valid_ids.size == 0
           next unless %w(numeric integer).include?(json["type"])
@@ -122,7 +122,7 @@ module Spout
 
       def load_variable_domains!
         @variable_files.each do |variable_file|
-          json = JSON.parse(File.read(variable_file)) rescue json = nil
+          json = JSON.parse(File.read(variable_file, encoding: "utf-8")) rescue json = nil
           next unless json
           next unless json["type"] == "choices" || json["domain"].to_s.downcase.strip != ""
           domain = json["domain"].to_s.downcase
@@ -133,7 +133,7 @@ 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.parse(File.read(file))
+        JSON.parse(File.read(file, encoding: "utf-8"))
       rescue
         nil
       end

data/lib/spout/models/coverage_result.rb

@@ -23,7 +23,7 @@ module Spout
       def load_json(column)
         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 = JSON.parse(File.read(file, encoding: "utf-8")) rescue @json = {}
         @json_id_test = (@json["id"].to_s.downcase == column)
       end
 
@@ -31,7 +31,7 @@ module Spout
         valid_values = []
         if @json["type"] == "choices" || domain_name != ""
           file = Dir.glob("domains/**/#{@json['domain'].to_s.downcase}.json", File::FNM_CASEFOLD).first
-          if json = JSON.parse(File.read(file)) rescue false
+          if json = JSON.parse(File.read(file, encoding: "utf-8")) rescue false
             valid_values = json.collect { |hash| hash["value"] }
           end
         end
@@ -55,7 +55,7 @@ module Spout
           true
         else
           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
+          if domain_json = JSON.parse(File.read(domain_file, encoding: "utf-8")) rescue false
             return domain_json.is_a?(Array)
           end
           false

data/lib/spout/models/domain.rb

@@ -20,7 +20,7 @@ module Spout
 
         json = begin
           if File.exist?(file_name)
-            JSON.parse(File.read(file_name))
+            JSON.parse(File.read(file_name, encoding: "utf-8"))
           else
             @errors << "No corresponding #{@id}.json file found."
             nil

data/lib/spout/models/form.rb

@@ -20,7 +20,7 @@ module Spout
         @folder = file_name.to_s.gsub(/^#{dictionary_root}\/forms\/|#{@id}\.json$/, "")
 
         json = begin
-          JSON.parse(File.read(file_name))
+          JSON.parse(File.read(file_name, encoding: "utf-8"))
         rescue => e
           form_name = file_name.to_s.gsub(/^(.*)\/|\.json$/, "").downcase
           @errors << "Error Parsing #{form_name}.json: #{e.message}"

data/lib/spout/models/variable.rb

@@ -26,7 +26,7 @@ module Spout
         @domain_name = nil
 
         json = begin
-                 JSON.parse(File.read(file_name))
+                 JSON.parse(File.read(file_name, encoding: "utf-8"))
                rescue => e
                  error = e.message
                  nil

data/lib/spout/tests/domain_existence_validation.rb

@@ -10,7 +10,7 @@ module Spout
           file.split("/").last.to_s.downcase.split(".json").first
         end
         result = begin
-          domain_name = JSON.parse(File.read(item))["domain"]
+          domain_name = JSON.parse(File.read(item, encoding: "utf-8"))["domain"]
           domain_names.include?(domain_name)
         rescue JSON::ParserError
           domain_name = ""
@@ -21,7 +21,7 @@ module Spout
       end
 
       Dir.glob("variables/**/*.json").each do |file|
-        if (not [nil, ""].include?(JSON.parse(File.read(file))["domain"]) rescue false)
+        if (not [nil, ""].include?(JSON.parse(File.read(file, encoding: "utf-8"))["domain"]) rescue false)
           define_method("test_domain_exists: #{file}") do
             assert_domain_existence file
           end

data/lib/spout/tests/domain_format.rb

@@ -6,7 +6,7 @@ module Spout
       # Verifies the format of a domain.
       def assert_domain_format(item)
         result = begin
-          json = JSON.parse(File.read(item))
+          json = JSON.parse(File.read(item, encoding: "utf-8"))
           if json.is_a?(Array)
             json.empty? || json.select { |o| !o.is_a?(Hash) }.empty?
           else

data/lib/spout/tests/form_existence_validation.rb

@@ -7,7 +7,7 @@ module Spout
         form_names = Dir.glob("forms/**/*.json").collect{|file| file.split("/").last.to_s.downcase.split(".json").first}
 
         result = begin
-          (form_names | JSON.parse(File.read(item))["forms"]).size == form_names.size
+          (form_names | JSON.parse(File.read(item, encoding: "utf-8"))["forms"]).size == form_names.size
         rescue JSON::ParserError
           false
         end
@@ -18,7 +18,7 @@ module Spout
       end
 
       Dir.glob("variables/**/*.json").each do |file|
-        if (not [nil, ""].include?(JSON.parse(File.read(file))["forms"]) rescue false)
+        if (not [nil, ""].include?(JSON.parse(File.read(file, encoding: "utf-8"))["forms"]) rescue false)
           define_method("test_form_exists: "+file) do
             assert_form_existence file
           end

data/lib/spout/tests/form_name_format.rb

@@ -8,7 +8,7 @@ module Spout
       Dir.glob("forms/**/*.json").each do |file|
         define_method("test_form_name_format: #{file}") do
           message = "Form name format error. Name must start with a lowercase letter and be followed by lowercase letters, numbers, or underscores"
-          assert_match(/^[a-z]\w*$/, (begin JSON.parse(File.read(file))["id"] rescue nil end), message)
+          assert_match(/^[a-z]\w*$/, (begin JSON.parse(File.read(file, encoding: "utf-8"))["id"] rescue nil end), message)
         end
       end
     end

data/lib/spout/tests/form_name_match.rb

@@ -5,7 +5,7 @@ module Spout
     module FormNameMatch
       Dir.glob("forms/**/*.json").each do |file|
         define_method("test_form_name_match: "+file) do
-          assert_equal file.gsub(/^.*\//, "").gsub(".json", "").downcase, (begin JSON.parse(File.read(file))["id"] rescue nil end)
+          assert_equal file.gsub(/^.*\//, "").gsub(".json", "").downcase, (begin JSON.parse(File.read(file, encoding: "utf-8"))["id"] rescue nil end)
         end
       end
     end

data/lib/spout/tests/json_helper.rb

@@ -3,5 +3,5 @@
 require "json"
 
 def json_value(file, key)
-  begin JSON.parse(File.read(file))[key.to_s] rescue nil end
+  begin JSON.parse(File.read(file, encoding: "utf-8"))[key.to_s] rescue nil end
 end

data/lib/spout/tests/json_validation.rb

@@ -5,7 +5,7 @@ module Spout
     module JsonValidation
       def assert_valid_json(item, msg = nil)
         result = begin
-          !!JSON.parse(File.read(item))
+          !!JSON.parse(File.read(item, encoding: "utf-8"))
         rescue JSON::ParserError => e
           error = e
           false

data/lib/spout/tests/variable_display_name_length.rb

@@ -5,7 +5,7 @@ module Spout
     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)
+          assert_operator 255, :>=, (begin JSON.parse(File.read(file, encoding: "utf-8"))["display_name"].size rescue 0 end)
         end
       end
     end

data/lib/spout/tests/variable_name_format.rb

@@ -8,7 +8,7 @@ module Spout
       Dir.glob("variables/**/*.json").each do |file|
         define_method("test_variable_name_format: #{file}") do
           message = "Variable name format error. Name must start with a lowercase letter and be followed by lowercase letters, numbers, or underscores"
-          assert_match(/^[a-z]\w*$/, (begin JSON.parse(File.read(file))["id"] rescue nil end), message)
+          assert_match(/^[a-z]\w*$/, (begin JSON.parse(File.read(file, encoding: "utf-8"))["id"] rescue nil end), message)
         end
       end
     end

data/lib/spout/tests/variable_name_match.rb

@@ -5,7 +5,7 @@ module Spout
     module VariableNameMatch
       Dir.glob("variables/**/*.json").each do |file|
         define_method("test_variable_name_match: "+file) do
-          assert_equal file.gsub(/^.*\//, "").gsub(".json", "").downcase, (begin JSON.parse(File.read(file))["id"] rescue nil end)
+          assert_equal file.gsub(/^.*\//, "").gsub(".json", "").downcase, (begin JSON.parse(File.read(file, encoding: "utf-8"))["id"] rescue nil end)
         end
       end
     end

data/lib/spout/tests/variable_type_validation.rb

@@ -12,7 +12,7 @@ module Spout
 
       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
+          assert_variable_type begin JSON.parse(File.read(file, encoding: "utf-8"))["type"] rescue nil end
         end
       end
     end

data/lib/spout/version.rb

@@ -5,7 +5,7 @@ module Spout
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta1" # "pre", "rc", "rc2", nil
+    BUILD = "beta2" # "pre", "rc", "rc2", nil
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".").freeze
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler